Skip to content

Commit a9a7baa

Browse files
committed
feat(room): 主界面接入房间入口并更新 UI 与启动场景资源
HotfixLauncher 加载 UIRoom 包,UIMain 新增房间按钮跳转房间列表,同时提交 UIRoom/UIMain/UICommon/UICommonAvatar/UILauncher 的 FairyGUI 资源与 Launcher 场景更新。
1 parent 895e5e1 commit a9a7baa

15 files changed

Lines changed: 64 additions & 25 deletions

File tree

-5 Bytes
Loading
-32 Bytes
Loading

Assets/Bundles/UI/UILogin/background_05_sample_00_1920.png.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
103 Bytes
Loading
128 Bytes
Binary file not shown.

Assets/Bundles/UI/UIRoom.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
14.3 KB
Binary file not shown.

Assets/Bundles/UI/UIRoom/UIRoom_fui.bytes.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Hotfix/HotfixLauncher.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ public static void Main()
3636
private static async void LoadUI()
3737
{
3838
#if ENABLE_UI_FAIRYGUI
39-
GameApp.FUIPackage.AddPackageAsync(Utility.Asset.Path.GetUIPackagePath(FUIPackage.UICommon));
40-
GameApp.FUIPackage.AddPackageAsync(Utility.Asset.Path.GetUIPackagePath(FUIPackage.UICommonAvatar));
41-
#endif
39+
GameApp.FUIPackage.AddPackageAsync(Utility.Asset.Path.GetUIPackagePath(FUIPackage.UICommon));
40+
GameApp.FUIPackage.AddPackageAsync(Utility.Asset.Path.GetUIPackagePath(FUIPackage.UICommonAvatar));
41+
GameApp.FUIPackage.AddPackageAsync(Utility.Asset.Path.GetUIPackagePath(FUIPackage.UIRoom));
42+
#endif
4243
await GameApp.UI.OpenAsync<UILogin>();
4344
var item = GameApp.Config.GetConfig<TbSoundsConfig>().FirstOrDefault;
4445
Log.Info(item);
@@ -199,4 +200,4 @@ private static async Task<JSONNode> ConfigLoader(string file)
199200
}
200201
#endif
201202
}
202-
}
203+
}

Assets/Hotfix/UI/FairyGUI/UIMain/Components/UIMain.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public sealed partial class UIMain : FUI
2525

2626
public GLoader m_bg { get; private set; }
2727
public GButton m_bag_button { get; private set; }
28+
public GButton m_room_button { get; private set; }
2829
public GLoader m_player_icon { get; private set; }
2930
public GTextField m_player_name { get; private set; }
3031
public GTextField m_player_level { get; private set; }
@@ -92,6 +93,7 @@ protected override void InitView()
9293
{
9394
m_bg = (GLoader)com.GetChild("bg");
9495
m_bag_button = (GButton)com.GetChild("bag_button");
96+
m_room_button = (GButton)com.GetChild("room_button");
9597
m_player_icon = (GLoader)com.GetChild("player_icon");
9698
m_player_name = (GTextField)com.GetChild("player_name");
9799
m_player_level = (GTextField)com.GetChild("player_level");
@@ -109,6 +111,7 @@ public override void Dispose()
109111
self.Remove();
110112
m_bg = null;
111113
m_bag_button = null;
114+
m_room_button = null;
112115
m_player_icon = null;
113116
m_player_name = null;
114117
m_player_level = null;

0 commit comments

Comments
 (0)