fix code for UI dlgTeamList
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace BrewMonster.UI
|
||||
{
|
||||
if (member == null)
|
||||
{
|
||||
Show(false);
|
||||
CloseDialogue();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user