|
@@ -15,6 +15,7 @@ namespace Fort23.Mono
|
|
|
|
|
|
private void Init()
|
|
|
{
|
|
|
+ isAddStack = false;
|
|
|
}
|
|
|
|
|
|
protected override void AddEvent()
|
|
@@ -29,7 +30,8 @@ namespace Fort23.Mono
|
|
|
|
|
|
private void DivineSensePointChange(IEventData e)
|
|
|
{
|
|
|
- Text_divineSensePoint.text = $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
|
|
|
+ Text_divineSensePoint.text =
|
|
|
+ $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
|
|
|
}
|
|
|
|
|
|
public override void AddButtonEvent()
|
|
@@ -81,7 +83,7 @@ namespace Fort23.Mono
|
|
|
{
|
|
|
UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
|
|
|
currentOpenUIPanel = null;
|
|
|
- UIManager.Instance.GetComponent<MainPanel>().Show();
|
|
|
+ // UIManager.Instance.GetComponent<MainPanel>().Show();
|
|
|
// MainPanel.OpenPanel();
|
|
|
});
|
|
|
}
|
|
@@ -90,7 +92,8 @@ namespace Fort23.Mono
|
|
|
{
|
|
|
// EventSystemManager.Instance.DetectRandomEvents();
|
|
|
|
|
|
- if (AccountFileInfo.Instance.playerData.divineSensePoint < PlayerManager.Instance.gameConstantConfig.DetectEventCount)
|
|
|
+ if (AccountFileInfo.Instance.playerData.divineSensePoint <
|
|
|
+ PlayerManager.Instance.gameConstantConfig.DetectEventCount)
|
|
|
{
|
|
|
TipMessagePanel.OpenTipMessagePanel("神识值不够!");
|
|
|
return;
|
|
@@ -129,7 +132,8 @@ namespace Fort23.Mono
|
|
|
eventLists.Remove(reeultEventList);
|
|
|
}
|
|
|
|
|
|
- DivineSenceEventResultPanel divineSenceEventResultPanel = await DivineSenceEventResultPanel.OpenPanel(reeultEventLists, count);
|
|
|
+ DivineSenceEventResultPanel divineSenceEventResultPanel =
|
|
|
+ await DivineSenceEventResultPanel.OpenPanel(reeultEventLists, count);
|
|
|
await divineSenceEventResultPanel.UIClosed();
|
|
|
}
|
|
|
|
|
@@ -159,13 +163,25 @@ namespace Fort23.Mono
|
|
|
|
|
|
public async static CTask OpenPanel(UIPanel uiPanel)
|
|
|
{
|
|
|
- AppBarPanel appBarPanel = await UIManager.Instance.LoadAndOpenPanel<AppBarPanel>(null, UILayer.Top);
|
|
|
+ AppBarPanel appBarPanel = null;
|
|
|
+ if (UIManager.Instance.GetComponent<AppBarPanel>() == null)
|
|
|
+ {
|
|
|
+ appBarPanel = await UIManager.Instance.LoadAndOpenPanel<AppBarPanel>(null, UILayer.Top);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ appBarPanel = UIManager.Instance.GetComponent<AppBarPanel>();
|
|
|
+ await appBarPanel.Show();
|
|
|
+ }
|
|
|
+
|
|
|
appBarPanel.CustomInit(uiPanel);
|
|
|
}
|
|
|
|
|
|
public async static CTask ClosePanel()
|
|
|
{
|
|
|
- UIManager.Instance.HideUIUIPanel<AppBarPanel>();
|
|
|
+ // UIManager.Instance.HideUIUIPanel<AppBarPanel>();
|
|
|
+
|
|
|
+ UIManager.Instance.GetComponent<AppBarPanel>()?.Hide();
|
|
|
}
|
|
|
}
|
|
|
}
|