diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/Event.meta b/Client/Assets/Scripts/Hotfix/GameLogic/Event.meta new file mode 100644 index 0000000..e484060 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/Event.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5b13f03f2a8a4b3d9c87b8b4cb6e51ba +timeCreated: 1763021850 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs b/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs new file mode 100644 index 0000000..51daf14 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs @@ -0,0 +1,16 @@ +using AlicizaX; + +namespace GameLogic.Event +{ + public readonly struct TestUIOpenEvent:IEventArgs + { + public readonly string UIName; + public readonly bool State; + + public TestUIOpenEvent(string uiName, bool state) + { + UIName = uiName; + State = state; + } + } +} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs.meta new file mode 100644 index 0000000..c8cf6e7 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6e99bec8aaa34153b84e0d09164c9e02 +timeCreated: 1763021859 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs index 96974ef..3d9f4da 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs @@ -42,7 +42,8 @@ namespace GameLogic GameLocaizationTable table = await GameApp.Resource.LoadAssetAsync("LocalizationTable"); GameApp.Localization.IncreAddLocalizationConfig(table); Log.Info("加载多语言配置表完毕"); - await GameApp.UI.ShowUI(); + GameApp.UI.ShowUISync(); + Log.Info("sdadasdas"); } /// diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs index 49d52db..cbce0b2 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs @@ -1,23 +1,48 @@ - +using AlicizaX; +using AlicizaX.Resource.Runtime; using AlicizaX.UI.Runtime; +using Cysharp.Threading.Tasks; using Game.UI; +using GameLogic.Event; +using GameLogic.Event.Generated; using UnityEngine; - -[Window(UILayer.UI,false,160)] +[UIUpdate] +[Window(UILayer.UI, false, 160)] public class UILoadUpdate : UITabWindow { protected override void OnInitialize() { - // baseui.ImgBackGround.color = Color.gray; - // baseui.BtnTest.onClick.AddListener(OnTestClick); + baseui.ImgBackGround.color = Color.gray; + baseui.BtnTest.onClick.AddListener(OnTestClick); + } + + protected override void OnRegisterEvent(EventListenerProxy proxy) + { + base.OnRegisterEvent(proxy); + EventPublisher.Subscribe(OnHandleTestUIOpenEevent); + } + + private void OnHandleTestUIOpenEevent(TestUIOpenEvent obj) + { } private void OnTestClick() { - Debug.Log("ShowUIA"); + EventPublisher.Publish(new TestUIOpenEvent("Test", false)); } + public async UniTask TestFuncA() + { + await UniTask.Delay(1000); + Debug.Log("TestFuncA"); + } + + public void TestFuncB() + { + TestFuncA(); + Debug.Log("TestFuncB"); + } protected override void OnOpen() { @@ -28,5 +53,4 @@ public class UILoadUpdate : UITabWindow { Debug.Log("OnClose"); } - } diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes index 49be030..840d58c 100644 Binary files a/Client/Assets/Test/GameLogic.dll.bytes and b/Client/Assets/Test/GameLogic.dll.bytes differ diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes index b20ed9d..aa06db7 100644 Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and b/Client/Assets/Test/GameLogic.pdb.bytes differ diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes index 0925bfb..4ce1d45 100644 Binary files a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes and b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes differ diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash index 887c56f..29a507a 100644 --- a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash +++ b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash @@ -1 +1 @@ -003bfed3 \ No newline at end of file +54c8e4fa \ No newline at end of file diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json index edbcb6e..92f915a 100644 --- a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json +++ b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json @@ -10,7 +10,7 @@ "BuildPipeline": "EditorSimulateBuildPipeline", "PackageName": "DefaultPackage", "PackageVersion": "Simulate", - "PackageNote": "2025/11/12 16:32:50", + "PackageNote": "2025/11/13 17:20:00", "AssetList": [ { "Address": "A1", @@ -1593,7 +1593,7 @@ "UnityCRC": 0, "FileHash": "e0807c700d7f154aa3711c1bf07383d6", "FileCRC": 0, - "FileSize": 35909, + "FileSize": 34603, "Encrypted": false, "Tags": [ "UI" diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index 110c345..6969907 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit 110c3451ea718e721ad296a532b0fa4e9feb2664 +Subproject commit 69699074de4e895c427c7670bf5ccbb0dd30e6fd diff --git a/Client/ProjectSettings/PackageManagerSettings.asset b/Client/ProjectSettings/PackageManagerSettings.asset index bbc5e03..9b79a36 100644 --- a/Client/ProjectSettings/PackageManagerSettings.asset +++ b/Client/ProjectSettings/PackageManagerSettings.asset @@ -39,6 +39,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -832 - m_OriginalInstanceId: -836 - m_LoadAssets: 0 + m_UserModificationsInstanceId: -830 + m_OriginalInstanceId: -834 + m_LoadAssets: -1