From 772af076968c2f55fa94a4afa519601f5bd5b5b3 Mon Sep 17 00:00:00 2001
From: VuNgocHaiC7 <pro9zuka17@gmail.com>
Date: Thu, 12 Mar 2026 16:11:09 +0700
Subject: [PATCH] fix code for UI dlgTeamList

---
 Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMain.cs |  9 ++++-----
 Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMate.cs |  2 +-
 Assets/Scripts/CECHostPlayer.cs                       | 10 +++++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMain.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMain.cs
index 996d53d217..fa95f1f867 100644
--- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMain.cs
+++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMain.cs
@@ -53,7 +53,6 @@ namespace BrewMonster.UI
             {
                 HideTeamList();
                 ClearAllTeamMates();
-                m_bPendingShow = false;
                 return true;
             }
 
@@ -76,9 +75,9 @@ namespace BrewMonster.UI
                 displayMembers.Add(member);
             }
 
-            if (displayMembers.Count > 0 && !IsShow() && m_bPendingShow)
+            if (!IsShow() && m_bPendingShow)
             {
-                Show(true);
+                CECUIManager.Instance?.ShowUI("Win_TeamMain");
                 m_bPendingShow = false;
             }
 
@@ -180,7 +179,7 @@ namespace BrewMonster.UI
         {
             if (IsShow())
             {
-                Show(false);
+                CloseDialogue();
             }
 
             HideAllTeamMates();
@@ -192,7 +191,7 @@ namespace BrewMonster.UI
             {
                 if(mate != null && mate.IsShow())
                 {
-                    mate.Show(false);
+                    mate.CloseDialogue();
                 }
             }
         }
diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMate.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMate.cs
index 933f1e537d..f1b92e4edd 100644
--- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMate.cs
+++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgTeamMate.cs
@@ -40,7 +40,7 @@ namespace BrewMonster.UI
         {
             if (member == null)
             {
-                Show(false);
+                CloseDialogue();
                 return;
             }
 
diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs
index 4408cdcee2..2f68be2bf8 100644
--- a/Assets/Scripts/CECHostPlayer.cs
+++ b/Assets/Scripts/CECHostPlayer.cs
@@ -654,15 +654,19 @@ namespace BrewMonster
             if (uiMan == null)
                 return;
 
-            var dlgTeamMain = CECUIManager.Instance.ShowUI("Win_TeamMain") as DlgTeamMain;
+            // CECGameUIMan will forward to DlgTeamMain if it's open, otherwise do nothing.
+            var dlgTeamMain = uiMan.GetDialog("Win_TeamMain") as DlgTeamMain;
             if (dlgTeamMain != null)
             {
-                dlgTeamMain.UpdateTeamInfo();
-
                 if (showDialog)
                 {
+                    CECUIManager.Instance?.ShowUI("Win_TeamMain");
                     dlgTeamMain.ShowTeamDialog();
                 }
+                else
+                {
+                    dlgTeamMain.UpdateTeamInfo();
+                }
             }
             else
             {