Merge pull request 'feature/skill-data' (#101) from feature/skill-data into develop

Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/101
2025-12-31 03:10:26 +00:00
parent 1664bc9293 f6f9cb343f
commit 8da1b60188
3 changed files with 13 additions and 71 deletions
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb8091c80f707db4967ed52b1a07499bc0012b25ce0ea5aa537c095698219ca9
-size 200762507
+oid sha256:107cb05c7bf60ae1c799ecf263afb7aaa491784495f6dafc9daf900f23396195
+size 200763028
@@ -2293,10 +2293,6 @@ namespace BrewMonster
                //m_pWorkMan.StartWork_p0(pWork);
                EventBus.PublishChannel(GetCharacterID(), new ClearComActFlagAllRankNodesEvent(true));
                PlayAction((int)PLAYER_ACTION_TYPE.ACT_GROUNDDIE);
-                if (PopupManager.Instance != null)
-                {
-                    PopupManager.Instance.OnPlayerDied();
-                }
            }
            else
            {
@@ -4250,9 +4246,9 @@ namespace BrewMonster
        {
            if (IsDead())
            {
-                // TODO: A Hung lam survive dialog
-              /*  CECGameUIMan* pGameUI = g_pGame->GetGameRun()->GetUIManager()->GetInGameUIMan();
+               /* CECGameUIMan pGameUI = g_pGame->GetGameRun()->GetUIManager()->GetInGameUIMan();
                pGameUI->PopupReviveDialog(true);*/
+                PopupManager.Instance.OnPlayerDied();
            }
            m_bEnterGame = true;
        }