1

Assets/Res/Config/ItemConfig.json

@@ -100,6 +100,31 @@
       "sort": null,
       "itemDesc_1": null
     },
+    {
+      "ID": 1005,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "icon_item_1005",
+      "itemTag": 1,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
     {
       "ID": 1201,
       "itemName": 250,

Assets/Res/Config/LanguageChineseConfig.json

@@ -2886,15 +2886,15 @@
     },
     {
       "ID": 722,
-      "txt": "0"
+      "txt": "最终生命+{0}%"
     },
     {
       "ID": 723,
-      "txt": "0"
+      "txt": "最终攻击+{0}%"
     },
     {
       "ID": 724,
-      "txt": "0"
+      "txt": "最终防御+{0}%"
     },
     {
       "ID": 725,

Assets/Res/Config/SkillConstant.json

@@ -0,0 +1,44 @@
+{
+  "configList": [
+    {
+      "SkilltoPieceNum": 1,
+      "SkillPromoteNeedPieceNum": 4
+    },
+    {
+      "SkilltoPieceNum": 5,
+      "SkillPromoteNeedPieceNum": 15
+    },
+    {
+      "SkilltoPieceNum": 20,
+      "SkillPromoteNeedPieceNum": 80
+    },
+    {
+      "SkilltoPieceNum": 100,
+      "SkillPromoteNeedPieceNum": 100
+    },
+    {
+      "SkilltoPieceNum": 200,
+      "SkillPromoteNeedPieceNum": 100
+    },
+    {
+      "SkilltoPieceNum": 300,
+      "SkillPromoteNeedPieceNum": 200
+    },
+    {
+      "SkilltoPieceNum": 500,
+      "SkillPromoteNeedPieceNum": 200
+    },
+    {
+      "SkilltoPieceNum": 700,
+      "SkillPromoteNeedPieceNum": 300
+    },
+    {
+      "SkilltoPieceNum": 1000,
+      "SkillPromoteNeedPieceNum": 300
+    },
+    {
+      "SkilltoPieceNum": 1300,
+      "SkillPromoteNeedPieceNum": null
+    }
+  ]
+}

Assets/Res/Config/SkillPowerupConfig.json

@@ -3,297 +3,651 @@
     {
       "ID": 1,
       "MainPower": 100,
-      "SkillPower1": 100.0
+      "SkillPower1": 100.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        200
+      ]
     },
     {
       "ID": 2,
       "MainPower": 120,
-      "SkillPower1": 110.0
+      "SkillPower1": 110.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        300
+      ]
     },
     {
       "ID": 3,
       "MainPower": 140,
-      "SkillPower1": 120.0
+      "SkillPower1": 120.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        400
+      ]
     },
     {
       "ID": 4,
       "MainPower": 160,
-      "SkillPower1": 130.0
+      "SkillPower1": 130.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        500
+      ]
     },
     {
       "ID": 5,
       "MainPower": 180,
-      "SkillPower1": 140.0
+      "SkillPower1": 140.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        600
+      ]
     },
     {
       "ID": 6,
       "MainPower": 200,
-      "SkillPower1": 150.0
+      "SkillPower1": 150.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        700
+      ]
     },
     {
       "ID": 7,
       "MainPower": 220,
-      "SkillPower1": 160.0
+      "SkillPower1": 160.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        800
+      ]
     },
     {
       "ID": 8,
       "MainPower": 240,
-      "SkillPower1": 170.0
+      "SkillPower1": 170.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        900
+      ]
     },
     {
       "ID": 9,
       "MainPower": 260,
-      "SkillPower1": 180.0
+      "SkillPower1": 180.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1000
+      ]
     },
     {
       "ID": 10,
       "MainPower": 280,
-      "SkillPower1": 190.0
+      "SkillPower1": 190.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1100
+      ]
     },
     {
       "ID": 11,
       "MainPower": 300,
-      "SkillPower1": 200.0
+      "SkillPower1": 200.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1200
+      ]
     },
     {
       "ID": 12,
       "MainPower": 320,
-      "SkillPower1": 210.0
+      "SkillPower1": 210.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1300
+      ]
     },
     {
       "ID": 13,
       "MainPower": 340,
-      "SkillPower1": 220.0
+      "SkillPower1": 220.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1400
+      ]
     },
     {
       "ID": 14,
       "MainPower": 360,
-      "SkillPower1": 230.0
+      "SkillPower1": 230.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1500
+      ]
     },
     {
       "ID": 15,
       "MainPower": 380,
-      "SkillPower1": 240.0
+      "SkillPower1": 240.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1600
+      ]
     },
     {
       "ID": 16,
       "MainPower": 400,
-      "SkillPower1": 250.0
+      "SkillPower1": 250.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1700
+      ]
     },
     {
       "ID": 17,
       "MainPower": 420,
-      "SkillPower1": 260.0
+      "SkillPower1": 260.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1800
+      ]
     },
     {
       "ID": 18,
       "MainPower": 440,
-      "SkillPower1": 270.0
+      "SkillPower1": 270.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1900
+      ]
     },
     {
       "ID": 19,
       "MainPower": 460,
-      "SkillPower1": 280.0
+      "SkillPower1": 280.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2000
+      ]
     },
     {
       "ID": 20,
       "MainPower": 480,
-      "SkillPower1": 290.0
+      "SkillPower1": 290.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2100
+      ]
     },
     {
       "ID": 21,
       "MainPower": 500,
-      "SkillPower1": 300.0
+      "SkillPower1": 300.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2200
+      ]
     },
     {
       "ID": 22,
       "MainPower": 520,
-      "SkillPower1": 310.0
+      "SkillPower1": 310.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2300
+      ]
     },
     {
       "ID": 23,
       "MainPower": 540,
-      "SkillPower1": 320.0
+      "SkillPower1": 320.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2400
+      ]
     },
     {
       "ID": 24,
       "MainPower": 560,
-      "SkillPower1": 330.0
+      "SkillPower1": 330.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2500
+      ]
     },
     {
       "ID": 25,
       "MainPower": 580,
-      "SkillPower1": 340.0
+      "SkillPower1": 340.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2600
+      ]
     },
     {
       "ID": 26,
       "MainPower": 600,
-      "SkillPower1": 350.0
+      "SkillPower1": 350.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2700
+      ]
     },
     {
       "ID": 27,
       "MainPower": 620,
-      "SkillPower1": 360.0
+      "SkillPower1": 360.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2800
+      ]
     },
     {
       "ID": 28,
       "MainPower": 640,
-      "SkillPower1": 370.0
+      "SkillPower1": 370.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2900
+      ]
     },
     {
       "ID": 29,
       "MainPower": 660,
-      "SkillPower1": 380.0
+      "SkillPower1": 380.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3000
+      ]
     },
     {
       "ID": 30,
       "MainPower": 680,
-      "SkillPower1": 390.0
+      "SkillPower1": 390.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3100
+      ]
     },
     {
       "ID": 31,
       "MainPower": 700,
-      "SkillPower1": 400.0
+      "SkillPower1": 400.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3200
+      ]
     },
     {
       "ID": 32,
       "MainPower": 720,
-      "SkillPower1": 410.0
+      "SkillPower1": 410.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3300
+      ]
     },
     {
       "ID": 33,
       "MainPower": 740,
-      "SkillPower1": 420.0
+      "SkillPower1": 420.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3400
+      ]
     },
     {
       "ID": 34,
       "MainPower": 760,
-      "SkillPower1": 430.0
+      "SkillPower1": 430.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3500
+      ]
     },
     {
       "ID": 35,
       "MainPower": 780,
-      "SkillPower1": 440.0
+      "SkillPower1": 440.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3600
+      ]
     },
     {
       "ID": 36,
       "MainPower": 800,
-      "SkillPower1": 450.0
+      "SkillPower1": 450.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3700
+      ]
     },
     {
       "ID": 37,
       "MainPower": 820,
-      "SkillPower1": 460.0
+      "SkillPower1": 460.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3800
+      ]
     },
     {
       "ID": 38,
       "MainPower": 840,
-      "SkillPower1": 470.0
+      "SkillPower1": 470.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3900
+      ]
     },
     {
       "ID": 39,
       "MainPower": 860,
-      "SkillPower1": 480.0
+      "SkillPower1": 480.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4000
+      ]
     },
     {
       "ID": 40,
       "MainPower": 880,
-      "SkillPower1": 490.0
+      "SkillPower1": 490.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4100
+      ]
     },
     {
       "ID": 41,
       "MainPower": 900,
-      "SkillPower1": 500.0
+      "SkillPower1": 500.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4200
+      ]
     },
     {
       "ID": 42,
       "MainPower": 920,
-      "SkillPower1": 510.0
+      "SkillPower1": 510.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4300
+      ]
     },
     {
       "ID": 43,
       "MainPower": 940,
-      "SkillPower1": 520.0
+      "SkillPower1": 520.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4400
+      ]
     },
     {
       "ID": 44,
       "MainPower": 960,
-      "SkillPower1": 530.0
+      "SkillPower1": 530.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4500
+      ]
     },
     {
       "ID": 45,
       "MainPower": 980,
-      "SkillPower1": 540.0
+      "SkillPower1": 540.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4600
+      ]
     },
     {
       "ID": 46,
       "MainPower": 1000,
-      "SkillPower1": 550.0
+      "SkillPower1": 550.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4700
+      ]
     },
     {
       "ID": 47,
       "MainPower": 1020,
-      "SkillPower1": 560.0
+      "SkillPower1": 560.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4800
+      ]
     },
     {
       "ID": 48,
       "MainPower": 1040,
-      "SkillPower1": 570.0
+      "SkillPower1": 570.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4900
+      ]
     },
     {
       "ID": 49,
       "MainPower": 1060,
-      "SkillPower1": 580.0
+      "SkillPower1": 580.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5000
+      ]
     },
     {
       "ID": 50,
       "MainPower": 1080,
-      "SkillPower1": 590.0
+      "SkillPower1": 590.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5100
+      ]
     },
     {
       "ID": 51,
       "MainPower": 1100,
-      "SkillPower1": 600.0
+      "SkillPower1": 600.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5200
+      ]
     },
     {
       "ID": 52,
       "MainPower": 1120,
-      "SkillPower1": 610.0
+      "SkillPower1": 610.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5300
+      ]
     },
     {
       "ID": 53,
       "MainPower": 1140,
-      "SkillPower1": 620.0
+      "SkillPower1": 620.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5400
+      ]
     },
     {
       "ID": 54,
       "MainPower": 1160,
-      "SkillPower1": 630.0
+      "SkillPower1": 630.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5500
+      ]
     },
     {
       "ID": 55,
       "MainPower": 1180,
-      "SkillPower1": 640.0
+      "SkillPower1": 640.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5600
+      ]
     },
     {
       "ID": 56,
       "MainPower": 1200,
-      "SkillPower1": 650.0
+      "SkillPower1": 650.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5700
+      ]
     },
     {
       "ID": 57,
       "MainPower": 1220,
-      "SkillPower1": 660.0
+      "SkillPower1": 660.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5800
+      ]
     },
     {
       "ID": 58,
       "MainPower": 1240,
-      "SkillPower1": 670.0
+      "SkillPower1": 670.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5900
+      ]
     },
     {
       "ID": 59,
       "MainPower": 1260,
-      "SkillPower1": 680.0
+      "SkillPower1": 680.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        6000
+      ]
     },
     {
       "ID": 60,

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -110,6 +110,18 @@ public int[] addPropertyType;
 public float[] addPropertyValue;
 
 
+		/// <summary>
+		///升星简短描述
+		/// </summary>
+public int PromoteLan;
+
+
+		/// <summary>
+		///升星简短描述参数
+		/// </summary>
+public float[] PromoteLanPara;
+
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -0,0 +1,32 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "SkillConstant.json")]
+	public partial class SkillConstantHolder : ConfigHolder<SkillConstant>
	{
+	}
+
+
+	[Serializable]
+	public struct SkillConstant : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///重复功法自动转碎片的数量
+		/// </summary>
+public int SkilltoPieceNum;
+
+
+		/// <summary>
+		///功法升到对应星级所需碎片数量
+		/// </summary>
+public int SkillPromoteNeedPieceNum;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -32,6 +32,18 @@ public int MainPower;
 public float SkillPower1;
 
 
+		/// <summary>
+		///功法升级所需道具
+		/// </summary>
+public int[] LevelupItem;
+
+
+		/// <summary>
+		///攻击升级所需道具数量
+		/// </summary>
+public int[] LevelupItemNum;
+
+
 	}
 
 }