Browse Source

修改bug

DESKTOP-FB72PO8\Administrator 1 week ago
parent
commit
553e8c00cc

+ 22 - 6
Assets/Scenes/testCombat.scene

@@ -2198,11 +2198,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 40000
+      value: 62862
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].att
-      value: 400
+      value: 2086
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].def
+      value: 1042
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].hp
@@ -2210,7 +2214,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,7 +2222,7 @@ 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
@@ -2242,7 +2246,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 +2254,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}
@@ -2258,7 +2274,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 8 - 2
Assets/Scripts/GameLogic/CombatScenesTool/TestCombatHeroConfig.cs

@@ -21,7 +21,7 @@ namespace GameLogic.CombatScenesTool
             [Header("水")] public int shui;
             [Header("火")] public int huo;
             [Header("土")] public int tu;
-            
+
             [Header("测试功法(skill ID)")] public List<int> skill;
 
             [Header("测试法宝 法宝ID")] public List<int> magicWeaponId;
@@ -32,10 +32,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);
                     }
                 }

+ 6 - 1
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -103,9 +103,14 @@ public class PlayerManager : Singleton<PlayerManager>
 
         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;
             }