From 1289df0a91aa39848c8a5013a2a69c4cdefe4eec Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 05 九月 2018 17:38:59 +0800
Subject: [PATCH] 1863 前端  灵宠属性项509不需要全值

---
 System/MainInterfacePanel/PlayerTaskDatas.cs |   83 +++++++++++++++++++++++++++++------------
 1 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 112033a..2f46d01 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -121,13 +121,15 @@
     public int currentMission { get; private set; }
     public int currentMissionState { get; private set; }
 
-    public int GetNowTaskID { get; set; }
+    public int GetNowTaskID { get; set; }//鑾峰彇褰撳墠閫変腑鏉＄殑浠诲姟ID
 
     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娑堝け鏃惰幏鍙栫殑鍧愭爣
+
+
     PlayerPackModel _playerPack;
     PlayerPackModel playerPack
     {
@@ -183,8 +185,12 @@
 
     public void OnPlayerLoginOk()
     {
+        GlobalTimeEvent.Instance.secondEvent -= secondEvent;
+        GlobalTimeEvent.Instance.secondEvent += secondEvent;
         AutomaticityBool = true;
     }
+
+ 
 
     private void onStageLoadFinish()//鍦板浘鍒囨崲鏃惰皟鐢�
     {
@@ -203,6 +209,10 @@
     {
         try
         {
+            if (AutomaticityBool && MissionState!=3)
+            {
+                TaskupToDate = MissionID;
+            }
             var pytaskM = Config.Instance.Get<PyTaskConfig>(MissionID);
             if (pytaskM == null)
             {
@@ -264,7 +274,7 @@
         }
         catch (Exception ex)
         {
-            DebugEx.Log(ex);
+            DebugEx.Log(ex.StackTrace);
         }
 
     }
@@ -848,9 +858,14 @@
             {
                 if (MainTaskDic.ContainsKey(_MissionId) && MainCardLevelChange != null && _DictValue == 0)
                 {
+                   
+                    if (IsGetOnBool)
+                    {
+                        GetNowTaskID = _MissionId;
+                    }
                     MainCardLevelChange(_MissionId);
+                    
                 }
-
             }
         }
         else
@@ -864,9 +879,16 @@
                     {
                         CardLevelChange(_MissionId);
                     }
-                    if (MainTaskDic.ContainsKey(_MissionId) && MainCardLevelChange != null)
-                    {
-                        MainCardLevelChange(_MissionId);
+                    if (MainTaskDic.ContainsKey(_MissionId))
+                    {                    
+                        if (IsGetOnBool)
+                        {
+                            GetNowTaskID = _MissionId;
+                        }
+                        if (MainCardLevelChange != null)
+                        {
+                            MainCardLevelChange(_MissionId);
+                        }
                     }
                 }
             }
@@ -986,15 +1008,6 @@
                     }
                 }
             }
-
-            //if (_NpcID == allMissionDict[key].LightList.NpcId)
-            //{
-            //    if (allMissionDict[key].LightList.StateLight > Light)
-            //    {
-            //        Light = allMissionDict[key].LightList.StateLight;
-            //    }
-
-            //}
         }
 
         return Light;
@@ -1013,7 +1026,6 @@
                     return;
                 }
             }
-
         }
         if (FairyAuDic.Count != 0)
         {
@@ -1027,8 +1039,6 @@
                 }
             }
         }
-
-
     }
     public void DailyBountyMove()//鏃ュ父璧忛噾浠诲姟
     {
@@ -1043,7 +1053,6 @@
                     return;
                 }
             }
-
         }
         if (BountyDic.Count != 0)
         {
@@ -1057,7 +1066,6 @@
                 }
             }
         }
-
     }
 
 
@@ -1080,7 +1088,6 @@
                 }
             }
         }
-
     }
 
     private int Autotasking(int taskID)
@@ -1144,7 +1151,6 @@
                         return;
                     }
                 }
-
             }
             else if (FairyAuDic.ContainsKey(_taskID))//浠欑洘浠诲姟
             {
@@ -1248,7 +1254,6 @@
                 {
                     break;
                 }
-
                 if (MapTransferUtility.Instance.MapTransferDoType != MapTransferUtility.E_MapTransferDoType.None)
                 {
                     break;
@@ -1371,7 +1376,6 @@
                     GA_NpcFunc.SetNpcFuncVisible(Npcid, true);
                 }
             }
-
         }
     }
 
@@ -1493,7 +1497,6 @@
         {
             return -1;
         }
-
     }
 
     public int GetQuestState(int _taskId)
@@ -1507,5 +1510,35 @@
             return -1;
         }
     }
+    //--------涓昏鐢ㄤ簬璁板綍浠诲姟鍒楄〃閫変腑鏉＄殑鏅鸿兘鎬� 锛�-_-||锛�
+    public int TaskupToDate = 0;//鑾峰彇鏈�鏂颁换鍔D
+    public int GetOnTaskId = 0;
+    public bool IsGetOnBool = false;
+    private  int NeedTime = 10;
+    private DateTime dateTimeA;
+    public void  GetTaskGetOnNow(int TaskID, string DictKey)//璁板綍涓嬩俊鎭瓧鍏哥殑ID
+    {
+        string key1Str = "on_kill_" + TaskID;
+        string key2Str = "get_byid_" + TaskID;
+        if (TaskID > 1 && (key1Str== DictKey || key2Str== DictKey))
+        {
+            GetOnTaskId = TaskID;
+            dateTimeA =DateTime.Now;
+        }
 
+    }
+    private void secondEvent()
+    {
+        TimeSpan timeS =DateTime.Now- dateTimeA;
+        int timeSend = timeS.Seconds;
+        if (timeSend >= NeedTime)
+        {
+            IsGetOnBool = true;
+            GetOnTaskId = GetNowTaskID;//鑾峰彇褰撳墠閫変腑鐨処D 
+        }
+        else
+        {
+            IsGetOnBool = false;
+        }
+    }
 }

--
Gitblit v1.8.0