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

Assets/Res/Config/FabaoConfig.json

@@ -7,7 +7,6 @@
       "Type": 1,
       "magicAttribute": 1,
       "model": "fb_ding1",
-      "cd": 5.0,
       "fragmentID": 11001,
       "ShuxingIDs": [
         1
@@ -24,7 +23,6 @@
       "Type": 1,
       "magicAttribute": 1,
       "model": "fb_xuanguidun",
-      "cd": 5.0,
       "fragmentID": 11002,
       "ShuxingIDs": [
         2
@@ -41,7 +39,6 @@
       "Type": 1,
       "magicAttribute": 2,
       "model": "fb_feicuihulu",
-      "cd": 5.0,
       "fragmentID": 11003,
       "ShuxingIDs": [
         3
@@ -58,7 +55,6 @@
       "Type": 1,
       "magicAttribute": 2,
       "model": "fb_3202",
-      "cd": 5.0,
       "fragmentID": 11004,
       "ShuxingIDs": [
         1
@@ -75,7 +71,6 @@
       "Type": 1,
       "magicAttribute": 2,
       "model": "fb_linglongta",
-      "cd": 5.0,
       "fragmentID": 11005,
       "ShuxingIDs": [
         2
@@ -92,7 +87,6 @@
       "Type": 1,
       "magicAttribute": 4,
       "model": "fb_BossPing",
-      "cd": 5.0,
       "fragmentID": 11006,
       "ShuxingIDs": [
         3
@@ -109,7 +103,6 @@
       "Type": 1,
       "magicAttribute": 4,
       "model": "fb_3302",
-      "cd": 5.0,
       "fragmentID": 11007,
       "ShuxingIDs": [
         1
@@ -126,7 +119,6 @@
       "Type": 1,
       "magicAttribute": 8,
       "model": "fb_3401",
-      "cd": 5.0,
       "fragmentID": 11008,
       "ShuxingIDs": [
         2
@@ -143,7 +135,6 @@
       "Type": 1,
       "magicAttribute": 8,
       "model": "fb_BossPing",
-      "cd": 5.0,
       "fragmentID": 11009,
       "ShuxingIDs": [
         1
@@ -160,7 +151,6 @@
       "Type": 1,
       "magicAttribute": 16,
       "model": "fb_xuanguidun",
-      "cd": 5.0,
       "fragmentID": 11010,
       "ShuxingIDs": [
         3
@@ -177,7 +167,6 @@
       "Type": 1,
       "magicAttribute": 16,
       "model": "fb_ding1",
-      "cd": 5.0,
       "fragmentID": 11011,
       "ShuxingIDs": [
         1

Assets/Res/Config/HeroModelConfig.json

@@ -7,11 +7,7 @@
       "headicon": "icon_tx101",
       "model": "Nanzhu",
       "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 3,
       "heroType": 1,
-      "profession": 1,
-      "itemID": 1004,
       "hp": 100,
       "attack": 100,
       "def": 50,
@@ -36,12 +32,30 @@
         -1,
         -1
       ],
+      "skillActiveLv": [
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1
+      ],
       "fa_bao_id": [
         -1,
         -1,
         -1,
         -1
       ],
+      "fabaoActiveLv": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
       "heroStory": null
     },
     {
@@ -51,11 +65,7 @@
       "headicon": "icon_tx9101",
       "model": "Guixiu01",
       "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 3,
       "heroType": 1,
-      "profession": 1,
-      "itemID": 1004,
       "hp": 100,
       "attack": 60,
       "def": 50,
@@ -70,21 +80,39 @@
       ],
       "skillID": [
         1201,
-        2001,
+        2004,
         1301,
         2004,
         1401,
-        -1,
+        2006,
         -1,
         -1,
         1101,
-        2007
+        2001
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
+        1,
+        10
       ],
       "fa_bao_id": [
         10001,
-        -1,
-        10010,
-        -1
+        10003,
+        10006,
+        10010
+      ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
       ],
       "heroStory": null
     },
@@ -95,11 +123,7 @@
       "headicon": "icon_tx9102",
       "model": "Nanzhu",
       "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 3,
       "heroType": 1,
-      "profession": 1,
-      "itemID": 1004,
       "hp": 100,
       "attack": 60,
       "def": 50,
@@ -114,21 +138,39 @@
       ],
       "skillID": [
         1202,
-        2002,
+        2005,
         1301,
         2005,
         1402,
-        -1,
+        2007,
         -1,
         -1,
         1102,
-        2008
+        2002
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
+        1,
+        10
       ],
       "fa_bao_id": [
         10003,
-        -1,
-        10001,
-        -1
+        10006,
+        10010,
+        10001
+      ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
       ],
       "heroStory": null
     },
@@ -139,11 +181,7 @@
       "headicon": "icon_tx9103",
       "model": "Guixiu01",
       "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 3,
       "heroType": 1,
-      "profession": 1,
-      "itemID": 1004,
       "hp": 100,
       "attack": 60,
       "def": 50,
@@ -158,21 +196,39 @@
       ],
       "skillID": [
         1201,
-        2003,
+        2006,
         1301,
         2006,
         1403,
-        -1,
+        2008,
         -1,
         -1,
         1103,
-        2001
+        2003
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
+        1,
+        10
       ],
       "fa_bao_id": [
         10006,
-        -1,
-        10003,
-        -1
+        10010,
+        10001,
+        10003
+      ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
       ],
       "heroStory": null
     },
@@ -183,11 +239,7 @@
       "headicon": "icon_tx9201",
       "model": "Boss01",
       "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 3,
       "heroType": 4,
-      "profession": 1,
-      "itemID": 1004,
       "hp": 200,
       "attack": 100,
       "def": 50,
@@ -212,11 +264,29 @@
         9001,
         9002
       ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
       "fa_bao_id": [
         10001,
-        10003,
+        -1,
         10006,
-        10010
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
       ],
       "heroStory": null
     }

Assets/Scripts/GameData/ExcelConfig/FabaoConfig.cs

@@ -50,12 +50,6 @@ public int magicAttribute;
 public string model;
 
 
-		/// <summary>
-		///cd时间
-		/// </summary>
-public float cd;
-
-
 		/// <summary>
 		///法宝对应碎片道具ID
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -50,36 +50,12 @@ public string model;
 public bool isUseGpu;
 
 
-		/// <summary>
-		///星级
-		/// </summary>
-public int starGrade;
-
-
-		/// <summary>
-		///稀有度 1.精英r  2.史诗 sr  3.传说 ssr
-		/// </summary>
-public int rarity;
-
-
 		/// <summary>
 		///1. 英雄 2. 小怪 3. 精英 4. BOSS
 		/// </summary>
 public int heroType;
 
 
-		/// <summary>
-		///职业 1.战士 2.法师 3.牧师 4.游侠
-		/// </summary>
-public int profession;
-
-
-		/// <summary>
-		///对应的itemID
-		/// </summary>
-public int itemID;
-
-
 		/// <summary>
 		///生命值
 		/// </summary>
@@ -117,17 +93,29 @@ public int[] Linggen;
 
 
 		/// <summary>
-		///功法序列 主动≤4 主动+被动≤10
+		///功法序列 主动≤4 被动≤3
 		/// </summary>
 public int[] skillID;
 
 
+		/// <summary>
+		///功法最低出现等级
+		/// </summary>
+public int[] skillActiveLv;
+
+
 		/// <summary>
 		///角色自带的法宝（最多4个）
 		/// </summary>
 public int[] fa_bao_id;
 
 
+		/// <summary>
+		///法宝最低出现等级
+		/// </summary>
+public int[] fabaoActiveLv;
+
+
 		/// <summary>
 		///英雄故事文本
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -152,6 +152,24 @@ public int AutoXiuwei;
 public int FailureExpReduce;
 
 
+		/// <summary>
+		///主动功法可配置上限
+		/// </summary>
+public int MaxActiveGongfaNum;
+
+
+		/// <summary>
+		///被动功法可配置上限
+		/// </summary>
+public int MaxPassiveGongfaNum;
+
+
+		/// <summary>
+		///法宝可配置上限
+		/// </summary>
+public int MaxFabaoNum;
+
+
 	}
 
 }