ybx_Gdn hace 11 meses
padre
commit
e1dcd6ac50

+ 2 - 2
Assets/Src/GameLogic/Battle/Base/BaseBattle.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -425,7 +425,7 @@ public class BaseBattle
 
     }
 
-    public virtual void SyncBossLife(int life)
+    public virtual void SyncBossLife(long life)
     {
 
     }

+ 10 - 10
Assets/Src/GameLogic/Battle/BattleSystemNew.cs

@@ -1227,7 +1227,7 @@ public class BattleMgr : SingletonMono<BattleMgr>
         {
             if (mLuaBattleMgr == null) return;
 
-            mLuaBattleMgr.CallCS2Lua("OnCloneNewBoss", f.Name, (int)f.Life, (int)f.MaxLife, f.CastSkill);
+            mLuaBattleMgr.CallCS2Lua("OnCloneNewBoss", f.Name, (float)f.Life, (float)f.MaxLife, f.CastSkill);
         }
     }
 
@@ -1240,13 +1240,13 @@ public class BattleMgr : SingletonMono<BattleMgr>
             SetDifModeBossAttr(f);
             //Debug.Log("--------------OnBossSpawned-----Level-" + f.Actor.Level);
             //f.Actor.SetLevel(1200);
-            mLuaBattleMgr.CallCS2Lua("OnBossSpawned", f.Actor, f.Name, (int)f.Life, (int)f.MaxLife, f.CastSkill, mBattle.IsPlayRecord);
+            mLuaBattleMgr.CallCS2Lua("OnBossSpawned", f.Actor, f.Name, (float)f.Life, (float)f.MaxLife, f.CastSkill, mBattle.IsPlayRecord);
         }
         else if (mBattle.IsBossBattle)
         {
             if (mLuaBossBattleMgr == null) return;
 
-            mLuaBossBattleMgr.CallCS2Lua("OnBossSpawned", f.Name, (int)f.Life, (int)f.MaxLife, f.CastSkill);
+            mLuaBossBattleMgr.CallCS2Lua("OnBossSpawned", f.Name, (float)f.Life, (float)f.MaxLife, f.CastSkill);
         }
     }
 
@@ -1689,19 +1689,19 @@ public class BattleMgr : SingletonMono<BattleMgr>
             if (IsKillBoss)
             {
                 if (mLuaBattleMgr != null && (f.IsPlayer || f.IsBoss))
-                    mLuaBattleMgr.CallCS2Lua("OnFighterLifeChanged", f.IsBoss, f.Actor.ID, (int)f.Life, (int)f.MaxLife);
+                    mLuaBattleMgr.CallCS2Lua("OnFighterLifeChanged", f.IsBoss, f.Actor.ID, (float)f.Life, (float)f.MaxLife);
             }
         }
         else if (mBattle.IsBossBattle)
         {
             if (mLuaBossBattleMgr != null && (f.IsPlayer || f.IsBoss))
-                mLuaBossBattleMgr.CallCS2Lua("OnFighterLifeChanged", f.IsBoss, f.Actor.ID, (int)f.Life, (int)f.MaxLife);
+                mLuaBossBattleMgr.CallCS2Lua("OnFighterLifeChanged", f.IsBoss, f.Actor.ID, (float)f.Life, (float)f.MaxLife);
 
         }
         else if (mBattle.IsVersusBattle)
         {
             if (mLuaVersusMgr != null && f.IsPlayer)
-                mLuaVersusMgr.CallCS2Lua("OnFighterLifeChanged", f.IsBoss, f.Actor.ID, (int)f.Life, (int)f.MaxLife, (int)f.TeamSide);
+                mLuaVersusMgr.CallCS2Lua("OnFighterLifeChanged", f.IsBoss, f.Actor.ID, (float)f.Life, (float)f.MaxLife, (int)f.TeamSide);
         }
         else if (mBattle.IsTimeBattle)
         {
@@ -1711,8 +1711,8 @@ public class BattleMgr : SingletonMono<BattleMgr>
                 {
                     mLuaTimeBattleMgr.CallCS2Lua("OnFighterLifeChanged", f.IsBoss,
                                                                          f.Actor.ID,
-                                                                         (int)f.Life,
-                                                                         (int)f.MaxLife,
+                                                                         (float)f.Life,
+                                                                         (float)f.MaxLife,
                                                                          (int)f.Sp,
                                                                          (int)f.MaxSp);
                 }
@@ -1748,8 +1748,8 @@ public class BattleMgr : SingletonMono<BattleMgr>
                 {
                     mLuaTimeBattleMgr.CallCS2Lua("OnFighterEnergyChanged", f.IsBoss,
                                                                            f.Actor.ID,
-                                                                           (int)f.Life,
-                                                                           (int)f.MaxLife,
+                                                                           (float)f.Life,
+                                                                           (float)f.MaxLife,
                                                                            (int)f.Sp,
                                                                            (int)f.MaxSp);
                 }

+ 2 - 2
Assets/Src/GameLogic/Battle/BossBattle/BossBattle.cs

@@ -31,7 +31,7 @@ public class BossBattle : BaseBattle
     private ReadyPoint mActorReadyPoint;
     private SpawnPointCfg mBossSpawnCfg;
     private BattleSubMode mBossMode;
-    private int mBossServerLife = 0;        //服务器同步的boss血量
+    private long mBossServerLife = 0;        //服务器同步的boss血量
     private bool mBossDirty = false;
     private bool mPepareResOk = false;
     private bool mFighterResOk = false;
@@ -249,7 +249,7 @@ public class BossBattle : BaseBattle
         }
     }
 
-    public override void SyncBossLife(int life)
+    public override void SyncBossLife(long life)
     {
         mBossServerLife = life;
         

+ 1 - 1
Assets/Src/GameLogic/Battle/FighterManager/Fighter.cs

@@ -1759,7 +1759,7 @@ public class Fighter : LogicTransform
 
     public void ResetLife()
     {
-        Life = Mathf.RoundToInt(MaxLife);
+        Life = (long)MaxLife;
         Sp = Mathf.RoundToInt(MaxSp);
 
         //mBloodBarHud.OnActorRevive();