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

Assets/Res/Config/EventLinkConfig.json

@@ -9,7 +9,6 @@
         216
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -22,7 +21,6 @@
         177
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -43,7 +41,6 @@
         178
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -63,7 +60,6 @@
         179
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -82,7 +78,6 @@
         180
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -101,7 +96,6 @@
         181
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -120,7 +114,6 @@
         182
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -141,7 +134,6 @@
         183
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -163,7 +155,6 @@
         187
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -182,7 +173,6 @@
         185
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -203,7 +193,6 @@
         189
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -222,7 +211,6 @@
         188
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -241,7 +229,6 @@
         190
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1021,
@@ -262,7 +249,6 @@
         191
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -288,7 +274,6 @@
         192
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 4,
       "PrizeIDs": [
         1002
@@ -308,7 +293,6 @@
         196
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100004
@@ -335,7 +319,6 @@
         197
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -354,7 +337,6 @@
         207
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1024,
@@ -375,7 +357,6 @@
         221
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -394,7 +375,6 @@
         222
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -413,7 +393,6 @@
         223
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -434,7 +413,6 @@
         224
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -447,7 +425,6 @@
         208
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -467,7 +444,6 @@
         209
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -488,7 +464,6 @@
         1903
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1005
@@ -510,7 +485,6 @@
         215
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1006
@@ -529,7 +503,6 @@
         1901
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -549,7 +522,6 @@
         1902
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -569,7 +541,6 @@
         2036
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         9004,
@@ -590,7 +561,6 @@
         2037
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -610,7 +580,6 @@
         2038
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -623,7 +592,6 @@
         2039
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -636,7 +604,6 @@
         2040
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 4,
       "ResultType": 1,
       "ResultOptions": [
@@ -649,7 +616,6 @@
       "EventConditionMessage": null,
       "NPCID": null,
       "EventID": null,
-      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -668,7 +634,6 @@
         2074
       ],
       "EventID": null,
-      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         9026
@@ -684,7 +649,6 @@
       "EventConditionMessage": null,
       "NPCID": null,
       "EventID": null,
-      "ConditionId": null,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -697,7 +661,9 @@
       "EventConditionMessage": null,
       "NPCID": null,
       "EventID": null,
-      "ConditionId": 3,
+      "ConditionId": [
+        3
+      ],
       "optionType": null,
       "ResultType": null
     },
@@ -707,7 +673,6 @@
       "EventConditionMessage": 2077,
       "NPCID": null,
       "EventID": null,
-      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -723,7 +688,6 @@
         2083
       ],
       "EventID": 10001,
-      "ConditionId": null,
       "optionType": null,
       "ResultType": 1,
       "ResultOptions": [
@@ -739,7 +703,6 @@
         2084
       ],
       "EventID": 10001,
-      "ConditionId": null,
       "optionType": null,
       "ResultType": 1,
       "ResultOptions": [
@@ -755,7 +718,6 @@
         2085
       ],
       "EventID": 10001,
-      "ConditionId": null,
       "optionType": null,
       "ResultType": 1,
       "ResultOptions": [
@@ -768,7 +730,9 @@
       "EventConditionMessage": null,
       "NPCID": null,
       "EventID": 10001,
-      "ConditionId": 5,
+      "ConditionId": [
+        5
+      ],
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -784,11 +748,10 @@
         2092
       ],
       "EventID": 10002,
-      "ConditionId": null,
       "optionType": null,
-      "ResultType": 3,
+      "ResultType": 1,
       "ResultOptions": [
-        10003
+        1000202
       ]
     },
     {
@@ -800,11 +763,10 @@
         2093
       ],
       "EventID": 10002,
-      "ConditionId": null,
       "optionType": null,
-      "ResultType": 3,
+      "ResultType": 1,
       "ResultOptions": [
-        10003
+        1000203
       ]
     },
     {
@@ -813,7 +775,9 @@
       "EventConditionMessage": null,
       "NPCID": null,
       "EventID": 10002,
-      "ConditionId": 6,
+      "ConditionId": [
+        6
+      ],
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -825,23 +789,45 @@
       "conciseEventMessage": 2095,
       "EventConditionMessage": null,
       "NPCID": null,
+      "LanID": [
+        2096
+      ],
       "EventID": 10003,
-      "ConditionId": null,
       "optionType": null,
-      "ResultType": 3,
+      "ResultType": 1,
       "ResultOptions": [
-        10004
+        1000303
       ]
     },
     {
-      "ID": 100004,
-      "conciseEventMessage": 1913,
+      "ID": 1000302,
+      "conciseEventMessage": 2095,
       "EventConditionMessage": null,
       "NPCID": null,
-      "EventID": null,
-      "ConditionId": null,
+      "LanID": [
+        2096
+      ],
+      "EventID": 10003,
       "optionType": null,
-      "ResultType": null
+      "ResultType": 1,
+      "ResultOptions": [
+        0
+      ]
+    },
+    {
+      "ID": 1000303,
+      "conciseEventMessage": 2095,
+      "EventConditionMessage": null,
+      "NPCID": 101,
+      "LanID": [
+        2096
+      ],
+      "EventID": 10003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        0
+      ]
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -2,58 +2,75 @@
   "configList": [
     {
       "ID": 1,
+      "name": null,
       "ID_1": null,
       "DaoyouID": null
     },
     {
       "ID": 2,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 1
     },
     {
       "ID": 3,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 2
     },
     {
       "ID": 4,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 3
     },
     {
       "ID": 5,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 4
     },
     {
       "ID": 6,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 5
     },
     {
       "ID": 7,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 6
     },
     {
       "ID": 8,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 7
     },
     {
       "ID": 9,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 8
     },
     {
       "ID": 10,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 9
     },
     {
       "ID": 11,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 10
+    },
+    {
+      "ID": 101,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -8330,19 +8330,19 @@
     },
     {
       "ID": 2083,
-      "txt": ""
+      "txt": "北冥有鱼，其名为鲲……"
     },
     {
       "ID": 2084,
-      "txt": ""
+      "txt": "不过北海遥远，何时能寻得鲲鹏的踪迹。"
     },
     {
       "ID": 2085,
-      "txt": ""
+      "txt": "好在我的神识尚在，可探天地，再加上刚刚的风铃，或许能寻得前路线索。"
     },
     {
       "ID": 2086,
-      "txt": "北冥有鱼，其名为鲲……"
+      "txt": "使用风铃唤醒还未泯灭的神识"
     },
     {
       "ID": 2087,
@@ -8362,15 +8362,15 @@
     },
     {
       "ID": 2091,
-      "txt": "神识发现有一条古径，隐于云山之间，不过似乎有妖兽盘踞。"
+      "txt": "前往妖兽盘踞的地方"
     },
     {
       "ID": 2092,
-      "txt": ""
+      "txt": "神识发现有一条古径，隐于云山之间，不过似乎有妖兽盘踞。"
     },
     {
       "ID": 2093,
-      "txt": ""
+      "txt": "没其他办法了，过去看看吧。"
     },
     {
       "ID": 2094,
@@ -8378,7 +8378,7 @@
     },
     {
       "ID": 2095,
-      "txt": ""
+      "txt": "蜩鸟和小麻雀对你的到来很好奇"
     },
     {
       "ID": 2096,

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -53,7 +53,7 @@ public int EventID;
 		/// <summary>
 		///条件判断类型
 		/// </summary>
-public int ConditionId;
+public int[] ConditionId;
 
 
 		/// <summary>

Assets/Scripts/GameData/ExcelConfig/EventNPC.cs

@@ -20,6 +20,12 @@ namespace Excel2Json
 public int ID;
 
 
+		/// <summary>
+		///名字
+		/// </summary>
+public int name;
+
+
 		/// <summary>
 		///半身像icon
 		/// </summary>