Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/EventConfig.json

@@ -12,6 +12,7 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -37,6 +38,7 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -62,6 +64,7 @@
       "EventTriggerType": 3,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -81,6 +84,7 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -100,6 +104,7 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -119,6 +124,7 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -138,6 +144,7 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -157,6 +164,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": null,
@@ -170,6 +178,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": null,
@@ -183,6 +192,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": null,
@@ -196,6 +206,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": null,
@@ -209,6 +220,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": null,
@@ -222,6 +234,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": 1906,
@@ -235,6 +248,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": 1907,
@@ -248,6 +262,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": 1908,
@@ -261,6 +276,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventCount": null,
       "EventName": 1909,

Assets/Res/Config/PlacesConfig.json

@@ -8,13 +8,13 @@
       "to3DPrefab": "a",
       "placeDesc": null,
       "TotalScore": null,
-      "DivineSenseDedicatedEvent": [
+      "ZhixianID": [
         10,
         15,
         20
       ],
       "DivineSenseGeneralProbability": 40,
-      "DivineSenseGeneralEvent": [
+      "SpecialTaskID": [
         1,
         2,
         3

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -44,6 +44,12 @@ public int EventTag;
 public int EventType;
 
 
+		/// <summary>
+		///增加进度值
+		/// </summary>
+public int Score;
+
+
 		/// <summary>
 		///事件品质
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/PlacesConfig.cs

@@ -59,19 +59,19 @@ public int TotalScore;
 		/// <summary>
 		///主线事件ID
 		/// </summary>
-public int[] TotalScore_1;
+public int[] MainTaskID;
 
 
 		/// <summary>
 		///支线事件ID 
 		/// </summary>
-public int[] DivineSenseDedicatedEvent;
+public int[] ZhixianID;
 
 
 		/// <summary>
 		///触发支线的进度百分比
 		/// </summary>
-public int[] Column12;
+public int[] ZhixianActivatedPercentage;
 
 
 		/// <summary>
@@ -81,13 +81,13 @@ public int DivineSenseGeneralProbability;
 
 
 		/// <summary>
-		///该地图特定的无限次事件 12
+		///该地图特定的无限次事件
 		/// </summary>
-public int[] DivineSenseGeneralEvent;
+public int[] SpecialTaskID;
 
 
 		/// <summary>
-		///挂机包含的事件列表
+		///挂机包含的特殊事件列表
 		/// </summary>
 public int[] GuajiEvent;