|
@@ -1232,6 +1232,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
|
|
|
await rewardsPanel.UIClosed();
|
|
await rewardsPanel.UIClosed();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (eventConfig.EventTriggerType == 4)
|
|
|
|
|
+ {
|
|
|
|
|
+ await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
|
|
|
|
|
+ UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid)
|
|
if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid)
|
|
|
{
|
|
{
|
|
@@ -1262,7 +1267,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
|
|
|
/// 取消事件
|
|
/// 取消事件
|
|
|
/// </summary>
|
|
/// </summary>
|
|
|
/// <param name="eventID">事件ID</param>
|
|
/// <param name="eventID">事件ID</param>
|
|
|
- public void CancelEvent(AccountFileInfo.EventList eventList)
|
|
|
|
|
|
|
+ public async void CancelEvent(AccountFileInfo.EventList eventList)
|
|
|
{
|
|
{
|
|
|
LogTool.Log($"取消事件{eventList.eventID}");
|
|
LogTool.Log($"取消事件{eventList.eventID}");
|
|
|
isTriggerEvent = false;
|
|
isTriggerEvent = false;
|
|
@@ -1271,7 +1276,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
|
|
|
CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
|
|
CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
|
|
|
onCompleteCallback?.Invoke();
|
|
onCompleteCallback?.Invoke();
|
|
|
onCompleteCallback = null;
|
|
onCompleteCallback = null;
|
|
|
-
|
|
|
|
|
|
|
+ EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
|
|
|
|
|
+ if (eventConfig.EventTriggerType == 4)
|
|
|
|
|
+ {
|
|
|
|
|
+
|
|
|
|
|
+ await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
|
|
|
|
|
+ await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (PlayerGuideManager.Instance.GuideIsCanDo(2))
|
|
if (PlayerGuideManager.Instance.GuideIsCanDo(2))
|
|
|
{
|
|
{
|