修改bug

Assets/Res/Config/DaoyouConfig.json

@@ -0,0 +1,304 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "SkillPower1": 100,
+      "SkillPower2": 100.0
+    },
+    {
+      "ID": 2,
+      "SkillPower1": 110,
+      "SkillPower2": 110.0
+    },
+    {
+      "ID": 3,
+      "SkillPower1": 120,
+      "SkillPower2": 120.0
+    },
+    {
+      "ID": 4,
+      "SkillPower1": 130,
+      "SkillPower2": 130.0
+    },
+    {
+      "ID": 5,
+      "SkillPower1": 140,
+      "SkillPower2": 140.0
+    },
+    {
+      "ID": 6,
+      "SkillPower1": 150,
+      "SkillPower2": 150.0
+    },
+    {
+      "ID": 7,
+      "SkillPower1": 160,
+      "SkillPower2": 160.0
+    },
+    {
+      "ID": 8,
+      "SkillPower1": 170,
+      "SkillPower2": 170.0
+    },
+    {
+      "ID": 9,
+      "SkillPower1": 180,
+      "SkillPower2": 180.0
+    },
+    {
+      "ID": 10,
+      "SkillPower1": 190,
+      "SkillPower2": 190.0
+    },
+    {
+      "ID": 11,
+      "SkillPower1": 200,
+      "SkillPower2": 200.0
+    },
+    {
+      "ID": 12,
+      "SkillPower1": 210,
+      "SkillPower2": 210.0
+    },
+    {
+      "ID": 13,
+      "SkillPower1": 220,
+      "SkillPower2": 220.0
+    },
+    {
+      "ID": 14,
+      "SkillPower1": 230,
+      "SkillPower2": 230.0
+    },
+    {
+      "ID": 15,
+      "SkillPower1": 240,
+      "SkillPower2": 240.0
+    },
+    {
+      "ID": 16,
+      "SkillPower1": 250,
+      "SkillPower2": 250.0
+    },
+    {
+      "ID": 17,
+      "SkillPower1": 260,
+      "SkillPower2": 260.0
+    },
+    {
+      "ID": 18,
+      "SkillPower1": 270,
+      "SkillPower2": 270.0
+    },
+    {
+      "ID": 19,
+      "SkillPower1": 280,
+      "SkillPower2": 280.0
+    },
+    {
+      "ID": 20,
+      "SkillPower1": 290,
+      "SkillPower2": 290.0
+    },
+    {
+      "ID": 21,
+      "SkillPower1": 300,
+      "SkillPower2": 300.0
+    },
+    {
+      "ID": 22,
+      "SkillPower1": 310,
+      "SkillPower2": 310.0
+    },
+    {
+      "ID": 23,
+      "SkillPower1": 320,
+      "SkillPower2": 320.0
+    },
+    {
+      "ID": 24,
+      "SkillPower1": 330,
+      "SkillPower2": 330.0
+    },
+    {
+      "ID": 25,
+      "SkillPower1": 340,
+      "SkillPower2": 340.0
+    },
+    {
+      "ID": 26,
+      "SkillPower1": 350,
+      "SkillPower2": 350.0
+    },
+    {
+      "ID": 27,
+      "SkillPower1": 360,
+      "SkillPower2": 360.0
+    },
+    {
+      "ID": 28,
+      "SkillPower1": 370,
+      "SkillPower2": 370.0
+    },
+    {
+      "ID": 29,
+      "SkillPower1": 380,
+      "SkillPower2": 380.0
+    },
+    {
+      "ID": 30,
+      "SkillPower1": 390,
+      "SkillPower2": 390.0
+    },
+    {
+      "ID": 31,
+      "SkillPower1": 400,
+      "SkillPower2": 400.0
+    },
+    {
+      "ID": 32,
+      "SkillPower1": 410,
+      "SkillPower2": 410.0
+    },
+    {
+      "ID": 33,
+      "SkillPower1": 420,
+      "SkillPower2": 420.0
+    },
+    {
+      "ID": 34,
+      "SkillPower1": 430,
+      "SkillPower2": 430.0
+    },
+    {
+      "ID": 35,
+      "SkillPower1": 440,
+      "SkillPower2": 440.0
+    },
+    {
+      "ID": 36,
+      "SkillPower1": 450,
+      "SkillPower2": 450.0
+    },
+    {
+      "ID": 37,
+      "SkillPower1": 460,
+      "SkillPower2": 460.0
+    },
+    {
+      "ID": 38,
+      "SkillPower1": 470,
+      "SkillPower2": 470.0
+    },
+    {
+      "ID": 39,
+      "SkillPower1": 480,
+      "SkillPower2": 480.0
+    },
+    {
+      "ID": 40,
+      "SkillPower1": 490,
+      "SkillPower2": 490.0
+    },
+    {
+      "ID": 41,
+      "SkillPower1": 500,
+      "SkillPower2": 500.0
+    },
+    {
+      "ID": 42,
+      "SkillPower1": 510,
+      "SkillPower2": 510.0
+    },
+    {
+      "ID": 43,
+      "SkillPower1": 520,
+      "SkillPower2": 520.0
+    },
+    {
+      "ID": 44,
+      "SkillPower1": 530,
+      "SkillPower2": 530.0
+    },
+    {
+      "ID": 45,
+      "SkillPower1": 540,
+      "SkillPower2": 540.0
+    },
+    {
+      "ID": 46,
+      "SkillPower1": 550,
+      "SkillPower2": 550.0
+    },
+    {
+      "ID": 47,
+      "SkillPower1": 560,
+      "SkillPower2": 560.0
+    },
+    {
+      "ID": 48,
+      "SkillPower1": 570,
+      "SkillPower2": 570.0
+    },
+    {
+      "ID": 49,
+      "SkillPower1": 580,
+      "SkillPower2": 580.0
+    },
+    {
+      "ID": 50,
+      "SkillPower1": 590,
+      "SkillPower2": 590.0
+    },
+    {
+      "ID": 51,
+      "SkillPower1": 600,
+      "SkillPower2": 600.0
+    },
+    {
+      "ID": 52,
+      "SkillPower1": 610,
+      "SkillPower2": 610.0
+    },
+    {
+      "ID": 53,
+      "SkillPower1": 620,
+      "SkillPower2": 620.0
+    },
+    {
+      "ID": 54,
+      "SkillPower1": 630,
+      "SkillPower2": 630.0
+    },
+    {
+      "ID": 55,
+      "SkillPower1": 640,
+      "SkillPower2": 640.0
+    },
+    {
+      "ID": 56,
+      "SkillPower1": 650,
+      "SkillPower2": 650.0
+    },
+    {
+      "ID": 57,
+      "SkillPower1": 660,
+      "SkillPower2": 660.0
+    },
+    {
+      "ID": 58,
+      "SkillPower1": 670,
+      "SkillPower2": 670.0
+    },
+    {
+      "ID": 59,
+      "SkillPower1": 680,
+      "SkillPower2": 680.0
+    },
+    {
+      "ID": 60,
+      "SkillPower1": 690,
+      "SkillPower2": 690.0
+    }
+  ]
+}

Assets/Res/Config/DaoyouConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Bngc4Xn4W3oiKbVaQvthvCTNWljVTB26ceIQ92Qff5X5RZgzKkagTJRr2lan
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/FabaoPowerupConfig.json

@@ -2,303 +2,283 @@
   "configList": [
     {
       "ID": 1,
-      "SkillPower1": 100,
-      "SkillPower2": 100.0
+      "Power": 10,
+      "HP": 10,
+      "DEF": 10,
+      "MP": 10,
+      "ATK": 10,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 2,
-      "SkillPower1": 110,
-      "SkillPower2": 110.0
+      "Power": 20,
+      "HP": 20,
+      "DEF": 20,
+      "MP": 20,
+      "ATK": 20,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 3,
-      "SkillPower1": 120,
-      "SkillPower2": 120.0
+      "Power": 30,
+      "HP": 30,
+      "DEF": 30,
+      "MP": 30,
+      "ATK": 30,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 4,
-      "SkillPower1": 130,
-      "SkillPower2": 130.0
+      "Power": 40,
+      "HP": 40,
+      "DEF": 40,
+      "MP": 40,
+      "ATK": 40,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 5,
-      "SkillPower1": 140,
-      "SkillPower2": 140.0
+      "Power": 50,
+      "HP": 50,
+      "DEF": 50,
+      "MP": 50,
+      "ATK": 50,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 6,
-      "SkillPower1": 150,
-      "SkillPower2": 150.0
+      "Power": 60,
+      "HP": 60,
+      "DEF": 60,
+      "MP": 60,
+      "ATK": 60,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 7,
-      "SkillPower1": 160,
-      "SkillPower2": 160.0
+      "Power": 70,
+      "HP": 70,
+      "DEF": 70,
+      "MP": 70,
+      "ATK": 70,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 8,
-      "SkillPower1": 170,
-      "SkillPower2": 170.0
+      "Power": 80,
+      "HP": 80,
+      "DEF": 80,
+      "MP": 80,
+      "ATK": 80,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 9,
-      "SkillPower1": 180,
-      "SkillPower2": 180.0
+      "Power": 90,
+      "HP": 90,
+      "DEF": 90,
+      "MP": 90,
+      "ATK": 90,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 10,
-      "SkillPower1": 190,
-      "SkillPower2": 190.0
+      "Power": 100,
+      "HP": 100,
+      "DEF": 100,
+      "MP": 100,
+      "ATK": 100,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 11,
-      "SkillPower1": 200,
-      "SkillPower2": 200.0
+      "Power": 110,
+      "HP": 110,
+      "DEF": 110,
+      "MP": 110,
+      "ATK": 110,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 12,
-      "SkillPower1": 210,
-      "SkillPower2": 210.0
+      "Power": 120,
+      "HP": 120,
+      "DEF": 120,
+      "MP": 120,
+      "ATK": 120,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 13,
-      "SkillPower1": 220,
-      "SkillPower2": 220.0
+      "Power": 130,
+      "HP": 130,
+      "DEF": 130,
+      "MP": 130,
+      "ATK": 130,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 14,
-      "SkillPower1": 230,
-      "SkillPower2": 230.0
+      "Power": 140,
+      "HP": 140,
+      "DEF": 140,
+      "MP": 140,
+      "ATK": 140,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 15,
-      "SkillPower1": 240,
-      "SkillPower2": 240.0
+      "Power": 150,
+      "HP": 150,
+      "DEF": 150,
+      "MP": 150,
+      "ATK": 150,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 16,
-      "SkillPower1": 250,
-      "SkillPower2": 250.0
+      "Power": 160,
+      "HP": 160,
+      "DEF": 160,
+      "MP": 160,
+      "ATK": 160,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 17,
-      "SkillPower1": 260,
-      "SkillPower2": 260.0
+      "Power": 170,
+      "HP": 170,
+      "DEF": 170,
+      "MP": 170,
+      "ATK": 170,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 18,
-      "SkillPower1": 270,
-      "SkillPower2": 270.0
+      "Power": 180,
+      "HP": 180,
+      "DEF": 180,
+      "MP": 180,
+      "ATK": 180,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 19,
-      "SkillPower1": 280,
-      "SkillPower2": 280.0
+      "Power": 190,
+      "HP": 190,
+      "DEF": 190,
+      "MP": 190,
+      "ATK": 190,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     },
     {
       "ID": 20,
-      "SkillPower1": 290,
-      "SkillPower2": 290.0
-    },
-    {
-      "ID": 21,
-      "SkillPower1": 300,
-      "SkillPower2": 300.0
-    },
-    {
-      "ID": 22,
-      "SkillPower1": 310,
-      "SkillPower2": 310.0
-    },
-    {
-      "ID": 23,
-      "SkillPower1": 320,
-      "SkillPower2": 320.0
-    },
-    {
-      "ID": 24,
-      "SkillPower1": 330,
-      "SkillPower2": 330.0
-    },
-    {
-      "ID": 25,
-      "SkillPower1": 340,
-      "SkillPower2": 340.0
-    },
-    {
-      "ID": 26,
-      "SkillPower1": 350,
-      "SkillPower2": 350.0
-    },
-    {
-      "ID": 27,
-      "SkillPower1": 360,
-      "SkillPower2": 360.0
-    },
-    {
-      "ID": 28,
-      "SkillPower1": 370,
-      "SkillPower2": 370.0
-    },
-    {
-      "ID": 29,
-      "SkillPower1": 380,
-      "SkillPower2": 380.0
-    },
-    {
-      "ID": 30,
-      "SkillPower1": 390,
-      "SkillPower2": 390.0
-    },
-    {
-      "ID": 31,
-      "SkillPower1": 400,
-      "SkillPower2": 400.0
-    },
-    {
-      "ID": 32,
-      "SkillPower1": 410,
-      "SkillPower2": 410.0
-    },
-    {
-      "ID": 33,
-      "SkillPower1": 420,
-      "SkillPower2": 420.0
-    },
-    {
-      "ID": 34,
-      "SkillPower1": 430,
-      "SkillPower2": 430.0
-    },
-    {
-      "ID": 35,
-      "SkillPower1": 440,
-      "SkillPower2": 440.0
-    },
-    {
-      "ID": 36,
-      "SkillPower1": 450,
-      "SkillPower2": 450.0
-    },
-    {
-      "ID": 37,
-      "SkillPower1": 460,
-      "SkillPower2": 460.0
-    },
-    {
-      "ID": 38,
-      "SkillPower1": 470,
-      "SkillPower2": 470.0
-    },
-    {
-      "ID": 39,
-      "SkillPower1": 480,
-      "SkillPower2": 480.0
-    },
-    {
-      "ID": 40,
-      "SkillPower1": 490,
-      "SkillPower2": 490.0
-    },
-    {
-      "ID": 41,
-      "SkillPower1": 500,
-      "SkillPower2": 500.0
-    },
-    {
-      "ID": 42,
-      "SkillPower1": 510,
-      "SkillPower2": 510.0
-    },
-    {
-      "ID": 43,
-      "SkillPower1": 520,
-      "SkillPower2": 520.0
-    },
-    {
-      "ID": 44,
-      "SkillPower1": 530,
-      "SkillPower2": 530.0
-    },
-    {
-      "ID": 45,
-      "SkillPower1": 540,
-      "SkillPower2": 540.0
-    },
-    {
-      "ID": 46,
-      "SkillPower1": 550,
-      "SkillPower2": 550.0
-    },
-    {
-      "ID": 47,
-      "SkillPower1": 560,
-      "SkillPower2": 560.0
-    },
-    {
-      "ID": 48,
-      "SkillPower1": 570,
-      "SkillPower2": 570.0
-    },
-    {
-      "ID": 49,
-      "SkillPower1": 580,
-      "SkillPower2": 580.0
-    },
-    {
-      "ID": 50,
-      "SkillPower1": 590,
-      "SkillPower2": 590.0
-    },
-    {
-      "ID": 51,
-      "SkillPower1": 600,
-      "SkillPower2": 600.0
-    },
-    {
-      "ID": 52,
-      "SkillPower1": 610,
-      "SkillPower2": 610.0
-    },
-    {
-      "ID": 53,
-      "SkillPower1": 620,
-      "SkillPower2": 620.0
-    },
-    {
-      "ID": 54,
-      "SkillPower1": 630,
-      "SkillPower2": 630.0
-    },
-    {
-      "ID": 55,
-      "SkillPower1": 640,
-      "SkillPower2": 640.0
-    },
-    {
-      "ID": 56,
-      "SkillPower1": 650,
-      "SkillPower2": 650.0
-    },
-    {
-      "ID": 57,
-      "SkillPower1": 660,
-      "SkillPower2": 660.0
-    },
-    {
-      "ID": 58,
-      "SkillPower1": 670,
-      "SkillPower2": 670.0
-    },
-    {
-      "ID": 59,
-      "SkillPower1": 680,
-      "SkillPower2": 680.0
-    },
-    {
-      "ID": 60,
-      "SkillPower1": 690,
-      "SkillPower2": 690.0
+      "Power": 200,
+      "HP": 200,
+      "DEF": 200,
+      "MP": 200,
+      "ATK": 200,
+      "PoerupItemIDs": [
+        1001
+      ],
+      "PoerupItemCosts": [
+        1
+      ]
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/DaoyouConfig.cs

@@ -0,0 +1,38 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\DaoyouConfig.xlsx. SheetName: DaoyouConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DaoyouConfig.json")]
+	public partial class DaoyouConfigHolder : ConfigHolder<DaoyouConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct DaoyouConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///等级
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///标准强度固定值
+		/// </summary>
+public int SkillPower1;
+
+
+		/// <summary>
+		///标准强度百分比
+		/// </summary>
+public float SkillPower2;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DaoyouConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Cn0WtyKvAH88ynl+fRHg5tm7r9JpM+wzmAqEgvv6sCVMpsEBZ203fMS8cjVt
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/FabaoConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\LevelSupress.xlsx. SheetName: FabaoConfig
+// Generate From Excel\FabaoConfig.xlsx. SheetName: FabaoConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/FabaoPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\DaoyouConfig.xlsx. SheetName: FabaoPowerupConfig
+// Generate From Excel\FabaoConfig.xlsx. SheetName: FabaoPowerupConfig
 
 using System;
 using Fort23.GameData;
@@ -15,21 +15,51 @@ namespace Excel2Json
 	public struct FabaoPowerupConfig : IConfig
	{
 		public int GetID() {return ID;} 
 		/// <summary>
-		///等级
+		///
 		/// </summary>
 public int ID;
 
 
 		/// <summary>
-		///标准强度固定值
+		///法宝的基础强度成长
 		/// </summary>
-public int SkillPower1;
+public int Power;
 
 
 		/// <summary>
-		///标准强度百分比
+		///法宝的生命标准成长
 		/// </summary>
-public float SkillPower2;
+public int HP;
+
+
+		/// <summary>
+		///法宝的防御标准成长
+		/// </summary>
+public int DEF;
+
+
+		/// <summary>
+		///法宝的法力标准成长
+		/// </summary>
+public int MP;
+
+
+		/// <summary>
+		///法宝的攻击标准成长
+		/// </summary>
+public int ATK;
+
+
+		/// <summary>
+		///强化所需道具ID
+		/// </summary>
+public int[] PoerupItemIDs;
+
+
+		/// <summary>
+		///强化所需道具数量
+		/// </summary>
+public int[] PoerupItemCosts;
 
 
 	}

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -41,7 +41,7 @@ namespace GameLogic.Combat.Hero
         {
             if (_combatHeroEntity.IsEnemy)
             {
-                await SetNewSkill(_combatHeroEntity.CurrCombatHeroInfo.unLockSkills);
+                await SetNewSkill(_combatHeroEntity.CurrCombatHeroInfo.unLockSkills.ToArray());
             }
             else
             {
@@ -94,7 +94,7 @@ namespace GameLogic.Combat.Hero
             // CombatEventManager.Instance.Dispatch(CombatEventType.ExercisesAlter, null);
         }
 
-        public override async CTask SetNewSkill(List<SkillInfo> allSkill)
+        public override async CTask SetNewSkill(SkillInfo[]  allSkill)
         {
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
             _skillQueue.Clear();
@@ -102,7 +102,7 @@ namespace GameLogic.Combat.Hero
             int indexCount = 0;
             if (allSkill != null)
             {
-                for (int i = 0; i < allSkill.Count; i++)
+                for (int i = 0; i < allSkill.Length; i++)
                 {
                     SkillInfo skillInfo = allSkill[i];
                     if (skillInfo == null)
@@ -111,7 +111,7 @@ namespace GameLogic.Combat.Hero
                     }
 
                     SkillConfig skillConfig = skillInfo.skillConfig;
-                    SkillBasic skillBasic = AddSkill(skillConfig);
+                    SkillBasic skillBasic = AddSkill(skillInfo);
                     if (skillBasic == null)
                     {
                         continue;
@@ -160,24 +160,7 @@ namespace GameLogic.Combat.Hero
             return _skillQueue[index];
         }
 
-        public void UpdateSkill(List<int> skillIDs)
-        {
-            for (int i = 0; i < skillIDs.Count; i++)
-            {
-                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillIDs[i]);
-                // SkillConfig skillConfig = skillIDs[i];
-                SkillBasic skillBasic = GetSkillBasic(skillConfig.IDGroup);
-                if (skillBasic == null)
-                {
-                    AddSkill(skillConfig);
-                }
-                else
-                {
-                    skillBasic.InitSkillConfig(skillConfig);
-                    skillBasic.InitSkill(_combatHeroEntity);
-                }
-            }
-        }
+       
 
 
         public void AddCommandSkill(SkillBasic skill)

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControlBasic.cs

@@ -54,19 +54,19 @@ namespace GameLogic.Combat.Hero
             return null;
         }
 
-        public virtual async CTask SetNewSkill(List<SkillInfo> allSkill)
+        public virtual async CTask SetNewSkill(SkillInfo[] allSkill)
         {
             
         }
 
-        public SkillBasic AddSkill(SkillConfig skillConfig)
+        public SkillBasic AddSkill(SkillInfo skillInfo)
         {
-            if (string.IsNullOrEmpty(skillConfig.scriptName))
+            if (string.IsNullOrEmpty(skillInfo.skillConfig.scriptName))
             {
                 return null;
             }
 
-            SkillBasic skillBasic = SkillScriptManager.Instance.CreateSkillBasic(skillConfig);
+            SkillBasic skillBasic = SkillScriptManager.Instance.CreateSkillBasic(skillInfo.skillConfig);
             if (skillBasic == null)
             {
                 return null;

Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -7,6 +7,7 @@ using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero.State;
 using GameLogic.Combat.Skill;
+using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine.AI;
 
@@ -116,8 +117,9 @@ namespace GameLogic.Combat.Hero
                 for (int i = 0; i < magicWeaponConfig.skillID.Length; i++)
                 {
                     int id = magicWeaponConfig.skillID[i] * 10 + 1;
-                    SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(id);
-                    CombatHeroSkillControl.AddSkill(skillConfig);
+                    // SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(id);
+                    SkillInfo skillInfo=new SkillInfo(id, 1);
+                    CombatHeroSkillControl.AddSkill(skillInfo);
                 }
             }
 

Assets/Scripts/GameLogic/Hero/HeroController.cs

@@ -329,168 +329,6 @@ namespace GameLogic.Hero
         }
         
         
-         /// <summary>
-        /// onlyUnLock=true， 获取已解锁的最高等级的技能
-        /// onlyUnLock=false，获取已解锁的最高等级的技能，若都没有解锁，则获取未解锁的1级技能
-        /// </summary>
-        /// <param name="groupID">技能组</param>
-        /// <param name="level">英雄等级</param>
-        /// <param name="star">英雄星级</param>
-        /// <param name="onlyUnLock">ture=只返回解锁的</param>
-        /// <returns></returns>
-        // public SkillConfig GetHighestLevelOr1(int groupID, int level, int star, bool onlyUnLock = false,bool isMonster=false)
-        // {
-        //     SkillConfig skillConfig = new SkillConfig();
-        //     
-        //     int lv = 0;
-        //     for(int i = 0; i <  PlayerManager.Instance.groupSkillDic[groupID].Count; i++)
-        //     {
-        //         SkillConfig config = PlayerManager.Instance.groupSkillDic[groupID][i];
-        //
-        //         if (i == 0 && !onlyUnLock)
-        //         {
-        //             skillConfig = config;
-        //         }
-        //         
-        //         // if (config.isUnLock && config.skillConfig.level > lv)
-        //         if(IsUnLockSkill(level, star, config.ID,isMonster) && config.level > lv)
-        //         {
-        //             lv = config.level;
-        //             skillConfig = config;
-        //         }
-        //     }
-        //     return skillConfig;
-        // }
-        //
-        /// <summary>
-        /// 技能是否解锁
-        /// </summary>
-        /// <param name="level">英雄等级</param>
-        /// <param name="star">英雄星级</param>
-        /// <param name="skillID">技能id</param>
-        /// <returns></returns>
-        public bool IsUnLockSkill(int level, int star, int skillID,bool isMonster=false)
-        {
-            bool isUnLock = false;
-            if (skillID == GlobalParam.Normal_Attack_Skill_Group_ID)
-            {
-                isUnLock = true;
-            }
-            else
-            {
-                //整体可能有点绕，后面再看优化不
-                
-                //取技能ID的后两位，后两位是技能解锁表SkillUpConfig的ID, 取这个ID来判断，这个技能技能的解锁情况
-                int skillUpID = skillID % 100;
-                SkillUpConfig upConfig = ConfigComponent.Instance.Get<SkillUpConfig>(skillUpID);
-
-                //取个位
-                int gw = skillUpID % 10;
-                
-                int skillUpIDLevel1 = -1;
-                //当个位>1时(表示技能等级>1)，需要额外判断一下，技能的1级是否已经解锁（可能1级是星级解锁）
-                //避免出现，技能是5星解锁解锁1级，200级解锁2级，但玩家现在4星，201级，就不该解锁2级，因为星级不够
-                if (gw > 1)
-                {
-                    //技能1级的解锁ID，例如： 33 - 3 + 1 = 31, 31就是技能1级的解锁条件id
-                    skillUpIDLevel1 = skillUpID - gw + 1;
-                }
-                
-                //等级解锁
-                if (upConfig.upType == 1)
-                {
-                    SkillUpConfig skillUpConfigLevel1 = new SkillUpConfig();
-                    //准备判断，该技能1级时，是否为星级解锁
-                    if (skillUpIDLevel1 > 0)
-                    {
-                        skillUpConfigLevel1 = ConfigComponent.Instance.Get<SkillUpConfig>(skillUpIDLevel1);
-                    }
-
-                    //如果技能的第一级需要星级解锁，需额外判断一下星级是否达到
-                    bool isStarEnough = skillUpConfigLevel1.upType != 2 || star > skillUpConfigLevel1.upValue;
-                    
-
-                    if (level >= upConfig.upValue && isStarEnough)
-                    {
-                        isUnLock = true;
-                    }
-                }
-                //星级解锁
-                else if (upConfig.upType == 2)
-                {
-                    if (star >= upConfig.upValue||isMonster)
-                    {
-                        isUnLock = true;
-                    }
-                }
-            }
-
-            return isUnLock;
-        }
-
-
-        public SkillUpConfig GetSkillUpConfig(int skillID)
-        {
-            //取技能ID的后两位，后两位是技能解锁表SkillUpConfig的ID, 取这个ID来判断，这个技能技能的解锁情况
-            int skillUpID = skillID % 100;
-            SkillUpConfig upConfig = ConfigComponent.Instance.Get<SkillUpConfig>(skillUpID);
-            return upConfig;
-        }
-
-        /// <summary>
-        /// 根据【等级】查找是否有技能
-        /// </summary>
-        /// <param name="level">英雄等级</param>
-        /// <returns></returns>
-        // public SkillUpConfig GetSkillUpConfig4Lv(int level)
-        // {
-        //     SkillUpConfig upConfig = new SkillUpConfig();
-        //     foreach (SkillUpConfig skillUpConfig in PlayerManager.Instance.skillUpConfigs)
-        //     {
-        //         if (skillUpConfig.upType == 1 && level == skillUpConfig.upValue)
-        //         {
-        //             return skillUpConfig;
-        //         }
-        //     }
-        //     return upConfig;
-        // }
-        
-        
-        /// <summary>
-        /// 根据【星级】查找是否有技能
-        /// </summary>
-        /// <param name="level">英雄等级</param>
-        /// <returns></returns>
-        // public SkillUpConfig GetSkillUpConfig4Star(int star)
-        // {
-        //     SkillUpConfig upConfig = new SkillUpConfig();
-        //     foreach (SkillUpConfig skillUpConfig in PlayerManager.Instance.skillUpConfigs)
-        //     {
-        //         if (skillUpConfig.upType == 2 && star == skillUpConfig.upValue)
-        //         {
-        //             return skillUpConfig;
-        //         }
-        //     }
-        //     return upConfig;
-        // }
-        
-        // /// <summary>
-        // /// 判断【星级】是否可以解锁新技能
-        // /// </summary>
-        // /// <param name="star"></param>
-        // /// <returns></returns>
-        // public SkillUpConfig IsStarUpGetNewSkill(int star)
-        // {
-        //     SkillUpConfig upConfig = new SkillUpConfig();
-        //     foreach (SkillUpConfig skillUpConfig in PlayerManager.Instance.skillUpConfigs)
-        //     {
-        //         if (skillUpConfig.upType == 2 && star == skillUpConfig.upValue)
-        //         {
-        //             return upConfig;
-        //         }
-        //     }
-        //     return upConfig;
-        // }
-        
+       
     }
 }

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -6,14 +6,18 @@ namespace GameLogic.Hero
 {
     public class SkillInfo
     {
+        public long qiangDu;
         public SkillConfig skillConfig;
         public SkillPowerupConfig SkillPowerupConfig;
 
-        private int index;
+        public int index;
+
         public SkillInfo(int skillId, int powerId)
         {
             skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillId);
-            SkillPowerupConfig= ConfigComponent.Instance.Get<SkillPowerupConfig>(powerId);
+            SkillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(powerId);
+            qiangDu= (long)(SkillPowerupConfig.MainPower* skillConfig.power);
+            index = 0;
         }
     }
 }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -29,7 +29,7 @@ public class PlayerManager : Singleton<PlayerManager>
     public long heroExp;
 
 
-    public List<SkillInfo> allUseSkill = new List<SkillInfo>();
+    public SkillInfo[] allUseSkill = new SkillInfo[10];
     public void SaveUseSkill()
     {
         CombatHeroEntity combatHeroEntity = CombatController.currActiveCombat.CombatHeroController.playerHeroEntity;
@@ -62,6 +62,15 @@ public class PlayerManager : Singleton<PlayerManager>
         // }
     }
 
+    public SkillInfo GetSkillInfo(int index)
+    {
+      
+        return   allUseSkill[index];
+    }
+    public void RemoveSkillInfo(int index)
+    {
+        allUseSkill[index] = null;
+    }
     private void InitGameData()
     {
         InitBags();

Assets/Scripts/GameUI/UI/CombatPanel/SkillKongWidget.cs

@@ -1,6 +1,7 @@
 
 using Excel2Json;
 using Fort23.UTool;
+using GameLogic.Hero;
 using UnityEngine;
 
 namespace Fort23.Mono
@@ -11,7 +12,7 @@ namespace Fort23.Mono
         public int index;
         private SkillSelectPanel skillSelectPanel;
 
-        public int skillId;
+        public SkillInfo SkillInfo;
         protected bool _isSelect;
 
         private void Init()
@@ -34,12 +35,12 @@ namespace Fort23.Mono
             };
             myButton.OnPressAndHold = delegate
             {
-                if (skillId == 0)
+                if (SkillInfo == null)
                 {
                     return;
                 }
 
-                SkillConfig skillConfig=  ConfigComponent.Instance.Get<SkillConfig>(skillId);
+                SkillConfig skillConfig= SkillInfo.skillConfig;
                 SkillMassgePanel.OpenSkillSelectPanel(skillConfig.name, skillConfig.dec);
             };
         }
@@ -58,20 +59,20 @@ namespace Fort23.Mono
 
         public void Cleared()
         {
-            this.skillId = 0;
+            this.SkillInfo = null;
             icon.gameObject.SetActive(false);
         }
 
-        public void SetSKill(int skillId)
+        public void SetSKill(SkillInfo skillId)
         {
-            if (skillId == 0)
+            if (skillId == null)
             {
                 return;
             }
-
-            this.skillId = skillId;
+            skillId.index= index;
+            this.SkillInfo = skillId;
             icon.gameObject.SetActive(true);
-            SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillId);
+            SkillConfig skillConfig = SkillInfo.skillConfig;
             icon.icon_name = skillConfig.icon;
         }
 

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Fort23.Core;
+using GameLogic.Hero;
 using UnityEngine;
 
 namespace Fort23.Mono
@@ -10,7 +11,7 @@ namespace Fort23.Mono
     {
         private bool _isSelectSkill;
         private List<SkillKongWidget> allKongSkill = new List<SkillKongWidget>();
-        private int selectSkillConfig;
+        private SkillInfo selectSkillConfig;
         private bool isAlter;
 
         public static async CTask OpenSkillSelectPanel()
@@ -48,7 +49,8 @@ namespace Fort23.Mono
                 SkillWidget skillWidget = await UIManager.Instance.CreateGComponentForObject<SkillWidget>(SkillWidget,
                     null, SkillWidgetRoot,
                     isInstance: true);
-                skillWidget.InitSkillWidget(id, this);
+                SkillInfo skillInfo = new SkillInfo(id, 1);
+                skillWidget.InitSkillWidget(skillInfo, this);
             }
 
 
@@ -69,14 +71,14 @@ namespace Fort23.Mono
                     null, SkillKongWeiRoot,
                     isInstance: true);
                 skillKongWidget.InitWidget(index, this);
-                skillKongWidget.SetSKill(PlayerManager.Instance.useSkillId[index]);
+                skillKongWidget.SetSKill(PlayerManager.Instance.GetSkillInfo(index));
                 skillKongWidget.transform.anchoredPosition = pos;
                 allKongSkill.Add(skillKongWidget);
             }
         }
 
 
-        public void SelectSkill(int skillConfig)
+        public void SelectSkill(SkillInfo skillConfig)
         {
             selectSkillConfig = skillConfig;
             _isSelectSkill = true;
@@ -89,7 +91,7 @@ namespace Fort23.Mono
         private void CloseSelect()
         {
             _isSelectSkill = false;
-            selectSkillConfig = 0;
+            selectSkillConfig = null;
             for (int i = 0; i < allKongSkill.Count; i++)
             {
                 allKongSkill[i].SelectState(false);
@@ -99,16 +101,18 @@ namespace Fort23.Mono
         public void SelectKongSkill(SkillKongWidget skillKongWidget)
         {
             isAlter = true;
-            if (!_isSelectSkill || selectSkillConfig == 0)
+            if (!_isSelectSkill || selectSkillConfig == null)
             {
-                PlayerManager.Instance.useSkillId[skillKongWidget.index] = 0;
+                PlayerManager.Instance.RemoveSkillInfo(skillKongWidget.index);
+              
                 skillKongWidget.Cleared();
                 return;
             }
 
         
             skillKongWidget.SetSKill(selectSkillConfig);
-            PlayerManager.Instance.useSkillId[skillKongWidget.index] = selectSkillConfig;
+            selectSkillConfig.index= skillKongWidget.index;
+            PlayerManager.Instance.allUseSkill[skillKongWidget.index]=(selectSkillConfig);
             CloseSelect();
         }
 

Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs

@@ -1,12 +1,13 @@
 using Excel2Json;
 using Fort23.UTool;
+using GameLogic.Hero;
 
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "SkillWidget")]
     public partial class SkillWidget : UIComponent
     {
-        private int skillConfigId;
+        private SkillInfo skillConfigId;
         private SkillSelectPanel skillSelectPanel;
         private void Init()
         {
@@ -25,17 +26,18 @@ namespace Fort23.Mono
             myButton.onClick=delegate {
                 skillSelectPanel.SelectSkill(skillConfigId);
             };
-            myButton.OnPressAndHold=delegate {
-                SkillConfig skillConfig=  ConfigComponent.Instance.Get<SkillConfig>(skillConfigId);
+            myButton.OnPressAndHold=delegate
+            {
+                SkillConfig skillConfig = skillConfigId.skillConfig;
                 SkillMassgePanel.OpenSkillSelectPanel(skillConfig.name, skillConfig.dec);
             };
         }
 
-        public void InitSkillWidget(int skillId,SkillSelectPanel skillSelectPanel)
+        public void InitSkillWidget(SkillInfo skillId,SkillSelectPanel skillSelectPanel)
         {
             this.skillSelectPanel = skillSelectPanel;
             skillConfigId=skillId;
-            SkillConfig skillConfig=  ConfigComponent.Instance.Get<SkillConfig>(skillId);
+            SkillConfig skillConfig=  skillId.skillConfig;
             icon.icon_name= skillConfig.icon;
         }
     }