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

Assets/Res/Config/HeroModelConfig.json

@@ -240,10 +240,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 65,
-      "hp": 140,
-      "def": 55,
-      "shield": 140,
+      "attack": 60,
+      "hp": 151,
+      "def": 60,
+      "shield": 100,
       "speed_atk": 6.0,
       "Linggen": [
         100,

Assets/Res/Config/SkillConfig.json

@@ -193,7 +193,7 @@
       "level": 1,
       "effectValue": [
         6.0,
-        90.0
+        50.0
       ],
       "intensifierIndex": [
         2
@@ -216,7 +216,7 @@
       "level": 2,
       "effectValue": [
         6.0,
-        90.0,
+        60.0,
         15.0
       ],
       "intensifierIndex": [
@@ -243,7 +243,7 @@
       "level": 3,
       "effectValue": [
         6.0,
-        90.0,
+        70.0,
         15.0
       ],
       "intensifierIndex": [
@@ -273,7 +273,7 @@
       "level": 4,
       "effectValue": [
         6.0,
-        90.0,
+        80.0,
         15.0
       ],
       "intensifierIndex": [
@@ -336,7 +336,7 @@
       "level": 6,
       "effectValue": [
         6.0,
-        90.0,
+        100.0,
         15.0,
         100.0,
         30.0
@@ -739,7 +739,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -763,7 +763,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -797,7 +797,7 @@
       "level": 3,
       "effectValue": [
         4.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -834,7 +834,7 @@
       "level": 4,
       "effectValue": [
         4.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -868,7 +868,7 @@
       "level": 5,
       "effectValue": [
         5.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -905,7 +905,7 @@
       "level": 6,
       "effectValue": [
         5.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -2965,7 +2965,7 @@
       "effectValue": [
         3.0,
         70.0,
-        20.0
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -2988,8 +2988,8 @@
       "level": 2,
       "effectValue": [
         3.0,
-        70.0,
-        20.0
+        80.0,
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -3022,8 +3022,8 @@
       "level": 3,
       "effectValue": [
         4.0,
-        70.0,
-        20.0
+        80.0,
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -3059,8 +3059,8 @@
       "level": 4,
       "effectValue": [
         4.0,
-        70.0,
-        20.0
+        80.0,
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -3093,8 +3093,8 @@
       "level": 5,
       "effectValue": [
         5.0,
-        70.0,
-        20.0
+        80.0,
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -3131,7 +3131,7 @@
       "effectValue": [
         5.0,
         100.0,
-        20.0
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -7044,7 +7044,7 @@
     {
       "ID": 90010,
       "PieceID": null,
-      "power": 100.0,
+      "power": 300.0,
       "name": 707,
       "dec": 717,
       "attribute": 1,
@@ -7052,7 +7052,7 @@
       "scriptName": "S9001",
       "IDGroup": 9001,
       "timelineName": "BossSk1_timeline_TD",
-      "cd": 6.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -7065,7 +7065,7 @@
         20.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     },
@@ -7080,7 +7080,7 @@
       "scriptName": "S9002",
       "IDGroup": 9002,
       "timelineName": "BossSk2_timeline_TD",
-      "cd": 3.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -7088,7 +7088,7 @@
         60.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     },
@@ -7110,14 +7110,14 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     },
     {
       "ID": 90040,
       "PieceID": null,
-      "power": 100.0,
+      "power": 300.0,
       "name": 710,
       "dec": 720,
       "attribute": 1,
@@ -7132,14 +7132,14 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     },
     {
       "ID": 90050,
       "PieceID": null,
-      "power": 110.0,
+      "power": 300.0,
       "name": 711,
       "dec": 721,
       "attribute": 1,
@@ -7154,7 +7154,7 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     }

Assets/Scenes/testCombat.scene

@@ -2198,11 +2198,35 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 40000
+      value: 46090
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].mu
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].tu
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].att
-      value: 400
+      value: 1713
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].def
+      value: 933
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].huo
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].jing
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].shui
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].hp
@@ -2210,7 +2234,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 90
+      value: 120
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].att
@@ -2218,12 +2242,20 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 90
+      value: 120
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
       value: 9201
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].skillLevel
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].skillStart
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.size
       value: 0
@@ -2242,7 +2274,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 0
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
@@ -2250,6 +2282,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
+      value: 10010
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
+      value: 10001
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[2]
+      value: 10004
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[3]
       value: 10008
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}

Assets/Scripts/GameLogic/Combat/Buff/b_1005.cs

@@ -6,7 +6,7 @@ using GameLogic.Player;
 namespace GameLogic.Combat.Buff
 {
     /// <summary>
-    /// 灼热：每秒对敌人照成火属性灼烧伤害
+    /// 灼热：每秒对敌人照成火属性灼烧伤害,满层后敌人获得灼痛,有灼痛时不在获得
     /// </summary>
     public class b_1005 : BuffBasic
     {
@@ -31,6 +31,21 @@ namespace GameLogic.Combat.Buff
                     WuXingType.Fire,null,HarmType.Buff);
             }
         }
+        protected override void ProUpdateEffect()
+        {
+            if (buffCount >= buffInf.BuffConfig.overlayCount) //最大叠加数量
+            {
+                b_1010 b1010 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1010>();
+                if (b1010 != null)
+                {
+                    return;
+                }
+
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10101, 1);
+                combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
+                // combatHeroEntity.BuffControl.RemoveBuff(this);
+            }
+        }
      
 
         protected override void ProDormancyObj()

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -375,12 +375,12 @@ namespace GameLogic.Combat.CombatTool
             float p2 = 100;
             if (c < 0) //a被压制
             {
-                p2 = Mathf.Max(100, Mathf.Min(200, 30 + lg_b - lg_a));
+                p2 = Mathf.Max(100, Mathf.Min(200, 130 + lg_b - lg_a));
                 targetHp = GetVlaueRatioForLong(targetHp, p2);
             }
             else if (c > 0)
             {
-                p2 = Mathf.Max(100, Mathf.Min(200, 30 + lg_a - lg_b));
+                p2 = Mathf.Max(100, Mathf.Min(200, 130 + lg_a - lg_b));
                 myHp = GetVlaueRatioForLong(myHp, p2);
             }
 

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

@@ -271,22 +271,9 @@ public class CombatHeroInfo
                         continue;
                     }
 
-                    int start = MonsterPowerUpConfig.GongfaStar-1;
-                    int skillid = id * 10 + start;
-                    while (start >= 0)
-                    {
-                        SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillid);
-                        if (skillConfig.ID > 0)
-                        {
-                            break;
-                        }
-
-                        start--;
-                        skillid = id * 10 + start;
-                    }
-
+                   
 
-                    SkillInfo skillInfo = new SkillInfo(skillid, MonsterPowerUpConfig.GongfaLv);
+                    SkillInfo skillInfo = new SkillInfo(id, MonsterPowerUpConfig.GongfaLv,MonsterPowerUpConfig.GongfaStar);
                     skillInfo.index = i;
                     unLockSkills.Add(skillInfo);
                 }

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

@@ -5,6 +5,7 @@ using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.CombatType;
 using GameLogic.Combat.Hero.Turntable;
 using GameLogic.Combat.Skill;
 using GameLogic.Hero;
@@ -62,6 +63,8 @@ namespace GameLogic.Combat.Hero
             }
             else
             {
+                
+
                 await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
             }
 

Assets/Scripts/GameLogic/Combat/Skill/S9002.cs

@@ -20,7 +20,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProInitSkill()
         {
-            AddTriggerCallBack("sk1_fashe", Sk1_FaSheProDefaultTimeLineTrigger);
+            // AddTriggerCallBack("sk1_fashe", Sk1_FaSheProDefaultTimeLineTrigger);
         }
 
         protected override void ProUseSkill()
@@ -45,15 +45,15 @@ namespace GameLogic.Combat.Skill
                 effectValue[0]);
         }
 
-        private void Sk1_FaSheProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData,ISkillFeatures skillFeatures)
-        {
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                effectValue[0]);
-            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,skillFeatures,
-                HarmType.Default);
-        }
+        // private void Sk1_FaSheProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+        //     ITimelineFxLogic timelineFxLogic,
+        //     TriggerData triggerData,ISkillFeatures skillFeatures)
+        // {
+        //     long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+        //         effectValue[0]);
+        //     CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,skillFeatures,
+        //         HarmType.Default);
+        // }
 
         protected override void ProCombatUpdate(float time)
         {

Assets/Scripts/GameLogic/CombatScenesTool/TestCombatHeroConfig.cs

@@ -15,9 +15,16 @@ namespace GameLogic.CombatScenesTool
             [Header("等级")] public int level;
             [Header("额外生命")] public int hp;
             [Header("额外攻击力")] public int att;
+            [Header("额外防御")] public int def;
+            [Header("金")] public int jing;
+            [Header("木")] public int mu;
+            [Header("水")] public int shui;
+            [Header("火")] public int huo;
+            [Header("土")] public int tu;
 
             [Header("测试功法（skill ID）")] public List<int> skill;
-
+            [Header("测试场景功法等级")] public int skillLevel=1;
+            [Header("测试场景功法星级")] public int skillStart=1;
             [Header("测试法宝 法宝ID")] public List<int> magicWeaponId;
 
             public void CopyToCombatHeroInfo(CombatHeroInfo combatHeroInfo)
@@ -26,10 +33,16 @@ namespace GameLogic.CombatScenesTool
                 // int[] skill = combatHeroInfo.modelConfig.skillID;
                 if (magicWeaponId != null && magicWeaponId.Count > 0)
                 {
+                    int fbLevel = ((level - 1) / 10) + 1;
+                    if (fbLevel <= 0)
+                    {
+                        fbLevel = 1;
+                    }
+
                     combatHeroInfo.MagicWeaponID.Clear();
                     for (int i = 0; i < magicWeaponId.Count; i++)
                     {
-                        FaBaoInfo faBaoInfo = new FaBaoInfo(magicWeaponId[i], 1);
+                        FaBaoInfo faBaoInfo = new FaBaoInfo(magicWeaponId[i], fbLevel);
                         combatHeroInfo.MagicWeaponID.Add(faBaoInfo);
                     }
                 }
@@ -39,7 +52,7 @@ namespace GameLogic.CombatScenesTool
                     combatHeroInfo.unLockSkills.Clear();
                     for (int i = 0; i < skill.Count; i++)
                     {
-                        SkillInfo skillInfo = new SkillInfo(skill[i], 1);
+                        SkillInfo skillInfo = new SkillInfo(skill[i], skillLevel,skillStart);
                         skillInfo.index = i;
                         combatHeroInfo.unLockSkills.Add(skillInfo);
                     }

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -16,10 +16,35 @@ namespace GameLogic.Hero
 
         public AccountFileInfo.SkillData SkillData;
 
+        public SkillInfo(int skillId, int skillPowerup)
+        {
+            InitSkill(skillId, skillPowerup);
+        }
 
-        public SkillInfo(int skill, int skillPowerup)
+        public SkillInfo(int skillIdGroup, int skillPowerup, int start)
         {
-            skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skill);
+            start--;
+            int skillid = skillIdGroup * 10 + start;
+            while (start >= 0)
+            {
+                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillid);
+                if (skillConfig.ID > 0)
+                {
+                    break;
+                }
+
+                start--;
+                skillid = skillIdGroup * 10 + start;
+            }
+
+            InitSkill(skillid, skillPowerup);
+        }
+
+        private void InitSkill(int skillId, int skillPowerup)
+        {
+            SkillData = new AccountFileInfo.SkillData();
+          
+            skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillId);
             SkillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(skillPowerup);
             if (skillConfig.ID != 0)
             {
@@ -48,7 +73,6 @@ namespace GameLogic.Hero
             index = 0;
         }
 
-
         public void CustomInt(AccountFileInfo.SkillData skillId)
         {
             SkillData = skillId;
@@ -58,6 +82,7 @@ namespace GameLogic.Hero
             {
                 skillConfig.effectValue = new float[1];
             }
+
             if (skillConfig.effectValue != null)
             {
                 effectValue = new float[skillConfig.effectValue.Length];

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -85,6 +85,19 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public void AddTestHeroInfo(TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig)
     {
+        GongFaControl.allSkill.Clear();
+        SkillConfig[] allSkillConfig = ConfigComponent.Instance.GetAll<SkillConfig>();
+        for (int i = 0; i < allSkillConfig.Length; i++)
+        {
+            SkillConfig skillConfig = allSkillConfig[i];
+            if (skillConfig.level == testHeroInfoConfig.skillStart)
+            {
+                SkillInfo skillInfo = new SkillInfo(skillConfig.ID, testHeroInfoConfig.skillLevel);
+                skillInfo.index = -1;
+                GongFaControl.AddSkillInfo(skillInfo);
+            }
+        }
+
         AccountFileInfo.HeroData heroData = new AccountFileInfo.HeroData();
         heroData.heroModelId = testHeroInfoConfig.heroID;
         heroData.heroPowerId = testHeroInfoConfig.level;
@@ -95,17 +108,39 @@ public class PlayerManager : Singleton<PlayerManager>
             GongFaControl.allSkill.Clear();
             for (int i = 0; i < testHeroInfoConfig.skill.Count; i++)
             {
-                SkillInfo skillInfo = new SkillInfo(testHeroInfoConfig.skill[i], 1);
+                SkillInfo skillInfo = new SkillInfo(testHeroInfoConfig.skill[i], testHeroInfoConfig.skillLevel,
+                    testHeroInfoConfig.skillStart);
                 skillInfo.index = i;
                 GongFaControl.AddSkillInfo(skillInfo);
             }
         }
+        else
+        {
+            SkillInfo[] skillInfos = GongFaControl.allUseSkill;
+            for (int i = 0; i < skillInfos.Length; i++)
+            {
+                if (skillInfos[i] != null)
+                {
+                    SkillInfo skillInfo = new SkillInfo(skillInfos[i].skillConfig.IDGroup,
+                        testHeroInfoConfig.skillLevel,
+                        testHeroInfoConfig.skillStart);
+                    skillInfo.index = i;
+                    GongFaControl.allUseSkill[i] = skillInfo;
+                }
+            }
+        }
 
         if (testHeroInfoConfig.magicWeaponId.Count > 0)
         {
+            int fbLevel = ((testHeroInfoConfig.level - 1) / 10) + 1;
+            if (fbLevel <= 0)
+            {
+                fbLevel = 1;
+            }
+
             for (int i = 0; i < testHeroInfoConfig.magicWeaponId.Count; i++)
             {
-                FaBaoInfo faBaoInfo = new FaBaoInfo(testHeroInfoConfig.magicWeaponId[i], 1);
+                FaBaoInfo faBaoInfo = new FaBaoInfo(testHeroInfoConfig.magicWeaponId[i], fbLevel);
                 FaBaoControl.AddFaBao(faBaoInfo);
                 FaBaoControl.FightFaBao[i] = faBaoInfo;
             }
@@ -117,9 +152,37 @@ public class PlayerManager : Singleton<PlayerManager>
         // }
         myHero.hp += testHeroInfoConfig.hp;
         myHero.attack += testHeroInfoConfig.att;
+        myHero.defense += testHeroInfoConfig.def;
+        myHero.Metal += testHeroInfoConfig.jing;
+        myHero.Wood += testHeroInfoConfig.mu;
+        myHero.Water += testHeroInfoConfig.shui;
+        myHero.Fire += testHeroInfoConfig.huo;
+        myHero.Earth += testHeroInfoConfig.tu;
         myHero.TaoismSkillId = 601011;
         myHero.MagicWeaponID.Clear();
         myHero.MagicWeaponID.AddRange(FaBaoControl.FightFaBao);
+        for (int i = 0; i < FaBaoControl.FightFaBao.Length; i++)
+        {
+            FaBaoInfo faBaoInfo = FaBaoControl.FightFaBao[i];
+            if (faBaoInfo != null)
+            {
+                foreach (var VARIABLE in faBaoInfo.attriButedIC)
+                {
+                    switch (VARIABLE.Key)
+                    {
+                        case 1:
+                            myHero.hp += VARIABLE.Value;
+                            break;
+                        case 2:
+                            myHero.defense += VARIABLE.Value;
+                            break;
+                        case 3:
+                            myHero.attack += VARIABLE.Value;
+                            break;
+                    }
+                }
+            }
+        }
     }
 
 

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -93,7 +93,7 @@ namespace Fort23.Mono
                         int index = i;
                         cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<SkillWidget>((skillWidget) =>
                         {
-                            skillWidget.InitSkillWidget(new SkillInfo(combatHeroInfo.modelConfig.skillID[index] * 10 + heroPowerUpConfig.GongfaStar - 1, heroPowerUpConfig.GongfaLv));
+                            skillWidget.InitSkillWidget(new SkillInfo(combatHeroInfo.modelConfig.skillID[index] , heroPowerUpConfig.GongfaLv,heroPowerUpConfig.GongfaStar));
                             skillWidget.OnClick = SkillWidgetOnClick;
                             _skillWidgets.Add(skillWidget);
                         }, GongfaRoot));

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -245,7 +245,7 @@ namespace Fort23.Mono
             {
                 if (configs[i].level == 1)
                     continue;
-                SkillInfo skillInfo1 = new SkillInfo(configs[i].ID, _skillInfo.SkillPowerupConfig.ID);
+                SkillInfo skillInfo1 = new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID,configs[i].level);
                 GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
                 gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1);
                 _gongFaUpgradeInfoWidgets.Add(gongFaUpgradeInfoWidget);

UserSettings/Layouts/default-2022.dwlt

@@ -15,11 +15,11 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 567
-    y: 83
-    width: 1820
-    height: 1349
+    y: 51
+    width: 1337
+    height: 1333
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: CombatR
   m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -34,25 +34,25 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: CombaReportEnditorManager
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 281
-    width: 1059
-    height: 1018
-  m_MinSize: {x: 276, y: 121}
+    y: 278
+    width: 778
+    height: 1005
+  m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_ActualView: {fileID: 10}
   m_Panes:
   - {fileID: 12}
   - {fileID: 14}
   - {fileID: 11}
   - {fileID: 10}
-  m_Selected: 2
-  m_LastSelected: 3
+  m_Selected: 3
+  m_LastSelected: 2
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -70,14 +70,14 @@ MonoBehaviour:
   - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 761
+    x: 559
     y: 0
-    width: 1059
-    height: 1299
+    width: 778
+    height: 1283
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 367
+  controlID: 232
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -99,8 +99,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1820
-    height: 1349
+    width: 1337
+    height: 1333
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -124,7 +124,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1820
+    width: 1337
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -148,12 +148,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1820
-    height: 1299
+    width: 1337
+    height: 1283
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
-  controlID: 366
+  controlID: 231
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -171,8 +171,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1329
-    width: 1820
+    y: 1313
+    width: 1337
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -193,8 +193,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1059
-    height: 281
+    width: 778
+    height: 278
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
   m_ActualView: {fileID: 15}
@@ -220,8 +220,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 761
-    height: 1299
+    width: 559
+    height: 1283
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 16}
@@ -249,10 +249,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 651
-    y: 337
-    width: 684
-    height: 840
+    x: -20960.668
+    y: -21128
+    width: 777
+    height: 984
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -284,14 +284,14 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1328
-    y: 394
-    width: 1058
-    height: 997
+    x: 1126
+    y: 359
+    width: 777
+    height: 984
   m_SerializedDataModeController:
-    m_DataMode: 1
-    m_PreferredDataMode: 1
-    m_SupportedDataModes: 010000000200000003000000
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -331,10 +331,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 651
-    y: 337
-    width: 684
-    height: 840
+    x: 1126
+    y: 359
+    width: 777
+    height: 984
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -426,10 +426,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 651
-    y: 337
-    width: 684
-    height: 840
+    x: 1126
+    y: 359
+    width: 777
+    height: 984
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -445,7 +445,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 4efcfeff4225ffff
+      m_ExpandedIDs: 4efcfeff4225ffffc4d9ffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -489,10 +489,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1328
-    y: 113
-    width: 1058
-    height: 260
+    x: 1126
+    y: 81
+    width: 777
+    height: 257
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -514,7 +514,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Editor
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -522,16 +522,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets
+  - Assets/Editor
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\UGit\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: d2eb0000
-    m_LastClickedID: 60370
-    m_ExpandedIDs: 00000000d2eb000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 60}
+    m_SelectedIDs: e4df0000
+    m_LastClickedID: 57316
+    m_ExpandedIDs: 0000000076dd000006e00000fae7000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -559,7 +559,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d2eb000000ca9a3bffffff7f
+    m_ExpandedIDs: 0000000076dd000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -586,7 +586,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -636,9 +636,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 567
-    y: 113
-    width: 760
-    height: 1278
+    y: 81
+    width: 558
+    height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -691,23 +691,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 760
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 380, y: 628.5}
+      width: 558
+      height: 1241
+    m_Scale: {x: 0.744, y: 0.744}
+    m_Translation: {x: 279, y: 620.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -490.94672
-      y: -812
-      width: 981.89343
-      height: 1624
+      x: -375
+      y: -834.0054
+      width: 750
+      height: 1668.0107
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 760, y: 1278}
+  m_defaultScale: 0.744
+  m_LastWindowPixelSize: {x: 558, y: 1262}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000