zg 3 weeks ago
parent
commit
0a3509ad55

+ 104 - 52
Assets/Res/Config/EventConfig.json

@@ -7,7 +7,8 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 3,
@@ -41,7 +42,8 @@
         1013,
         1014,
         1015,
-        1016
+        1016,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 3,
@@ -100,10 +102,11 @@
     {
       "ID": 4,
       "EventLinksId": [
-        1030
+        1030,
+        100
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -128,10 +131,11 @@
     {
       "ID": 5,
       "EventLinksId": [
-        1040
+        1040,
+        100
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -153,10 +157,11 @@
     {
       "ID": 6,
       "EventLinksId": [
-        1050
+        1050,
+        100
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -178,10 +183,11 @@
     {
       "ID": 7,
       "EventLinksId": [
-        1060
+        1060,
+        100
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -204,10 +210,11 @@
       "ID": 11,
       "EventLinksId": [
         1101,
-        1102
+        1102,
+        100
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -231,10 +238,11 @@
       "EventLinksId": [
         1201,
         1202,
-        1203
+        1203,
+        100
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -259,10 +267,11 @@
         1301,
         1302,
         1303,
-        1304
+        1304,
+        100
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -285,10 +294,11 @@
       "ID": 14,
       "EventLinksId": [
         1401,
-        1402
+        1402,
+        100
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -311,10 +321,11 @@
       "ID": 15,
       "EventLinksId": [
         1501,
-        1502
+        1502,
+        100
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -890,7 +901,11 @@
         1001813,
         1001814,
         1001815,
-        1001816
+        1001816,
+        1001817,
+        1001818,
+        1001819,
+        1001820
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1180,7 +1195,8 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 4,
@@ -1205,7 +1221,8 @@
     {
       "ID": 1011,
       "EventLinksId": [
-        101101
+        101101,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1230,7 +1247,8 @@
     {
       "ID": 1012,
       "EventLinksId": [
-        101201
+        101201,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1255,7 +1273,8 @@
     {
       "ID": 1013,
       "EventLinksId": [
-        101301
+        101301,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1280,7 +1299,8 @@
     {
       "ID": 1014,
       "EventLinksId": [
-        101401
+        101401,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1306,7 +1326,8 @@
       "ID": 1015,
       "EventLinksId": [
         101501,
-        101502
+        101502,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1332,7 +1353,8 @@
       "ID": 1016,
       "EventLinksId": [
         101601,
-        101602
+        101602,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1357,7 +1379,8 @@
     {
       "ID": 1017,
       "EventLinksId": [
-        101701
+        101701,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1388,7 +1411,8 @@
         101801,
         101802,
         101803,
-        101804
+        101804,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1415,7 +1439,8 @@
       "EventLinksId": [
         101901,
         101902,
-        101903
+        101903,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1441,7 +1466,8 @@
       "ID": 1020,
       "EventLinksId": [
         102001,
-        102002
+        102002,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1468,7 +1494,8 @@
       "EventLinksId": [
         102101,
         102102,
-        102103
+        102103,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1496,7 +1523,8 @@
         102204,
         102205,
         102206,
-        102207
+        102207,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1520,7 +1548,8 @@
       "EventLinksId": [
         102301,
         102302,
-        102303
+        102303,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1541,7 +1570,8 @@
       "EventLinksId": [
         102401,
         102402,
-        102403
+        102403,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1562,7 +1592,8 @@
       "EventLinksId": [
         102501,
         102502,
-        102503
+        102503,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1582,7 +1613,8 @@
       "ID": 1026,
       "EventLinksId": [
         102601,
-        102602
+        102602,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1608,7 +1640,8 @@
       "ID": 1027,
       "EventLinksId": [
         102701,
-        102702
+        102702,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1637,7 +1670,8 @@
         102802,
         102803,
         102804,
-        102805
+        102805,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1669,7 +1703,8 @@
         102905,
         102906,
         102907,
-        102908
+        102908,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1700,7 +1735,8 @@
         103004,
         103005,
         103006,
-        103007
+        103007,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1729,7 +1765,8 @@
         103102,
         103103,
         103104,
-        103105
+        103105,
+        100
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -2004,6 +2041,9 @@
     },
     {
       "ID": 30001,
+      "EventLinksId": [
+        100
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
       "EventType": 1,
@@ -2020,6 +2060,9 @@
     },
     {
       "ID": 30002,
+      "EventLinksId": [
+        100
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
       "EventType": 1,
@@ -2037,7 +2080,8 @@
     {
       "ID": 30003,
       "EventLinksId": [
-        3000301
+        3000301,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2056,7 +2100,8 @@
     {
       "ID": 30004,
       "EventLinksId": [
-        3000401
+        3000401,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2075,7 +2120,8 @@
     {
       "ID": 30005,
       "EventLinksId": [
-        3000501
+        3000501,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2094,7 +2140,8 @@
     {
       "ID": 30006,
       "EventLinksId": [
-        3000601
+        3000601,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2113,7 +2160,8 @@
     {
       "ID": 30007,
       "EventLinksId": [
-        3000701
+        3000701,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2132,7 +2180,8 @@
     {
       "ID": 30008,
       "EventLinksId": [
-        3000801
+        3000801,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2152,7 +2201,8 @@
       "ID": 30009,
       "EventLinksId": [
         3000901,
-        3000902
+        3000902,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2177,7 +2227,8 @@
     {
       "ID": 30010,
       "EventLinksId": [
-        3001001
+        3001001,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2206,7 +2257,8 @@
       "ID": 30011,
       "EventLinksId": [
         3001101,
-        3001102
+        3001102,
+        100
       ],
       "EventTriggerType": 99,
       "EventTag": 6,

+ 5 - 4
Assets/Res/Config/EventLinkConfig.json

@@ -2255,6 +2255,7 @@
       "EventID": 10012,
       "optionType": 1,
       "optionPara1": [
+        1001206,
         1001206
       ],
       "optionPara2": [
@@ -3088,7 +3089,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        2244
+        3186
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3106,7 +3107,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2245
+        3187
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3124,7 +3125,7 @@
       "PreShowPar": null,
       "NPCID": 100,
       "LanID": [
-        2246
+        3188
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3142,7 +3143,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2247
+        3189
       ],
       "DialogueType": null,
       "EventID": 10016,

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

@@ -8982,7 +8982,7 @@
     },
     {
       "ID": 2246,
-      "txt": "(低声)……前辈,我做了怎么多事,一次比一次难。为何每次都让我喝茶?前辈可是希望我去处理?"
+      "txt": "前辈可是希望我去处理?"
     },
     {
       "ID": 2247,
@@ -12739,6 +12739,38 @@
     {
       "ID": 3185,
       "txt": "击败结界兽"
+    },
+    {
+      "ID": 3186,
+      "txt": "(你回到屋前,略显疲惫,许由依然在烧水,煮茶)"
+    },
+    {
+      "ID": 3187,
+      "txt": "(不动声色,递茶)喝吧。"
+    },
+    {
+      "ID": 3188,
+      "txt": "(低声)……前辈,我做了怎么多事,一次比一次难。为何每次都让我喝茶?"
+    },
+    {
+      "ID": 3189,
+      "txt": "哈哈哈,小友.你赢得越来越多,喝得却越来越不甘心。"
+    },
+    {
+      "ID": 3190,
+      "txt": "0"
+    },
+    {
+      "ID": 3191,
+      "txt": "0"
+    },
+    {
+      "ID": 3192,
+      "txt": "0"
+    },
+    {
+      "ID": 3193,
+      "txt": "0"
     }
   ]
 }

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx