zg 1 week ago
parent
commit
2e2c543533

+ 9 - 9
Assets/Res/Config/EventConditionConfig.json

@@ -56,7 +56,7 @@
     },
     },
     {
     {
       "ID": 7,
       "ID": 7,
-      "message": 2362,
+      "message": 2843,
       "Operation": null,
       "Operation": null,
       "ConditionType": 5,
       "ConditionType": 5,
       "ConditionPara": [
       "ConditionPara": [
@@ -66,7 +66,7 @@
     },
     },
     {
     {
       "ID": 8,
       "ID": 8,
-      "message": 2363,
+      "message": 2844,
       "Operation": null,
       "Operation": null,
       "ConditionType": 3,
       "ConditionType": 3,
       "ConditionPara": [
       "ConditionPara": [
@@ -76,7 +76,7 @@
     },
     },
     {
     {
       "ID": 9,
       "ID": 9,
-      "message": 2364,
+      "message": 2845,
       "Operation": null,
       "Operation": null,
       "ConditionType": 5,
       "ConditionType": 5,
       "ConditionPara": [
       "ConditionPara": [
@@ -86,7 +86,7 @@
     },
     },
     {
     {
       "ID": 10,
       "ID": 10,
-      "message": 2365,
+      "message": 2846,
       "Operation": null,
       "Operation": null,
       "ConditionType": 5,
       "ConditionType": 5,
       "ConditionPara": [
       "ConditionPara": [
@@ -96,7 +96,7 @@
     },
     },
     {
     {
       "ID": 11,
       "ID": 11,
-      "message": 2366,
+      "message": 2847,
       "Operation": null,
       "Operation": null,
       "ConditionType": 6,
       "ConditionType": 6,
       "ConditionPara": [
       "ConditionPara": [
@@ -106,7 +106,7 @@
     },
     },
     {
     {
       "ID": 12,
       "ID": 12,
-      "message": 2367,
+      "message": 2848,
       "Operation": null,
       "Operation": null,
       "ConditionType": 5,
       "ConditionType": 5,
       "ConditionPara": [
       "ConditionPara": [
@@ -116,7 +116,7 @@
     },
     },
     {
     {
       "ID": 13,
       "ID": 13,
-      "message": 2368,
+      "message": 2849,
       "Operation": null,
       "Operation": null,
       "ConditionType": 5,
       "ConditionType": 5,
       "ConditionPara": [
       "ConditionPara": [
@@ -126,7 +126,7 @@
     },
     },
     {
     {
       "ID": 14,
       "ID": 14,
-      "message": 2369,
+      "message": 2850,
       "Operation": null,
       "Operation": null,
       "ConditionType": 3,
       "ConditionType": 3,
       "ConditionPara": [
       "ConditionPara": [
@@ -136,7 +136,7 @@
     },
     },
     {
     {
       "ID": 15,
       "ID": 15,
-      "message": 2370,
+      "message": 2851,
       "Operation": null,
       "Operation": null,
       "ConditionType": 5,
       "ConditionType": 5,
       "ConditionPara": [
       "ConditionPara": [

+ 45 - 43
Assets/Res/Config/EventConfig.json

@@ -543,8 +543,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2320,
-      "Description": 2341
+      "EventName": 2801,
+      "Description": 2822
     },
     },
     {
     {
       "ID": 10008,
       "ID": 10008,
@@ -581,8 +581,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2321,
-      "Description": 2342
+      "EventName": 2802,
+      "Description": 2823
     },
     },
     {
     {
       "ID": 10009,
       "ID": 10009,
@@ -608,8 +608,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2322,
-      "Description": 2343
+      "EventName": 2803,
+      "Description": 2824
     },
     },
     {
     {
       "ID": 10010,
       "ID": 10010,
@@ -633,8 +633,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2323,
-      "Description": 2344
+      "EventName": 2804,
+      "Description": 2825
     },
     },
     {
     {
       "ID": 10011,
       "ID": 10011,
@@ -658,8 +658,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2324,
-      "Description": 2345
+      "EventName": 2805,
+      "Description": 2826
     },
     },
     {
     {
       "ID": 10012,
       "ID": 10012,
@@ -694,8 +694,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2325,
-      "Description": 2346
+      "EventName": 2806,
+      "Description": 2827
     },
     },
     {
     {
       "ID": 10013,
       "ID": 10013,
@@ -734,8 +734,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2326,
-      "Description": 2347
+      "EventName": 2807,
+      "Description": 2828
     },
     },
     {
     {
       "ID": 10014,
       "ID": 10014,
@@ -766,8 +766,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2327,
-      "Description": 2348
+      "EventName": 2808,
+      "Description": 2829
     },
     },
     {
     {
       "ID": 10015,
       "ID": 10015,
@@ -798,8 +798,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2328,
-      "Description": 2349
+      "EventName": 2809,
+      "Description": 2830
     },
     },
     {
     {
       "ID": 10016,
       "ID": 10016,
@@ -835,8 +835,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2329,
-      "Description": 2350
+      "EventName": 2810,
+      "Description": 2831
     },
     },
     {
     {
       "ID": 10017,
       "ID": 10017,
@@ -869,8 +869,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2330,
-      "Description": 2351
+      "EventName": 2811,
+      "Description": 2832
     },
     },
     {
     {
       "ID": 10018,
       "ID": 10018,
@@ -913,8 +913,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2331,
-      "Description": 2352
+      "EventName": 2812,
+      "Description": 2833
     },
     },
     {
     {
       "ID": 10019,
       "ID": 10019,
@@ -939,8 +939,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2332,
-      "Description": 2353
+      "EventName": 2813,
+      "Description": 2834
     },
     },
     {
     {
       "ID": 10020,
       "ID": 10020,
@@ -967,8 +967,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2333,
-      "Description": 2354
+      "EventName": 2814,
+      "Description": 2835
     },
     },
     {
     {
       "ID": 10021,
       "ID": 10021,
@@ -1003,8 +1003,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2334,
-      "Description": 2355
+      "EventName": 2815,
+      "Description": 2836
     },
     },
     {
     {
       "ID": 10022,
       "ID": 10022,
@@ -1030,13 +1030,15 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2335,
-      "Description": 2356
+      "EventName": 2816,
+      "Description": 2837
     },
     },
     {
     {
       "ID": 10023,
       "ID": 10023,
       "EventLinksId": [
       "EventLinksId": [
-        1002301
+        1002301,
+        1002302,
+        1002303
       ],
       ],
       "EventTriggerType": 4,
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventTag": 1,
@@ -1055,8 +1057,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2336,
-      "Description": 2357
+      "EventName": 2817,
+      "Description": 2838
     },
     },
     {
     {
       "ID": 10024,
       "ID": 10024,
@@ -1077,8 +1079,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2337,
-      "Description": 2358
+      "EventName": 2818,
+      "Description": 2839
     },
     },
     {
     {
       "ID": 10025,
       "ID": 10025,
@@ -1099,8 +1101,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2338,
-      "Description": 2359
+      "EventName": 2819,
+      "Description": 2840
     },
     },
     {
     {
       "ID": 10026,
       "ID": 10026,
@@ -1121,8 +1123,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2339,
-      "Description": 2360
+      "EventName": 2820,
+      "Description": 2841
     },
     },
     {
     {
       "ID": 10027,
       "ID": 10027,
@@ -1143,8 +1145,8 @@
       "XiantuID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventCount": null,
-      "EventName": 2340,
-      "Description": 2361
+      "EventName": 2821,
+      "Description": 2842
     },
     },
     {
     {
       "ID": 1001,
       "ID": 1001,

+ 33 - 1
Assets/Res/Config/EventLinkConfig.json

@@ -3742,13 +3742,45 @@
       "ID": 1002301,
       "ID": 1002301,
       "conciseEventMessage": 2318,
       "conciseEventMessage": 2318,
       "EventConditionMessage": null,
       "EventConditionMessage": null,
-      "NPCID": null,
+      "NPCID": 111,
       "LanID": [
       "LanID": [
         2319
         2319
       ],
       ],
       "DialogueType": null,
       "DialogueType": null,
       "EventID": 10023,
       "EventID": 10023,
       "optionType": null,
       "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002302
+      ]
+    },
+    {
+      "ID": 1002302,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2320
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002303
+      ]
+    },
+    {
+      "ID": 1002303,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2321
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": null,
       "ResultType": 3,
       "ResultType": 3,
       "ResultOptions": [
       "ResultOptions": [
         10024
         10024

+ 6 - 0
Assets/Res/Config/EventNPC.json

@@ -131,6 +131,12 @@
       "name": 3010,
       "name": 3010,
       "ID_1": null,
       "ID_1": null,
       "DaoyouID": null
       "DaoyouID": null
+    },
+    {
+      "ID": 111,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
     }
     }
   ]
   ]
 }
 }

+ 55 - 55
Assets/Res/Config/LanguageChineseConfig.json

@@ -9270,19 +9270,19 @@
     },
     },
     {
     {
       "ID": 2318,
       "ID": 2318,
-      "txt": ""
+      "txt": "听惠子吹嘘种子来历,并答应帮他种葫芦"
     },
     },
     {
     {
       "ID": 2319,
       "ID": 2319,
-      "txt": ""
+      "txt": "(惠子手持一颗七彩流光的种子,满脸得意)\n“小友!来得正好!瞧我这宝贝——”"
     },
     },
     {
     {
       "ID": 2320,
       "ID": 2320,
-      "txt": ""
+      "txt": "(惠子举起一颗种子,阳光照射下熠熠生辉)\n“此乃‘五石葫芦’之种!虽然我也不知道能种出来什么,但绝非凡品,一定大有用处!”"
     },
     },
     {
     {
       "ID": 2321,
       "ID": 2321,
-      "txt": ""
+      "txt": "这么厉害?哪来的?"
     },
     },
     {
     {
       "ID": 2322,
       "ID": 2322,
@@ -11202,207 +11202,207 @@
     },
     },
     {
     {
       "ID": 2801,
       "ID": 2801,
-      "txt": ""
+      "txt": "风中洞府1"
     },
     },
     {
     {
       "ID": 2802,
       "ID": 2802,
-      "txt": ""
+      "txt": "风中洞府2"
     },
     },
     {
     {
       "ID": 2803,
       "ID": 2803,
-      "txt": ""
+      "txt": "风灵之力"
     },
     },
     {
     {
       "ID": 2804,
       "ID": 2804,
-      "txt": ""
+      "txt": "北海深处1"
     },
     },
     {
     {
       "ID": 2805,
       "ID": 2805,
-      "txt": ""
+      "txt": "北海深处2"
     },
     },
     {
     {
       "ID": 2806,
       "ID": 2806,
-      "txt": ""
+      "txt": "尧之都"
     },
     },
     {
     {
       "ID": 2807,
       "ID": 2807,
-      "txt": ""
+      "txt": "山林清音"
     },
     },
     {
     {
       "ID": 2808,
       "ID": 2808,
-      "txt": ""
+      "txt": "山中劳作"
     },
     },
     {
     {
       "ID": 2809,
       "ID": 2809,
-      "txt": ""
+      "txt": "风起夜战"
     },
     },
     {
     {
       "ID": 2810,
       "ID": 2810,
-      "txt": ""
+      "txt": "吃茶三问"
     },
     },
     {
     {
       "ID": 2811,
       "ID": 2811,
-      "txt": ""
+      "txt": "尧让天下"
     },
     },
     {
     {
       "ID": 2812,
       "ID": 2812,
-      "txt": ""
+      "txt": "无用之树"
     },
     },
     {
     {
       "ID": 2813,
       "ID": 2813,
-      "txt": ""
+      "txt": "樗木之灵"
     },
     },
     {
     {
       "ID": 2814,
       "ID": 2814,
-      "txt": ""
+      "txt": "游尧都"
     },
     },
     {
     {
       "ID": 2815,
       "ID": 2815,
-      "txt": ""
+      "txt": "再见尧帝"
     },
     },
     {
     {
       "ID": 2816,
       "ID": 2816,
-      "txt": ""
+      "txt": "云海漫行"
     },
     },
     {
     {
       "ID": 2817,
       "ID": 2817,
-      "txt": ""
+      "txt": "初见惠子"
     },
     },
     {
     {
       "ID": 2818,
       "ID": 2818,
-      "txt": ""
+      "txt": "葫芦肥料"
     },
     },
     {
     {
       "ID": 2819,
       "ID": 2819,
-      "txt": ""
+      "txt": "藐姑射山"
     },
     },
     {
     {
       "ID": 2820,
       "ID": 2820,
-      "txt": ""
+      "txt": "炼器师"
     },
     },
     {
     {
       "ID": 2821,
       "ID": 2821,
-      "txt": ""
+      "txt": "忘火剑"
     },
     },
     {
     {
       "ID": 2822,
       "ID": 2822,
-      "txt": ""
+      "txt": "击败痴道人"
     },
     },
     {
     {
       "ID": 2823,
       "ID": 2823,
-      "txt": ""
+      "txt": "疯痴相聚"
     },
     },
     {
     {
       "ID": 2824,
       "ID": 2824,
-      "txt": ""
+      "txt": "筑基后期"
     },
     },
     {
     {
       "ID": 2825,
       "ID": 2825,
-      "txt": ""
+      "txt": "妖兽横行"
     },
     },
     {
     {
       "ID": 2826,
       "ID": 2826,
-      "txt": ""
+      "txt": "遇见鲲鹏"
     },
     },
     {
     {
       "ID": 2827,
       "ID": 2827,
-      "txt": ""
+      "txt": "尧让天下"
     },
     },
     {
     {
       "ID": 2828,
       "ID": 2828,
-      "txt": ""
+      "txt": "访贤许由"
     },
     },
     {
     {
       "ID": 2829,
       "ID": 2829,
-      "txt": ""
+      "txt": "割草喝茶"
     },
     },
     {
     {
       "ID": 2830,
       "ID": 2830,
-      "txt": ""
+      "txt": "再来一杯"
     },
     },
     {
     {
       "ID": 2831,
       "ID": 2831,
-      "txt": ""
+      "txt": "战胜妖王"
     },
     },
     {
     {
       "ID": 2832,
       "ID": 2832,
-      "txt": ""
+      "txt": "复命尧帝"
     },
     },
     {
     {
       "ID": 2833,
       "ID": 2833,
-      "txt": ""
+      "txt": "树下闲话"
     },
     },
     {
     {
       "ID": 2834,
       "ID": 2834,
-      "txt": ""
+      "txt": "切磋切磋"
     },
     },
     {
     {
       "ID": 2835,
       "ID": 2835,
-      "txt": ""
+      "txt": "金丹前期"
     },
     },
     {
     {
       "ID": 2836,
       "ID": 2836,
-      "txt": ""
+      "txt": "仙山传说"
     },
     },
     {
     {
       "ID": 2837,
       "ID": 2837,
-      "txt": ""
+      "txt": "入山幻阵"
     },
     },
     {
     {
       "ID": 2838,
       "ID": 2838,
-      "txt": ""
+      "txt": "葫芦种子"
     },
     },
     {
     {
       "ID": 2839,
       "ID": 2839,
-      "txt": ""
+      "txt": "天肥地肥"
     },
     },
     {
     {
       "ID": 2840,
       "ID": 2840,
-      "txt": ""
+      "txt": "登山"
     },
     },
     {
     {
       "ID": 2841,
       "ID": 2841,
-      "txt": ""
+      "txt": "重铸忘火剑"
     },
     },
     {
     {
       "ID": 2842,
       "ID": 2842,
-      "txt": ""
+      "txt": "护法"
     },
     },
     {
     {
       "ID": 2843,
       "ID": 2843,
-      "txt": ""
+      "txt": "- 击败结界兽{0}/{1}"
     },
     },
     {
     {
       "ID": 2844,
       "ID": 2844,
-      "txt": ""
+      "txt": "- 达到境界:筑基-后期{0}/{1}"
     },
     },
     {
     {
       "ID": 2845,
       "ID": 2845,
-      "txt": ""
+      "txt": "- 击杀妖兽{0}/{1}"
     },
     },
     {
     {
       "ID": 2846,
       "ID": 2846,
-      "txt": ""
+      "txt": "- 击败后山小妖{0}/{1}"
     },
     },
     {
     {
       "ID": 2847,
       "ID": 2847,
-      "txt": ""
+      "txt": "- 收集灵草种子{0}/{1}"
     },
     },
     {
     {
       "ID": 2848,
       "ID": 2848,
-      "txt": ""
+      "txt": "- 击败夜袭的妖兽{0}/{1}"
     },
     },
     {
     {
       "ID": 2849,
       "ID": 2849,
-      "txt": ""
+      "txt": "- 击败峰顶的妖王{0}/{1}"
     },
     },
     {
     {
       "ID": 2850,
       "ID": 2850,
-      "txt": ""
+      "txt": "- 境界达到[金丹-前期]{0}/{1}"
     },
     },
     {
     {
       "ID": 2851,
       "ID": 2851,
-      "txt": ""
+      "txt": "- 击败仙山的阵眼妖兽{0}/{1}"
     },
     },
     {
     {
       "ID": 2852,
       "ID": 2852,

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx