zg 1 week ago
parent
commit
f35c57b120

+ 73 - 248
Assets/Res/Config/DaoyouGiftConfig.json

@@ -2,318 +2,143 @@
   "configList": [
     {
       "ID": 1,
+      "ItemID": 1501,
+      "emotionValue": 20
+    },
+    {
+      "ID": 2,
+      "ItemID": 1502,
+      "emotionValue": 50
+    },
+    {
+      "ID": 301,
       "ItemID": 1201,
       "emotionValue": 10
     },
     {
-      "ID": 2,
+      "ID": 302,
       "ItemID": 1202,
-      "emotionValue": 20
+      "emotionValue": 10
     },
     {
-      "ID": 3,
+      "ID": 303,
       "ItemID": 1203,
-      "emotionValue": 30
+      "emotionValue": 10
     },
     {
-      "ID": 4,
+      "ID": 304,
       "ItemID": 1204,
       "emotionValue": 10
     },
     {
-      "ID": 5,
+      "ID": 305,
       "ItemID": 1205,
-      "emotionValue": 20
+      "emotionValue": 10
     },
     {
-      "ID": 6,
+      "ID": 306,
       "ItemID": 1206,
-      "emotionValue": 30
+      "emotionValue": 10
     },
     {
-      "ID": 7,
+      "ID": 307,
       "ItemID": 1207,
       "emotionValue": 10
     },
     {
-      "ID": 8,
+      "ID": 308,
       "ItemID": 1208,
-      "emotionValue": 20
+      "emotionValue": 10
     },
     {
-      "ID": 9,
+      "ID": 309,
       "ItemID": 1209,
-      "emotionValue": 30
-    },
-    {
-      "ID": 10,
-      "ItemID": 1301,
       "emotionValue": 10
     },
     {
-      "ID": 11,
-      "ItemID": 1302,
-      "emotionValue": 15
-    },
-    {
-      "ID": 12,
-      "ItemID": 1303,
-      "emotionValue": 20
-    },
-    {
-      "ID": 13,
-      "ItemID": 1304,
-      "emotionValue": 25
-    },
-    {
-      "ID": 14,
-      "ItemID": 1401,
+      "ID": 310,
+      "ItemID": 1210,
       "emotionValue": 10
     },
     {
-      "ID": 15,
-      "ItemID": 1402,
-      "emotionValue": 15
-    },
-    {
-      "ID": 16,
-      "ItemID": 1403,
-      "emotionValue": 20
-    },
-    {
-      "ID": 17,
-      "ItemID": 1404,
-      "emotionValue": 30
-    },
-    {
-      "ID": 18,
-      "ItemID": 1501,
-      "emotionValue": 50
-    },
-    {
-      "ID": 19,
-      "ItemID": 1502,
-      "emotionValue": 100
-    },
-    {
-      "ID": 20,
-      "ItemID": 11001,
-      "emotionValue": 20
-    },
-    {
-      "ID": 21,
-      "ItemID": 11002,
-      "emotionValue": 20
-    },
-    {
-      "ID": 22,
-      "ItemID": 11003,
-      "emotionValue": 20
-    },
-    {
-      "ID": 23,
-      "ItemID": 11004,
-      "emotionValue": 20
-    },
-    {
-      "ID": 24,
-      "ItemID": 11005,
-      "emotionValue": 20
-    },
-    {
-      "ID": 25,
-      "ItemID": 11006,
-      "emotionValue": 20
-    },
-    {
-      "ID": 26,
-      "ItemID": 11007,
-      "emotionValue": 20
-    },
-    {
-      "ID": 27,
-      "ItemID": 11008,
-      "emotionValue": 20
-    },
-    {
-      "ID": 28,
-      "ItemID": 11009,
-      "emotionValue": 20
-    },
-    {
-      "ID": 29,
-      "ItemID": 11010,
-      "emotionValue": 20
-    },
-    {
-      "ID": 30,
-      "ItemID": 11011,
-      "emotionValue": 20
-    },
-    {
-      "ID": 31,
-      "ItemID": 13001,
-      "emotionValue": 20
-    },
-    {
-      "ID": 32,
-      "ItemID": 13002,
-      "emotionValue": 20
-    },
-    {
-      "ID": 33,
-      "ItemID": 13003,
-      "emotionValue": 20
-    },
-    {
-      "ID": 34,
-      "ItemID": 13004,
-      "emotionValue": 20
-    },
-    {
-      "ID": 35,
-      "ItemID": 13005,
-      "emotionValue": 20
-    },
-    {
-      "ID": 36,
-      "ItemID": 13006,
-      "emotionValue": 20
-    },
-    {
-      "ID": 37,
-      "ItemID": 13007,
-      "emotionValue": 20
-    },
-    {
-      "ID": 38,
-      "ItemID": 13008,
-      "emotionValue": 20
-    },
-    {
-      "ID": 39,
-      "ItemID": 13009,
-      "emotionValue": 20
-    },
-    {
-      "ID": 40,
-      "ItemID": 13010,
-      "emotionValue": 20
-    },
-    {
-      "ID": 41,
-      "ItemID": 13011,
-      "emotionValue": 20
-    },
-    {
-      "ID": 42,
-      "ItemID": 13012,
-      "emotionValue": 20
-    },
-    {
-      "ID": 43,
-      "ItemID": 13013,
-      "emotionValue": 20
-    },
-    {
-      "ID": 44,
-      "ItemID": 13014,
-      "emotionValue": 20
-    },
-    {
-      "ID": 45,
-      "ItemID": 13015,
-      "emotionValue": 20
-    },
-    {
-      "ID": 46,
-      "ItemID": 13016,
-      "emotionValue": 20
-    },
-    {
-      "ID": 47,
-      "ItemID": 13017,
-      "emotionValue": 20
-    },
-    {
-      "ID": 48,
-      "ItemID": 13018,
-      "emotionValue": 20
+      "ID": 311,
+      "ItemID": 1211,
+      "emotionValue": 10
     },
     {
-      "ID": 49,
-      "ItemID": 13019,
-      "emotionValue": 20
+      "ID": 312,
+      "ItemID": 1212,
+      "emotionValue": 10
     },
     {
-      "ID": 50,
-      "ItemID": 13020,
-      "emotionValue": 20
+      "ID": 313,
+      "ItemID": 1213,
+      "emotionValue": 10
     },
     {
-      "ID": 51,
-      "ItemID": 13021,
-      "emotionValue": 20
+      "ID": 314,
+      "ItemID": 1214,
+      "emotionValue": 10
     },
     {
-      "ID": 52,
-      "ItemID": 13022,
-      "emotionValue": 20
+      "ID": 315,
+      "ItemID": 1215,
+      "emotionValue": 10
     },
     {
-      "ID": 53,
-      "ItemID": 13023,
-      "emotionValue": 20
+      "ID": 316,
+      "ItemID": 1216,
+      "emotionValue": 10
     },
     {
-      "ID": 54,
-      "ItemID": 13024,
-      "emotionValue": 20
+      "ID": 317,
+      "ItemID": 1217,
+      "emotionValue": 10
     },
     {
-      "ID": 55,
-      "ItemID": 13025,
-      "emotionValue": 20
+      "ID": 318,
+      "ItemID": 1218,
+      "emotionValue": 10
     },
     {
-      "ID": 56,
-      "ItemID": 13501,
-      "emotionValue": 20
+      "ID": 319,
+      "ItemID": 1219,
+      "emotionValue": 10
     },
     {
-      "ID": 57,
-      "ItemID": 13502,
-      "emotionValue": 20
+      "ID": 320,
+      "ItemID": 1220,
+      "emotionValue": 10
     },
     {
-      "ID": 58,
-      "ItemID": 13503,
-      "emotionValue": 20
+      "ID": 321,
+      "ItemID": 1221,
+      "emotionValue": 10
     },
     {
-      "ID": 59,
-      "ItemID": 13504,
-      "emotionValue": 20
+      "ID": 322,
+      "ItemID": 1222,
+      "emotionValue": 10
     },
     {
-      "ID": 60,
-      "ItemID": 13505,
-      "emotionValue": 20
+      "ID": 323,
+      "ItemID": 1223,
+      "emotionValue": 10
     },
     {
-      "ID": 61,
-      "ItemID": 13506,
-      "emotionValue": 20
+      "ID": 324,
+      "ItemID": 1224,
+      "emotionValue": 10
     },
     {
-      "ID": 62,
-      "ItemID": 13507,
-      "emotionValue": 20
+      "ID": 325,
+      "ItemID": 1225,
+      "emotionValue": 10
     },
     {
-      "ID": 63,
-      "ItemID": 13508,
-      "emotionValue": 20
+      "ID": 326,
+      "ItemID": 1226,
+      "emotionValue": 10
     }
   ]
 }

+ 27 - 27
Assets/Res/Config/DaoyouLevelupConfig.json

@@ -3,102 +3,102 @@
     {
       "ID": 1,
       "name": 2025,
-      "exp": 10,
+      "exp": 100,
       "guajiGrowup": 0
     },
     {
       "ID": 2,
       "name": 2026,
-      "exp": 20,
+      "exp": 200,
       "prizeID": [
-        1002
+        1701
       ],
       "prizeNum": [
-        100
+        1
       ],
       "guajiGrowup": 100
     },
     {
       "ID": 3,
       "name": 2027,
-      "exp": 30,
+      "exp": 300,
       "prizeID": [
-        1002
+        1701
       ],
       "prizeNum": [
-        150
+        2
       ],
       "guajiGrowup": 112
     },
     {
       "ID": 4,
       "name": 2028,
-      "exp": 40,
+      "exp": 400,
       "prizeID": [
-        1002
+        1703
       ],
       "prizeNum": [
-        200
+        1
       ],
       "guajiGrowup": 125
     },
     {
       "ID": 5,
       "name": 2029,
-      "exp": 50,
+      "exp": 500,
       "prizeID": [
-        1002
+        1703
       ],
       "prizeNum": [
-        250
+        1
       ],
       "guajiGrowup": 137
     },
     {
       "ID": 6,
       "name": 2030,
-      "exp": 60,
+      "exp": 600,
       "prizeID": [
-        1002
+        1703
       ],
       "prizeNum": [
-        300
+        2
       ],
       "guajiGrowup": 150
     },
     {
       "ID": 7,
       "name": 2031,
-      "exp": 70,
+      "exp": 700,
       "prizeID": [
-        1002
+        1703
       ],
       "prizeNum": [
-        350
+        2
       ],
       "guajiGrowup": 162
     },
     {
       "ID": 8,
       "name": 2032,
-      "exp": 80,
+      "exp": 800,
       "prizeID": [
-        1002
+        1704
       ],
       "prizeNum": [
-        400
+        1
       ],
       "guajiGrowup": 175
     },
     {
       "ID": 9,
       "name": 2033,
-      "exp": 90,
+      "exp": 900,
       "prizeID": [
-        1002
+        1704
       ],
       "prizeNum": [
-        450
+        1
       ],
       "guajiGrowup": 187
     },
@@ -107,10 +107,10 @@
       "name": 2034,
       "exp": -1,
       "prizeID": [
-        1002
+        1704
       ],
       "prizeNum": [
-        500
+        1
       ],
       "guajiGrowup": 200
     }

+ 50 - 0
Assets/Res/Config/DropConfig.json

@@ -2350,6 +2350,56 @@
         23200
       ]
     },
+    {
+      "ID": 23300,
+      "dropGroupID": [
+        23300
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23300
+      ]
+    },
+    {
+      "ID": 23301,
+      "dropGroupID": [
+        23301
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23301
+      ]
+    },
+    {
+      "ID": 23302,
+      "dropGroupID": [
+        23302
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23302
+      ]
+    },
+    {
+      "ID": 23303,
+      "dropGroupID": [
+        23303
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23303
+      ]
+    },
+    {
+      "ID": 23304,
+      "dropGroupID": [
+        23304
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23304
+      ]
+    },
     {
       "ID": 999001,
       "dropGroupID": [

+ 11 - 11
Assets/Res/Config/EventConfig.json

@@ -203,13 +203,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1201
+        23300
       ],
       "PrizeNums": [
         -5000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -482,13 +482,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1201
+        23301
       ],
       "PrizeNums": [
         -7500,
-        2
+        1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -761,13 +761,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1202
+        23302
       ],
       "PrizeNums": [
         -15000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1040,13 +1040,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1203
+        23303
       ],
       "PrizeNums": [
         -30000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1319,13 +1319,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1204
+        23304
       ],
       "PrizeNums": [
         -50000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,

+ 15 - 15
Assets/Res/Config/EventLinkConfig.json

@@ -125,7 +125,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5011
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -180,7 +180,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5001
+        5016
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -203,7 +203,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5021
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -304,7 +304,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5012
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -359,7 +359,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5002
+        5017
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -382,7 +382,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5007
+        5022
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -483,7 +483,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5013
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -538,7 +538,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5003
+        5018
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -561,7 +561,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5008
+        5023
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -662,7 +662,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5014
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -717,7 +717,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5004
+        5019
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -740,7 +740,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5009
+        5024
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -841,7 +841,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5015
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -896,7 +896,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5005
+        5020
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -919,7 +919,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5010
+        5025
       ],
       "ResultType": 2,
       "ResultOptions": [

+ 340 - 27
Assets/Res/Config/GroupConfig.json

@@ -640,7 +640,7 @@
     {
       "ID": 5001,
       "GroupMonster": [
-        1005
+        1001
       ],
       "hpQiangDu": [
         70
@@ -655,7 +655,7 @@
     {
       "ID": 5002,
       "GroupMonster": [
-        1006
+        1001
       ],
       "hpQiangDu": [
         85
@@ -670,52 +670,68 @@
     {
       "ID": 5003,
       "GroupMonster": [
-        1007
+        1001,
+        1002
       ],
       "hpQiangDu": [
-        100
+        60,
+        60
       ],
       "attQiangDu": [
-        112
+        66,
+        66
       ],
       "duipingQiangDu": [
-        106
+        63,
+        63
       ]
     },
     {
       "ID": 5004,
       "GroupMonster": [
-        1008
+        1001,
+        1002
       ],
       "hpQiangDu": [
-        115
+        70,
+        70
       ],
       "attQiangDu": [
-        123
+        77,
+        77
       ],
       "duipingQiangDu": [
-        119
+        74,
+        74
       ]
     },
     {
       "ID": 5005,
       "GroupMonster": [
-        1001
+        1001,
+        1002,
+        1003
       ],
       "hpQiangDu": [
-        130
+        40,
+        40,
+        50
       ],
       "attQiangDu": [
-        134
+        44,
+        44,
+        55
       ],
       "duipingQiangDu": [
-        132
+        42,
+        42,
+        52
       ]
     },
     {
       "ID": 5006,
       "GroupMonster": [
-        1005
+        1002
       ],
       "hpQiangDu": [
         70
@@ -730,7 +746,7 @@
     {
       "ID": 5007,
       "GroupMonster": [
-        1006
+        1002
       ],
       "hpQiangDu": [
         85
@@ -745,46 +761,62 @@
     {
       "ID": 5008,
       "GroupMonster": [
-        1007
+        1002,
+        1003
       ],
       "hpQiangDu": [
-        100
+        60,
+        60
       ],
       "attQiangDu": [
-        112
+        66,
+        66
       ],
       "duipingQiangDu": [
-        106
+        63,
+        63
       ]
     },
     {
       "ID": 5009,
       "GroupMonster": [
-        1008
+        1002,
+        1003
       ],
       "hpQiangDu": [
-        115
+        70,
+        70
       ],
       "attQiangDu": [
-        123
+        77,
+        77
       ],
       "duipingQiangDu": [
-        119
+        74,
+        74
       ]
     },
     {
       "ID": 5010,
       "GroupMonster": [
+        1002,
+        1003,
         1001
       ],
       "hpQiangDu": [
-        130
+        40,
+        40,
+        50
       ],
       "attQiangDu": [
-        134
+        44,
+        44,
+        55
       ],
       "duipingQiangDu": [
-        132
+        42,
+        42,
+        52
       ]
     },
     {
@@ -1686,6 +1718,287 @@
       "GroupMonster": [
         9006
       ]
+    },
+    {
+      "ID": 5011,
+      "GroupMonster": [
+        1005
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5012,
+      "GroupMonster": [
+        1005
+      ],
+      "hpQiangDu": [
+        85
+      ],
+      "attQiangDu": [
+        101
+      ],
+      "duipingQiangDu": [
+        93
+      ]
+    },
+    {
+      "ID": 5013,
+      "GroupMonster": [
+        1005,
+        1006
+      ],
+      "hpQiangDu": [
+        60,
+        60
+      ],
+      "attQiangDu": [
+        66,
+        66
+      ],
+      "duipingQiangDu": [
+        63,
+        63
+      ]
+    },
+    {
+      "ID": 5014,
+      "GroupMonster": [
+        1005,
+        1006
+      ],
+      "hpQiangDu": [
+        70,
+        70
+      ],
+      "attQiangDu": [
+        77,
+        77
+      ],
+      "duipingQiangDu": [
+        74,
+        74
+      ]
+    },
+    {
+      "ID": 5015,
+      "GroupMonster": [
+        1005,
+        1006,
+        1001
+      ],
+      "hpQiangDu": [
+        40,
+        40,
+        50
+      ],
+      "attQiangDu": [
+        44,
+        44,
+        55
+      ],
+      "duipingQiangDu": [
+        42,
+        42,
+        52
+      ]
+    },
+    {
+      "ID": 5016,
+      "GroupMonster": [
+        1007
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5017,
+      "GroupMonster": [
+        1007
+      ],
+      "hpQiangDu": [
+        85
+      ],
+      "attQiangDu": [
+        101
+      ],
+      "duipingQiangDu": [
+        93
+      ]
+    },
+    {
+      "ID": 5018,
+      "GroupMonster": [
+        1007,
+        1008
+      ],
+      "hpQiangDu": [
+        60,
+        60
+      ],
+      "attQiangDu": [
+        66,
+        66
+      ],
+      "duipingQiangDu": [
+        63,
+        63
+      ]
+    },
+    {
+      "ID": 5019,
+      "GroupMonster": [
+        1007,
+        1008
+      ],
+      "hpQiangDu": [
+        70,
+        70
+      ],
+      "attQiangDu": [
+        77,
+        77
+      ],
+      "duipingQiangDu": [
+        74,
+        74
+      ]
+    },
+    {
+      "ID": 5020,
+      "GroupMonster": [
+        1007,
+        1008,
+        1003
+      ],
+      "hpQiangDu": [
+        40,
+        40,
+        50
+      ],
+      "attQiangDu": [
+        44,
+        44,
+        55
+      ],
+      "duipingQiangDu": [
+        42,
+        42,
+        52
+      ]
+    },
+    {
+      "ID": 5021,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5022,
+      "GroupMonster": [
+        9002,
+        5006
+      ],
+      "hpQiangDu": [
+        80,
+        40
+      ],
+      "attQiangDu": [
+        72,
+        36
+      ],
+      "duipingQiangDu": [
+        66,
+        33
+      ]
+    },
+    {
+      "ID": 5023,
+      "GroupMonster": [
+        9003,
+        5007
+      ],
+      "hpQiangDu": [
+        88,
+        44
+      ],
+      "attQiangDu": [
+        80,
+        40
+      ],
+      "duipingQiangDu": [
+        73,
+        36
+      ]
+    },
+    {
+      "ID": 5024,
+      "GroupMonster": [
+        9004,
+        5006,
+        5007
+      ],
+      "hpQiangDu": [
+        60,
+        40,
+        40
+      ],
+      "attQiangDu": [
+        66,
+        44,
+        44
+      ],
+      "duipingQiangDu": [
+        63,
+        42,
+        42
+      ]
+    },
+    {
+      "ID": 5025,
+      "GroupMonster": [
+        9006,
+        5006,
+        5007
+      ],
+      "hpQiangDu": [
+        66,
+        44,
+        44
+      ],
+      "attQiangDu": [
+        73,
+        48,
+        48
+      ],
+      "duipingQiangDu": [
+        70,
+        46,
+        46
+      ]
     }
   ]
 }

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

@@ -7481,6 +7481,146 @@
       "associateID": 0,
       "sort": 0,
       "itemDesc2": 0
+    },
+    {
+      "ID": 23300,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        7
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23301,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        8
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23302,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        9
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23303,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23304,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        11
+      ],
+      "sort": 0,
+      "itemDesc2": 0
     }
   ]
 }

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

@@ -7834,19 +7834,19 @@
     },
     {
       "ID": 1959,
-      "txt": "道友7"
+      "txt": "馨儿"
     },
     {
       "ID": 1960,
-      "txt": "道友8"
+      "txt": "柳轻烟"
     },
     {
       "ID": 1961,
-      "txt": "道友9"
+      "txt": "楚云缪"
     },
     {
       "ID": 1962,
-      "txt": "道友10"
+      "txt": "林风"
     },
     {
       "ID": 1963,
@@ -13066,7 +13066,7 @@
     },
     {
       "ID": 4007,
-      "txt": "[资源]灵血草"
+      "txt": "[资源]动态道具1"
     },
     {
       "ID": 4008,
@@ -13102,7 +13102,7 @@
     },
     {
       "ID": 4016,
-      "txt": "[资源]灵血草"
+      "txt": "[资源]动态道具2"
     },
     {
       "ID": 4017,
@@ -14254,7 +14254,7 @@
     },
     {
       "ID": 4304,
-      "txt": "[资源]玄玉髓"
+      "txt": "[资源]动态道具3"
     },
     {
       "ID": 4305,
@@ -14290,7 +14290,7 @@
     },
     {
       "ID": 4313,
-      "txt": "[资源]赤阳砂"
+      "txt": "[资源]动态道具4"
     },
     {
       "ID": 4314,
@@ -14326,7 +14326,7 @@
     },
     {
       "ID": 4322,
-      "txt": "[资源]火灵果"
+      "txt": "[资源]动态道具5"
     },
     {
       "ID": 4323,
@@ -17062,7 +17062,7 @@
     },
     {
       "ID": 5006,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他炫耀着抢来的法宝,正向你扑来,应战!"
     },
     {
       "ID": 5007,
@@ -17070,7 +17070,7 @@
     },
     {
       "ID": 5008,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他嘴里念叨着才学会的功法秘诀,正向你扑来,应战!"
     },
     {
       "ID": 5009,
@@ -17078,7 +17078,7 @@
     },
     {
       "ID": 5010,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他口袋里的灵石正叮当作响,看来你要发财了,应战!"
     },
     {
       "ID": 5011,
@@ -17086,7 +17086,7 @@
     },
     {
       "ID": 5012,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的功法灵气!"
     },
     {
       "ID": 5013,
@@ -17094,7 +17094,7 @@
     },
     {
       "ID": 5014,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的法宝玄晶!"
     },
     {
       "ID": 5015,
@@ -17102,7 +17102,7 @@
     },
     {
       "ID": 5016,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你遭遇一只妖邪,他挥舞着不知从哪来的妖丹,示意要打劫,应战!"
     },
     {
       "ID": 5017,
@@ -17110,7 +17110,7 @@
     },
     {
       "ID": 5018,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只实力不俗的妖邪,正在炼制渡劫所需要的天材地宝,这等好事都让你遇上了!"
     },
     {
       "ID": 5019,
@@ -17118,7 +17118,7 @@
     },
     {
       "ID": 5020,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你来到一片清香之地,漫山的茶叶散发着清香,你摘走了一些。"
     },
     {
       "ID": 5021,
@@ -17126,7 +17126,7 @@
     },
     {
       "ID": 5022,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你偶然闯入一片隐秘的果林,突然发现这果实,不正好是可以让所有道友都开心的好东西么!"
     },
     {
       "ID": 5023,
@@ -17134,7 +17134,7 @@
     },
     {
       "ID": 5024,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他炫耀着抢来的法宝,正向你扑来,应战!"
     },
     {
       "ID": 5025,
@@ -17142,7 +17142,7 @@
     },
     {
       "ID": 5026,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他嘴里念叨着才学会的功法秘诀,正向你扑来,应战!"
     },
     {
       "ID": 5027,
@@ -17150,7 +17150,7 @@
     },
     {
       "ID": 5028,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他口袋里的灵石正叮当作响,看来你要发财了,应战!"
     },
     {
       "ID": 5029,
@@ -17158,7 +17158,7 @@
     },
     {
       "ID": 5030,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的功法灵气!"
     },
     {
       "ID": 5031,
@@ -17166,7 +17166,7 @@
     },
     {
       "ID": 5032,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的法宝玄晶!"
     },
     {
       "ID": 5033,
@@ -17174,7 +17174,7 @@
     },
     {
       "ID": 5034,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你遭遇一只妖邪,他挥舞着不知从哪来的妖丹,示意要打劫,应战!"
     },
     {
       "ID": 5035,
@@ -17182,7 +17182,7 @@
     },
     {
       "ID": 5036,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只实力不俗的妖邪,正在炼制渡劫所需要的天材地宝,这等好事都让你遇上了!"
     },
     {
       "ID": 5037,
@@ -17190,7 +17190,7 @@
     },
     {
       "ID": 5038,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你来到一片清香之地,漫山的茶叶散发着清香,你摘走了一些。"
     },
     {
       "ID": 5039,
@@ -17198,7 +17198,7 @@
     },
     {
       "ID": 5040,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你偶然闯入一片隐秘的果林,突然发现这果实,不正好是可以让所有道友都开心的好东西么!"
     },
     {
       "ID": 5041,
@@ -17206,7 +17206,7 @@
     },
     {
       "ID": 5042,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他炫耀着抢来的法宝,正向你扑来,应战!"
     },
     {
       "ID": 5043,
@@ -17214,7 +17214,7 @@
     },
     {
       "ID": 5044,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他嘴里念叨着才学会的功法秘诀,正向你扑来,应战!"
     },
     {
       "ID": 5045,
@@ -17222,7 +17222,7 @@
     },
     {
       "ID": 5046,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他口袋里的灵石正叮当作响,看来你要发财了,应战!"
     },
     {
       "ID": 5047,
@@ -17230,7 +17230,7 @@
     },
     {
       "ID": 5048,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的功法灵气!"
     },
     {
       "ID": 5049,
@@ -17238,7 +17238,7 @@
     },
     {
       "ID": 5050,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的法宝玄晶!"
     },
     {
       "ID": 5051,
@@ -17246,7 +17246,7 @@
     },
     {
       "ID": 5052,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你遭遇一只妖邪,他挥舞着不知从哪来的妖丹,示意要打劫,应战!"
     },
     {
       "ID": 5053,
@@ -17254,7 +17254,7 @@
     },
     {
       "ID": 5054,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只实力不俗的妖邪,正在炼制渡劫所需要的天材地宝,这等好事都让你遇上了!"
     },
     {
       "ID": 5055,
@@ -17262,7 +17262,7 @@
     },
     {
       "ID": 5056,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你来到一片清香之地,漫山的茶叶散发着清香,你摘走了一些。"
     },
     {
       "ID": 5057,
@@ -17270,7 +17270,7 @@
     },
     {
       "ID": 5058,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你偶然闯入一片隐秘的果林,突然发现这果实,不正好是可以让所有道友都开心的好东西么!"
     },
     {
       "ID": 5059,
@@ -17278,7 +17278,7 @@
     },
     {
       "ID": 5060,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他炫耀着抢来的法宝,正向你扑来,应战!"
     },
     {
       "ID": 5061,
@@ -17286,7 +17286,7 @@
     },
     {
       "ID": 5062,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他嘴里念叨着才学会的功法秘诀,正向你扑来,应战!"
     },
     {
       "ID": 5063,
@@ -17294,7 +17294,7 @@
     },
     {
       "ID": 5064,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他口袋里的灵石正叮当作响,看来你要发财了,应战!"
     },
     {
       "ID": 5065,
@@ -17302,7 +17302,7 @@
     },
     {
       "ID": 5066,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的功法灵气!"
     },
     {
       "ID": 5067,
@@ -17310,7 +17310,7 @@
     },
     {
       "ID": 5068,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的法宝玄晶!"
     },
     {
       "ID": 5069,
@@ -17318,7 +17318,7 @@
     },
     {
       "ID": 5070,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你遭遇一只妖邪,他挥舞着不知从哪来的妖丹,示意要打劫,应战!"
     },
     {
       "ID": 5071,
@@ -17326,7 +17326,7 @@
     },
     {
       "ID": 5072,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只实力不俗的妖邪,正在炼制渡劫所需要的天材地宝,这等好事都让你遇上了!"
     },
     {
       "ID": 5073,
@@ -17334,7 +17334,7 @@
     },
     {
       "ID": 5074,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你来到一片清香之地,漫山的茶叶散发着清香,你摘走了一些。"
     },
     {
       "ID": 5075,
@@ -17342,7 +17342,7 @@
     },
     {
       "ID": 5076,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你偶然闯入一片隐秘的果林,突然发现这果实,不正好是可以让所有道友都开心的好东西么!"
     },
     {
       "ID": 5077,
@@ -17350,7 +17350,7 @@
     },
     {
       "ID": 5078,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他炫耀着抢来的法宝,正向你扑来,应战!"
     },
     {
       "ID": 5079,
@@ -17358,7 +17358,7 @@
     },
     {
       "ID": 5080,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他嘴里念叨着才学会的功法秘诀,正向你扑来,应战!"
     },
     {
       "ID": 5081,
@@ -17366,7 +17366,7 @@
     },
     {
       "ID": 5082,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只落单的妖邪,他口袋里的灵石正叮当作响,看来你要发财了,应战!"
     },
     {
       "ID": 5083,
@@ -17374,7 +17374,7 @@
     },
     {
       "ID": 5084,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的功法灵气!"
     },
     {
       "ID": 5085,
@@ -17382,7 +17382,7 @@
     },
     {
       "ID": 5086,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "此处仙气缭绕,你用神识一探,果然探得丰富的法宝玄晶!"
     },
     {
       "ID": 5087,
@@ -17390,7 +17390,7 @@
     },
     {
       "ID": 5088,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你遭遇一只妖邪,他挥舞着不知从哪来的妖丹,示意要打劫,应战!"
     },
     {
       "ID": 5089,
@@ -17398,7 +17398,7 @@
     },
     {
       "ID": 5090,
-      "txt": "你发现一只落单的妖邪,应战!"
+      "txt": "你发现一只实力不俗的妖邪,正在炼制渡劫所需要的天材地宝,这等好事都让你遇上了!"
     },
     {
       "ID": 5091,
@@ -17406,7 +17406,7 @@
     },
     {
       "ID": 5092,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你来到一片清香之地,漫山的茶叶散发着清香,你摘走了一些。"
     },
     {
       "ID": 5093,
@@ -17414,7 +17414,7 @@
     },
     {
       "ID": 5094,
-      "txt": "此处仙气缭绕,你用神识一探果然探得丰富资源!"
+      "txt": "你偶然闯入一片隐秘的果林,突然发现这果实,不正好是可以让所有道友都开心的好东西么!"
     },
     {
       "ID": 5095,

+ 229 - 79
Assets/Res/Config/LevelbattleConfig.json

@@ -717,7 +717,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1401
       ],
       "awardNum": [
         4200,
@@ -735,7 +735,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1701
       ],
       "awardNum": [
         4200,
@@ -771,7 +771,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1304
       ],
       "awardNum": [
         4500,
@@ -789,7 +789,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1401
       ],
       "awardNum": [
         4500,
@@ -807,7 +807,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1701
       ],
       "awardNum": [
         4500,
@@ -825,7 +825,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        21012
       ],
       "awardNum": [
         4800,
@@ -843,7 +843,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1305
       ],
       "awardNum": [
         4800,
@@ -861,7 +861,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1402
       ],
       "awardNum": [
         5100,
@@ -879,7 +879,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1702
       ],
       "awardNum": [
         5100,
@@ -897,7 +897,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         5100,
@@ -915,7 +915,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1306
       ],
       "awardNum": [
         5400,
@@ -987,7 +987,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1307
       ],
       "awardNum": [
         6000,
@@ -1005,7 +1005,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1402
       ],
       "awardNum": [
         6000,
@@ -1023,7 +1023,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         6300,
@@ -1041,7 +1041,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        21012
       ],
       "awardNum": [
         6300,
@@ -1059,7 +1059,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1308
       ],
       "awardNum": [
         6600,
@@ -1077,7 +1077,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1402
       ],
       "awardNum": [
         6600,
@@ -1095,7 +1095,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1702
       ],
       "awardNum": [
         6900,
@@ -1113,7 +1113,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         6900,
@@ -1131,7 +1131,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1309
       ],
       "awardNum": [
         7200,
@@ -1203,7 +1203,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1310
       ],
       "awardNum": [
         8100,
@@ -1221,7 +1221,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1402
       ],
       "awardNum": [
         8100,
@@ -1239,7 +1239,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         8400,
@@ -1257,7 +1257,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        21012
       ],
       "awardNum": [
         8700,
@@ -1275,7 +1275,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1311
       ],
       "awardNum": [
         9000,
@@ -1293,7 +1293,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1403
       ],
       "awardNum": [
         9000,
@@ -1311,7 +1311,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1702
       ],
       "awardNum": [
         9300,
@@ -1329,7 +1329,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         9600,
@@ -1347,7 +1347,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1312
       ],
       "awardNum": [
         9900,
@@ -1419,7 +1419,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1313
       ],
       "awardNum": [
         10800,
@@ -1437,7 +1437,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1403
       ],
       "awardNum": [
         11100,
@@ -1455,7 +1455,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         11400,
@@ -1473,7 +1473,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        21012
       ],
       "awardNum": [
         11700,
@@ -1491,7 +1491,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1314
       ],
       "awardNum": [
         12000,
@@ -1509,7 +1509,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1403
       ],
       "awardNum": [
         12300,
@@ -1527,7 +1527,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1702
       ],
       "awardNum": [
         12300,
@@ -1545,7 +1545,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         12900,
@@ -1563,7 +1563,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1315
       ],
       "awardNum": [
         13200,
@@ -1635,7 +1635,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1316
       ],
       "awardNum": [
         14700,
@@ -1653,7 +1653,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1403
       ],
       "awardNum": [
         15000,
@@ -1671,7 +1671,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         15300,
@@ -1689,7 +1689,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        21012
       ],
       "awardNum": [
         15600,
@@ -1707,7 +1707,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1317
       ],
       "awardNum": [
         16200,
@@ -1725,7 +1725,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1403
       ],
       "awardNum": [
         16500,
@@ -1743,7 +1743,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1702
       ],
       "awardNum": [
         16800,
@@ -1761,7 +1761,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         17400,
@@ -1779,7 +1779,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1318
       ],
       "awardNum": [
         18000,
@@ -1797,7 +1797,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1403
       ],
       "awardNum": [
         18300,
@@ -1851,7 +1851,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1319
       ],
       "awardNum": [
         19800,
@@ -1869,7 +1869,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1403
       ],
       "awardNum": [
         20100,
@@ -1887,7 +1887,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         20400,
@@ -1905,7 +1905,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        21012
       ],
       "awardNum": [
         21300,
@@ -1923,7 +1923,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1320
       ],
       "awardNum": [
         21900,
@@ -1941,7 +1941,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1404
       ],
       "awardNum": [
         22200,
@@ -1959,7 +1959,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1702
       ],
       "awardNum": [
         22800,
@@ -1977,7 +1977,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         23400,
@@ -1995,7 +1995,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1321
       ],
       "awardNum": [
         24000,
@@ -2067,7 +2067,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1322
       ],
       "awardNum": [
         26700,
@@ -2085,7 +2085,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1404
       ],
       "awardNum": [
         27300,
@@ -2103,7 +2103,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         27600,
@@ -2121,7 +2121,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        21012
       ],
       "awardNum": [
         28500,
@@ -2139,7 +2139,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1323
       ],
       "awardNum": [
         29400,
@@ -2157,7 +2157,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1404
       ],
       "awardNum": [
         30000,
@@ -2175,7 +2175,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1702
       ],
       "awardNum": [
         30600,
@@ -2193,7 +2193,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         31500,
@@ -2211,7 +2211,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1324
       ],
       "awardNum": [
         32700,
@@ -2283,7 +2283,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1325
       ],
       "awardNum": [
         36000,
@@ -2301,7 +2301,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1404
       ],
       "awardNum": [
         36600,
@@ -2319,7 +2319,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         37500,
@@ -2337,7 +2337,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        21012
       ],
       "awardNum": [
         38700,
@@ -2355,7 +2355,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1326
       ],
       "awardNum": [
         40200,
@@ -2373,7 +2373,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1703
       ],
       "awardNum": [
         42300,
@@ -2391,7 +2391,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1327
       ],
       "awardNum": [
         44400,
@@ -2409,7 +2409,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1703
       ],
       "awardNum": [
         46800,
@@ -2427,7 +2427,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1328
       ],
       "awardNum": [
         49200,
@@ -2445,7 +2445,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1703
       ],
       "awardNum": [
         51600,
@@ -2463,7 +2463,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1329
       ],
       "awardNum": [
         54300,
@@ -2481,7 +2481,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1703
       ],
       "awardNum": [
         57000,
@@ -2499,7 +2499,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1330
       ],
       "awardNum": [
         60000,
@@ -2509,6 +2509,156 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5011,
+      "Group": [
+        5011
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5012,
+      "Group": [
+        5012
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5013,
+      "Group": [
+        5013
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5014,
+      "Group": [
+        5014
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5015,
+      "Group": [
+        5015
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5016,
+      "Group": [
+        5016
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5017,
+      "Group": [
+        5017
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5018,
+      "Group": [
+        5018
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5019,
+      "Group": [
+        5019
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5020,
+      "Group": [
+        5020
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5021,
+      "Group": [
+        5021
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5022,
+      "Group": [
+        5022
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5023,
+      "Group": [
+        5023
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5024,
+      "Group": [
+        5024
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5025,
+      "Group": [
+        5025
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }

File diff suppressed because it is too large
+ 432 - 72
Assets/Res/Config/ResourceLevelConfig.json


+ 50 - 0
Assets/Scripts/GameData/ExcelConfig/ResourceLevelConfig.cs

@@ -94,6 +94,56 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///动态道具 23300
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value7;
+#else
+		public int value7{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///动态道具 23301
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value8;
+#else
+		public int value8{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///动态道具 23302
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value9;
+#else
+		public int value9{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///动态道具 23303
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value10;
+#else
+		public int value10{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///动态道具 23304
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value11;
+#else
+		public int value11{ set; get; }
+#endif
+		
+
 	}
 
 }

BIN
Excel2Json/Excel/ChouKa.xlsx


BIN
Excel2Json/Excel/DaoyouConfig.xlsx


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


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


BIN
Excel2Json/Excel/ResourceLevel.xlsx


BIN
Excel2Json/Excel/skill.xlsx


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


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