Przeglądaj źródła

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

lzx 1 dzień temu
rodzic
commit
1817181c39

+ 97 - 2
Assets/Res/Config/EventConditionConfig.json

@@ -666,11 +666,106 @@
       "Operation": 0,
       "ConditionType": 10,
       "ConditionPara": [
-        30016
+        30017
+      ],
+      "finishCount": 3,
+      "RelatedEvents": [
+        30017
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 42,
+      "message": 9041,
+      "Operation": 0,
+      "ConditionType": 10,
+      "ConditionPara": [
+        30018
       ],
       "finishCount": 1,
       "RelatedEvents": [
-        30016
+        30018
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 43,
+      "message": 9042,
+      "Operation": 0,
+      "ConditionType": 10,
+      "ConditionPara": [
+        30019
+      ],
+      "finishCount": 2,
+      "RelatedEvents": [
+        30019
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 44,
+      "message": 9043,
+      "Operation": 0,
+      "ConditionType": 10,
+      "ConditionPara": [
+        30020
+      ],
+      "finishCount": 3,
+      "RelatedEvents": [
+        30020
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 45,
+      "message": 9044,
+      "Operation": 0,
+      "ConditionType": 10,
+      "ConditionPara": [
+        30021
+      ],
+      "finishCount": 2,
+      "RelatedEvents": [
+        30021
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 46,
+      "message": 9045,
+      "Operation": 0,
+      "ConditionType": 10,
+      "ConditionPara": [
+        30022
+      ],
+      "finishCount": 3,
+      "RelatedEvents": [
+        30022
       ],
       "SkiptoIds": [
         1,

+ 618 - 3
Assets/Res/Config/EventConfig.json

@@ -2975,7 +2975,7 @@
       "placeID": 1,
       "XiantuID": 0,
       "EventConditionId": 0,
-      "EventCount": 3,
+      "EventCount": 1,
       "EventName": 4177,
       "Description": 4178
     },
@@ -3030,10 +3030,169 @@
       "placeID": 1,
       "XiantuID": 0,
       "EventConditionId": 0,
-      "EventCount": 3,
+      "EventCount": 1,
       "EventName": 4195,
       "Description": 4196
     },
+    {
+      "ID": 30017,
+      "EventLinksId": [
+        3001701,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20007
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 3,
+      "EventName": 4197,
+      "Description": 4198
+    },
+    {
+      "ID": 30018,
+      "EventLinksId": [
+        3001801,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20008
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 1,
+      "EventName": 4199,
+      "Description": 4200
+    },
+    {
+      "ID": 30019,
+      "EventLinksId": [
+        3001901,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20009
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 2,
+      "EventName": 4213,
+      "Description": 4214
+    },
+    {
+      "ID": 30020,
+      "EventLinksId": [
+        3002001,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20010
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 2,
+      "EventName": 4227,
+      "Description": 4228
+    },
+    {
+      "ID": 30021,
+      "EventLinksId": [
+        3002101,
+        3002102,
+        3002103,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20011
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 2,
+      "EventName": 4229,
+      "Description": 4230
+    },
+    {
+      "ID": 30022,
+      "EventLinksId": [
+        3002201,
+        3002202,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20012
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 3,
+      "EventName": 4242,
+      "Description": 4243
+    },
     {
       "ID": 5001,
       "EventLinksId": [
@@ -3689,7 +3848,7 @@
       "XiantuID": 0,
       "EventConditionId": 3,
       "EventValue": [
-        61
+        81
       ],
       "EventCount": 0,
       "EventName": 4179,
@@ -3754,6 +3913,7 @@
         602401,
         602402,
         602403,
+        602404,
         102
       ],
       "EventTriggerType": 7,
@@ -3776,6 +3936,9 @@
     {
       "ID": 6025,
       "EventLinksId": [
+        602501,
+        602502,
+        602503,
         102
       ],
       "EventTriggerType": 7,
@@ -3798,6 +3961,13 @@
     {
       "ID": 6026,
       "EventLinksId": [
+        602601,
+        602602,
+        602603,
+        602604,
+        602605,
+        602606,
+        602607,
         102
       ],
       "EventTriggerType": 7,
@@ -3816,6 +3986,451 @@
       "EventCount": 0,
       "EventName": 4184,
       "Description": 4190
+    },
+    {
+      "ID": 6031,
+      "EventLinksId": [
+        603101,
+        603102,
+        603103,
+        603104,
+        603105,
+        603106,
+        603107,
+        603108,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 35,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 3,
+      "EventValue": [
+        101
+      ],
+      "EventCount": 0,
+      "EventName": 4201,
+      "Description": 4207
+    },
+    {
+      "ID": 6032,
+      "EventLinksId": [
+        603201,
+        603202,
+        603203,
+        603204,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6031
+      ],
+      "EventCount": 0,
+      "EventName": 4202,
+      "Description": 4208
+    },
+    {
+      "ID": 6033,
+      "EventLinksId": [
+        603301,
+        603302,
+        603303,
+        603304,
+        603305,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 25,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6032
+      ],
+      "EventCount": 0,
+      "EventName": 4203,
+      "Description": 4209
+    },
+    {
+      "ID": 6034,
+      "EventLinksId": [
+        603401,
+        603402,
+        603403,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6033
+      ],
+      "EventCount": 0,
+      "EventName": 4204,
+      "Description": 4210
+    },
+    {
+      "ID": 6035,
+      "EventLinksId": [
+        603501,
+        603502,
+        603503,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 15,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6034
+      ],
+      "EventCount": 0,
+      "EventName": 4205,
+      "Description": 4211
+    },
+    {
+      "ID": 6036,
+      "EventLinksId": [
+        603601,
+        603602,
+        603603,
+        603604,
+        603605,
+        603606,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 10,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6035
+      ],
+      "EventCount": 0,
+      "EventName": 4206,
+      "Description": 4212
+    },
+    {
+      "ID": 6041,
+      "EventLinksId": [
+        604101,
+        604102,
+        604103,
+        604104,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 35,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 3,
+      "EventValue": [
+        121
+      ],
+      "EventCount": 0,
+      "EventName": 4215,
+      "Description": 4221
+    },
+    {
+      "ID": 6042,
+      "EventLinksId": [
+        604201,
+        604202,
+        604203,
+        604204,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6041
+      ],
+      "EventCount": 0,
+      "EventName": 4216,
+      "Description": 4222
+    },
+    {
+      "ID": 6043,
+      "EventLinksId": [
+        604301,
+        604302,
+        604303,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 25,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6042
+      ],
+      "EventCount": 0,
+      "EventName": 4217,
+      "Description": 4223
+    },
+    {
+      "ID": 6044,
+      "EventLinksId": [
+        604401,
+        604402,
+        604403,
+        604404,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6043
+      ],
+      "EventCount": 0,
+      "EventName": 4218,
+      "Description": 4224
+    },
+    {
+      "ID": 6045,
+      "EventLinksId": [
+        604501,
+        604502,
+        604503,
+        604504,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 15,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6044
+      ],
+      "EventCount": 0,
+      "EventName": 4219,
+      "Description": 4225
+    },
+    {
+      "ID": 6046,
+      "EventLinksId": [
+        604601,
+        604602,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 10,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6045
+      ],
+      "EventCount": 0,
+      "EventName": 4220,
+      "Description": 4226
+    },
+    {
+      "ID": 6051,
+      "EventLinksId": [
+        605101,
+        605102,
+        605103,
+        605104,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 35,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 3,
+      "EventValue": [
+        141
+      ],
+      "EventCount": 0,
+      "EventName": 4231,
+      "Description": 4237
+    },
+    {
+      "ID": 6052,
+      "EventLinksId": [
+        605201,
+        605202,
+        605203,
+        605204,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6051
+      ],
+      "EventCount": 0,
+      "EventName": 4232,
+      "Description": 4238
+    },
+    {
+      "ID": 6053,
+      "EventLinksId": [
+        605301,
+        605302,
+        605303,
+        605304,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 25,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6052
+      ],
+      "EventCount": 0,
+      "EventName": 4233,
+      "Description": 4239
+    },
+    {
+      "ID": 6054,
+      "EventLinksId": [
+        605401,
+        605402,
+        605403,
+        605404,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6053
+      ],
+      "EventCount": 0,
+      "EventName": 4234,
+      "Description": 4240
+    },
+    {
+      "ID": 6055,
+      "EventLinksId": [
+        605501,
+        605502,
+        605503,
+        605504,
+        605505,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 15,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6054
+      ],
+      "EventCount": 0,
+      "EventName": 4235,
+      "Description": 4241
     }
   ]
 }

+ 1834 - 22
Assets/Res/Config/EventLinkConfig.json

@@ -1399,9 +1399,10 @@
       "optionPara1": [
         1002
       ],
-      "ResultType": 1,
+      "ResultType": 2,
       "ResultOptions": [
-        1000404
+        1000404,
+        101
       ]
     },
     {
@@ -1904,9 +1905,10 @@
       "optionPara1": [
         1003
       ],
-      "ResultType": 1,
+      "ResultType": 2,
       "ResultOptions": [
-        1000705
+        1000705,
+        101
       ]
     },
     {
@@ -4377,9 +4379,10 @@
       "optionPara1": [
         1016
       ],
-      "ResultType": 1,
+      "ResultType": 2,
       "ResultOptions": [
-        1002002
+        1002002,
+        101
       ]
     },
     {
@@ -6919,7 +6922,11 @@
       "optionPara1": [
         1003
       ],
-      "ResultType": 0
+      "ResultType": 2,
+      "ResultOptions": [
+        3000302,
+        101
+      ]
     },
     {
       "ID": 3000401,
@@ -6934,7 +6941,11 @@
       "optionPara1": [
         1004
       ],
-      "ResultType": 0
+      "ResultType": 2,
+      "ResultOptions": [
+        3000402,
+        101
+      ]
     },
     {
       "ID": 3000501,
@@ -6949,7 +6960,11 @@
       "optionPara1": [
         1005
       ],
-      "ResultType": 0
+      "ResultType": 2,
+      "ResultOptions": [
+        3000502,
+        101
+      ]
     },
     {
       "ID": 3000601,
@@ -6964,7 +6979,11 @@
       "optionPara1": [
         1006
       ],
-      "ResultType": 0
+      "ResultType": 2,
+      "ResultOptions": [
+        3000602,
+        101
+      ]
     },
     {
       "ID": 3000701,
@@ -6979,7 +6998,11 @@
       "optionPara1": [
         1007
       ],
-      "ResultType": 0
+      "ResultType": 2,
+      "ResultOptions": [
+        3000702,
+        101
+      ]
     },
     {
       "ID": 3000801,
@@ -6994,13 +7017,11 @@
       "optionPara1": [
         1008
       ],
-      "PrizeIDs": [
-        20002
-      ],
-      "PrizeNums": [
-        1
-      ],
-      "ResultType": 0
+      "ResultType": 2,
+      "ResultOptions": [
+        3000802,
+        101
+      ]
     },
     {
       "ID": 3001101,
@@ -8218,7 +8239,7 @@
       "EventID": 30009,
       "optionType": 2,
       "optionPara1": [
-        100001
+        10001
       ],
       "PrizeIDs": [
         1301
@@ -8226,9 +8247,10 @@
       "PrizeNums": [
         1
       ],
-      "ResultType": 1,
+      "ResultType": 2,
       "ResultOptions": [
-        3000902
+        300902,
+        101
       ]
     },
     {
@@ -9863,6 +9885,182 @@
       "optionType": 0,
       "ResultType": 0
     },
+    {
+      "ID": 3001701,
+      "conciseEventMessage": 5727,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5728
+      ],
+      "DialogueType": 0,
+      "EventID": 30017,
+      "optionType": 2,
+      "optionPara1": [
+        30017
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        3001702,
+        101
+      ]
+    },
+    {
+      "ID": 3001801,
+      "conciseEventMessage": 5729,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5730
+      ],
+      "DialogueType": 0,
+      "EventID": 30018,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 3001901,
+      "conciseEventMessage": 5731,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5732
+      ],
+      "DialogueType": 0,
+      "EventID": 30019,
+      "optionType": 2,
+      "optionPara1": [
+        3009
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        3001902,
+        101
+      ]
+    },
+    {
+      "ID": 3002001,
+      "conciseEventMessage": 5733,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5734
+      ],
+      "DialogueType": 0,
+      "EventID": 30020,
+      "optionType": 2,
+      "optionPara1": [
+        3011
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        3002002,
+        101
+      ]
+    },
+    {
+      "ID": 3002101,
+      "conciseEventMessage": 5735,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5736
+      ],
+      "DialogueType": 0,
+      "EventID": 30021,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 3002102,
+      "conciseEventMessage": 5735,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5737
+      ],
+      "DialogueType": 0,
+      "EventID": 30021,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        3002103
+      ]
+    },
+    {
+      "ID": 3002103,
+      "conciseEventMessage": 5735,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5738
+      ],
+      "DialogueType": 0,
+      "EventID": 30021,
+      "optionType": 2,
+      "optionPara1": [
+        3012
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        3002104,
+        101
+      ]
+    },
+    {
+      "ID": 3002201,
+      "conciseEventMessage": 5739,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5740
+      ],
+      "DialogueType": 0,
+      "EventID": 30022,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        3002202
+      ]
+    },
+    {
+      "ID": 3002202,
+      "conciseEventMessage": 5739,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5741
+      ],
+      "DialogueType": 0,
+      "EventID": 30022,
+      "optionType": 2,
+      "optionPara1": [
+        3013
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        3002203,
+        101
+      ]
+    },
     {
       "ID": 600101,
       "conciseEventMessage": 5720,
@@ -12316,7 +12514,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 122,
+      "NPCID": 100,
       "LanID": [
         5889
       ],
@@ -12326,7 +12524,1621 @@
         41
       ],
       "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        602404
+      ]
+    },
+    {
+      "ID": 602404,
+      "conciseEventMessage": 5886,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 122,
+      "LanID": [
+        5890
+      ],
+      "DialogueType": 0,
+      "EventID": 6024,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 602501,
+      "conciseEventMessage": 5891,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 122,
+      "LanID": [
+        5892
+      ],
+      "DialogueType": 0,
+      "EventID": 6025,
+      "optionType": 1,
+      "optionPara1": [
+        602502
+      ],
+      "optionPara2": [
+        5893
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        602502
+      ]
+    },
+    {
+      "ID": 602502,
+      "conciseEventMessage": 5894,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 6025,
+      "ConditionId": [
+        42
+      ],
+      "optionType": 1,
+      "optionPara1": [
+        602503
+      ],
+      "optionPara2": [
+        5895
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        602503
+      ]
+    },
+    {
+      "ID": 602503,
+      "conciseEventMessage": 5896,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 122,
+      "LanID": [
+        5897
+      ],
+      "DialogueType": 0,
+      "EventID": 6025,
+      "optionType": 0,
       "ResultType": 0
+    },
+    {
+      "ID": 602601,
+      "conciseEventMessage": 5898,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5899
+      ],
+      "DialogueType": 0,
+      "EventID": 6026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        602602
+      ]
+    },
+    {
+      "ID": 602602,
+      "conciseEventMessage": 5898,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 122,
+      "LanID": [
+        5900
+      ],
+      "DialogueType": 0,
+      "EventID": 6026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        602603
+      ]
+    },
+    {
+      "ID": 602603,
+      "conciseEventMessage": 5898,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 103,
+      "LanID": [
+        5901
+      ],
+      "DialogueType": 0,
+      "EventID": 6026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        602604
+      ]
+    },
+    {
+      "ID": 602604,
+      "conciseEventMessage": 5898,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 122,
+      "LanID": [
+        5902
+      ],
+      "DialogueType": 0,
+      "EventID": 6026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        602605
+      ]
+    },
+    {
+      "ID": 602605,
+      "conciseEventMessage": 5898,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 103,
+      "LanID": [
+        5903
+      ],
+      "DialogueType": 0,
+      "EventID": 6026,
+      "optionType": 1,
+      "optionPara1": [
+        602606
+      ],
+      "optionPara2": [
+        5904
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        602606
+      ]
+    },
+    {
+      "ID": 602606,
+      "conciseEventMessage": 5898,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 122,
+      "LanID": [
+        5905
+      ],
+      "DialogueType": 0,
+      "EventID": 6026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        602607
+      ]
+    },
+    {
+      "ID": 602607,
+      "conciseEventMessage": 5898,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 103,
+      "LanID": [
+        5906
+      ],
+      "DialogueType": 0,
+      "EventID": 6026,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 603101,
+      "conciseEventMessage": 5907,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5908
+      ],
+      "DialogueType": 0,
+      "EventID": 6031,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603102
+      ]
+    },
+    {
+      "ID": 603102,
+      "conciseEventMessage": 5907,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        5909
+      ],
+      "DialogueType": 0,
+      "EventID": 6031,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603103
+      ]
+    },
+    {
+      "ID": 603103,
+      "conciseEventMessage": 5907,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5910
+      ],
+      "DialogueType": 0,
+      "EventID": 6031,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603104
+      ]
+    },
+    {
+      "ID": 603104,
+      "conciseEventMessage": 5907,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5911
+      ],
+      "DialogueType": 0,
+      "EventID": 6031,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603105
+      ]
+    },
+    {
+      "ID": 603105,
+      "conciseEventMessage": 5907,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5912
+      ],
+      "DialogueType": 0,
+      "EventID": 6031,
+      "optionType": 1,
+      "optionPara1": [
+        603106,
+        603106
+      ],
+      "optionPara2": [
+        5913,
+        5914
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        603106
+      ]
+    },
+    {
+      "ID": 603106,
+      "conciseEventMessage": 5907,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5915
+      ],
+      "DialogueType": 0,
+      "EventID": 6031,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603107
+      ]
+    },
+    {
+      "ID": 603107,
+      "conciseEventMessage": 5907,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5916
+      ],
+      "DialogueType": 0,
+      "EventID": 6031,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603108
+      ]
+    },
+    {
+      "ID": 603108,
+      "conciseEventMessage": 5907,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        5917
+      ],
+      "DialogueType": 0,
+      "EventID": 6031,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 603201,
+      "conciseEventMessage": 5918,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5919
+      ],
+      "DialogueType": 0,
+      "EventID": 6032,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603202
+      ]
+    },
+    {
+      "ID": 603202,
+      "conciseEventMessage": 5918,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5920
+      ],
+      "DialogueType": 0,
+      "EventID": 6032,
+      "optionType": 1,
+      "optionPara1": [
+        603203
+      ],
+      "optionPara2": [
+        5921
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        603203
+      ]
+    },
+    {
+      "ID": 603203,
+      "conciseEventMessage": 5918,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5922
+      ],
+      "DialogueType": 0,
+      "EventID": 6032,
+      "optionType": 1,
+      "optionPara1": [
+        603204
+      ],
+      "optionPara2": [
+        5923
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        603204
+      ]
+    },
+    {
+      "ID": 603204,
+      "conciseEventMessage": 5918,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5924
+      ],
+      "DialogueType": 0,
+      "EventID": 6032,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 603301,
+      "conciseEventMessage": 5925,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5926
+      ],
+      "DialogueType": 0,
+      "EventID": 6033,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603302
+      ]
+    },
+    {
+      "ID": 603302,
+      "conciseEventMessage": 5925,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5927
+      ],
+      "DialogueType": 0,
+      "EventID": 6033,
+      "optionType": 1,
+      "optionPara1": [
+        603303
+      ],
+      "optionPara2": [
+        5928
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        603303
+      ]
+    },
+    {
+      "ID": 603303,
+      "conciseEventMessage": 5925,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5929
+      ],
+      "DialogueType": 0,
+      "EventID": 6033,
+      "optionType": 1,
+      "optionPara1": [
+        603304
+      ],
+      "optionPara2": [
+        5930
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        603304
+      ]
+    },
+    {
+      "ID": 603304,
+      "conciseEventMessage": 5925,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5931
+      ],
+      "DialogueType": 0,
+      "EventID": 6033,
+      "optionType": 1,
+      "optionPara1": [
+        603305
+      ],
+      "optionPara2": [
+        5932
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        603305
+      ]
+    },
+    {
+      "ID": 603305,
+      "conciseEventMessage": 5925,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5933
+      ],
+      "DialogueType": 0,
+      "EventID": 6033,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 603401,
+      "conciseEventMessage": 5934,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5935
+      ],
+      "DialogueType": 0,
+      "EventID": 6034,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603402
+      ]
+    },
+    {
+      "ID": 603402,
+      "conciseEventMessage": 5934,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        5936
+      ],
+      "DialogueType": 0,
+      "EventID": 6034,
+      "ConditionId": [
+        43
+      ],
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603403
+      ]
+    },
+    {
+      "ID": 603403,
+      "conciseEventMessage": 5934,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5937
+      ],
+      "DialogueType": 0,
+      "EventID": 6034,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 603501,
+      "conciseEventMessage": 5938,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5939
+      ],
+      "DialogueType": 0,
+      "EventID": 6035,
+      "optionType": 2,
+      "optionPara1": [
+        3010
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        603502,
+        101
+      ]
+    },
+    {
+      "ID": 603502,
+      "conciseEventMessage": 5938,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        5940
+      ],
+      "DialogueType": 0,
+      "EventID": 6035,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603503
+      ]
+    },
+    {
+      "ID": 603503,
+      "conciseEventMessage": 5938,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5941
+      ],
+      "DialogueType": 0,
+      "EventID": 6035,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 603601,
+      "conciseEventMessage": 5942,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5943
+      ],
+      "DialogueType": 0,
+      "EventID": 6036,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603602
+      ]
+    },
+    {
+      "ID": 603602,
+      "conciseEventMessage": 5942,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5944
+      ],
+      "DialogueType": 0,
+      "EventID": 6036,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603603
+      ]
+    },
+    {
+      "ID": 603603,
+      "conciseEventMessage": 5942,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5945
+      ],
+      "DialogueType": 0,
+      "EventID": 6036,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603604
+      ]
+    },
+    {
+      "ID": 603604,
+      "conciseEventMessage": 5942,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5946
+      ],
+      "DialogueType": 0,
+      "EventID": 6036,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603605
+      ]
+    },
+    {
+      "ID": 603605,
+      "conciseEventMessage": 5942,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 5,
+      "LanID": [
+        5947
+      ],
+      "DialogueType": 0,
+      "EventID": 6036,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        603606
+      ]
+    },
+    {
+      "ID": 603606,
+      "conciseEventMessage": 5942,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5948
+      ],
+      "DialogueType": 0,
+      "EventID": 6036,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 604101,
+      "conciseEventMessage": 5949,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5950
+      ],
+      "DialogueType": 0,
+      "EventID": 6041,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        604102
+      ]
+    },
+    {
+      "ID": 604102,
+      "conciseEventMessage": 5949,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        5951
+      ],
+      "DialogueType": 0,
+      "EventID": 6041,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        604103
+      ]
+    },
+    {
+      "ID": 604103,
+      "conciseEventMessage": 5949,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5952
+      ],
+      "DialogueType": 0,
+      "EventID": 6041,
+      "optionType": 1,
+      "optionPara1": [
+        604104
+      ],
+      "optionPara2": [
+        5953
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604104
+      ]
+    },
+    {
+      "ID": 604104,
+      "conciseEventMessage": 5949,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5954
+      ],
+      "DialogueType": 0,
+      "EventID": 6041,
+      "optionType": 1,
+      "optionPara1": [
+        604105
+      ],
+      "optionPara2": [
+        5955
+      ],
+      "ResultType": 0
+    },
+    {
+      "ID": 604201,
+      "conciseEventMessage": 5956,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5957
+      ],
+      "DialogueType": 0,
+      "EventID": 6042,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        604202
+      ]
+    },
+    {
+      "ID": 604202,
+      "conciseEventMessage": 5956,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5958
+      ],
+      "DialogueType": 0,
+      "EventID": 6042,
+      "ConditionId": [
+        44
+      ],
+      "optionType": 1,
+      "optionPara1": [
+        604203
+      ],
+      "optionPara2": [
+        5959
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604203
+      ]
+    },
+    {
+      "ID": 604203,
+      "conciseEventMessage": 5956,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5960
+      ],
+      "DialogueType": 0,
+      "EventID": 6042,
+      "optionType": 1,
+      "optionPara1": [
+        604204
+      ],
+      "optionPara2": [
+        5961
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604204
+      ]
+    },
+    {
+      "ID": 604204,
+      "conciseEventMessage": 5956,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5962
+      ],
+      "DialogueType": 0,
+      "EventID": 6042,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 604301,
+      "conciseEventMessage": 5963,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5964
+      ],
+      "DialogueType": 0,
+      "EventID": 6043,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        604302
+      ]
+    },
+    {
+      "ID": 604302,
+      "conciseEventMessage": 5963,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5965
+      ],
+      "DialogueType": 0,
+      "EventID": 6043,
+      "optionType": 1,
+      "optionPara1": [
+        604303
+      ],
+      "optionPara2": [
+        5966
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604303
+      ]
+    },
+    {
+      "ID": 604303,
+      "conciseEventMessage": 5963,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5967
+      ],
+      "DialogueType": 0,
+      "EventID": 6043,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 604401,
+      "conciseEventMessage": 5968,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5969
+      ],
+      "DialogueType": 0,
+      "EventID": 6044,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        604402
+      ]
+    },
+    {
+      "ID": 604402,
+      "conciseEventMessage": 5968,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        5970
+      ],
+      "DialogueType": 0,
+      "EventID": 6044,
+      "ConditionId": [
+        45
+      ],
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        604403
+      ]
+    },
+    {
+      "ID": 604403,
+      "conciseEventMessage": 5968,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5971
+      ],
+      "DialogueType": 0,
+      "EventID": 6044,
+      "optionType": 1,
+      "optionPara1": [
+        604404,
+        604404
+      ],
+      "optionPara2": [
+        5972,
+        5973
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604404
+      ]
+    },
+    {
+      "ID": 604404,
+      "conciseEventMessage": 5968,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5974
+      ],
+      "DialogueType": 0,
+      "EventID": 6044,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 604501,
+      "conciseEventMessage": 5975,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5976
+      ],
+      "DialogueType": 0,
+      "EventID": 6045,
+      "optionType": 1,
+      "optionPara1": [
+        604502
+      ],
+      "optionPara2": [
+        5977
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604502
+      ]
+    },
+    {
+      "ID": 604502,
+      "conciseEventMessage": 5975,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5978
+      ],
+      "DialogueType": 0,
+      "EventID": 6045,
+      "optionType": 1,
+      "optionPara1": [
+        604503
+      ],
+      "optionPara2": [
+        5979
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604503
+      ]
+    },
+    {
+      "ID": 604503,
+      "conciseEventMessage": 5975,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5980
+      ],
+      "DialogueType": 0,
+      "EventID": 6045,
+      "optionType": 1,
+      "optionPara1": [
+        604504
+      ],
+      "optionPara2": [
+        5981
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604504
+      ]
+    },
+    {
+      "ID": 604504,
+      "conciseEventMessage": 5975,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5982
+      ],
+      "DialogueType": 0,
+      "EventID": 6045,
+      "optionType": 1,
+      "optionPara1": [
+        604505
+      ],
+      "optionPara2": [
+        5983
+      ],
+      "ResultType": 0
+    },
+    {
+      "ID": 604601,
+      "conciseEventMessage": 5984,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5985
+      ],
+      "DialogueType": 0,
+      "EventID": 6046,
+      "optionType": 1,
+      "optionPara1": [
+        604602
+      ],
+      "optionPara2": [
+        5986
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        604602
+      ]
+    },
+    {
+      "ID": 604602,
+      "conciseEventMessage": 5984,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 106,
+      "LanID": [
+        5987
+      ],
+      "DialogueType": 0,
+      "EventID": 6046,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 605101,
+      "conciseEventMessage": 5988,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5989
+      ],
+      "DialogueType": 0,
+      "EventID": 6051,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        605102
+      ]
+    },
+    {
+      "ID": 605102,
+      "conciseEventMessage": 5988,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        5990
+      ],
+      "DialogueType": 0,
+      "EventID": 6051,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        605103
+      ]
+    },
+    {
+      "ID": 605103,
+      "conciseEventMessage": 5988,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        5991
+      ],
+      "DialogueType": 0,
+      "EventID": 6051,
+      "optionType": 1,
+      "optionPara1": [
+        605104
+      ],
+      "optionPara2": [
+        5992
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        605104
+      ]
+    },
+    {
+      "ID": 605104,
+      "conciseEventMessage": 5988,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        5993
+      ],
+      "DialogueType": 0,
+      "EventID": 6051,
+      "optionType": 1,
+      "optionPara1": [
+        605105
+      ],
+      "optionPara2": [
+        5994
+      ],
+      "ResultType": 0
+    },
+    {
+      "ID": 605201,
+      "conciseEventMessage": 5995,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5996
+      ],
+      "DialogueType": 0,
+      "EventID": 6052,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        605202
+      ]
+    },
+    {
+      "ID": 605202,
+      "conciseEventMessage": 5995,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        5997
+      ],
+      "DialogueType": 0,
+      "EventID": 6052,
+      "ConditionId": [
+        46
+      ],
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        605203
+      ]
+    },
+    {
+      "ID": 605203,
+      "conciseEventMessage": 5995,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        5998
+      ],
+      "DialogueType": 0,
+      "EventID": 6052,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        605204
+      ]
+    },
+    {
+      "ID": 605204,
+      "conciseEventMessage": 5995,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        5999
+      ],
+      "DialogueType": 0,
+      "EventID": 6052,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 605301,
+      "conciseEventMessage": 6000,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6001
+      ],
+      "DialogueType": 0,
+      "EventID": 6053,
+      "optionType": 2,
+      "optionPara1": [
+        3014
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        605302,
+        101
+      ]
+    },
+    {
+      "ID": 605302,
+      "conciseEventMessage": 6000,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 6053,
+      "optionType": 1,
+      "optionPara1": [
+        605303
+      ],
+      "optionPara2": [
+        6002
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        605303
+      ]
+    },
+    {
+      "ID": 605303,
+      "conciseEventMessage": 6000,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6003
+      ],
+      "DialogueType": 0,
+      "EventID": 6053,
+      "optionType": 1,
+      "optionPara1": [
+        605304
+      ],
+      "optionPara2": [
+        6004
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        605304
+      ]
+    },
+    {
+      "ID": 605304,
+      "conciseEventMessage": 6000,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6005
+      ],
+      "DialogueType": 0,
+      "EventID": 6053,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 605401,
+      "conciseEventMessage": 6006,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6007
+      ],
+      "DialogueType": 0,
+      "EventID": 6054,
+      "optionType": 1,
+      "optionPara1": [
+        605402,
+        605403
+      ],
+      "optionPara2": [
+        6008,
+        6009
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        605402
+      ]
+    },
+    {
+      "ID": 605402,
+      "conciseEventMessage": 6006,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6010
+      ],
+      "DialogueType": 0,
+      "EventID": 6054,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        605403
+      ]
+    },
+    {
+      "ID": 605403,
+      "conciseEventMessage": 6006,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6011
+      ],
+      "DialogueType": 0,
+      "EventID": 6054,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 605404,
+      "conciseEventMessage": 6006,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6012
+      ],
+      "DialogueType": 0,
+      "EventID": 6054,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        605405
+      ]
+    },
+    {
+      "ID": 605501,
+      "conciseEventMessage": 6012,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6013
+      ],
+      "DialogueType": 0,
+      "EventID": 6055,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        605502
+      ]
+    },
+    {
+      "ID": 605502,
+      "conciseEventMessage": 6012,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6014
+      ],
+      "DialogueType": 0,
+      "EventID": 6055,
+      "optionType": 1,
+      "optionPara1": [
+        605503
+      ],
+      "optionPara2": [
+        6015
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        605503
+      ]
+    },
+    {
+      "ID": 605503,
+      "conciseEventMessage": 6012,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6016
+      ],
+      "DialogueType": 0,
+      "EventID": 6055,
+      "optionType": 1,
+      "optionPara1": [
+        605504
+      ],
+      "optionPara2": [
+        6017
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        605504
+      ]
+    },
+    {
+      "ID": 605504,
+      "conciseEventMessage": 6012,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 7,
+      "LanID": [
+        6018
+      ],
+      "DialogueType": 0,
+      "EventID": 6055,
+      "optionType": 1,
+      "optionPara1": [
+        605505
+      ],
+      "optionPara2": [
+        6019
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        605505
+      ]
+    },
+    {
+      "ID": 605505,
+      "conciseEventMessage": 6020,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 6055,
+      "optionType": 2,
+      "optionPara1": [
+        3015
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        605506,
+        101
+      ]
     }
   ]
 }

+ 23 - 23
Assets/Res/Config/EventNPC.json

@@ -2,67 +2,67 @@
   "configList": [
     {
       "ID": 1,
-      "name": 0,
+      "name": 3000,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 2,
-      "name": 0,
+      "name": 1953,
       "ID_1": 0,
       "DaoyouID": 1
     },
     {
       "ID": 3,
-      "name": 0,
+      "name": 1954,
       "ID_1": 0,
       "DaoyouID": 2
     },
     {
       "ID": 4,
-      "name": 0,
+      "name": 1955,
       "ID_1": 0,
       "DaoyouID": 3
     },
     {
       "ID": 5,
-      "name": 0,
+      "name": 1956,
       "ID_1": 0,
       "DaoyouID": 4
     },
     {
       "ID": 6,
-      "name": 0,
+      "name": 1957,
       "ID_1": 0,
       "DaoyouID": 5
     },
     {
       "ID": 7,
-      "name": 0,
+      "name": 1958,
       "ID_1": 0,
       "DaoyouID": 6
     },
     {
       "ID": 8,
-      "name": 0,
+      "name": 1959,
       "ID_1": 0,
       "DaoyouID": 7
     },
     {
       "ID": 9,
-      "name": 0,
+      "name": 1960,
       "ID_1": 0,
       "DaoyouID": 8
     },
     {
       "ID": 10,
-      "name": 0,
+      "name": 1961,
       "ID_1": 0,
       "DaoyouID": 9
     },
     {
       "ID": 11,
-      "name": 0,
+      "name": 1962,
       "ID_1": 0,
       "DaoyouID": 10
     },
@@ -134,7 +134,7 @@
     },
     {
       "ID": 111,
-      "name": 0,
+      "name": 2078,
       "ID_1": 0,
       "DaoyouID": 0
     },
@@ -158,67 +158,67 @@
     },
     {
       "ID": 115,
-      "name": 0,
+      "name": 2091,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 116,
-      "name": 0,
+      "name": 2092,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 117,
-      "name": 0,
+      "name": 2093,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 118,
-      "name": 0,
+      "name": 2094,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 119,
-      "name": 0,
+      "name": 2095,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 120,
-      "name": 0,
+      "name": 2096,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 121,
-      "name": 0,
+      "name": 2097,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 122,
-      "name": 0,
+      "name": 2098,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 123,
-      "name": 0,
+      "name": 2099,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 124,
-      "name": 0,
+      "name": 2100,
       "ID_1": 0,
       "DaoyouID": 0
     },
     {
       "ID": 125,
-      "name": 0,
+      "name": 2101,
       "ID_1": 0,
       "DaoyouID": 0
     }

+ 71 - 8
Assets/Res/Config/GroupConfig.json

@@ -622,7 +622,7 @@
     {
       "ID": 3001,
       "GroupMonsterLevel": [
-        41
+        40
       ],
       "GroupMonster": [
         1005
@@ -631,7 +631,7 @@
     {
       "ID": 3002,
       "GroupMonsterLevel": [
-        61
+        60
       ],
       "GroupMonster": [
         9006
@@ -640,7 +640,7 @@
     {
       "ID": 3003,
       "GroupMonsterLevel": [
-        45
+        40
       ],
       "GroupMonster": [
         1005
@@ -649,7 +649,7 @@
     {
       "ID": 3004,
       "GroupMonsterLevel": [
-        55
+        50
       ],
       "GroupMonster": [
         1005
@@ -658,7 +658,7 @@
     {
       "ID": 3005,
       "GroupMonsterLevel": [
-        65
+        60
       ],
       "GroupMonster": [
         5003
@@ -667,7 +667,7 @@
     {
       "ID": 3006,
       "GroupMonsterLevel": [
-        75
+        70
       ],
       "GroupMonster": [
         5003
@@ -676,7 +676,7 @@
     {
       "ID": 3007,
       "GroupMonsterLevel": [
-        85
+        80
       ],
       "GroupMonster": [
         5003
@@ -685,11 +685,74 @@
     {
       "ID": 3008,
       "GroupMonsterLevel": [
-        91
+        90
       ],
       "GroupMonster": [
         9002
       ]
+    },
+    {
+      "ID": 3009,
+      "GroupMonsterLevel": [
+        100
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 3010,
+      "GroupMonsterLevel": [
+        120
+      ],
+      "GroupMonster": [
+        5002
+      ]
+    },
+    {
+      "ID": 3011,
+      "GroupMonsterLevel": [
+        80
+      ],
+      "GroupMonster": [
+        1006
+      ]
+    },
+    {
+      "ID": 3012,
+      "GroupMonsterLevel": [
+        100
+      ],
+      "GroupMonster": [
+        5005
+      ]
+    },
+    {
+      "ID": 3013,
+      "GroupMonsterLevel": [
+        140
+      ],
+      "GroupMonster": [
+        5001
+      ]
+    },
+    {
+      "ID": 3014,
+      "GroupMonsterLevel": [
+        150
+      ],
+      "GroupMonster": [
+        5004
+      ]
+    },
+    {
+      "ID": 3015,
+      "GroupMonsterLevel": [
+        151
+      ],
+      "GroupMonster": [
+        9001
+      ]
     }
   ]
 }

+ 180 - 30
Assets/Res/Config/ItemConfig.json

@@ -3576,8 +3576,8 @@
     },
     {
       "ID": 13511,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10001,
+      "itemDesc": 10010,
       "icon": "icon_item_13511",
       "itemTag": 14,
       "quality": 5,
@@ -3601,8 +3601,8 @@
     },
     {
       "ID": 13512,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10002,
+      "itemDesc": 10011,
       "icon": "icon_item_13512",
       "itemTag": 14,
       "quality": 5,
@@ -3626,8 +3626,8 @@
     },
     {
       "ID": 13513,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10003,
+      "itemDesc": 10012,
       "icon": "icon_item_13513",
       "itemTag": 14,
       "quality": 5,
@@ -3651,8 +3651,8 @@
     },
     {
       "ID": 13514,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10004,
+      "itemDesc": 10013,
       "icon": "icon_item_13514",
       "itemTag": 14,
       "quality": 5,
@@ -3676,8 +3676,8 @@
     },
     {
       "ID": 13515,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10005,
+      "itemDesc": 10014,
       "icon": "icon_item_13515",
       "itemTag": 14,
       "quality": 5,
@@ -3701,8 +3701,8 @@
     },
     {
       "ID": 13516,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10006,
+      "itemDesc": 10015,
       "icon": "icon_item_13516",
       "itemTag": 14,
       "quality": 5,
@@ -3726,8 +3726,8 @@
     },
     {
       "ID": 13517,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10007,
+      "itemDesc": 10016,
       "icon": "icon_item_13517",
       "itemTag": 14,
       "quality": 5,
@@ -3751,8 +3751,8 @@
     },
     {
       "ID": 13518,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10008,
+      "itemDesc": 10017,
       "icon": "icon_item_13518",
       "itemTag": 14,
       "quality": 5,
@@ -3776,8 +3776,8 @@
     },
     {
       "ID": 13519,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10009,
+      "itemDesc": 10018,
       "icon": "icon_item_13519",
       "itemTag": 14,
       "quality": 5,
@@ -3805,7 +3805,7 @@
       "itemDesc": 3015,
       "icon": "icon_item_20001",
       "itemTag": 21,
-      "quality": 3,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -3830,7 +3830,7 @@
       "itemDesc": 3016,
       "icon": "icon_item_20002",
       "itemTag": 21,
-      "quality": 3,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -3855,7 +3855,7 @@
       "itemDesc": 3184,
       "icon": "icon_item_20003",
       "itemTag": 21,
-      "quality": 3,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -3876,11 +3876,11 @@
     },
     {
       "ID": 20004,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10019,
+      "itemDesc": 10028,
       "icon": "icon_item_20004",
       "itemTag": 21,
-      "quality": 3,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -3901,11 +3901,11 @@
     },
     {
       "ID": 20005,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10020,
+      "itemDesc": 10029,
       "icon": "icon_item_20005",
       "itemTag": 21,
-      "quality": 3,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -3926,11 +3926,161 @@
     },
     {
       "ID": 20006,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10021,
+      "itemDesc": 10030,
       "icon": "icon_item_20006",
       "itemTag": 21,
-      "quality": 3,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 20007,
+      "itemName": 10022,
+      "itemDesc": 10031,
+      "icon": "icon_item_20007",
+      "itemTag": 21,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 20008,
+      "itemName": 10023,
+      "itemDesc": 10032,
+      "icon": "icon_item_20008",
+      "itemTag": 21,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 20009,
+      "itemName": 10024,
+      "itemDesc": 10033,
+      "icon": "icon_item_20009",
+      "itemTag": 21,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 20010,
+      "itemName": 10025,
+      "itemDesc": 10034,
+      "icon": "icon_item_20010",
+      "itemTag": 21,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 20011,
+      "itemName": 10026,
+      "itemDesc": 10035,
+      "icon": "icon_item_20011",
+      "itemTag": 21,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 20012,
+      "itemName": 10027,
+      "itemDesc": 10036,
+      "icon": "icon_item_20012",
+      "itemTag": 21,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,

Plik diff jest za duży
+ 932 - 932
Assets/Res/Config/LanguageChineseConfig.json


+ 70 - 0
Assets/Res/Config/LevelbattleConfig.json

@@ -469,6 +469,76 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3009,
+      "Group": [
+        3009
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3010,
+      "Group": [
+        3010
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3011,
+      "Group": [
+        3011
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3012,
+      "Group": [
+        3012
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3013,
+      "Group": [
+        3013
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3014,
+      "Group": [
+        3014
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3015,
+      "Group": [
+        3015
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/LevelBattle.xlsx


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików