|
@@ -16,6 +16,8 @@ namespace Fort23.Mono
|
|
|
private ShengShiEventWidgetType2 mainShengShiEventWidgetType2;
|
|
|
|
|
|
private int saixuanType = 1;
|
|
|
+
|
|
|
+ bool isTriggerEvent = false;
|
|
|
|
|
|
|
|
|
private void Init()
|
|
@@ -33,9 +35,16 @@ namespace Fort23.Mono
|
|
|
|
|
|
public override CTask GetFocus()
|
|
|
{
|
|
|
+ if (isTriggerEvent)
|
|
|
+ GObjectPoolInterface.SetActive(false);
|
|
|
return base.GetFocus();
|
|
|
}
|
|
|
|
|
|
+ public override CTask Show()
|
|
|
+ {
|
|
|
+ return base.Show();
|
|
|
+ }
|
|
|
+
|
|
|
protected override void DelEvent()
|
|
|
{
|
|
|
EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
|
|
@@ -150,12 +159,15 @@ namespace Fort23.Mono
|
|
|
EventSystemManager.Instance.CancelEvent();
|
|
|
if (EventSystemManager.Instance.isTriggerEvent)
|
|
|
return;
|
|
|
+
|
|
|
+ isTriggerEvent = true;
|
|
|
this.GObjectPoolInterface.SetActive(false);
|
|
|
- EventSystemManager.Instance.isOpenUi = false;
|
|
|
+ // EventSystemManager.Instance.isOpenUi = false;
|
|
|
|
|
|
EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
|
|
|
{
|
|
|
this.GObjectPoolInterface.SetActive(true);
|
|
|
+ isTriggerEvent = false;
|
|
|
UpdateContent();
|
|
|
});
|
|
|
}
|
|
@@ -186,6 +198,7 @@ namespace Fort23.Mono
|
|
|
EventSystemManager.Instance.isOpenUi = false;
|
|
|
saixuanType = 1;
|
|
|
mainShengShiEventWidgetType2 = null;
|
|
|
+ isTriggerEvent = false;
|
|
|
base.Close();
|
|
|
}
|
|
|
}
|