邹舸 1 day ago
parent
commit
d4eb1614b3

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


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

@@ -21,6 +21,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -44,6 +45,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -67,6 +69,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -90,6 +93,384 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
+      "sort": null
+    },
+    {
+      "ID": 1201,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1201",
+      "itemTag": 3,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        100,
+        10
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1202,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1202",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        100,
+        20
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1203,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1203",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        100,
+        30
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1204,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1204",
+      "itemTag": 3,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        101,
+        200,
+        10
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1205,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1205",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        101,
+        200,
+        20
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1206,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1206",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        101,
+        200,
+        30
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1207,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1207",
+      "itemTag": 3,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        201,
+        300,
+        10
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1208,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1208",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        201,
+        300,
+        20
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1209,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1209",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        201,
+        300,
+        30
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1301,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1301",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1302,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1302",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1303,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1303",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        20
+      ],
+      "sort": null
+    },
+    {
+      "ID": 1304,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1304",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        30
+      ],
       "sort": null
     },
     {
@@ -113,6 +494,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -136,6 +518,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -159,6 +542,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -182,6 +566,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -205,6 +590,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -228,6 +614,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -251,6 +638,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -274,6 +662,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -297,6 +686,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -320,6 +710,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -343,6 +734,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -366,6 +758,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -389,6 +782,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -412,6 +806,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -435,6 +830,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     },
     {
@@ -458,6 +854,7 @@
         0
       ],
       "stack_1": 0,
+      "associateID": null,
       "sort": null
     }
   ]

+ 191 - 2
Assets/Res/Config/SkillConfig.json

@@ -3081,13 +3081,13 @@
       ]
     },
     {
-      "ID": 9010041,
+      "ID": 9010040,
       "power": 100.0,
       "name": null,
       "dec": null,
       "attribute": 1,
       "icon": "icon_skill_10003",
-      "scriptName": "FS901004",
+      "scriptName": "S901004",
       "IDGroup": 901004,
       "timelineName": "",
       "cd": 1,
@@ -3101,6 +3101,195 @@
         2
       ]
     },
+    {
+      "ID": 9010041,
+      "power": 110.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 2,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 9010042,
+      "power": 120.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 3,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 9010043,
+      "power": 130.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 4,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 9010044,
+      "power": 140.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 5,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 9010045,
+      "power": 150.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 6,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 9010046,
+      "power": 160.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 7,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 9010047,
+      "power": 170.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 8,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 9010048,
+      "power": 180.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 9,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 9010049,
+      "power": 190.0,
+      "name": null,
+      "dec": null,
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "S901004",
+      "IDGroup": 901004,
+      "timelineName": "",
+      "cd": 1,
+      "SkillType": 3,
+      "level": 10,
+      "effectValue": [
+        1.0,
+        9.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
     {
       "ID": 9010051,
       "power": 100.0,

+ 6 - 24
Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -26,24 +26,6 @@ public int ID;
 public int HeroLevel;
 
 
-		/// <summary>
-		///大境界ID
-		/// </summary>
-public int jingjie1;
-
-
-		/// <summary>
-		///中境界ID
-		/// </summary>
-public int jingjie2;
-
-
-		/// <summary>
-		///小境界ID
-		/// </summary>
-public int jingjie3;
-
-
 		/// <summary>
 		///升级所需修为值 (-1代表最大等级)
 		/// </summary>
@@ -56,6 +38,12 @@ public int levelUpExp;
 public int DujieLevelbattleID;
 
 
+		/// <summary>
+		///战斗增加渡劫几率
+		/// </summary>
+public int DujieRateviaBattle;
+
+
 		/// <summary>
 		///渡劫必需道具ID
 		/// </summary>
@@ -80,12 +68,6 @@ public int[] DujieItemIDs;
 public int[] DujieItemValues;
 
 
-		/// <summary>
-		///渡劫选有道具增加概率
-		/// </summary>
-public float[] DujieItemRates;
-
-
 		/// <summary>
 		///雷劫伤害 要填下限和上限
 		/// </summary>

+ 13 - 1
Assets/Scripts/GameData/ExcelConfig/ItemConfig.cs

@@ -45,7 +45,7 @@ public int itemTag;
 
 
 		/// <summary>
-		///品质 1.[物品]白 2.[物品]绿 3.[物品]蓝 4.[物品]紫 5.[物品]橙 6.[英雄碎片]铜 7.[英雄碎片]银 8.[英雄碎片]金 9.[私物]绿 10.[私物]紫 11.[私物]橙 12.[皮肤]银 13.[皮肤]金 14.[物品]红 99.SSS
+		///品质 1.[物品]白 2.[物品]绿 3.[物品]蓝 4.[物品]紫 5.[物品]橙 6.[物品]红
 		/// </summary>
 public int quality;
 
@@ -116,6 +116,18 @@ public int[] rewardsItemNums;
 public int stack_1;
 
 
+		/// <summary>
+		///特殊功能ID 详情见说明页
+		/// </summary>
+public int associateID;
+
+
+		/// <summary>
+		///特殊功能参数 详情见说明页
+		/// </summary>
+public int[] associateVlaue;
+
+
 		/// <summary>
 		///背包内排序
 		/// </summary>

BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/skill.xlsx


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