zg 1 هفته پیش
والد
کامیت
19530d199c

+ 4 - 20
Assets/Res/Config/EventConfig.json

@@ -66,6 +66,10 @@
       "ID": 103,
       "ID": 103,
       "EventLinksId": [
       "EventLinksId": [
         10301,
         10301,
+        10302,
+        10303,
+        10304,
+        10305,
         102,
         102,
         103
         103
       ],
       ],
@@ -343,11 +347,6 @@
     },
     },
     {
     {
       "ID": 112,
       "ID": 112,
-      "EventLinksId": [
-        11201,
-        102,
-        103
-      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventTag": 7,
       "EventType": 1,
       "EventType": 1,
@@ -622,11 +621,6 @@
     },
     },
     {
     {
       "ID": 121,
       "ID": 121,
-      "EventLinksId": [
-        12101,
-        102,
-        103
-      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventTag": 7,
       "EventType": 1,
       "EventType": 1,
@@ -901,11 +895,6 @@
     },
     },
     {
     {
       "ID": 130,
       "ID": 130,
-      "EventLinksId": [
-        13001,
-        102,
-        103
-      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventTag": 7,
       "EventType": 1,
       "EventType": 1,
@@ -1180,11 +1169,6 @@
     },
     },
     {
     {
       "ID": 139,
       "ID": 139,
-      "EventLinksId": [
-        13901,
-        102,
-        103
-      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventTag": 7,
       "EventType": 1,
       "EventType": 1,

+ 11 - 68
Assets/Res/Config/EventLinkConfig.json

@@ -112,19 +112,26 @@
     },
     },
     {
     {
       "ID": 10301,
       "ID": 10301,
-      "conciseEventMessage": 5009,
+      "conciseEventMessage": 5081,
       "EventConditionMessage": 0,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "NPCID": 0,
       "LanID": [
       "LanID": [
-        5010
+        5082
       ],
       ],
       "DialogueType": 3,
       "DialogueType": 3,
       "EventID": 103,
       "EventID": 103,
       "step": 1,
       "step": 1,
-      "optionType": 0,
-      "ResultType": 0
+      "optionType": 2,
+      "optionPara1": [
+        5006
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        10302,
+        101
+      ]
     },
     },
     {
     {
       "ID": 10401,
       "ID": 10401,
@@ -282,22 +289,6 @@
         101
         101
       ]
       ]
     },
     },
-    {
-      "ID": 11201,
-      "conciseEventMessage": 5027,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        5028
-      ],
-      "DialogueType": 2,
-      "EventID": 112,
-      "step": 1,
-      "optionType": 0,
-      "ResultType": 0
-    },
     {
     {
       "ID": 11301,
       "ID": 11301,
       "conciseEventMessage": 5029,
       "conciseEventMessage": 5029,
@@ -454,22 +445,6 @@
         101
         101
       ]
       ]
     },
     },
-    {
-      "ID": 12101,
-      "conciseEventMessage": 5045,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        5046
-      ],
-      "DialogueType": 2,
-      "EventID": 121,
-      "step": 1,
-      "optionType": 0,
-      "ResultType": 0
-    },
     {
     {
       "ID": 12201,
       "ID": 12201,
       "conciseEventMessage": 5047,
       "conciseEventMessage": 5047,
@@ -626,22 +601,6 @@
         101
         101
       ]
       ]
     },
     },
-    {
-      "ID": 13001,
-      "conciseEventMessage": 5063,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        5064
-      ],
-      "DialogueType": 2,
-      "EventID": 130,
-      "step": 1,
-      "optionType": 0,
-      "ResultType": 0
-    },
     {
     {
       "ID": 13101,
       "ID": 13101,
       "conciseEventMessage": 5065,
       "conciseEventMessage": 5065,
@@ -798,22 +757,6 @@
         101
         101
       ]
       ]
     },
     },
-    {
-      "ID": 13901,
-      "conciseEventMessage": 5081,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        5082
-      ],
-      "DialogueType": 2,
-      "EventID": 139,
-      "step": 1,
-      "optionType": 0,
-      "ResultType": 0
-    },
     {
     {
       "ID": 14001,
       "ID": 14001,
       "conciseEventMessage": 5083,
       "conciseEventMessage": 5083,

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 112 - 112
Assets/Res/Config/FabaoPowerupConfig.json


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 116 - 116
Assets/Res/Config/HeroPowerUpConfig.json


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 167 - 167
Assets/Res/Config/MonsterPowerUpConfig.json


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/FabaoConfig.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


BIN
Excel2Json/Excel/修仙游戏数据规划表.xlsx


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است