Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

Assets/Res/Config/HeroPowerUpConfig.json

@@ -9,7 +9,11 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 130,
-      "LevelupBasicPower": 330
+      "LevelupBasicPower": 330,
+      "skillParam": [
+        "0,1",
+        "1,1"
+      ]
     },
     {
       "ID": 2,
@@ -119,7 +123,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 630,
-      "LevelupBasicPower": 630
+      "LevelupBasicPower": 630,
+      "skillParam": [
+        "2,1"
+      ]
     },
     {
       "ID": 12,
@@ -339,7 +346,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 3280,
-      "LevelupBasicPower": 1230
+      "LevelupBasicPower": 1230,
+      "skillParam": [
+        "1,2"
+      ]
     },
     {
       "ID": 32,
@@ -559,7 +569,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 8750,
-      "LevelupBasicPower": 1830
+      "LevelupBasicPower": 1830,
+      "skillParam": [
+        "2,2"
+      ]
     },
     {
       "ID": 52,
@@ -779,7 +792,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 17640,
-      "LevelupBasicPower": 2430
+      "LevelupBasicPower": 2430,
+      "skillParam": [
+        "3,2"
+      ]
     },
     {
       "ID": 72,
@@ -999,7 +1015,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 30440,
-      "LevelupBasicPower": 3030
+      "LevelupBasicPower": 3030,
+      "skillParam": [
+        "4,2"
+      ]
     },
     {
       "ID": 92,
@@ -1219,7 +1238,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 47580,
-      "LevelupBasicPower": 3630
+      "LevelupBasicPower": 3630,
+      "skillParam": [
+        "5,2"
+      ]
     },
     {
       "ID": 112,
@@ -1439,7 +1461,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 69450,
-      "LevelupBasicPower": 4230
+      "LevelupBasicPower": 4230,
+      "skillParam": [
+        "1,3"
+      ]
     },
     {
       "ID": 132,
@@ -1659,7 +1684,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 96410,
-      "LevelupBasicPower": 4830
+      "LevelupBasicPower": 4830,
+      "skillParam": [
+        "2,3"
+      ]
     },
     {
       "ID": 152,
@@ -1879,7 +1907,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 128790,
-      "LevelupBasicPower": 5430
+      "LevelupBasicPower": 5430,
+      "skillParam": [
+        "3,3"
+      ]
     },
     {
       "ID": 172,
@@ -2099,7 +2130,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 166890,
-      "LevelupBasicPower": 6030
+      "LevelupBasicPower": 6030,
+      "skillParam": [
+        "4,3"
+      ]
     },
     {
       "ID": 192,
@@ -2319,7 +2353,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 211010,
-      "LevelupBasicPower": 6630
+      "LevelupBasicPower": 6630,
+      "skillParam": [
+        "5,3"
+      ]
     },
     {
       "ID": 212,
@@ -2539,7 +2576,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 261420,
-      "LevelupBasicPower": 7230
+      "LevelupBasicPower": 7230,
+      "skillParam": [
+        "1,4"
+      ]
     },
     {
       "ID": 232,
@@ -2759,7 +2799,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 318390,
-      "LevelupBasicPower": 7830
+      "LevelupBasicPower": 7830,
+      "skillParam": [
+        "2,4"
+      ]
     },
     {
       "ID": 252,
@@ -2979,7 +3022,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 382160,
-      "LevelupBasicPower": 8430
+      "LevelupBasicPower": 8430,
+      "skillParam": [
+        "3,4"
+      ]
     },
     {
       "ID": 272,
@@ -3199,7 +3245,10 @@
       "SHANBIFactor": 1.0,
       "EXPFactor": 1.0,
       "levelUpExp": 452980,
-      "LevelupBasicPower": 9030
+      "LevelupBasicPower": 9030,
+      "skillParam": [
+        "4,4"
+      ]
     },
     {
       "ID": 292,

Assets/Res/Config/HeroPromoteConfig.json

@@ -68,6 +68,9 @@
         "1",
         "1",
         "1"
+      ],
+      "skillParam": [
+        "3,1"
       ]
     },
     {
@@ -96,6 +99,9 @@
         "2",
         "1",
         "1"
+      ],
+      "skillParam": [
+        "4,1"
       ]
     },
     {
@@ -124,6 +130,9 @@
         "2",
         "2",
         "2"
+      ],
+      "skillParam": [
+        "5,1"
       ]
     },
     {

Assets/Res/Config/SkillConfig.json

@@ -2,6 +2,7 @@
   "configList": [
     {
       "ID": 10011,
+      "icon": "",
       "scriptName": "NormalSkill",
       "IDGroup": 1001,
       "cd": null,
@@ -14,6 +15,7 @@
     },
     {
       "ID": 100011,
+      "icon": "icon_skill_10001",
       "scriptName": "S10001",
       "IDGroup": 10001,
       "cd": 4,
@@ -26,6 +28,7 @@
     },
     {
       "ID": 100012,
+      "icon": "icon_skill_10001",
       "scriptName": "S10001",
       "IDGroup": 10001,
       "cd": 4,
@@ -38,6 +41,7 @@
     },
     {
       "ID": 100013,
+      "icon": "icon_skill_10001",
       "scriptName": "S10001",
       "IDGroup": 10001,
       "cd": 4,
@@ -50,6 +54,7 @@
     },
     {
       "ID": 100014,
+      "icon": "icon_skill_10001",
       "scriptName": "S10001",
       "IDGroup": 10001,
       "cd": 4,
@@ -62,6 +67,7 @@
     },
     {
       "ID": 300011,
+      "icon": "icon_skill_30001",
       "scriptName": "S30001",
       "IDGroup": 30001,
       "cd": 6,
@@ -75,6 +81,7 @@
     },
     {
       "ID": 300012,
+      "icon": "icon_skill_30001",
       "scriptName": "S30001",
       "IDGroup": 30001,
       "cd": 6,
@@ -88,6 +95,7 @@
     },
     {
       "ID": 300013,
+      "icon": "icon_skill_30001",
       "scriptName": "S30001",
       "IDGroup": 30001,
       "cd": 6,
@@ -101,6 +109,7 @@
     },
     {
       "ID": 300014,
+      "icon": "icon_skill_30001",
       "scriptName": "S30001",
       "IDGroup": 30001,
       "cd": 6,
@@ -114,6 +123,7 @@
     },
     {
       "ID": 200011,
+      "icon": "icon_skill_20001",
       "scriptName": "S20001",
       "IDGroup": 20001,
       "cd": 5,
@@ -126,6 +136,7 @@
     },
     {
       "ID": 200012,
+      "icon": "icon_skill_20001",
       "scriptName": "S20001",
       "IDGroup": 20001,
       "cd": 5,
@@ -138,6 +149,7 @@
     },
     {
       "ID": 200013,
+      "icon": "icon_skill_20001",
       "scriptName": "S20001",
       "IDGroup": 20001,
       "cd": 5,
@@ -150,6 +162,7 @@
     },
     {
       "ID": 200014,
+      "icon": "icon_skill_20001",
       "scriptName": "S20001",
       "IDGroup": 20001,
       "cd": 5,
@@ -162,6 +175,7 @@
     },
     {
       "ID": 400011,
+      "icon": "icon_skill_40001",
       "scriptName": "S40001",
       "IDGroup": 40001,
       "cd": 10,
@@ -174,6 +188,7 @@
     },
     {
       "ID": 400012,
+      "icon": "icon_skill_40001",
       "scriptName": "S40001",
       "IDGroup": 40001,
       "cd": 10,
@@ -186,6 +201,7 @@
     },
     {
       "ID": 400013,
+      "icon": "icon_skill_40001",
       "scriptName": "S40001",
       "IDGroup": 40001,
       "cd": 10,
@@ -198,6 +214,7 @@
     },
     {
       "ID": 400014,
+      "icon": "icon_skill_40001",
       "scriptName": "S40001",
       "IDGroup": 40001,
       "cd": 10,
@@ -210,6 +227,7 @@
     },
     {
       "ID": 1100011,
+      "icon": "icon_skill_110001",
       "scriptName": "S110001",
       "IDGroup": 110001,
       "cd": 5,
@@ -222,6 +240,7 @@
     },
     {
       "ID": 1100012,
+      "icon": "icon_skill_110001",
       "scriptName": "S110001",
       "IDGroup": 110001,
       "cd": 5,
@@ -234,6 +253,7 @@
     },
     {
       "ID": 1100013,
+      "icon": "icon_skill_110001",
       "scriptName": "S110001",
       "IDGroup": 110001,
       "cd": 5,
@@ -246,6 +266,7 @@
     },
     {
       "ID": 1100014,
+      "icon": "icon_skill_110001",
       "scriptName": "S110001",
       "IDGroup": 110001,
       "cd": 5,
@@ -258,6 +279,7 @@
     },
     {
       "ID": 1100021,
+      "icon": "icon_skill_110002",
       "scriptName": "S110002",
       "IDGroup": 110002,
       "cd": 10,
@@ -270,6 +292,7 @@
     },
     {
       "ID": 1100022,
+      "icon": "icon_skill_110002",
       "scriptName": "S110002",
       "IDGroup": 110002,
       "cd": 10,
@@ -282,6 +305,7 @@
     },
     {
       "ID": 1100023,
+      "icon": "icon_skill_110002",
       "scriptName": "S110002",
       "IDGroup": 110002,
       "cd": 10,
@@ -294,6 +318,7 @@
     },
     {
       "ID": 1100024,
+      "icon": "icon_skill_110002",
       "scriptName": "S110002",
       "IDGroup": 110002,
       "cd": 10,
@@ -306,6 +331,7 @@
     },
     {
       "ID": 1200011,
+      "icon": "icon_skill_120001",
       "scriptName": "S120001",
       "IDGroup": 120001,
       "cd": 4,
@@ -318,6 +344,7 @@
     },
     {
       "ID": 1200012,
+      "icon": "icon_skill_120001",
       "scriptName": "S120001",
       "IDGroup": 120001,
       "cd": 4,
@@ -330,6 +357,7 @@
     },
     {
       "ID": 1200013,
+      "icon": "icon_skill_120001",
       "scriptName": "S120001",
       "IDGroup": 120001,
       "cd": 4,
@@ -342,6 +370,7 @@
     },
     {
       "ID": 1200014,
+      "icon": "icon_skill_120001",
       "scriptName": "S120001",
       "IDGroup": 120001,
       "cd": 4,
@@ -354,6 +383,7 @@
     },
     {
       "ID": 1300011,
+      "icon": "icon_skill_130001",
       "scriptName": "S130001",
       "IDGroup": 130001,
       "cd": 5,
@@ -366,6 +396,7 @@
     },
     {
       "ID": 1300012,
+      "icon": "icon_skill_130001",
       "scriptName": "S130001",
       "IDGroup": 130001,
       "cd": 5,
@@ -378,6 +409,7 @@
     },
     {
       "ID": 1300013,
+      "icon": "icon_skill_130001",
       "scriptName": "S130001",
       "IDGroup": 130001,
       "cd": 5,
@@ -390,6 +422,7 @@
     },
     {
       "ID": 1300014,
+      "icon": "icon_skill_130001",
       "scriptName": "S130001",
       "IDGroup": 130001,
       "cd": 5,
@@ -402,6 +435,7 @@
     },
     {
       "ID": 1400011,
+      "icon": "icon_skill_140001",
       "scriptName": "S140001",
       "IDGroup": 140001,
       "cd": 3,
@@ -414,6 +448,7 @@
     },
     {
       "ID": 1400012,
+      "icon": "icon_skill_140001",
       "scriptName": "S140001",
       "IDGroup": 140001,
       "cd": 3,
@@ -426,6 +461,7 @@
     },
     {
       "ID": 1400013,
+      "icon": "icon_skill_140001",
       "scriptName": "S140001",
       "IDGroup": 140001,
       "cd": 3,
@@ -438,6 +474,7 @@
     },
     {
       "ID": 1400014,
+      "icon": "icon_skill_140001",
       "scriptName": "S140001",
       "IDGroup": 140001,
       "cd": 3,
@@ -450,6 +487,7 @@
     },
     {
       "ID": 1400031,
+      "icon": "icon_skill_140003",
       "scriptName": "S140003",
       "IDGroup": 140003,
       "cd": 8,
@@ -462,6 +500,7 @@
     },
     {
       "ID": 1400032,
+      "icon": "icon_skill_140003",
       "scriptName": "S140003",
       "IDGroup": 140003,
       "cd": 8,
@@ -474,6 +513,7 @@
     },
     {
       "ID": 1400033,
+      "icon": "icon_skill_140003",
       "scriptName": "S140003",
       "IDGroup": 140003,
       "cd": 8,
@@ -486,6 +526,7 @@
     },
     {
       "ID": 1400034,
+      "icon": "icon_skill_140003",
       "scriptName": "S140003",
       "IDGroup": 140003,
       "cd": 8,

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -68,6 +68,12 @@ public int levelUpExp;
 public int LevelupBasicPower;
 
 
+		/// <summary>
+		///对应HeroModel表的下标和等级 0,1 表示1位置的1级 1,1 表示2位置的1级 1,2 表示3位置的2级
+		/// </summary>
+public string[] skillParam;
+
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/HeroPromoteConfig.cs

@@ -56,6 +56,12 @@ public int itemCostCount;
 public string[] skillLv;
 
 
+		/// <summary>
+		///对应HeroModel表的下标和等级 0,1 表示1位置的1级 1,1 表示2位置的1级 1,2 表示3位置的2级
+		/// </summary>
+public string[] skillParam;
+
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -21,6 +21,12 @@ public int ID;
 
 
 
+		/// <summary>
+		///图标
+		/// </summary>
+public string icon;
+
+
 		/// <summary>
 		///脚本名称
 		/// </summary>
@@ -34,7 +40,7 @@ public int IDGroup;
 
 
 		/// <summary>
-		///技能Cd,普攻没有CD
+		///技能CD 普攻无CD
 		/// </summary>
 public int cd;
 

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Excel2Json;
 using Fort23.UTool;
 
@@ -12,6 +13,9 @@ namespace GameLogic.Hero
         /// 是否为主力英雄
         /// </summary>
         public bool isLead;
+        
+
+        public SkillComponent skillComponent;
 
         public string iconZhiYe
         {
@@ -37,11 +41,7 @@ namespace GameLogic.Hero
                 return _iconZhiYe;
             }
         }
-
-      
-
-
-
+        
         public void InitHero(AccountFileInfo.HeroData heroData)
         {
             modelID = heroData.heroModelId;
@@ -51,6 +51,7 @@ namespace GameLogic.Hero
                 heroData.heroPromoteId);
             CalFactor();
             CalAttribute();
+            skillComponent = new SkillComponent(this);
         }
 
         public HeroInfo Upgrade()
@@ -75,6 +76,8 @@ namespace GameLogic.Hero
             return this;
         }
 
+
+
         public AccountFileInfo.HeroData ToHeroData()
         {
             AccountFileInfo.HeroData heroData = new AccountFileInfo.HeroData

Assets/Scripts/GameLogic/Hero/SkillComponent.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using Excel2Json;
+using Fort23.UTool;
+
+namespace GameLogic.Hero
+{
+    public class SkillComponent
+    {
+        public SkillConfig skillConfig;
+
+        public List<SkillInfo> allSkills = new List<SkillInfo>();
+
+        public HeroInfo heroInfo;
+
+        public SkillComponent(HeroInfo heroInfo)
+        {
+            this.heroInfo = heroInfo;
+        }
+
+        // public void Init(HeroInfo heroInfo)
+        // {
+        //     this.heroInfo = heroInfo;
+        // }
+        
+        public void InitSkills()
+        {
+            for (int i = 0; i < heroInfo.skillId.Length; i++)
+            {
+                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(heroInfo.skillId[i]);
+                SkillInfo skillInfo = new SkillInfo();
+                skillInfo.Init(heroInfo, skillConfig);
+                allSkills.Add(skillInfo);
+            }
+        }
+
+        public void ShowUI()
+        {
+            
+        }
+    }
+}

Assets/Scripts/GameLogic/Hero/SkillComponent.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a9fc29ef24994d00bcc8dfd239c364ad
+timeCreated: 1733189071

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -0,0 +1,16 @@
+using Excel2Json;
+
+namespace GameLogic.Hero
+{
+    public class SkillInfo
+    {
+        public HeroInfo heroInfo;
+        public SkillConfig skillConfig;
+        public bool isLock;
+        public void Init(HeroInfo heroInfo, SkillConfig skillConfig)
+        {
+            this.heroInfo = heroInfo;
+            this.skillConfig = skillConfig;
+        }
+    }
+}

Assets/Scripts/GameLogic/Hero/SkillInfo.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5567827eef624f13bb637eca0df37f26
+timeCreated: 1733190450

Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -119,7 +119,7 @@ namespace Fort23.Mono
             this.heroInfo = heroInfo;
             // lv.text = heroInfo.level.Value.ToString();
             iconHero.icon_name = heroInfo.modelConfig.headicon;
-            iconHero.SetNativeSize();
+            // iconHero.SetNativeSize();
             iconZhiYe.icon_name = heroInfo.iconZhiYe;
             
             // HeroUITools.SetStarShow(stars, heroInfo.star.Value);