From 5834ae724e3adad27f7fe6c8c27125277d0afaec Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 16 五月 2019 10:46:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/TaskModel.cs |   65 +++++++++++++-------------------
 1 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/System/MainInterfacePanel/TaskModel.cs b/System/MainInterfacePanel/TaskModel.cs
index 6605bb4..a009083 100644
--- a/System/MainInterfacePanel/TaskModel.cs
+++ b/System/MainInterfacePanel/TaskModel.cs
@@ -130,7 +130,6 @@
     private bool AutomaticityBool = false;//鎺у埗鏄惁鑷姩杩涜鑷姩浠诲姟
     private int retainTaskID = 0;
     private float BossDelayTimeint = 0;
-    private List<int> FaBaoNPCIdList = new List<int>();//鐢ㄤ簬鑾峰彇闇�瑕佹秷澶辩殑娉曞疂NPCID锛�
     public Vector3 UIeffectFabaoVec = new Vector3();//娉曞疂NPC娑堝け鏃惰幏鍙栫殑鍧愭爣
     //----鍏充簬鍓嶆湡鏃犳搷浣滆嚜鍔ㄦ墽琛屼富绾�
     public int TaskAutoLv = 0;
@@ -153,14 +152,7 @@
     {
         StageLoad.Instance.onStageLoadFinish += onStageLoadFinish;
         NPCInteractProcessor.s_NpcInteractEvent += NpcInterac;
-        FaBaoNPCIdList.Clear();
-        string strFabao = FuncConfigConfig.Get("FaBaoNPCID").Numerical1;
-        string[] strFabaoNpcID = ConfigParse.GetMultipleStr(strFabao);//瑙f瀽鍑烘暟缁剕
 
-        for (int i = 0; i < strFabaoNpcID.Length; i++)
-        {
-            FaBaoNPCIdList.Add(int.Parse(strFabaoNpcID[i]));
-        }
         string BossDelayTime = FuncConfigConfig.Get("BossDelayTime").Numerical1;
         BossDelayTimeint = float.Parse(BossDelayTime);
         var Task_Auto = FuncConfigConfig.Get("TaskAuto");
@@ -1475,20 +1467,8 @@
                 if (Npcid != 0 && NPCShowDic.ContainsKey(Npcid))
                 {
                     if (NPCShowDic[Npcid] == 0)
-                    {
-                        if (FaBaoNPCIdList.Contains(Npcid))
-                        {
-                            GA_NpcFunc.SetNpcFuncVisible(Npcid, false, 0.5f, (Vector3 _pos) =>
-                            {
-                                WindowCenter.Instance.Open<EffectToFaBaoWin>();
-                                UIeffectFabaoVec = _pos;
-                            }, 0.3f);
-                        }
-                        else
-                        {
-                            GA_NpcFunc.SetNpcFuncVisible(Npcid, false);
-                        }
-
+                    {
+                        GA_NpcFunc.SetNpcFuncVisible(Npcid, false);
                     }
                     else if (NPCShowDic[Npcid] == 1)
                     {
@@ -1508,20 +1488,8 @@
             if (Npcid != 0 && NPCShowDic.ContainsKey(Npcid))
             {
                 if (NPCShowDic[Npcid] == 0)
-                {
-                    if (FaBaoNPCIdList.Contains(Npcid))
-                    {
-                        GA_NpcFunc.SetNpcFuncVisible(Npcid, false, 0.5f, (Vector3 _pos) =>
-                        {
-                            WindowCenter.Instance.Open<EffectToFaBaoWin>();
-                            UIeffectFabaoVec = _pos;
-                        }, 0.3f);
-                    }
-                    else
-                    {
-                        GA_NpcFunc.SetNpcFuncVisible(Npcid, false);
-                    }
-
+                {
+                    GA_NpcFunc.SetNpcFuncVisible(Npcid, false);
                 }
                 else if (NPCShowDic[Npcid] == 1)
                 {
@@ -1747,8 +1715,10 @@
                 foreach (var key in taskWaits.Keys)
                 {
                     if ((Time.realtimeSinceStartup - taskWaits[key]) < 1f)
-                    {
-                        DebugEx.LogFormat("<color=#00ffff>鐢变簬{0}寮�濮嬩换鍔$瓑寰�</color>", key.ToString());
+                    {
+#if UNITY_EDITOR
+                        DebugEx.LogFormat("<color=#00ffff>鐢变簬{0}寮�濮嬩换鍔$瓑寰�</color>", GetTaskWaitTypeLabel(key));
+#endif
                         return true;
                     }
                 }
@@ -1761,7 +1731,26 @@
         public void Push(TaskWaitType type)
         {
             taskWaits[type] = Time.realtimeSinceStartup;
+        }
+
+#if UNITY_EDITOR
+        static string GetTaskWaitTypeLabel(TaskWaitType waitType)
+        {
+            switch (waitType)
+            {
+                case TaskWaitType.TaskComplete:
+                    return "涓荤晫闈换鍔″畬鎴愯〃鐜�";
+                case TaskWaitType.LevelUp:
+                    return "鐜╁鍗囩骇琛ㄧ幇";
+                case TaskWaitType.TreasureProgress:
+                    return "娉曞疂杩涘害鏇存柊";
+                case TaskWaitType.BetterEquip:
+                    return "鑾峰緱鏇村ソ瑁呭";
+                default:
+                    return waitType.ToString();
+            }
         }
+#endif
     }
 
     public enum TaskWaitType

--
Gitblit v1.8.0