From f237dce65b7eb454dfc9e2fe6c8efdebca085b4e Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 11 九月 2018 14:13:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/PlayerMainDate.cs |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/System/MainInterfacePanel/PlayerMainDate.cs b/System/MainInterfacePanel/PlayerMainDate.cs
index d791053..29807fc 100644
--- a/System/MainInterfacePanel/PlayerMainDate.cs
+++ b/System/MainInterfacePanel/PlayerMainDate.cs
@@ -105,6 +105,30 @@
     public int FlyShoseTaskID = 0;
     //--------鑾峰彇鐜╁姝讳骸鐘舵��
     public bool IsDead = false;
+ 
+    //----------鍏充簬鏌愪簺鍓湰鍙互杩涜鍦板浘鎸傛満
+    public List<int> OneKeyList = new List<int>();
+
+    //----------浣跨敤濞茬殗鍗疯酱鍚庣殑Buff琛ㄧ幇
+    public static event Action EmperorBuffEvent;
+    public bool IsEmperor = false;
+
+    //---------鍏充簬浠诲姟闇�瑕佺殑鏁版嵁
+    public List<int> TaskId_Skill = new List<int>();
+    public List<int> TaskId_Skill1 = new List<int>();
+    public int ItemID = 0;
+    public int UnitPrice = 0;
+    public int ItemNumber = 0;
+    public int TaskLv = 0;//浠诲姟绛夌骇
+    //-----鍏充簬鏀嚎缈呰唨浠诲姟鐨勭壒娈婇�昏緫
+    public int WingTask = 0;
+
+    //------ 鍏充簬鍒囩嚎PK鐘舵�佺殑鐗规畩閫昏緫
+    public List<int> ActivityList = new List<int>();
+    public List<int> ShieldedArea = new List<int>();//闇�瑕佸睆钄界殑鍦板浘鍖哄煙
+
+
+
     public override void Init()
     {
         IsTipBool = true;
@@ -124,21 +148,19 @@
         }
         NetworkState = (int)SDKUtility.Instance.NetworkType;
         GetPassiveSkillTask();
+        var WingsTask = Config.Instance.Get<FuncConfigConfig>("WingsTask");
+        WingTask = int.Parse(WingsTask.Numerical1);
+
+        var ActivityListcon = Config.Instance.Get<FuncConfigConfig>("FairyGrabMapLine");
+        int[] Activity_List = ConfigParse.GetMultipleStr<int>(ActivityListcon.Numerical1);
+        for (int i = 0; i < Activity_List.Length; i++)
+        {
+            ActivityList.Add(Activity_List[i]);
+        }
+        ShieldedArea.Add(10010);
+        ShieldedArea.Add(10020);
+        ShieldedArea.Add(10030);
     }
-    //----------鍏充簬鏌愪簺鍓湰鍙互杩涜鍦板浘鎸傛満
-    public List<int> OneKeyList = new List<int>();
-
-    //----------浣跨敤濞茬殗鍗疯酱鍚庣殑Buff琛ㄧ幇
-    public static event Action EmperorBuffEvent;
-    public bool IsEmperor = false;
-
-    //---------鍏充簬浠诲姟闇�瑕佺殑鏁版嵁
-    public List<int> TaskId_Skill = new List<int>();
-    public List<int> TaskId_Skill1 = new List<int>();
-    public int ItemID = 0;
-    public int UnitPrice = 0;
-    public int ItemNumber = 0;
-
 
     private void GetPassiveSkillTask()//鑾峰彇浠诲姟鏁版嵁
     {
@@ -156,11 +178,14 @@
             TaskId_Skill1.Add(TaskId_SkillInt1[i]);
         }
         int[] PassiveSkillTask = ConfigParse.GetMultipleStr<int>(PassiveSkillTaskconfig.Numerical3);
+        string str4 =PassiveSkillTaskconfig.Numerical4;
+        TaskLv = int.Parse(str4);
         if (PassiveSkillTask.Length >= 3)
         {
             ItemID = PassiveSkillTask[0];
             UnitPrice = PassiveSkillTask[1];
             ItemNumber = PassiveSkillTask[2];
+           
         }     
     }
 

--
Gitblit v1.8.0