diff --git a/Assets/PerfectWorld/Prefab/UI/PlayerStats.prefab b/Assets/PerfectWorld/Prefab/UI/PlayerStats.prefab index b5371f4592..908ee8b70f 100644 --- a/Assets/PerfectWorld/Prefab/UI/PlayerStats.prefab +++ b/Assets/PerfectWorld/Prefab/UI/PlayerStats.prefab @@ -2096,10 +2096,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 6310702841431484757} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 4945258045561332121} + m_TargetAssemblyTypeName: BrewMonster.UI.DlgCharacter, Assembly-CSharp + m_MethodName: CloseDialogue + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgCharacter.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgCharacter.cs index f3952a227f..37d121e6d0 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgCharacter.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgCharacter.cs @@ -291,7 +291,7 @@ namespace BrewMonster.UI private void OnCommand_CANCEL() { - Show(false); + CloseDialogue(); } private void OnCommand_force() diff --git a/Assets/PerfectWorld/Scripts/UI/HUDPlayer.cs b/Assets/PerfectWorld/Scripts/UI/HUDPlayer.cs index e713b22a5a..cd3d928036 100644 --- a/Assets/PerfectWorld/Scripts/UI/HUDPlayer.cs +++ b/Assets/PerfectWorld/Scripts/UI/HUDPlayer.cs @@ -33,8 +33,6 @@ namespace BrewMonster EventBus.Subscribe(UpdateNeededExp); if (m_btnOpenCharacter != null) m_btnOpenCharacter.onClick.AddListener(OnOpenCharacterClick); - - } private void OnDestroy() @@ -85,16 +83,22 @@ namespace BrewMonster private void OnOpenCharacterClick() { + // var gameUIMan = EC_Game.GetGameRun()?.GetUIManager()?.GetInGameUIMan(); + // if (gameUIMan == null) return; + // var dlg = CECUIManager.Instance.ShowUI("Win_Character"); + // if (dlg == null) return; + // if (!dlg.IsShow()) + // { + // UnityGameSession.c2s_SendCmdGetExtProps(); + // dlg.ResetPoints(); + // } + // dlg.Show(!dlg.IsShow()); + var gameUIMan = EC_Game.GetGameRun()?.GetUIManager()?.GetInGameUIMan(); if (gameUIMan == null) return; - var dlg = gameUIMan.GetDialog("Win_Character"); - if (dlg == null) return; - if (!dlg.IsShow()) - { - UnityGameSession.c2s_SendCmdGetExtProps(); - dlg.ResetPoints(); - } - dlg.Show(!dlg.IsShow()); + var dlg = CECUIManager.Instance.ShowUI("Win_Character"); + UnityGameSession.c2s_SendCmdGetExtProps(); + dlg.ResetPoints(); } } } \ No newline at end of file