修改bug

Assets/Scenes/testCombat.scene

@@ -1869,7 +1869,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10010
+      value: 10002
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_Name
@@ -1877,7 +1877,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

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

@@ -57,6 +57,11 @@ namespace GameLogic.Combat.Hero
             List<FaBaoInfo> MagicWeaponID = combatHeroEntity.CurrCombatHeroInfo.MagicWeaponID;
             for (int i = 0; i < MagicWeaponID.Count; i++)
             {
+                if (MagicWeaponID[i] == null)
+                {
+                    continue;
+                }
+
                 CombatMagicWeaponEntity heroEntity = new CombatMagicWeaponEntity();
                 heroEntity.IsEnemy = combatHeroEntity.IsEnemy;
                 heroEntity.number = i;

Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -38,7 +38,10 @@ namespace GameLogic.Hero
 
         public FaBaoInfo(int id, int powerupId, int start = 1)
         {
-          
+            FaBaoData = new AccountFileInfo.FaBaoData();
+            FaBaoData.level= powerupId;
+            FaBaoData.id = id;
+            // FaBaoData.useIndex = start;
             FabaoConfig = ConfigComponent.Instance.Get<FabaoConfig>(id);
             FabaoPowerupConfig = ConfigComponent.Instance.Get<FabaoPowerupConfig>(powerupId);
             SkillConfig = ConfigComponent.Instance.Get<SkillConfig>(FabaoConfig.SkillGroupID * 10 + FabaoPowerupConfig.SkillLevel - 1);

Assets/Scripts/GameUI/GameApplction.cs

@@ -152,7 +152,7 @@ public class GameApplction : IGameStart
         TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
         if (testCombatHeroConfig != null)
         {
-            startCombatInfo.CombatType = CombatType.LevelBattle;
+            startCombatInfo.CombatType = CombatType.TestCombat;
             TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
             PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
                 testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);