1

Assets/Res/Config/BigMap.json

@@ -14,12 +14,6 @@
         6,
         7
       ],
-      "DivineSenseGeneralEvent": [
-        1,
-        2,
-        3
-      ],
-      "DivineSenseGeneralProbability": 50,
       "ulockFunction": [
         0
       ],
@@ -38,7 +32,6 @@
         11,
         12
       ],
-      "DivineSenseGeneralProbability": null,
       "ulockFunction": [
         0
       ],
@@ -57,7 +50,6 @@
         16,
         17
       ],
-      "DivineSenseGeneralProbability": null,
       "ulockFunction": [
         0
       ],

Assets/Res/Config/EventConfig.json

@@ -10,14 +10,16 @@
         1005
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 174,
       "Description": null
     },
@@ -33,14 +35,16 @@
         1016
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 175,
       "Description": null
     },
@@ -56,14 +60,16 @@
         1026
       ],
       "EventTriggerType": 3,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 176,
       "Description": null
     },
@@ -73,14 +79,16 @@
         1030
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 2,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 217,
       "Description": null
     },
@@ -90,14 +98,16 @@
         1040
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 2,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 218,
       "Description": null
     },
@@ -107,14 +117,16 @@
         1050
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 2,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 219,
       "Description": null
     },
@@ -124,14 +136,16 @@
         1060
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 2,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 220,
       "Description": null
     },
@@ -141,8 +155,10 @@
         10001
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -152,8 +168,10 @@
         10003
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -163,8 +181,10 @@
         10004
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -174,8 +194,10 @@
         10005
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -185,8 +207,10 @@
         10006
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -196,8 +220,10 @@
         100001
       ],
       "EventTriggerType": 4,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": 1906,
       "Description": 1914
     },
@@ -207,8 +233,10 @@
         100002
       ],
       "EventTriggerType": 4,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": 1907,
       "Description": 1915
     },
@@ -218,8 +246,10 @@
         100003
       ],
       "EventTriggerType": 4,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": 1908,
       "Description": 1916
     },
@@ -229,8 +259,10 @@
         100004
       ],
       "EventTriggerType": 4,
+      "EventTag": null,
       "EventType": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": 1909,
       "Description": 1917
     }

Assets/Res/Config/EventLinkConfig.json

@@ -558,10 +558,7 @@
         1001
       ],
       "finishCount": 1,
-      "optionType": 4,
-      "optionPara1": [
-        100004
-      ],
+      "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
         10004

Assets/Res/Config/Places.json

@@ -6,7 +6,19 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "a",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseDedicatedEvent": [
+        10,
+        15,
+        20
+      ],
+      "DivineSenseGeneralProbability": 40,
+      "DivineSenseGeneralEvent": [
+        1,
+        2,
+        3
+      ]
     },
     {
       "ID": 2,
@@ -14,7 +26,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "b",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 3,
@@ -22,7 +36,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "c",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 4,
@@ -30,7 +46,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "h",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 5,
@@ -38,7 +56,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 6,
@@ -46,7 +66,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 7,
@@ -54,7 +76,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 8,
@@ -62,7 +86,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 9,
@@ -70,7 +96,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 10,
@@ -78,7 +106,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 11,
@@ -86,7 +116,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 12,
@@ -94,7 +126,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 13,
@@ -102,7 +136,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 14,
@@ -110,7 +146,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 15,
@@ -118,7 +156,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 16,
@@ -126,7 +166,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 17,
@@ -134,7 +176,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 18,
@@ -142,7 +186,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 19,
@@ -150,7 +196,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 20,
@@ -158,7 +206,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 21,
@@ -166,7 +216,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 22,
@@ -174,7 +226,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 23,
@@ -182,7 +236,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 24,
@@ -190,7 +246,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 25,
@@ -198,7 +256,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 26,
@@ -206,7 +266,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 27,
@@ -214,7 +276,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 28,
@@ -222,7 +286,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 29,
@@ -230,7 +296,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 30,
@@ -238,7 +306,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/BigMap.cs

@@ -44,30 +44,6 @@ public int mapDesc;
 public int[] places;
 
 
-		/// <summary>
-		///神识场景事件列表
-		/// </summary>
-public int[] DivineSenseGeneralEvent;
-
-
-		/// <summary>
-		///神识专用事件 优先刷
-		/// </summary>
-public int[] DivineSenseDedicatedEvent;
-
-
-		/// <summary>
-		///刷场景事件概率
-		/// </summary>
-public int DivineSenseGeneralProbability;
-
-
-		/// <summary>
-		///挂机包含的事件列表
-		/// </summary>
-public int[] GuajiEvent;
-
-
 		/// <summary>
 		///解锁表ulockFunction
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -27,11 +27,17 @@ public int[] EventLinksId;
 
 
 		/// <summary>
-		///触发事件类型： 1.通用事件 2.挂机事件 3.地图专用事件 4.主线任务
+		///触发事件类型： 1.通用事件 2.挂机事件 4.主线任务 99.无标记事件 
 		/// </summary>
 public int EventTriggerType;
 
 
+		/// <summary>
+		///tag 1主线 2支线 3通用 4地图通用 5道友
+		/// </summary>
+public int EventTag;
+
+
 		/// <summary>
 		///1.正常触发 2.直接结算
 		/// </summary>
@@ -45,7 +51,7 @@ public int EventQuality;
 
 
 		/// <summary>
-		///触发条件类型
+		///触发条件类型 只能配处于什么状态和数值，不能配变化的数值
 		/// </summary>
 public int[] EventConditionId;
 
@@ -53,7 +59,13 @@ public int[] EventConditionId;
 		/// <summary>
 		///触发效果值
 		/// </summary>
-public int[] EventVlaue;
+public int[] EventValue;
+
+
+		/// <summary>
+		///触发判定数量or次数
+		/// </summary>
+public int EventCount;
 
 
 		/// <summary>

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -39,19 +39,19 @@ public int ConditionType;
 
 
 		/// <summary>
-		///条件判断数值
+		///条件判断值
 		/// </summary>
 public int[] ConditionPara;
 
 
 		/// <summary>
-		///条件完成次数
+		///条件完成次数or数量
 		/// </summary>
 public int finishCount;
 
 
 		/// <summary>
-		///事件类型 1=提供选项 2=进入战斗 3=获得奖励 4=触发下一个事件
+		///步骤类型 1=提供选项 2=进入战斗 3=获得奖励
 		/// </summary>
 public int optionType;
 
@@ -81,7 +81,7 @@ public int[] PrizeNums;
 
 
 		/// <summary>
-		///事件结束类型 1：跳转事件 2：根据战斗解锁跳转事件 3.触发新事件
+		///事件结束类型 1：跳转步骤 2：根据战斗结果跳转步骤 3.触发新事件
 		/// </summary>
 public int ResultType;
 

Assets/Scripts/GameData/ExcelConfig/Places.cs

@@ -50,6 +50,48 @@ public string to3DPrefab;
 public int placeDesc;
 
 
+		/// <summary>
+		///总进度值
+		/// </summary>
+public int TotalScore;
+
+
+		/// <summary>
+		///主线事件ID
+		/// </summary>
+public int[] TotalScore_1;
+
+
+		/// <summary>
+		///支线事件ID 
+		/// </summary>
+public int[] DivineSenseDedicatedEvent;
+
+
+		/// <summary>
+		///触发支线的进度百分比
+		/// </summary>
+public int[] Column12;
+
+
+		/// <summary>
+		///刷该地图特定无限次事件的概率 40=40%
+		/// </summary>
+public int DivineSenseGeneralProbability;
+
+
+		/// <summary>
+		///该地图特定的无限次事件 12
+		/// </summary>
+public int[] DivineSenseGeneralEvent;
+
+
+		/// <summary>
+		///挂机包含的事件列表
+		/// </summary>
+public int[] GuajiEvent;
+
+
 	}
 
 }