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

Assets/Res/Config/SkillPowerupConfig.json

@@ -9,7 +9,8 @@
       ],
       "LevelupItemNum": [
         200
-      ]
+      ],
+      "PlayerLevelLimit": 5
     },
     {
       "ID": 2,
@@ -20,7 +21,8 @@
       ],
       "LevelupItemNum": [
         300
-      ]
+      ],
+      "PlayerLevelLimit": 10
     },
     {
       "ID": 3,
@@ -31,7 +33,8 @@
       ],
       "LevelupItemNum": [
         400
-      ]
+      ],
+      "PlayerLevelLimit": 15
     },
     {
       "ID": 4,
@@ -42,7 +45,8 @@
       ],
       "LevelupItemNum": [
         500
-      ]
+      ],
+      "PlayerLevelLimit": 20
     },
     {
       "ID": 5,
@@ -53,7 +57,8 @@
       ],
       "LevelupItemNum": [
         600
-      ]
+      ],
+      "PlayerLevelLimit": 25
     },
     {
       "ID": 6,
@@ -64,7 +69,8 @@
       ],
       "LevelupItemNum": [
         700
-      ]
+      ],
+      "PlayerLevelLimit": 30
     },
     {
       "ID": 7,
@@ -75,7 +81,8 @@
       ],
       "LevelupItemNum": [
         800
-      ]
+      ],
+      "PlayerLevelLimit": 35
     },
     {
       "ID": 8,
@@ -86,7 +93,8 @@
       ],
       "LevelupItemNum": [
         900
-      ]
+      ],
+      "PlayerLevelLimit": 40
     },
     {
       "ID": 9,
@@ -97,7 +105,8 @@
       ],
       "LevelupItemNum": [
         1000
-      ]
+      ],
+      "PlayerLevelLimit": 45
     },
     {
       "ID": 10,
@@ -108,7 +117,8 @@
       ],
       "LevelupItemNum": [
         1100
-      ]
+      ],
+      "PlayerLevelLimit": 50
     },
     {
       "ID": 11,
@@ -119,7 +129,8 @@
       ],
       "LevelupItemNum": [
         1200
-      ]
+      ],
+      "PlayerLevelLimit": 55
     },
     {
       "ID": 12,
@@ -130,7 +141,8 @@
       ],
       "LevelupItemNum": [
         1300
-      ]
+      ],
+      "PlayerLevelLimit": 60
     },
     {
       "ID": 13,
@@ -141,7 +153,8 @@
       ],
       "LevelupItemNum": [
         1400
-      ]
+      ],
+      "PlayerLevelLimit": 65
     },
     {
       "ID": 14,
@@ -152,7 +165,8 @@
       ],
       "LevelupItemNum": [
         1500
-      ]
+      ],
+      "PlayerLevelLimit": 70
     },
     {
       "ID": 15,
@@ -163,7 +177,8 @@
       ],
       "LevelupItemNum": [
         1600
-      ]
+      ],
+      "PlayerLevelLimit": 75
     },
     {
       "ID": 16,
@@ -174,7 +189,8 @@
       ],
       "LevelupItemNum": [
         1700
-      ]
+      ],
+      "PlayerLevelLimit": 80
     },
     {
       "ID": 17,
@@ -185,7 +201,8 @@
       ],
       "LevelupItemNum": [
         1800
-      ]
+      ],
+      "PlayerLevelLimit": 85
     },
     {
       "ID": 18,
@@ -196,7 +213,8 @@
       ],
       "LevelupItemNum": [
         1900
-      ]
+      ],
+      "PlayerLevelLimit": 90
     },
     {
       "ID": 19,
@@ -207,7 +225,8 @@
       ],
       "LevelupItemNum": [
         2000
-      ]
+      ],
+      "PlayerLevelLimit": 95
     },
     {
       "ID": 20,
@@ -218,7 +237,8 @@
       ],
       "LevelupItemNum": [
         2100
-      ]
+      ],
+      "PlayerLevelLimit": 100
     },
     {
       "ID": 21,
@@ -229,7 +249,8 @@
       ],
       "LevelupItemNum": [
         2200
-      ]
+      ],
+      "PlayerLevelLimit": 105
     },
     {
       "ID": 22,
@@ -240,7 +261,8 @@
       ],
       "LevelupItemNum": [
         2300
-      ]
+      ],
+      "PlayerLevelLimit": 110
     },
     {
       "ID": 23,
@@ -251,7 +273,8 @@
       ],
       "LevelupItemNum": [
         2400
-      ]
+      ],
+      "PlayerLevelLimit": 115
     },
     {
       "ID": 24,
@@ -262,7 +285,8 @@
       ],
       "LevelupItemNum": [
         2500
-      ]
+      ],
+      "PlayerLevelLimit": 120
     },
     {
       "ID": 25,
@@ -273,7 +297,8 @@
       ],
       "LevelupItemNum": [
         2600
-      ]
+      ],
+      "PlayerLevelLimit": 125
     },
     {
       "ID": 26,
@@ -284,7 +309,8 @@
       ],
       "LevelupItemNum": [
         2700
-      ]
+      ],
+      "PlayerLevelLimit": 130
     },
     {
       "ID": 27,
@@ -295,7 +321,8 @@
       ],
       "LevelupItemNum": [
         2800
-      ]
+      ],
+      "PlayerLevelLimit": 135
     },
     {
       "ID": 28,
@@ -306,7 +333,8 @@
       ],
       "LevelupItemNum": [
         2900
-      ]
+      ],
+      "PlayerLevelLimit": 140
     },
     {
       "ID": 29,
@@ -317,7 +345,8 @@
       ],
       "LevelupItemNum": [
         3000
-      ]
+      ],
+      "PlayerLevelLimit": 145
     },
     {
       "ID": 30,
@@ -328,7 +357,8 @@
       ],
       "LevelupItemNum": [
         3100
-      ]
+      ],
+      "PlayerLevelLimit": 150
     },
     {
       "ID": 31,
@@ -339,7 +369,8 @@
       ],
       "LevelupItemNum": [
         3200
-      ]
+      ],
+      "PlayerLevelLimit": 155
     },
     {
       "ID": 32,
@@ -350,7 +381,8 @@
       ],
       "LevelupItemNum": [
         3300
-      ]
+      ],
+      "PlayerLevelLimit": 160
     },
     {
       "ID": 33,
@@ -361,7 +393,8 @@
       ],
       "LevelupItemNum": [
         3400
-      ]
+      ],
+      "PlayerLevelLimit": 165
     },
     {
       "ID": 34,
@@ -372,7 +405,8 @@
       ],
       "LevelupItemNum": [
         3500
-      ]
+      ],
+      "PlayerLevelLimit": 170
     },
     {
       "ID": 35,
@@ -383,7 +417,8 @@
       ],
       "LevelupItemNum": [
         3600
-      ]
+      ],
+      "PlayerLevelLimit": 175
     },
     {
       "ID": 36,
@@ -394,7 +429,8 @@
       ],
       "LevelupItemNum": [
         3700
-      ]
+      ],
+      "PlayerLevelLimit": 180
     },
     {
       "ID": 37,
@@ -405,7 +441,8 @@
       ],
       "LevelupItemNum": [
         3800
-      ]
+      ],
+      "PlayerLevelLimit": 185
     },
     {
       "ID": 38,
@@ -416,7 +453,8 @@
       ],
       "LevelupItemNum": [
         3900
-      ]
+      ],
+      "PlayerLevelLimit": 190
     },
     {
       "ID": 39,
@@ -427,7 +465,8 @@
       ],
       "LevelupItemNum": [
         4000
-      ]
+      ],
+      "PlayerLevelLimit": 195
     },
     {
       "ID": 40,
@@ -438,7 +477,8 @@
       ],
       "LevelupItemNum": [
         4100
-      ]
+      ],
+      "PlayerLevelLimit": 200
     },
     {
       "ID": 41,
@@ -449,7 +489,8 @@
       ],
       "LevelupItemNum": [
         4200
-      ]
+      ],
+      "PlayerLevelLimit": 205
     },
     {
       "ID": 42,
@@ -460,7 +501,8 @@
       ],
       "LevelupItemNum": [
         4300
-      ]
+      ],
+      "PlayerLevelLimit": 210
     },
     {
       "ID": 43,
@@ -471,7 +513,8 @@
       ],
       "LevelupItemNum": [
         4400
-      ]
+      ],
+      "PlayerLevelLimit": 215
     },
     {
       "ID": 44,
@@ -482,7 +525,8 @@
       ],
       "LevelupItemNum": [
         4500
-      ]
+      ],
+      "PlayerLevelLimit": 220
     },
     {
       "ID": 45,
@@ -493,7 +537,8 @@
       ],
       "LevelupItemNum": [
         4600
-      ]
+      ],
+      "PlayerLevelLimit": 225
     },
     {
       "ID": 46,
@@ -504,7 +549,8 @@
       ],
       "LevelupItemNum": [
         4700
-      ]
+      ],
+      "PlayerLevelLimit": 230
     },
     {
       "ID": 47,
@@ -515,7 +561,8 @@
       ],
       "LevelupItemNum": [
         4800
-      ]
+      ],
+      "PlayerLevelLimit": 235
     },
     {
       "ID": 48,
@@ -526,7 +573,8 @@
       ],
       "LevelupItemNum": [
         4900
-      ]
+      ],
+      "PlayerLevelLimit": 240
     },
     {
       "ID": 49,
@@ -537,7 +585,8 @@
       ],
       "LevelupItemNum": [
         5000
-      ]
+      ],
+      "PlayerLevelLimit": 245
     },
     {
       "ID": 50,
@@ -548,7 +597,8 @@
       ],
       "LevelupItemNum": [
         5100
-      ]
+      ],
+      "PlayerLevelLimit": 250
     },
     {
       "ID": 51,
@@ -559,7 +609,8 @@
       ],
       "LevelupItemNum": [
         5200
-      ]
+      ],
+      "PlayerLevelLimit": 255
     },
     {
       "ID": 52,
@@ -570,7 +621,8 @@
       ],
       "LevelupItemNum": [
         5300
-      ]
+      ],
+      "PlayerLevelLimit": 260
     },
     {
       "ID": 53,
@@ -581,7 +633,8 @@
       ],
       "LevelupItemNum": [
         5400
-      ]
+      ],
+      "PlayerLevelLimit": 265
     },
     {
       "ID": 54,
@@ -592,7 +645,8 @@
       ],
       "LevelupItemNum": [
         5500
-      ]
+      ],
+      "PlayerLevelLimit": 270
     },
     {
       "ID": 55,
@@ -603,7 +657,8 @@
       ],
       "LevelupItemNum": [
         5600
-      ]
+      ],
+      "PlayerLevelLimit": 275
     },
     {
       "ID": 56,
@@ -614,7 +669,8 @@
       ],
       "LevelupItemNum": [
         5700
-      ]
+      ],
+      "PlayerLevelLimit": 280
     },
     {
       "ID": 57,
@@ -625,7 +681,8 @@
       ],
       "LevelupItemNum": [
         5800
-      ]
+      ],
+      "PlayerLevelLimit": 285
     },
     {
       "ID": 58,
@@ -636,7 +693,8 @@
       ],
       "LevelupItemNum": [
         5900
-      ]
+      ],
+      "PlayerLevelLimit": 290
     },
     {
       "ID": 59,
@@ -647,12 +705,14 @@
       ],
       "LevelupItemNum": [
         6000
-      ]
+      ],
+      "PlayerLevelLimit": 295
     },
     {
       "ID": 60,
       "MainPower": 1280,
-      "SkillPower1": 690.0
+      "SkillPower1": 690.0,
+      "PlayerLevelLimit": 300
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -44,6 +44,12 @@ public int[] LevelupItem;
 public int[] LevelupItemNum;
 
 
+		/// <summary>
+		///升级所需境界
+		/// </summary>
+public int PlayerLevelLimit;
+
+
 	}
 
 }