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

Assets/Res/Config/DropConfig.json

@@ -20,6 +20,27 @@
         1003
       ],
       "dropType": 3
+    },
+    {
+      "ID": 1004,
+      "dropGroupID": [
+        1004
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1005,
+      "dropGroupID": [
+        1005
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1006,
+      "dropGroupID": [
+        1006
+      ],
+      "dropType": 3
     }
   ]
 }

Assets/Res/Config/EventConditionConfig.json

@@ -136,7 +136,7 @@
       "ConditionType": null,
       "optionType": 2,
       "optionPara1": [
-        100001
+        100002
       ],
       "ResultOptions": [
         1016,
@@ -196,13 +196,13 @@
       "ConditionType": null,
       "optionType": 2,
       "optionPara1": [
-        100002
+        100003
       ],
       "PrizeIDs": [
         1002
       ],
       "PrizeNums": [
-        10
+        100
       ],
       "ResultOptions": [
         1026,
@@ -235,13 +235,13 @@
       "ConditionType": null,
       "optionType": 2,
       "optionPara1": [
-        100003
+        100004
       ],
       "PrizeIDs": [
-        1001
+        1004
       ],
       "PrizeNums": [
-        200
+        100
       ],
       "ResultOptions": [
         1016,
@@ -342,7 +342,7 @@
       "ConditionType": null,
       "optionType": 2,
       "optionPara1": [
-        100003
+        100001
       ],
       "ResultOptions": [
         10002,
@@ -357,25 +357,28 @@
       "ConditionType": null,
       "optionType": 3,
       "PrizeIDs": [
-        1002
+        1001,
+        1003
       ],
       "PrizeNums": [
-        10
+        1000,
+        3000
       ]
     },
     {
       "ID": 10003,
       "LanID": [
         210,
-        211
+        211,
+        1903
       ],
       "ConditionType": null,
       "optionType": 3,
       "PrizeIDs": [
-        1002
+        1005
       ],
       "PrizeNums": [
-        10
+        500
       ]
     },
     {
@@ -389,10 +392,40 @@
       "ConditionType": null,
       "optionType": 3,
       "PrizeIDs": [
-        1003
+        1006
       ],
       "PrizeNums": [
-        10
+        500
+      ]
+    },
+    {
+      "ID": 10005,
+      "LanID": [
+        1901
+      ],
+      "ConditionType": null,
+      "optionType": 2,
+      "optionPara1": [
+        100002
+      ],
+      "ResultOptions": [
+        10002,
+        100
+      ]
+    },
+    {
+      "ID": 10006,
+      "LanID": [
+        1902
+      ],
+      "ConditionType": null,
+      "optionType": 2,
+      "optionPara1": [
+        100003
+      ],
+      "ResultOptions": [
+        10002,
+        100
       ]
     }
   ]

Assets/Res/Config/EventConfig.json

@@ -111,7 +111,7 @@
       "EventBeginId": 10003,
       "EventTriggerType": 2,
       "EventType": 1,
-      "EventQuality": 2,
+      "EventQuality": 1,
       "Description": null
     },
     {
@@ -119,7 +119,23 @@
       "EventBeginId": 10004,
       "EventTriggerType": 2,
       "EventType": 1,
-      "EventQuality": 3,
+      "EventQuality": 1,
+      "Description": null
+    },
+    {
+      "ID": 14,
+      "EventBeginId": 10005,
+      "EventTriggerType": 2,
+      "EventType": 1,
+      "EventQuality": 1,
+      "Description": null
+    },
+    {
+      "ID": 15,
+      "EventBeginId": 10006,
+      "EventTriggerType": 2,
+      "EventType": 1,
+      "EventQuality": 1,
       "Description": null
     }
   ]

Assets/Res/Config/FabaoConfig.json

@@ -12,7 +12,7 @@
         1
       ],
       "ShuxingPara": [
-        100
+        50
       ],
       "SkillGroupID": 3101
     },
@@ -25,10 +25,10 @@
       "model": "fb_feicuihulu",
       "fragmentID": 11003,
       "ShuxingIDs": [
-        3
+        2
       ],
       "ShuxingPara": [
-        100
+        50
       ],
       "SkillGroupID": 3201
     },
@@ -44,7 +44,7 @@
         3
       ],
       "ShuxingPara": [
-        100
+        50
       ],
       "SkillGroupID": 3301
     },
@@ -57,10 +57,12 @@
       "model": "fb_xuanguidun",
       "fragmentID": 11010,
       "ShuxingIDs": [
-        3
+        1,
+        2
       ],
       "ShuxingPara": [
-        100
+        25,
+        25
       ],
       "SkillGroupID": 3501
     }

Assets/Res/Config/HeroModelConfig.json

@@ -65,7 +65,7 @@
       "headicon": "icon_tx9101",
       "model": "Guixiu01",
       "isUseGpu": false,
-      "heroType": 1,
+      "heroType": 2,
       "hp": 100,
       "attack": 60,
       "def": 50,
@@ -123,7 +123,7 @@
       "headicon": "icon_tx9102",
       "model": "Nanzhu",
       "isUseGpu": false,
-      "heroType": 1,
+      "heroType": 2,
       "hp": 100,
       "attack": 60,
       "def": 50,
@@ -181,7 +181,7 @@
       "headicon": "icon_tx9103",
       "model": "Guixiu01",
       "isUseGpu": false,
-      "heroType": 1,
+      "heroType": 2,
       "hp": 100,
       "attack": 60,
       "def": 50,

Assets/Res/Config/LanguageChineseConfig.json

@@ -830,11 +830,11 @@
     },
     {
       "ID": 208,
-      "txt": "一头略有修为的熊精袭击了你，准备迎战"
+      "txt": "事件10001：一只[怪物1]袭击了你，准备迎战"
     },
     {
       "ID": 209,
-      "txt": "你击败了熊精，并从它身上吸取了一些修为"
+      "txt": "你击败了怪物，并从它身上吸取了一些修为和战利品"
     },
     {
       "ID": 210,
@@ -842,7 +842,7 @@
     },
     {
       "ID": 211,
-      "txt": "你在洞中吐纳休养生息，获得了一些修为"
+      "txt": "不知哪位高人在洞穴内壁留下绝世秘籍"
     },
     {
       "ID": 212,
@@ -850,11 +850,11 @@
     },
     {
       "ID": 213,
-      "txt": "原来是脚下有一块圆润的石头"
+      "txt": "原来是脚下有一块圆润的微微发光的石头"
     },
     {
       "ID": 214,
-      "txt": "你拾起来一看，居然是难得的天材地宝"
+      "txt": "你拾起来一看，原来它蕴含了丰富的法宝灵韵"
     },
     {
       "ID": 215,
@@ -7602,15 +7602,15 @@
     },
     {
       "ID": 1901,
-      "txt": "0"
+      "txt": "事件10005：一只[怪物2]袭击了你，准备迎战"
     },
     {
       "ID": 1902,
-      "txt": "0"
+      "txt": "事件10006：一只[怪物3]袭击了你，准备迎战"
     },
     {
       "ID": 1903,
-      "txt": "0"
+      "txt": "你仔细研读后，功法得到精进"
     },
     {
       "ID": 1904,

Assets/Res/Config/SkillPowerupConfig.json

@@ -2,716 +2,842 @@
   "configList": [
     {
       "ID": 1,
-      "MainPower": 100,
+      "MainPower": 100.0,
       "SkillPower1": 100.0,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        200
+        100,
+        100
       ],
       "PlayerLevelLimit": 5
     },
     {
       "ID": 2,
-      "MainPower": 120,
-      "SkillPower1": 110.0,
+      "MainPower": 101.69,
+      "SkillPower1": 101.69,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        300
+        100,
+        100
       ],
       "PlayerLevelLimit": 10
     },
     {
       "ID": 3,
-      "MainPower": 140,
-      "SkillPower1": 120.0,
+      "MainPower": 103.39,
+      "SkillPower1": 103.39,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        400
+        100,
+        100
       ],
       "PlayerLevelLimit": 15
     },
     {
       "ID": 4,
-      "MainPower": 160,
-      "SkillPower1": 130.0,
+      "MainPower": 105.08,
+      "SkillPower1": 105.08,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        500
+        100,
+        100
       ],
       "PlayerLevelLimit": 20
     },
     {
       "ID": 5,
-      "MainPower": 180,
-      "SkillPower1": 140.0,
+      "MainPower": 106.78,
+      "SkillPower1": 106.78,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        600
+        100,
+        100
       ],
       "PlayerLevelLimit": 25
     },
     {
       "ID": 6,
-      "MainPower": 200,
-      "SkillPower1": 150.0,
+      "MainPower": 108.47,
+      "SkillPower1": 108.47,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        700
+        100,
+        100
       ],
       "PlayerLevelLimit": 30
     },
     {
       "ID": 7,
-      "MainPower": 220,
-      "SkillPower1": 160.0,
+      "MainPower": 110.17,
+      "SkillPower1": 110.17,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        800
+        100,
+        100
       ],
       "PlayerLevelLimit": 35
     },
     {
       "ID": 8,
-      "MainPower": 240,
-      "SkillPower1": 170.0,
+      "MainPower": 111.86,
+      "SkillPower1": 111.86,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        900
+        100,
+        100
       ],
       "PlayerLevelLimit": 40
     },
     {
       "ID": 9,
-      "MainPower": 260,
-      "SkillPower1": 180.0,
+      "MainPower": 113.56,
+      "SkillPower1": 113.56,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1000
+        100,
+        100
       ],
       "PlayerLevelLimit": 45
     },
     {
       "ID": 10,
-      "MainPower": 280,
-      "SkillPower1": 190.0,
+      "MainPower": 115.25,
+      "SkillPower1": 115.25,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1100
+        100,
+        100
       ],
       "PlayerLevelLimit": 50
     },
     {
       "ID": 11,
-      "MainPower": 300,
-      "SkillPower1": 200.0,
+      "MainPower": 116.95,
+      "SkillPower1": 116.95,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1200
+        100,
+        100
       ],
       "PlayerLevelLimit": 55
     },
     {
       "ID": 12,
-      "MainPower": 320,
-      "SkillPower1": 210.0,
+      "MainPower": 118.64,
+      "SkillPower1": 118.64,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1300
+        100,
+        100
       ],
       "PlayerLevelLimit": 60
     },
     {
       "ID": 13,
-      "MainPower": 340,
-      "SkillPower1": 220.0,
+      "MainPower": 120.34,
+      "SkillPower1": 120.34,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1400
+        100,
+        100
       ],
       "PlayerLevelLimit": 65
     },
     {
       "ID": 14,
-      "MainPower": 360,
-      "SkillPower1": 230.0,
+      "MainPower": 122.03,
+      "SkillPower1": 122.03,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1500
+        100,
+        100
       ],
       "PlayerLevelLimit": 70
     },
     {
       "ID": 15,
-      "MainPower": 380,
-      "SkillPower1": 240.0,
+      "MainPower": 123.73,
+      "SkillPower1": 123.73,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1600
+        100,
+        100
       ],
       "PlayerLevelLimit": 75
     },
     {
       "ID": 16,
-      "MainPower": 400,
-      "SkillPower1": 250.0,
+      "MainPower": 125.42,
+      "SkillPower1": 125.42,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1700
+        100,
+        100
       ],
       "PlayerLevelLimit": 80
     },
     {
       "ID": 17,
-      "MainPower": 420,
-      "SkillPower1": 260.0,
+      "MainPower": 127.12,
+      "SkillPower1": 127.12,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1800
+        100,
+        100
       ],
       "PlayerLevelLimit": 85
     },
     {
       "ID": 18,
-      "MainPower": 440,
-      "SkillPower1": 270.0,
+      "MainPower": 128.81,
+      "SkillPower1": 128.81,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        1900
+        100,
+        100
       ],
       "PlayerLevelLimit": 90
     },
     {
       "ID": 19,
-      "MainPower": 460,
-      "SkillPower1": 280.0,
+      "MainPower": 130.51,
+      "SkillPower1": 130.51,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2000
+        100,
+        100
       ],
       "PlayerLevelLimit": 95
     },
     {
       "ID": 20,
-      "MainPower": 480,
-      "SkillPower1": 290.0,
+      "MainPower": 132.2,
+      "SkillPower1": 132.2,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2100
+        100,
+        100
       ],
       "PlayerLevelLimit": 100
     },
     {
       "ID": 21,
-      "MainPower": 500,
-      "SkillPower1": 300.0,
+      "MainPower": 133.9,
+      "SkillPower1": 133.9,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2200
+        100,
+        100
       ],
       "PlayerLevelLimit": 105
     },
     {
       "ID": 22,
-      "MainPower": 520,
-      "SkillPower1": 310.0,
+      "MainPower": 135.59,
+      "SkillPower1": 135.59,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2300
+        100,
+        100
       ],
       "PlayerLevelLimit": 110
     },
     {
       "ID": 23,
-      "MainPower": 540,
-      "SkillPower1": 320.0,
+      "MainPower": 137.29,
+      "SkillPower1": 137.29,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2400
+        100,
+        100
       ],
       "PlayerLevelLimit": 115
     },
     {
       "ID": 24,
-      "MainPower": 560,
-      "SkillPower1": 330.0,
+      "MainPower": 138.98,
+      "SkillPower1": 138.98,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2500
+        100,
+        100
       ],
       "PlayerLevelLimit": 120
     },
     {
       "ID": 25,
-      "MainPower": 580,
-      "SkillPower1": 340.0,
+      "MainPower": 140.68,
+      "SkillPower1": 140.68,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2600
+        100,
+        100
       ],
       "PlayerLevelLimit": 125
     },
     {
       "ID": 26,
-      "MainPower": 600,
-      "SkillPower1": 350.0,
+      "MainPower": 142.37,
+      "SkillPower1": 142.37,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2700
+        100,
+        100
       ],
       "PlayerLevelLimit": 130
     },
     {
       "ID": 27,
-      "MainPower": 620,
-      "SkillPower1": 360.0,
+      "MainPower": 144.07,
+      "SkillPower1": 144.07,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2800
+        100,
+        100
       ],
       "PlayerLevelLimit": 135
     },
     {
       "ID": 28,
-      "MainPower": 640,
-      "SkillPower1": 370.0,
+      "MainPower": 145.76,
+      "SkillPower1": 145.76,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        2900
+        100,
+        100
       ],
       "PlayerLevelLimit": 140
     },
     {
       "ID": 29,
-      "MainPower": 660,
-      "SkillPower1": 380.0,
+      "MainPower": 147.46,
+      "SkillPower1": 147.46,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3000
+        100,
+        100
       ],
       "PlayerLevelLimit": 145
     },
     {
       "ID": 30,
-      "MainPower": 680,
-      "SkillPower1": 390.0,
+      "MainPower": 149.15,
+      "SkillPower1": 149.15,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3100
+        100,
+        100
       ],
       "PlayerLevelLimit": 150
     },
     {
       "ID": 31,
-      "MainPower": 700,
-      "SkillPower1": 400.0,
+      "MainPower": 150.85,
+      "SkillPower1": 150.85,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3200
+        100,
+        100
       ],
       "PlayerLevelLimit": 155
     },
     {
       "ID": 32,
-      "MainPower": 720,
-      "SkillPower1": 410.0,
+      "MainPower": 152.54,
+      "SkillPower1": 152.54,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3300
+        100,
+        100
       ],
       "PlayerLevelLimit": 160
     },
     {
       "ID": 33,
-      "MainPower": 740,
-      "SkillPower1": 420.0,
+      "MainPower": 154.24,
+      "SkillPower1": 154.24,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3400
+        100,
+        100
       ],
       "PlayerLevelLimit": 165
     },
     {
       "ID": 34,
-      "MainPower": 760,
-      "SkillPower1": 430.0,
+      "MainPower": 155.93,
+      "SkillPower1": 155.93,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3500
+        100,
+        100
       ],
       "PlayerLevelLimit": 170
     },
     {
       "ID": 35,
-      "MainPower": 780,
-      "SkillPower1": 440.0,
+      "MainPower": 157.63,
+      "SkillPower1": 157.63,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3600
+        100,
+        100
       ],
       "PlayerLevelLimit": 175
     },
     {
       "ID": 36,
-      "MainPower": 800,
-      "SkillPower1": 450.0,
+      "MainPower": 159.32,
+      "SkillPower1": 159.32,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3700
+        100,
+        100
       ],
       "PlayerLevelLimit": 180
     },
     {
       "ID": 37,
-      "MainPower": 820,
-      "SkillPower1": 460.0,
+      "MainPower": 161.02,
+      "SkillPower1": 161.02,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3800
+        100,
+        100
       ],
       "PlayerLevelLimit": 185
     },
     {
       "ID": 38,
-      "MainPower": 840,
-      "SkillPower1": 470.0,
+      "MainPower": 162.71,
+      "SkillPower1": 162.71,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        3900
+        100,
+        100
       ],
       "PlayerLevelLimit": 190
     },
     {
       "ID": 39,
-      "MainPower": 860,
-      "SkillPower1": 480.0,
+      "MainPower": 164.41,
+      "SkillPower1": 164.41,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4000
+        100,
+        100
       ],
       "PlayerLevelLimit": 195
     },
     {
       "ID": 40,
-      "MainPower": 880,
-      "SkillPower1": 490.0,
+      "MainPower": 166.1,
+      "SkillPower1": 166.1,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4100
+        100,
+        100
       ],
       "PlayerLevelLimit": 200
     },
     {
       "ID": 41,
-      "MainPower": 900,
-      "SkillPower1": 500.0,
+      "MainPower": 167.8,
+      "SkillPower1": 167.8,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4200
+        100,
+        100
       ],
       "PlayerLevelLimit": 205
     },
     {
       "ID": 42,
-      "MainPower": 920,
-      "SkillPower1": 510.0,
+      "MainPower": 169.49,
+      "SkillPower1": 169.49,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4300
+        100,
+        100
       ],
       "PlayerLevelLimit": 210
     },
     {
       "ID": 43,
-      "MainPower": 940,
-      "SkillPower1": 520.0,
+      "MainPower": 171.19,
+      "SkillPower1": 171.19,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4400
+        100,
+        100
       ],
       "PlayerLevelLimit": 215
     },
     {
       "ID": 44,
-      "MainPower": 960,
-      "SkillPower1": 530.0,
+      "MainPower": 172.88,
+      "SkillPower1": 172.88,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4500
+        100,
+        100
       ],
       "PlayerLevelLimit": 220
     },
     {
       "ID": 45,
-      "MainPower": 980,
-      "SkillPower1": 540.0,
+      "MainPower": 174.58,
+      "SkillPower1": 174.58,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4600
+        100,
+        100
       ],
       "PlayerLevelLimit": 225
     },
     {
       "ID": 46,
-      "MainPower": 1000,
-      "SkillPower1": 550.0,
+      "MainPower": 176.27,
+      "SkillPower1": 176.27,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4700
+        100,
+        100
       ],
       "PlayerLevelLimit": 230
     },
     {
       "ID": 47,
-      "MainPower": 1020,
-      "SkillPower1": 560.0,
+      "MainPower": 177.97,
+      "SkillPower1": 177.97,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4800
+        100,
+        100
       ],
       "PlayerLevelLimit": 235
     },
     {
       "ID": 48,
-      "MainPower": 1040,
-      "SkillPower1": 570.0,
+      "MainPower": 179.66,
+      "SkillPower1": 179.66,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        4900
+        100,
+        100
       ],
       "PlayerLevelLimit": 240
     },
     {
       "ID": 49,
-      "MainPower": 1060,
-      "SkillPower1": 580.0,
+      "MainPower": 181.36,
+      "SkillPower1": 181.36,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5000
+        100,
+        100
       ],
       "PlayerLevelLimit": 245
     },
     {
       "ID": 50,
-      "MainPower": 1080,
-      "SkillPower1": 590.0,
+      "MainPower": 183.05,
+      "SkillPower1": 183.05,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5100
+        100,
+        100
       ],
       "PlayerLevelLimit": 250
     },
     {
       "ID": 51,
-      "MainPower": 1100,
-      "SkillPower1": 600.0,
+      "MainPower": 184.75,
+      "SkillPower1": 184.75,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5200
+        100,
+        100
       ],
       "PlayerLevelLimit": 255
     },
     {
       "ID": 52,
-      "MainPower": 1120,
-      "SkillPower1": 610.0,
+      "MainPower": 186.44,
+      "SkillPower1": 186.44,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5300
+        100,
+        100
       ],
       "PlayerLevelLimit": 260
     },
     {
       "ID": 53,
-      "MainPower": 1140,
-      "SkillPower1": 620.0,
+      "MainPower": 188.14,
+      "SkillPower1": 188.14,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5400
+        100,
+        100
       ],
       "PlayerLevelLimit": 265
     },
     {
       "ID": 54,
-      "MainPower": 1160,
-      "SkillPower1": 630.0,
+      "MainPower": 189.83,
+      "SkillPower1": 189.83,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5500
+        100,
+        100
       ],
       "PlayerLevelLimit": 270
     },
     {
       "ID": 55,
-      "MainPower": 1180,
-      "SkillPower1": 640.0,
+      "MainPower": 191.53,
+      "SkillPower1": 191.53,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5600
+        100,
+        100
       ],
       "PlayerLevelLimit": 275
     },
     {
       "ID": 56,
-      "MainPower": 1200,
-      "SkillPower1": 650.0,
+      "MainPower": 193.22,
+      "SkillPower1": 193.22,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5700
+        100,
+        100
       ],
       "PlayerLevelLimit": 280
     },
     {
       "ID": 57,
-      "MainPower": 1220,
-      "SkillPower1": 660.0,
+      "MainPower": 194.92,
+      "SkillPower1": 194.92,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5800
+        100,
+        100
       ],
       "PlayerLevelLimit": 285
     },
     {
       "ID": 58,
-      "MainPower": 1240,
-      "SkillPower1": 670.0,
+      "MainPower": 196.61,
+      "SkillPower1": 196.61,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        5900
+        100,
+        100
       ],
       "PlayerLevelLimit": 290
     },
     {
       "ID": 59,
-      "MainPower": 1260,
-      "SkillPower1": 680.0,
+      "MainPower": 198.31,
+      "SkillPower1": 198.31,
       "LevelupItem": [
+        1001,
         1005
       ],
       "LevelupItemNum": [
-        6000
+        100,
+        100
       ],
       "PlayerLevelLimit": 295
     },
     {
       "ID": 60,
-      "MainPower": 1280,
-      "SkillPower1": 690.0,
+      "MainPower": 200.0,
+      "SkillPower1": 200.0,
+      "LevelupItem": [
+        1001,
+        1005
+      ],
+      "LevelupItemNum": [
+        100,
+        100
+      ],
       "PlayerLevelLimit": 300
     }
   ]

Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs

@@ -69,7 +69,7 @@ public int[] PrizeNums;
 
 
 		/// <summary>
-		///事件结局后提供的选项
+		///事件结局后提供的选项 战斗：胜利/失败转事件ID
 		/// </summary>
 public int[] ResultOptions;
 

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -23,7 +23,7 @@ public int ID;
 		/// <summary>
 		///功法对拼标准强度
 		/// </summary>
-public int MainPower;
+public float MainPower;
 
 
 		/// <summary>