Merge remote-tracking branch 'origin/develop' into feature/HP_move_when_load_terrain_lit

2026-05-07 17:59:02 +07:00
parent 5581c616c1 17ffe70075
commit 9b6ff7c377
16 changed files with 523 additions and 30 deletions
@@ -53,6 +53,13 @@ namespace BrewMonster.UI
        private void OnDisable()
        {
            _btnEnterGame.onClick.RemoveListener(OnClickedEnterGame);
+            if (_showModelReadyCoroutine != null)
+            {
+                StopCoroutine(_showModelReadyCoroutine);
+                _showModelReadyCoroutine = null;
+            }
+            _pendingShowModelRoleId = -1;
+            HostPlayerPortraitCapture.Instance?.ClearPortrait();
            _selectingCharacterItemUI = null;
        }

@@ -242,6 +249,7 @@ namespace BrewMonster.UI

        private void OnClickedExit()
        {
+            HostPlayerPortraitCapture.Instance?.ClearPortrait();
            _onExit?.Invoke();
            gameObject.SetActive(false);