From 0d5d3129c01f140b5e0ea0b79ba00489fa2b1571 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期六, 29 九月 2018 21:25:41 +0800
Subject: [PATCH] 2077 【BUG】【主干】引导出现错误

---
 System/MainInterfacePanel/PlayerTaskDatas.cs |   48 ++++++++++++++++++++++++++++++------------------
 1 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 13f727e..a770311 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -209,7 +209,7 @@
     {
         try
         {
-            if (AutomaticityBool)
+            if (AutomaticityBool && MissionState!=3)
             {
                 TaskupToDate = MissionID;
             }
@@ -229,6 +229,7 @@
 
             if (allMissionDict.ContainsKey(MissionID))
             {
+                int missionState = allMissionDict[MissionID].MissionState;
                 if (allMissionDict[MissionID].MissionState != MissionState && MissionState == 3 && AutomaticityBool)
                 {
                     if (CompletionOfTaskEvent != null)
@@ -238,10 +239,21 @@
                 }
                 TaskChanges(MissionID, MissionState, DiscriptionIndex);//浠诲姟鐨勭姸鎬佷慨鏀�
 
-                if (Event_TaskRefreshes != null)//鍒锋柊浠诲姟
+                if (missionState == 0 && (MissionState == 1 || MissionState==2))
                 {
-                    Event_TaskRefreshes(MissionID);
+                    if (Event_TaskToAdd != null)//浠诲姟娣诲姞锛堢敤浜庡瓨鍌ㄤ簬韬笂鐨勬湭鎺ュ彇浠诲姟鐨勭壒娈婂鐞嗭級
+                    {
+                        Event_TaskToAdd(MissionID, MissionState, DiscriptionIndex);
+                    }
                 }
+                else
+                {
+                    if (Event_TaskRefreshes != null)//鍒锋柊浠诲姟
+                    {
+                        Event_TaskRefreshes(MissionID);
+                    }
+                }
+                
             }
             else
             {
@@ -274,7 +286,7 @@
         }
         catch (Exception ex)
         {
-            DebugEx.Log(ex);
+            DebugEx.Log(ex.StackTrace);
         }
 
     }
@@ -300,8 +312,8 @@
         {
             return;
         }
-        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
-        if (!WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>() && IsOpenMain)
+        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
+        if (!WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>() && IsOpenMain)
         {
             WindowCenter.Instance.Open<DefaultDialogueBoxWin>();
             WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -319,7 +331,7 @@
             return;
         }
         var config = Config.Instance.Get<StoryMissionsConfig>(taskID);
-        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
+        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
         var treasureStageUpShow = ModelCenter.Instance.GetModel<TreasureModel>().treasureStageUpShow;
         if (config != null)
         {
@@ -327,7 +339,7 @@
             {
                 if (NPCid == config.NpcID[i])
                 {
-                    if (!WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>() && IsOpenMain
+                    if (!WindowCenter.Instance.IsOpen<DialogueDuidanceWin>() && IsOpenMain
                         && !treasureStageUpShow && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())
                     {
                         WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -336,7 +348,7 @@
                     return;
                 }
             }
-            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
+            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
             {
                 WindowCenter.Instance.Close<MainInterfaceWin>();
                 WindowCenter.Instance.Open<TaskBoxBGMWin>();
@@ -353,7 +365,7 @@
         }
         else
         {
-            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
+            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
             {
                 WindowCenter.Instance.Close<MainInterfaceWin>();
                 WindowCenter.Instance.Open<TaskBoxBGMWin>();
@@ -469,7 +481,7 @@
         SideQuestsType17 = 17,//鏀嚎17-21鏂板
         SideQuestsType18 = 18,
         SideQuestsType19 = 19,
-        SideQuestsType20 = 20,
+        SideQuestsType20 = 20,//(鍚庣鐗规畩澶勭悊锛屾殏瀹氫笉璁╀娇鐢�)
         SideQuestsType21 = 21,
     }
 
@@ -1277,12 +1289,12 @@
             yield break;
         }
 
-        if (WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())
+        if (WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())
         {
             yield break;
         }
 
-        if (WindowCenter.Instance.CheckOpen<MysteriousMissionWin>())
+        if (WindowCenter.Instance.IsOpen<MysteriousMissionWin>())
         {
             yield break;
         }
@@ -1443,18 +1455,18 @@
 
     public static bool IsOPenAutoResolve()//浠诲姟闈㈡澘涓嶅紑鍚嚜鍔ㄦ寕鏈虹姸鎬�
     {
-        WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>();
-        WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>();
+        WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>();
+        WindowCenter.Instance.IsOpen<DialogueDuidanceWin>();
         bool _bool = true;
-        if (WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>())
+        if (WindowCenter.Instance.IsOpen<TaskBoxBGMWin>())
         {
             _bool = false;
         }
-        else if (WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>())
+        else if (WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>())
         {
             _bool = false;
         }
-        else if (WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())
+        else if (WindowCenter.Instance.IsOpen<DialogueDuidanceWin>())
         {
             _bool = false;
         }

--
Gitblit v1.8.0