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

Assets/Res/Config/EventConfig.json

@@ -10,9 +10,9 @@
         1005
       ],
       "EventTriggerType": 1,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 3,
       "EventValue": [
@@ -34,9 +34,9 @@
         1016
       ],
       "EventTriggerType": 1,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -55,7 +55,7 @@
         1026
       ],
       "EventTriggerType": 99,
-      "EventTag": null,
+      "EventTag": 2,
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
@@ -73,9 +73,9 @@
         1030
       ],
       "EventTriggerType": 1,
-      "EventTag": null,
+      "EventTag": 1,
       "EventType": 2,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 7,
       "EventValue": [
@@ -91,9 +91,9 @@
         1040
       ],
       "EventTriggerType": 1,
-      "EventTag": null,
+      "EventTag": 1,
       "EventType": 2,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -106,9 +106,9 @@
         1050
       ],
       "EventTriggerType": 1,
-      "EventTag": null,
+      "EventTag": 1,
       "EventType": 2,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -121,9 +121,9 @@
         1060
       ],
       "EventTriggerType": 1,
-      "EventTag": null,
+      "EventTag": 1,
       "EventType": 2,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -138,7 +138,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -153,7 +153,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -168,7 +168,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -183,7 +183,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -198,7 +198,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -211,7 +211,7 @@
         100001
       ],
       "EventTriggerType": 4,
-      "EventTag": null,
+      "EventTag": 1,
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
@@ -226,7 +226,7 @@
         100002
       ],
       "EventTriggerType": 4,
-      "EventTag": null,
+      "EventTag": 1,
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
@@ -241,7 +241,7 @@
         100003
       ],
       "EventTriggerType": 4,
-      "EventTag": null,
+      "EventTag": 1,
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
@@ -256,7 +256,7 @@
         100004
       ],
       "EventTriggerType": 4,
-      "EventTag": null,
+      "EventTag": 1,
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
@@ -264,6 +264,25 @@
       "EventCount": null,
       "EventName": 1909,
       "Description": 1917
+    },
+    {
+      "ID": 1001,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 4,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 1943,
+      "Description": 1944
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -7770,11 +7770,11 @@
     },
     {
       "ID": 1943,
-      "txt": "0"
+      "txt": "受伤的鸟"
     },
     {
       "ID": 1944,
-      "txt": "0"
+      "txt": "你发现一只奄奄一息的鸟，决定上前一探究竟。"
     },
     {
       "ID": 1945,

Assets/Res/Config/PlacesConfig.json

@@ -7,7 +7,7 @@
       "bigMapID": 1,
       "to3DPrefab": "a",
       "placeDesc": null,
-      "TotalScore": 4,
+      "TotalScore": 60,
       "MainTaskID": [
         10001,
         10002,
@@ -22,8 +22,7 @@
       ],
       "DivineSenseGeneralProbability": 40,
       "SpecialTaskID": [
-        1,
-        2
+        1001
       ]
     },
     {
@@ -33,7 +32,7 @@
       "bigMapID": 1,
       "to3DPrefab": "b",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -43,7 +42,7 @@
       "bigMapID": 1,
       "to3DPrefab": "c",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -53,7 +52,7 @@
       "bigMapID": 1,
       "to3DPrefab": "h",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -63,7 +62,7 @@
       "bigMapID": 2,
       "to3DPrefab": "j",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -73,7 +72,7 @@
       "bigMapID": 2,
       "to3DPrefab": "j",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -83,7 +82,7 @@
       "bigMapID": 2,
       "to3DPrefab": "j",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -93,7 +92,7 @@
       "bigMapID": 3,
       "to3DPrefab": "j",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -103,7 +102,7 @@
       "bigMapID": 3,
       "to3DPrefab": "j",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -113,7 +112,7 @@
       "bigMapID": 3,
       "to3DPrefab": "j",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -123,7 +122,7 @@
       "bigMapID": 3,
       "to3DPrefab": "j",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     },
     {
@@ -133,7 +132,7 @@
       "bigMapID": 3,
       "to3DPrefab": "j",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 0,
       "DivineSenseGeneralProbability": null
     }
   ]

Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs

@@ -80,6 +80,12 @@ public int BuffType;
 public int[] BuffValue;
 
 
+		/// <summary>
+		///道侣任务ID
+		/// </summary>
+public int Column12;
+
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -27,13 +27,13 @@ public int[] EventLinksId;
 
 
 		/// <summary>
-		///触发事件类型： 1.通用事件 2.挂机事件 4.主线任务 99.无标记事件 
+		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 99.无标记 
 		/// </summary>
 public int EventTriggerType;
 
 
 		/// <summary>
-		///tag 1主线 2支线 3通用 4地图通用 5道友
+		///tag 1主线2支线 3通用 4地图通用 5道友
 		/// </summary>
 public int EventTag;