修改bug

Assets/Scenes/testCombat.scene

@@ -2183,9 +2183,21 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].hp
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].att
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].hp
-      value: 1000000
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[0].att
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
@@ -9256,6 +9268,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Nanzhu (4)
       objectReference: {fileID: 0}
+    - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.105

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -55,7 +55,6 @@ namespace GameLogic.Combat.CombatType
 
         protected override async CTask ProStartGame()
         {
-          
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
 
             TestCombat(cTaskAwaitBuffer);
@@ -113,13 +112,7 @@ namespace GameLogic.Combat.CombatType
                 testHeroInfoConfig.CopyToCombatHeroInfo((combatHeroInfo));
                 Vector3 pos = startPos + quaternion * enemyHeroPosOff[index];
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), combatHeroInfo, pos,
-                    delegate(CombatHeroEntity entity)
-                    {
-                        entity.CurrCombatHeroInfo.hp = (EncryptionLong) testHeroInfoConfig.hp;
-
-                        entity.MaxCombatHeroInfo.hp =  (EncryptionLong) testHeroInfoConfig.hp;
-                        combatController.CombatHeroController.AddHero(entity);
-                    }));
+                    delegate(CombatHeroEntity entity) { combatController.CombatHeroController.AddHero(entity); }));
             }
         }
 
@@ -140,8 +133,7 @@ namespace GameLogic.Combat.CombatType
             if (testCombatHeroConfig != null)
             {
                 TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
-                PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
-                    testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
+                PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig);
 
 
                 CombatHeroEntity heroEntity = new CombatHeroEntity();
@@ -153,8 +145,8 @@ namespace GameLogic.Combat.CombatType
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
                     delegate(CombatHeroEntity entity)
                     {
-                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
-                        entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
+                        // entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
+                        // entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
                         combatController.CombatHeroController.AddHero(entity);
                     }, isPlayer: true));
             }

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

@@ -37,14 +37,10 @@ namespace GameLogic.Combat.Skill
                     return;
                 }
 
-                if (skillBasic != null)
+                if (skillBasic != null&&IsPassiveActivateSkill(skillBasic))
                 {
-                    int index = skillBasic.index;
-                    if (index + 1 == this.index)
-                    {
-                        harmReturnInfo.isInvalid = true;
-                        barrier.BarrierTriggerData.isPenetrate = true;
-                    }
+                    harmReturnInfo.isInvalid = true;
+                    barrier.BarrierTriggerData.isPenetrate = true;
                 }
             }
         }

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

@@ -36,7 +36,7 @@ namespace GameLogic.Combat.Skill
                     return;
                 }
 
-                if (skillBasic.index + 1 == index)
+                if (skillBasic != null&&IsPassiveActivateSkill(skillBasic))
                 {
                     CombatHeroEntity.heroMagicWeaponControl.ReduceMagicCd(SelfSkillConfig.effectValue[0]);
                 }

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

@@ -31,7 +31,7 @@ namespace GameLogic.Combat.Skill
             if (heroInjuredEventData.HarmReturnInfo.source == CombatHeroEntity)
             {
                 SkillBasic skillBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as SkillBasic;
-                if (skillBasic != null && skillBasic.SelfSkillConfig.SkillType == 1 && skillBasic.index + 1 == index)
+                if (skillBasic != null&&IsPassiveActivateSkill(skillBasic))
                 {
                     int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                     if (odds < 5)

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

@@ -49,10 +49,13 @@ namespace GameLogic.Combat.Skill
         private void TimelineFxLogicInit(IEventData iEventData)
         {
             TimelineFxLogicInitEventData timelineFxLogicInitEventData = iEventData as TimelineFxLogicInitEventData;
-            if (timelineFxLogicInitEventData.SkillBasic.CombatHeroEntity == CombatHeroEntity &&
-                timelineFxLogicInitEventData.SkillBasic.index + 1 == index)
+            if (timelineFxLogicInitEventData.SkillBasic.CombatHeroEntity == CombatHeroEntity)
             {
-                timelineFxLogicInitEventData.timelineFxLogic.size *= 2;
+                if (IsPassiveActivateSkill(timelineFxLogicInitEventData.SkillBasic))
+                {
+                    timelineFxLogicInitEventData.timelineFxLogic.size *= 2;
+                }
+
 
                 // timelineFxLogicInitEventData.timelineFxLogic.SkillFeaturesData.
             }

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

@@ -72,14 +72,16 @@ namespace GameLogic.Combat.Skill
         private void AddUseGongFa(IEventData iEventData)
         {
             AddUseGongFaEventData addUseGongFaEventData = iEventData as AddUseGongFaEventData;
-            if (addUseGongFaEventData.SkillBasic.CombatHeroEntity == CombatHeroEntity &&
-                addUseGongFaEventData.SkillBasic.index + 1 == index)
+            if (addUseGongFaEventData.SkillBasic.CombatHeroEntity == CombatHeroEntity )
             {
-                _addTime = 0;
-                _isUpdate = true;
-                Finish();
-                _addSpeed = SelfSkillConfig.effectValue[0];
-                CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl += _addSpeed;
+                if (IsPassiveActivateSkill(addUseGongFaEventData.SkillBasic))
+                {
+                    _addTime = 0;
+                    _isUpdate = true;
+                    Finish();
+                    _addSpeed = SelfSkillConfig.effectValue[0];
+                    CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl += _addSpeed;
+                }
             }
         }
     }

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

@@ -595,6 +595,29 @@ namespace GameLogic.Combat.Skill
             }
         }
 
+        public bool IsPassiveActivateSkill(SkillBasic targetSkillBasic)
+        {
+            if (targetSkillBasic.SelfSkillConfig.SkillType != 1)
+            {
+                return false;
+            }
+
+            if (SelfSkillConfig.PromoteLanPara == null)
+            {
+                return false;
+            }
+
+            for (int i = 0; i < SelfSkillConfig.PromoteLanPara.Length; i++)
+            {
+                int configIndex = (int)SelfSkillConfig.PromoteLanPara[i];
+                if (targetSkillBasic.index == configIndex + index)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
 
         public ILifetCycleHitPoint[] GetTineLineTargetEntity(TimeLineEventLogicBasic timeLineEventLogicBasic)
         {

Assets/Scripts/GameLogic/CombatScenesTool/TestCombatHeroConfig.cs

@@ -12,41 +12,41 @@ namespace GameLogic.CombatScenesTool
         public class TestHeroInfoConfig
         {
             public int heroID;
-            public int level;
-            public int hp;
-            public int att;
+            [Header("等级")] public int level;
+            [Header("额外生命")] public int hp;
+            [Header("额外攻击力")] public int att;
 
-            public List<int> skill;
+            [Header("测试功法（skill ID）")] public List<int> skill;
 
-            public List<int> magicWeaponId;
+            [Header("测试法宝 法宝ID")] public List<int> magicWeaponId;
 
             public void CopyToCombatHeroInfo(CombatHeroInfo combatHeroInfo)
             {
                 combatHeroInfo.InitMonster(heroID, level);
-                int[] skill = combatHeroInfo.modelConfig.skillID;
-                for (int i = 0; i < magicWeaponId.Count; i++)
+                // int[] skill = combatHeroInfo.modelConfig.skillID;
+                if (magicWeaponId != null && magicWeaponId.Count > 0)
                 {
-                    FaBaoInfo faBaoInfo = new FaBaoInfo(magicWeaponId[i], 1);
-                    combatHeroInfo.MagicWeaponID.Add(faBaoInfo);
+                    combatHeroInfo.MagicWeaponID.Clear();
+                    for (int i = 0; i < magicWeaponId.Count; i++)
+                    {
+                        FaBaoInfo faBaoInfo = new FaBaoInfo(magicWeaponId[i], 1);
+                        combatHeroInfo.MagicWeaponID.Add(faBaoInfo);
+                    }
                 }
 
-                if (skill.Length > 0)
+                if (skill.Count > 0)
                 {
                     combatHeroInfo.unLockSkills.Clear();
-                    for (int i = 0; i < skill.Length; i++)
+                    for (int i = 0; i < skill.Count; i++)
                     {
-                        int id = skill[i] * 10 + 1;
-                        // SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(id);
-                        SkillInfo skillInfo = new SkillInfo(id, 1);
+                        SkillInfo skillInfo = new SkillInfo(skill[i], 1);
                         skillInfo.index = i;
                         combatHeroInfo.unLockSkills.Add(skillInfo);
                     }
                 }
 
-                // combatHeroInfo.modelName = modelName;
-                combatHeroInfo.hp.Value = (hp);
-
-                combatHeroInfo.attack.Value = (att);
+                combatHeroInfo.hp.Value += (hp);
+                combatHeroInfo.attack.Value += (att);
             }
         }
 

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -6,6 +6,7 @@ using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Combat.CombatTool;
+using GameLogic.CombatScenesTool;
 using GameLogic.Equipment;
 using GameLogic.Hero;
 using GameLogic.Player;
@@ -25,7 +26,7 @@ public class PlayerManager : Singleton<PlayerManager>
     /// </summary>
     public HeroInfo myHero;
 
-    public long serverTime => TimeHelper.ServerNow(); 
+    public long serverTime => TimeHelper.ServerNow();
 
 
     public void Init()
@@ -82,31 +83,40 @@ public class PlayerManager : Singleton<PlayerManager>
     }
 
 
-    public void AddTestHeroInfo(int heroId, int level, List<int> skill, List<int> magicWeaponId)
+    public void AddTestHeroInfo(TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig)
     {
-        if (skill.Count > 0)
+        AccountFileInfo.HeroData heroData = new AccountFileInfo.HeroData();
+        heroData.heroModelId = testHeroInfoConfig.heroID;
+        heroData.heroPowerId = testHeroInfoConfig.level;
+        myHero = new HeroInfo();
+        myHero.InitHero(heroData);
+        if (testHeroInfoConfig.skill.Count > 0)
         {
             GongFaControl.allSkill.Clear();
-            for (int i = 0; i < skill.Count; i++)
+            for (int i = 0; i < testHeroInfoConfig.skill.Count; i++)
             {
-                SkillInfo skillInfo = new SkillInfo(skill[i], 1);
+                SkillInfo skillInfo = new SkillInfo(testHeroInfoConfig.skill[i], 1);
                 skillInfo.index = i;
                 GongFaControl.AddSkillInfo(skillInfo);
             }
         }
 
-        for (int i = 0; i < magicWeaponId.Count; i++)
+        if (testHeroInfoConfig.magicWeaponId.Count > 0)
         {
-            FaBaoInfo faBaoInfo = new FaBaoInfo(magicWeaponId[i], 1);
-            FaBaoControl.AddFaBao(faBaoInfo);
-            FaBaoControl.FightFaBao[i]= faBaoInfo;
+            for (int i = 0; i < testHeroInfoConfig.magicWeaponId.Count; i++)
+            {
+                FaBaoInfo faBaoInfo = new FaBaoInfo(testHeroInfoConfig.magicWeaponId[i], 1);
+                FaBaoControl.AddFaBao(faBaoInfo);
+                FaBaoControl.FightFaBao[i] = faBaoInfo;
+            }
         }
 
         // for (int i = 0; i < 4; i++)
         // {
         //     FaBaoControl.FightFaBao[i] = FaBaoControl.myAllFaBao[i];
         // }
-
+        myHero.hp += testHeroInfoConfig.hp;
+        myHero.attack += testHeroInfoConfig.att;
         myHero.TaoismSkillId = 601011;
         myHero.MagicWeaponID.Clear();
         myHero.MagicWeaponID.AddRange(FaBaoControl.FightFaBao);
@@ -122,7 +132,7 @@ public class PlayerManager : Singleton<PlayerManager>
         AccountFileInfo.Instance.playerData.heroData = heroInfo.heroData;
         AccountFileInfo.Instance.SavePlayerData();
     }
-    
+
     /// <summary>
     /// 时间（秒）转换位小时分钟秒
     /// </summary>

Assets/Scripts/GameUI/GameApplction.cs

@@ -154,8 +154,7 @@ public class GameApplction : IGameStart
         {
             startCombatInfo.CombatType = CombatType.TestCombat;
             TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
-            PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
-                testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
+            PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig);
         }
 #endif