Browse Source

修改bug

DESKTOP-FB72PO8\Administrator 15 hours ago
parent
commit
bdf4725a86

+ 29 - 0
Assets/Res/Config/EventConditionConfig.json

@@ -423,6 +423,35 @@
         3,
         4
       ]
+    },
+    {
+      "ID": 27,
+      "message": 0,
+      "Operation": 0,
+      "ConditionType": 6,
+      "ConditionPara": [
+        20004
+      ],
+      "finishCount": 3,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 28,
+      "message": 0,
+      "Operation": 0,
+      "ConditionType": 5,
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     }
   ]
 }

+ 261 - 113
Assets/Res/Config/EventConfig.json

@@ -1116,7 +1116,7 @@
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 11,
+      "RefreshCount": 0,
       "placeID": 1,
       "XiantuID": 1,
       "EventConditionId": 0,
@@ -1247,7 +1247,7 @@
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 21,
+      "RefreshCount": 0,
       "placeID": 1,
       "XiantuID": 1,
       "EventConditionId": 0,
@@ -1287,17 +1287,6 @@
       "ID": 10012,
       "EventLinksId": [
         1001201,
-        1001202,
-        1001203,
-        1001204,
-        1001205,
-        1001206,
-        1001207,
-        1001208,
-        1001209,
-        1001210,
-        1001211,
-        1001212,
         102
       ],
       "EventTriggerType": 4,
@@ -1314,7 +1303,7 @@
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 31,
+      "RefreshCount": 0,
       "placeID": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
@@ -1337,10 +1326,6 @@
         1001310,
         1001311,
         1001312,
-        1001313,
-        1001314,
-        1001315,
-        1001316,
         102
       ],
       "EventTriggerType": 4,
@@ -1350,7 +1335,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1702,
-        1402
+        1401
       ],
       "PrizeNums": [
         1,
@@ -1362,8 +1347,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2807,
-      "Description": 2828
+      "EventName": 2806,
+      "Description": 2827
     },
     {
       "ID": 10014,
@@ -1376,6 +1361,14 @@
         1001406,
         1001407,
         1001408,
+        1001409,
+        1001410,
+        1001411,
+        1001412,
+        1001413,
+        1001414,
+        1001415,
+        1001416,
         102
       ],
       "EventTriggerType": 4,
@@ -1392,13 +1385,13 @@
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 41,
+      "RefreshCount": 0,
       "placeID": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2808,
-      "Description": 2829
+      "EventName": 2807,
+      "Description": 2828
     },
     {
       "ID": 10015,
@@ -1432,8 +1425,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2809,
-      "Description": 2830
+      "EventName": 2808,
+      "Description": 2829
     },
     {
       "ID": 10016,
@@ -1446,11 +1439,6 @@
         1001606,
         1001607,
         1001608,
-        1001609,
-        1001610,
-        1001611,
-        1001612,
-        1001613,
         102
       ],
       "EventTriggerType": 4,
@@ -1467,13 +1455,13 @@
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 51,
+      "RefreshCount": 0,
       "placeID": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2810,
-      "Description": 2831
+      "EventName": 2809,
+      "Description": 2830
     },
     {
       "ID": 10017,
@@ -1488,6 +1476,9 @@
         1001708,
         1001709,
         1001710,
+        1001711,
+        1001712,
+        1001713,
         102
       ],
       "EventTriggerType": 4,
@@ -1509,8 +1500,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2811,
-      "Description": 2832
+      "EventName": 2810,
+      "Description": 2831
     },
     {
       "ID": 10018,
@@ -1525,16 +1516,6 @@
         1001808,
         1001809,
         1001810,
-        1001811,
-        1001812,
-        1001813,
-        1001814,
-        1001815,
-        1001816,
-        1001817,
-        1001818,
-        1001819,
-        1001820,
         102
       ],
       "EventTriggerType": 4,
@@ -1544,26 +1525,44 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1702,
-        1403
+        1402
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 61,
+      "RefreshCount": 0,
       "placeID": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2812,
-      "Description": 2833
+      "EventName": 2811,
+      "Description": 2832
     },
     {
       "ID": 10019,
       "EventLinksId": [
         1001901,
         1001902,
+        1001903,
+        1001904,
+        1001905,
+        1001906,
+        1001907,
+        1001908,
+        1001909,
+        1001910,
+        1001911,
+        1001912,
+        1001913,
+        1001914,
+        1001915,
+        1001916,
+        1001917,
+        1001918,
+        1001919,
+        1001920,
         102
       ],
       "EventTriggerType": 4,
@@ -1585,16 +1584,14 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2813,
-      "Description": 2834
+      "EventName": 2812,
+      "Description": 2833
     },
     {
       "ID": 10020,
       "EventLinksId": [
         1002001,
         1002002,
-        1002003,
-        1002004,
         102
       ],
       "EventTriggerType": 4,
@@ -1611,13 +1608,13 @@
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 71,
+      "RefreshCount": 0,
       "placeID": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2814,
-      "Description": 2835
+      "EventName": 2813,
+      "Description": 2834
     },
     {
       "ID": 10021,
@@ -1626,14 +1623,6 @@
         1002102,
         1002103,
         1002104,
-        1002105,
-        1002106,
-        1002107,
-        1002108,
-        1002109,
-        1002110,
-        1002111,
-        1002112,
         102
       ],
       "EventTriggerType": 4,
@@ -1655,8 +1644,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2815,
-      "Description": 2836
+      "EventName": 2814,
+      "Description": 2835
     },
     {
       "ID": 10022,
@@ -1664,6 +1653,15 @@
         1002201,
         1002202,
         1002203,
+        1002204,
+        1002205,
+        1002206,
+        1002207,
+        1002208,
+        1002209,
+        1002210,
+        1002211,
+        1002212,
         102
       ],
       "EventTriggerType": 4,
@@ -1680,13 +1678,13 @@
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 81,
-      "placeID": 3,
+      "RefreshCount": 0,
+      "placeID": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2816,
-      "Description": 2837
+      "EventName": 2815,
+      "Description": 2836
     },
     {
       "ID": 10023,
@@ -1694,16 +1692,6 @@
         1002301,
         1002302,
         1002303,
-        1002304,
-        1002305,
-        1002306,
-        1002307,
-        1002308,
-        1002309,
-        1002310,
-        1002311,
-        1002312,
-        1002313,
         102
       ],
       "EventTriggerType": 4,
@@ -1725,8 +1713,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2817,
-      "Description": 2838
+      "EventName": 2816,
+      "Description": 2837
     },
     {
       "ID": 10024,
@@ -1738,6 +1726,12 @@
         1002405,
         1002406,
         1002407,
+        1002408,
+        1002409,
+        1002410,
+        1002411,
+        1002412,
+        1002413,
         102
       ],
       "EventTriggerType": 4,
@@ -1746,21 +1740,21 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1703,
-        1404
+        1702,
+        1403
       ],
       "PrizeNums": [
-        1,
+        2,
         2
       ],
       "RefreshProbability": 0,
-      "RefreshCount": 91,
+      "RefreshCount": 0,
       "placeID": 3,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2818,
-      "Description": 2839
+      "EventName": 2817,
+      "Description": 2838
     },
     {
       "ID": 10025,
@@ -1772,8 +1766,6 @@
         1002505,
         1002506,
         1002507,
-        1002508,
-        1002509,
         102
       ],
       "EventTriggerType": 4,
@@ -1795,8 +1787,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2819,
-      "Description": 2840
+      "EventName": 2818,
+      "Description": 2839
     },
     {
       "ID": 10026,
@@ -1810,13 +1802,68 @@
         1002607,
         1002608,
         1002609,
-        1002610,
-        1002611,
-        1002612,
-        1002613,
-        1002614,
-        1002615,
-        1002616,
+        102
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1703,
+        1404
+      ],
+      "PrizeNums": [
+        1,
+        2
+      ],
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 3,
+      "XiantuID": 1,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 2819,
+      "Description": 2840
+    },
+    {
+      "ID": 10027,
+      "EventLinksId": [
+        1002701,
+        1002702,
+        1002703,
+        1002704,
+        1002705,
+        1002706,
+        1002707,
+        1002708,
+        1002709,
+        1002710,
+        1002711,
+        1002712,
+        1002713,
+        1002714,
+        1002715,
+        1002716,
+        1002717,
+        1002718,
+        1002719,
+        1002720,
+        1002721,
+        1002722,
+        1002723,
+        1002724,
+        1002725,
+        1002726,
+        1002727,
+        1002728,
+        1002729,
+        1002730,
+        1002731,
+        1002732,
+        1002733,
+        1002734,
+        1002735,
         102
       ],
       "EventTriggerType": 4,
@@ -1842,8 +1889,9 @@
       "Description": 2841
     },
     {
-      "ID": 10027,
+      "ID": 10028,
       "EventLinksId": [
+        1002801,
         102
       ],
       "EventTriggerType": 4,
@@ -1868,6 +1916,80 @@
       "EventName": 2821,
       "Description": 2842
     },
+    {
+      "ID": 10029,
+      "EventLinksId": [
+        1002901,
+        1002902,
+        1002903,
+        1002904,
+        1002905,
+        1002906,
+        1002907,
+        1002908,
+        1002909,
+        1002910,
+        1002911,
+        1002912,
+        1002913,
+        1002914,
+        1002915,
+        1002916,
+        1002917,
+        1002918,
+        1002919,
+        102
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1703,
+        1404
+      ],
+      "PrizeNums": [
+        1,
+        2
+      ],
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 3,
+      "XiantuID": 1,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 2822,
+      "Description": 2843
+    },
+    {
+      "ID": 10030,
+      "EventLinksId": [
+        1003001,
+        102
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1703,
+        1404
+      ],
+      "PrizeNums": [
+        1,
+        2
+      ],
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 3,
+      "XiantuID": 1,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 2823,
+      "Description": 2844
+    },
     {
       "ID": 20001,
       "EventLinksId": [
@@ -2462,7 +2584,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2482,7 +2604,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2503,7 +2625,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2524,7 +2646,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2545,7 +2667,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2566,7 +2688,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2587,7 +2709,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2608,7 +2730,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2630,7 +2752,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2657,7 +2779,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2688,7 +2810,7 @@
         100,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 98,
       "EventTag": 6,
       "EventType": 1,
       "Score": 0,
@@ -2708,6 +2830,32 @@
       "EventName": 0,
       "Description": 0
     },
+    {
+      "ID": 30012,
+      "EventLinksId": [
+        3001201,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20004
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 2,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
     {
       "ID": 5001,
       "EventLinksId": [

File diff suppressed because it is too large
+ 164 - 146
Assets/Res/Config/EventLinkConfig.json


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

@@ -173,6 +173,12 @@
       "name": 0,
       "ID_1": 0,
       "DaoyouID": 0
+    },
+    {
+      "ID": 118,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
     }
   ]
 }

+ 25 - 0
Assets/Res/Config/ItemConfig.json

@@ -3874,6 +3874,31 @@
       "sort": 0,
       "itemDesc2": 0
     },
+    {
+      "ID": 20004,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_20004",
+      "itemTag": 21,
+      "quality": 3,
+      "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": 21001,
       "itemName": 3194,

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -35,7 +35,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///事件类型: 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 99.无标记 
+		///事件类型: 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 88.特定任务触发的事件 99.无标记 
 		/// </summary>
 #if !COMBAT_SERVER
 		public int EventTriggerType;

Some files were not shown because too many files changed in this diff