zg 13 ore fa
parent
commit
ce617f159a

+ 58 - 29
Assets/Res/Config/DivineSenseConfig.json

@@ -8,9 +8,11 @@
         100.0,
         50.0,
         5.0,
-        0.0
+        0.0,
+        1.0
       ],
-      "exp": 1000
+      "exp": 300,
+      "MaxNum": 1
     },
     {
       "ID": 2,
@@ -20,9 +22,11 @@
         105.0,
         52.0,
         6.0,
-        0.0
+        0.0,
+        2.0
       ],
-      "exp": 2000
+      "exp": 600,
+      "MaxNum": 2
     },
     {
       "ID": 3,
@@ -32,9 +36,11 @@
         110.0,
         54.0,
         7.0,
-        0.0
+        0.0,
+        3.0
       ],
-      "exp": 3000
+      "exp": 900,
+      "MaxNum": 3
     },
     {
       "ID": 4,
@@ -44,9 +50,11 @@
         115.0,
         56.0,
         8.0,
-        0.0
+        0.0,
+        4.0
       ],
-      "exp": 4000
+      "exp": 1200,
+      "MaxNum": 4
     },
     {
       "ID": 5,
@@ -56,9 +64,11 @@
         120.0,
         58.0,
         9.0,
-        0.0
+        0.0,
+        5.0
       ],
-      "exp": 5000
+      "exp": 1500,
+      "MaxNum": 5
     },
     {
       "ID": 6,
@@ -68,9 +78,11 @@
         125.0,
         60.0,
         10.0,
-        0.0
+        0.0,
+        6.0
       ],
-      "exp": 6000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 7,
@@ -80,9 +92,11 @@
         130.0,
         62.0,
         11.0,
-        0.0
+        0.0,
+        7.0
       ],
-      "exp": 7000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 8,
@@ -92,9 +106,11 @@
         135.0,
         64.0,
         12.0,
-        0.0
+        0.0,
+        8.0
       ],
-      "exp": 8000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 9,
@@ -104,9 +120,11 @@
         140.0,
         66.0,
         13.0,
-        0.0
+        0.0,
+        9.0
       ],
-      "exp": 9000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 10,
@@ -118,7 +136,8 @@
         14.0,
         0.0
       ],
-      "exp": 10000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 11,
@@ -130,7 +149,8 @@
         15.0,
         0.0
       ],
-      "exp": 11000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 12,
@@ -142,7 +162,8 @@
         16.0,
         0.0
       ],
-      "exp": 12000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 13,
@@ -154,7 +175,8 @@
         17.0,
         0.0
       ],
-      "exp": 13000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 14,
@@ -166,7 +188,8 @@
         18.0,
         0.0
       ],
-      "exp": 14000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 15,
@@ -178,7 +201,8 @@
         19.0,
         0.0
       ],
-      "exp": 15000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 16,
@@ -190,7 +214,8 @@
         20.0,
         0.0
       ],
-      "exp": 16000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 17,
@@ -202,7 +227,8 @@
         21.0,
         0.0
       ],
-      "exp": 17000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 18,
@@ -214,7 +240,8 @@
         22.0,
         0.0
       ],
-      "exp": 18000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 19,
@@ -226,7 +253,8 @@
         23.0,
         0.0
       ],
-      "exp": 19000
+      "exp": 1500,
+      "MaxNum": 6
     },
     {
       "ID": 20,
@@ -238,7 +266,8 @@
         24.0,
         0.0
       ],
-      "exp": 20000
+      "exp": 1500,
+      "MaxNum": 6
     }
   ]
 }

+ 78 - 96
Assets/Res/Config/EventConfig.json

@@ -964,12 +964,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        12004,
+        1702
       ],
       "PrizeNums": [
         1,
-        2
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -995,12 +995,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        12507,
+        1702
       ],
       "PrizeNums": [
         1,
-        2
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1032,12 +1032,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        12005,
+        1702
       ],
       "PrizeNums": [
         1,
-        2
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1064,12 +1064,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        10001,
+        1702
       ],
       "PrizeNums": [
         1,
-        2
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1106,12 +1106,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        12501,
+        1702
       ],
       "PrizeNums": [
         1,
-        2
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1140,11 +1140,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        12009,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1173,11 +1173,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        12506,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1215,11 +1215,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        10003,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1246,11 +1246,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        12010,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1280,11 +1280,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1701,
-        1401
+        12502,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1320,8 +1320,8 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1401
+        12014,
+        1702
       ],
       "PrizeNums": [
         1,
@@ -1351,8 +1351,8 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1401
+        12508,
+        1702
       ],
       "PrizeNums": [
         1,
@@ -1391,8 +1391,8 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1401
+        10006,
+        1702
       ],
       "PrizeNums": [
         1,
@@ -1435,8 +1435,8 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1402
+        12015,
+        1702
       ],
       "PrizeNums": [
         1,
@@ -1471,8 +1471,8 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1402
+        12503,
+        1702
       ],
       "PrizeNums": [
         1,
@@ -1507,8 +1507,8 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1402
+        12019,
+        1702
       ],
       "PrizeNums": [
         1,
@@ -1548,8 +1548,8 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1402
+        12509,
+        1702
       ],
       "PrizeNums": [
         1,
@@ -1586,12 +1586,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1402
+        10008,
+        1702
       ],
       "PrizeNums": [
         1,
-        2
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1634,11 +1634,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1403
+        12020,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1664,12 +1664,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1403
+        12505,
+        1702
       ],
       "PrizeNums": [
-        2,
-        2
+        1,
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1696,11 +1696,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1403
+        12024,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1736,11 +1736,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1403
+        12510,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1767,11 +1767,11 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1403
+        10010,
+        1702
       ],
       "PrizeNums": [
-        2,
+        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1808,12 +1808,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1702,
-        1403
+        12025,
+        1702
       ],
       "PrizeNums": [
-        2,
-        2
+        1,
+        3
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1844,12 +1844,12 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1703,
-        1404
+        12504,
+        1702
       ],
       "PrizeNums": [
         1,
-        2
+        3
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1881,12 +1881,10 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1703,
-        1404
+        1702
       ],
       "PrizeNums": [
-        1,
-        2
+        4
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1945,11 +1943,9 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1703,
-        1404
+        1702
       ],
       "PrizeNums": [
-        1,
         2
       ],
       "RefreshProbability": 0,
@@ -1974,12 +1970,10 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1703,
-        1404
+        1702
       ],
       "PrizeNums": [
-        1,
-        2
+        3
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2022,11 +2016,9 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1703,
-        1404
+        1702
       ],
       "PrizeNums": [
-        1,
         2
       ],
       "RefreshProbability": 0,
@@ -2058,12 +2050,10 @@
       "Score": 10,
       "EventQuality": 1,
       "PrizeIDs": [
-        1703,
-        1404
+        1702
       ],
       "PrizeNums": [
-        1,
-        2
+        3
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2101,14 +2091,6 @@
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
-      "PrizeIDs": [
-        1703,
-        1404
-      ],
-      "PrizeNums": [
-        1,
-        2
-      ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 3,

File diff suppressed because it is too large
+ 141 - 119
Assets/Res/Config/HeroPowerUpConfig.json


+ 95 - 91
Assets/Res/Config/ItemConfig.json

@@ -373,9 +373,9 @@
       "associateID": 1,
       "associateVlaue": [
         1,
-        100,
+        300,
         10,
-        20
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -404,9 +404,9 @@
       "associateID": 1,
       "associateVlaue": [
         1,
-        100,
-        20,
-        35
+        300,
+        15,
+        25
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -435,8 +435,8 @@
       "associateID": 1,
       "associateVlaue": [
         1,
-        100,
-        30,
+        300,
+        25,
         50
       ],
       "sort": 0,
@@ -448,7 +448,7 @@
       "itemDesc": 262,
       "icon": "icon_item_1204",
       "itemTag": 3,
-      "quality": 3,
+      "quality": 6,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -465,20 +465,20 @@
       "stack_1": 0,
       "associateID": 1,
       "associateVlaue": [
-        101,
-        200,
-        10,
-        20
+        1,
+        300,
+        40,
+        80
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1205,
-      "itemName": 254,
-      "itemDesc": 263,
-      "icon": "icon_item_1205",
-      "itemTag": 3,
+      "ID": 1301,
+      "itemName": 268,
+      "itemDesc": 272,
+      "icon": "icon_item_1301",
+      "itemTag": 4,
       "quality": 4,
       "stack": 0,
       "isSell": false,
@@ -496,21 +496,21 @@
       "stack_1": 0,
       "associateID": 1,
       "associateVlaue": [
-        101,
-        200,
-        20,
-        35
+        1,
+        300,
+        45,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1206,
-      "itemName": 255,
-      "itemDesc": 264,
-      "icon": "icon_item_1206",
-      "itemTag": 3,
-      "quality": 5,
+      "ID": 1302,
+      "itemName": 269,
+      "itemDesc": 273,
+      "icon": "icon_item_1302",
+      "itemTag": 4,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -527,21 +527,21 @@
       "stack_1": 0,
       "associateID": 1,
       "associateVlaue": [
-        101,
-        200,
-        30,
-        50
+        1,
+        300,
+        40,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1207,
-      "itemName": 256,
-      "itemDesc": 265,
-      "icon": "icon_item_1207",
-      "itemTag": 3,
-      "quality": 3,
+      "ID": 1303,
+      "itemName": 270,
+      "itemDesc": 274,
+      "icon": "icon_item_1303",
+      "itemTag": 4,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -558,21 +558,21 @@
       "stack_1": 0,
       "associateID": 1,
       "associateVlaue": [
-        201,
+        1,
         300,
-        10,
-        20
+        35,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1208,
-      "itemName": 257,
-      "itemDesc": 266,
-      "icon": "icon_item_1208",
-      "itemTag": 3,
-      "quality": 4,
+      "ID": 1304,
+      "itemName": 271,
+      "itemDesc": 275,
+      "icon": "icon_item_1304",
+      "itemTag": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -589,20 +589,20 @@
       "stack_1": 0,
       "associateID": 1,
       "associateVlaue": [
-        201,
+        1,
         300,
-        20,
-        35
+        30,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1209,
-      "itemName": 258,
-      "itemDesc": 267,
-      "icon": "icon_item_1209",
-      "itemTag": 3,
+      "ID": 1305,
+      "itemName": 10112,
+      "itemDesc": 10117,
+      "icon": "icon_item_1305",
+      "itemTag": 4,
       "quality": 5,
       "stack": 0,
       "isSell": false,
@@ -620,21 +620,21 @@
       "stack_1": 0,
       "associateID": 1,
       "associateVlaue": [
-        201,
+        1,
         300,
-        30,
-        50
+        25,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1301,
-      "itemName": 268,
-      "itemDesc": 272,
-      "icon": "icon_item_1301",
+      "ID": 1306,
+      "itemName": 10113,
+      "itemDesc": 10118,
+      "icon": "icon_item_1306",
       "itemTag": 4,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -653,18 +653,19 @@
       "associateVlaue": [
         1,
         300,
-        10
+        20,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1302,
-      "itemName": 269,
-      "itemDesc": 273,
-      "icon": "icon_item_1302",
+      "ID": 1307,
+      "itemName": 10114,
+      "itemDesc": 10119,
+      "icon": "icon_item_1307",
       "itemTag": 4,
-      "quality": 4,
+      "quality": 6,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -683,18 +684,19 @@
       "associateVlaue": [
         1,
         300,
-        10
+        15,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1303,
-      "itemName": 270,
-      "itemDesc": 274,
-      "icon": "icon_item_1303",
+      "ID": 1308,
+      "itemName": 10115,
+      "itemDesc": 10120,
+      "icon": "icon_item_1308",
       "itemTag": 4,
-      "quality": 5,
+      "quality": 6,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -713,16 +715,17 @@
       "associateVlaue": [
         1,
         300,
-        20
+        10,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1304,
-      "itemName": 271,
-      "itemDesc": 275,
-      "icon": "icon_item_1304",
+      "ID": 1309,
+      "itemName": 10116,
+      "itemDesc": 10121,
+      "icon": "icon_item_1309",
       "itemTag": 4,
       "quality": 6,
       "stack": 0,
@@ -743,7 +746,8 @@
       "associateVlaue": [
         1,
         300,
-        30
+        5,
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -995,7 +999,7 @@
       "stack_1": 0,
       "associateID": 8,
       "associateVlaue": [
-        300
+        100
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1023,7 +1027,7 @@
       "stack_1": 0,
       "associateID": 8,
       "associateVlaue": [
-        1000
+        100
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2639,7 +2643,7 @@
     },
     {
       "ID": 12511,
-      "itemName": 0,
+      "itemName": 10122,
       "itemDesc": 0,
       "icon": "icon_item_12511",
       "itemTag": 13,
@@ -2668,7 +2672,7 @@
     },
     {
       "ID": 12512,
-      "itemName": 0,
+      "itemName": 10123,
       "itemDesc": 0,
       "icon": "icon_item_12512",
       "itemTag": 13,
@@ -2697,7 +2701,7 @@
     },
     {
       "ID": 12513,
-      "itemName": 0,
+      "itemName": 10124,
       "itemDesc": 0,
       "icon": "icon_item_12513",
       "itemTag": 13,
@@ -2726,7 +2730,7 @@
     },
     {
       "ID": 12514,
-      "itemName": 0,
+      "itemName": 10125,
       "itemDesc": 0,
       "icon": "icon_item_12514",
       "itemTag": 13,
@@ -2755,7 +2759,7 @@
     },
     {
       "ID": 12515,
-      "itemName": 0,
+      "itemName": 10126,
       "itemDesc": 0,
       "icon": "icon_item_12515",
       "itemTag": 13,
@@ -2784,7 +2788,7 @@
     },
     {
       "ID": 12516,
-      "itemName": 0,
+      "itemName": 10127,
       "itemDesc": 0,
       "icon": "icon_item_12516",
       "itemTag": 13,
@@ -2813,7 +2817,7 @@
     },
     {
       "ID": 12517,
-      "itemName": 0,
+      "itemName": 10128,
       "itemDesc": 0,
       "icon": "icon_item_12517",
       "itemTag": 13,
@@ -2842,7 +2846,7 @@
     },
     {
       "ID": 12518,
-      "itemName": 0,
+      "itemName": 10129,
       "itemDesc": 0,
       "icon": "icon_item_12518",
       "itemTag": 13,
@@ -2871,7 +2875,7 @@
     },
     {
       "ID": 12519,
-      "itemName": 0,
+      "itemName": 10130,
       "itemDesc": 0,
       "icon": "icon_item_12519",
       "itemTag": 13,

File diff suppressed because it is too large
+ 501 - 501
Assets/Res/Config/LanguageChineseConfig.json


File diff suppressed because it is too large
+ 112 - 112
Assets/Res/Config/MonsterPowerUpConfig.json


+ 10 - 0
Assets/Scripts/GameData/ExcelConfig/DivineSenseConfig.cs

@@ -44,6 +44,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///同时最大存在神识数量
+		/// </summary>
+#if !COMBAT_SERVER
+		public int MaxNum;
+#else
+		public int MaxNum{ set; get; }
+#endif
+		
+
 	}
 
 }

BIN
Excel2Json/Excel/DivineSenseConfig.xlsx


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/GameConstant.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


BIN
Excel2Json/Excel/QiankundaiConfig.xlsx


BIN
Excel2Json/Excel/ResourceLevel.xlsx


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


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