1

Assets/Res/Config/EventConditionConfig.json

@@ -46,6 +46,13 @@
       "Operation": null,
       "ConditionType": 8,
       "finishCount": 1
+    },
+    {
+      "ID": 6,
+      "message": 2094,
+      "Operation": null,
+      "ConditionType": 9,
+      "finishCount": 6
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -343,8 +343,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
-      "XiantuID": 1,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1906,
@@ -368,8 +368,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
-      "XiantuID": 1,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1907,
@@ -393,8 +393,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
-      "XiantuID": 1,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1908,
@@ -418,8 +418,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
-      "XiantuID": 1,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1909,
@@ -652,8 +652,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
-      "XiantuID": 2,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2067,
@@ -680,8 +680,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
-      "XiantuID": 2,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2069,
@@ -705,7 +705,7 @@
       ],
       "RefreshProbability": 30,
       "RefreshCount": 2,
-      "placeID": 1,
+      "placeID": null,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,

Assets/Res/Config/EventLinkConfig.json

@@ -4,10 +4,12 @@
       "ID": 100,
       "conciseEventMessage": 216,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         216
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -15,10 +17,12 @@
       "ID": 1001,
       "conciseEventMessage": 177,
       "EventConditionMessage": null,
+      "NPCID": 2,
       "LanID": [
         177
       ],
-      "NPCID": 2,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -34,10 +38,12 @@
       "ID": 1002,
       "conciseEventMessage": 178,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         178
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -52,10 +58,12 @@
       "ID": 1003,
       "conciseEventMessage": 179,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         179
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -69,10 +77,12 @@
       "ID": 1004,
       "conciseEventMessage": 180,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         180
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -86,10 +96,12 @@
       "ID": 1005,
       "conciseEventMessage": 181,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         181
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -103,10 +115,12 @@
       "ID": 1010,
       "conciseEventMessage": 182,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         182
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -122,10 +136,12 @@
       "ID": 1011,
       "conciseEventMessage": 183,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         183
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -141,11 +157,13 @@
       "ID": 1012,
       "conciseEventMessage": 184,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         184,
         187
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -159,10 +177,12 @@
       "ID": 1014,
       "conciseEventMessage": 185,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         185
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -177,11 +197,13 @@
       "ID": 1015,
       "conciseEventMessage": 186,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         186,
         189
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -195,10 +217,12 @@
       "ID": 1016,
       "conciseEventMessage": 188,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         188
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -212,10 +236,12 @@
       "ID": 1020,
       "conciseEventMessage": 190,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         190
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1021,
@@ -231,10 +257,12 @@
       "ID": 1021,
       "conciseEventMessage": 191,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         191
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -255,10 +283,12 @@
       "ID": 1022,
       "conciseEventMessage": 192,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         192
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 4,
       "PrizeIDs": [
         1002
@@ -272,11 +302,13 @@
       "ID": 1024,
       "conciseEventMessage": 193,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         193,
         196
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100004
@@ -297,11 +329,13 @@
       "ID": 1025,
       "conciseEventMessage": 194,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         194,
         197
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -315,10 +349,12 @@
       "ID": 1026,
       "conciseEventMessage": 207,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         207
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1024,
@@ -334,10 +370,12 @@
       "ID": 1030,
       "conciseEventMessage": 221,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         221
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -351,10 +389,12 @@
       "ID": 1040,
       "conciseEventMessage": 222,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         222
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -368,10 +408,12 @@
       "ID": 1050,
       "conciseEventMessage": 223,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         223
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -387,10 +429,12 @@
       "ID": 1060,
       "conciseEventMessage": 224,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         224
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -398,10 +442,12 @@
       "ID": 10001,
       "conciseEventMessage": 208,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         208
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -416,10 +462,12 @@
       "ID": 10002,
       "conciseEventMessage": 209,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         209
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -433,12 +481,14 @@
       "ID": 10003,
       "conciseEventMessage": 210,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         210,
         211,
         1903
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1005
@@ -452,13 +502,15 @@
       "ID": 10004,
       "conciseEventMessage": 212,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         212,
         213,
         214,
         215
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1006
@@ -472,10 +524,12 @@
       "ID": 10005,
       "conciseEventMessage": 1901,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         1901
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -490,10 +544,12 @@
       "ID": 10006,
       "conciseEventMessage": 1902,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         1902
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -508,10 +564,12 @@
       "ID": 9003,
       "conciseEventMessage": 2036,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2036
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         9004,
@@ -527,10 +585,12 @@
       "ID": 9004,
       "conciseEventMessage": 2037,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2037
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -545,10 +605,12 @@
       "ID": 9005,
       "conciseEventMessage": 2038,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2038
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -556,10 +618,12 @@
       "ID": 9006,
       "conciseEventMessage": 2039,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2039
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -567,10 +631,12 @@
       "ID": 9007,
       "conciseEventMessage": 2040,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2040
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 4,
       "ResultType": 1,
       "ResultOptions": [
@@ -582,6 +648,8 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -595,10 +663,12 @@
       "ID": 9025,
       "conciseEventMessage": 2074,
       "EventConditionMessage": 2073,
+      "NPCID": null,
       "LanID": [
         2074
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         9026
@@ -613,6 +683,8 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -624,9 +696,8 @@
       "conciseEventMessage": 2070,
       "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionId": [
-        3
-      ],
+      "EventID": null,
+      "ConditionId": 3,
       "optionType": null,
       "ResultType": null
     },
@@ -635,6 +706,8 @@
       "conciseEventMessage": 2076,
       "EventConditionMessage": 2077,
       "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -642,18 +715,60 @@
       "ResultType": null
     },
     {
-      "ID": 100001,
+      "ID": 1000101,
       "conciseEventMessage": 2086,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
-        2083,
-        2084,
-        2085
+        2083
+      ],
+      "EventID": 10001,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000102
+      ]
+    },
+    {
+      "ID": 1000102,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2084
       ],
+      "EventID": 10001,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000103
+      ]
+    },
+    {
+      "ID": 1000103,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionId": [
-        5
+      "LanID": [
+        2085
       ],
+      "EventID": 10001,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000104
+      ]
+    },
+    {
+      "ID": 1000104,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "EventID": 10001,
+      "ConditionId": 5,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -661,24 +776,57 @@
       ]
     },
     {
-      "ID": 100002,
-      "conciseEventMessage": 1911,
+      "ID": 1000201,
+      "conciseEventMessage": 2091,
       "EventConditionMessage": null,
       "NPCID": null,
-      "optionType": 2,
-      "optionPara1": [
-        100001
+      "LanID": [
+        2092
       ],
+      "EventID": 10002,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10003
+      ]
+    },
+    {
+      "ID": 1000202,
+      "conciseEventMessage": 2091,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2093
+      ],
+      "EventID": 10002,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10003
+      ]
+    },
+    {
+      "ID": 1000203,
+      "conciseEventMessage": 2091,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "EventID": 10002,
+      "ConditionId": 6,
+      "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
         10003
       ]
     },
     {
-      "ID": 100003,
-      "conciseEventMessage": 1912,
+      "ID": 1000301,
+      "conciseEventMessage": 2095,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": 10003,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -690,6 +838,8 @@
       "conciseEventMessage": 1913,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     }

Assets/Res/Config/LanguageChineseConfig.json

@@ -7654,19 +7654,19 @@
     },
     {
       "ID": 1914,
-      "txt": "    北冥有鱼，其名为鲲……不过北海遥远，何时能寻得鲲鹏的踪迹。\n    好在我的神识尚在，可探天地，再加上刚刚的风铃，或许能寻得前路线索。"
+      "txt": ""
     },
     {
       "ID": 1915,
-      "txt": "神识探得北海方向，有一条古径，隐于云山之间。\n不过，古径深处妖气弥漫，有妖兽盘踞，需要破除后才能通过。\n鲲鹏的秘密，可能和这些妖兽有关。"
+      "txt": ""
     },
     {
       "ID": 1916,
-      "txt": "鲲鹏需要去南海最深处的天池，可缺少龙卷风，没有大风，大鹏无法飞起来"
+      "txt": ""
     },
     {
       "ID": 1917,
-      "txt": "需要达到境界"
+      "txt": ""
     },
     {
       "ID": 1918,
@@ -8330,55 +8330,55 @@
     },
     {
       "ID": 2083,
-      "txt": "北冥有鱼，其名为鲲……"
+      "txt": ""
     },
     {
       "ID": 2084,
-      "txt": "不过北海遥远，何时能寻得鲲鹏的踪迹。"
+      "txt": ""
     },
     {
       "ID": 2085,
-      "txt": "好在我的神识尚在，可探天地，再加上刚刚的风铃，或许能寻得前路线索。"
+      "txt": ""
     },
     {
       "ID": 2086,
-      "txt": "使用风铃唤醒还未泯灭的神识"
+      "txt": "北冥有鱼，其名为鲲……"
     },
     {
       "ID": 2087,
-      "txt": "0"
+      "txt": "第一章.逍遥游"
     },
     {
       "ID": 2088,
-      "txt": "0"
+      "txt": "无用的大葫芦"
     },
     {
       "ID": 2089,
-      "txt": "0"
+      "txt": "多次渡劫失败的你，误入“无何有之乡”，在这里受到了列子的指引，踏上了寻找七道心境的修仙之路。"
     },
     {
       "ID": 2090,
-      "txt": "0"
+      "txt": "惠子种出了巨大葫芦，他觉得毫无用处，非常生气！"
     },
     {
       "ID": 2091,
-      "txt": "0"
+      "txt": "神识发现有一条古径，隐于云山之间，不过似乎有妖兽盘踞。"
     },
     {
       "ID": 2092,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2093,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2094,
-      "txt": "0"
+      "txt": "继续飞行一段时间{0}/{1}"
     },
     {
       "ID": 2095,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2096,

Assets/Res/Config/XianTuLogConfig.json

@@ -3,14 +3,16 @@
     {
       "ID": 1,
       "EventType": 1,
-      "Ttile": 2082,
-      "Desc": 2083
+      "Title": 2087,
+      "Desc": 2089,
+      "BigMapID": null
     },
     {
       "ID": 2,
       "EventType": 2,
-      "Ttile": 2084,
-      "Desc": 2085
+      "Title": 2088,
+      "Desc": 2090,
+      "BigMapID": null
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -32,6 +32,12 @@ public int conciseEventMessage;
 public int EventConditionMessage;
 
 
+		/// <summary>
+		///对话NPCID
+		/// </summary>
+public int NPCID;
+
+
 		/// <summary>
 		///对话
 		/// </summary>
@@ -39,15 +45,15 @@ public int[] LanID;
 
 
 		/// <summary>
-		///对话NPCID
+		///属于哪个事件
 		/// </summary>
-public int NPCID;
+public int EventID;
 
 
 		/// <summary>
-		///条件判断Id
+		///条件判断类型
 		/// </summary>
-public int[] ConditionId;
+public int ConditionId;
 
 
 		/// <summary>
@@ -81,7 +87,7 @@ public int[] PrizeNums;
 
 
 		/// <summary>
-		///事件结束类型 1：跳转步骤 2：根据战斗结果跳转步骤 3.触发新事件
+		///事件结束类型 1：跳转步骤 2：根据战斗结果跳转 3.触发新事件
 		/// </summary>
 public int ResultType;
 

Assets/Scripts/GameData/ExcelConfig/XianTuLogConfig.cs

@@ -29,7 +29,7 @@ public int EventType;
 		/// <summary>
 		///名称
 		/// </summary>
-public int Ttile;
+public int Title;
 
 
 		/// <summary>
@@ -38,6 +38,12 @@ public int Ttile;
 public int Desc;
 
 
+		/// <summary>
+		///属于哪个章节
+		/// </summary>
+public int BigMapID;
+
+
 	}
 
 }