From 3b2a6bb9047cfce9f501593b3669a9c1af6c5df4 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 05 十一月 2025 17:40:23 +0800
Subject: [PATCH] 130 战斗修改回合样式

---
 Main/System/Battle/BattleObject/BattleObject.cs |   72 +++++++++++++++++++++++++-----------
 1 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/Main/System/Battle/BattleObject/BattleObject.cs b/Main/System/Battle/BattleObject/BattleObject.cs
index 89714c3..24b2e63 100644
--- a/Main/System/Battle/BattleObject/BattleObject.cs
+++ b/Main/System/Battle/BattleObject/BattleObject.cs
@@ -87,6 +87,8 @@
         buffMgr = new BattleObjectBuffMgr();
         buffMgr.Init(this);
 
+        buffMgr.onIsControlChanged += OnControledChange;
+
         layerMgr = new BattleObjectLayerMgr();
         layerMgr.Init(this);
 
@@ -127,6 +129,9 @@
 
         motionBase.Release();
         motionBase = null;
+        buffMgr.onIsControlChanged -= OnControledChange;
+        buffMgr.Release();
+        buffMgr = null;
         teamHero = null;
         ObjID = 0;
 
@@ -134,6 +139,24 @@
         {
             GameObject.DestroyImmediate(heroGo);
             heroGo = null;
+        }
+    }
+
+    //  鏈夊彉鍖栦簡鎵嶄細璋冪敤杩欎釜鍑芥暟
+    private void OnControledChange(int groupType, bool value)
+    {
+        //  杩欓噷鏄彈鍒扮‖鎺ф椂鍊� 闇�瑕佽〃鐜扮殑鍔ㄧ敾
+        if (groupType == BattleConst.HardControlGroup)
+        {
+            //  浠庢病琚‖鎺у埌琚‖鎺�
+            if (value)
+            {
+                motionBase.SetControledAnimation();
+            }
+            else
+            {
+                motionBase.CancelControledAnimation();
+            }
         }
     }
 
@@ -270,15 +293,16 @@
 
     public virtual void Hurt(List<long> damageValues, long _totalDamage,
         HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig, int hitIndex,
-        BattleDrops battleDrops, HB422_tagMCTurnFightObjDead deadPack)
+        BattleDrops battleDrops, HB422_tagMCTurnFightObjDead deadPack,
+        long fromHp, long toHp)
     {
         bool isLastHit = hitIndex >= skillConfig.DamageDivide.Length - 1;
         bool firstHit = hitIndex == 0;
-        BattleDmgInfo dmgInfo = PopDamage(damageValues, _totalDamage, hurt, skillConfig, isLastHit);
+        BattleDmgInfo dmgInfo = PopDamage(damageValues, _totalDamage, hurt, skillConfig, isLastHit, fromHp, toHp);
 
 
         //  杩欓噷
-        if (dmgInfo.IsType(DamageType.Dodge))
+        if (dmgInfo.IsType(DamageType.Dodge) && !buffMgr.isControled[BattleConst.HardControlGroup])
         {
             if (isLastHit)
             {
@@ -291,6 +315,8 @@
                 OnDodgeBegin();
             }
         }
+
+
 
         bool isFatalAttack = (null != deadPack) && isLastHit;
 
@@ -305,23 +331,32 @@
         }
         else
         {
-            if ((dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsRealdamage()))
+            if (dmgInfo.IsType(DamageType.Block))
             {
-                motionBase.PlayAnimation(MotionName.hit, false);
+                battleField.battleEffectMgr.PlayEffect(this, 19999, heroRectTrans, Camp);
             }
+            else
+            {
+                if ((dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsRealdamage()))
+                {
+                    if (!buffMgr.isControled[BattleConst.HardControlGroup])
+                    {
+                        motionBase.PlayAnimation(MotionName.hit, false);
+                    }
+                }
+            }
+
         }
-
-
     }
 
     public void SuckHp(uint suckHP, SkillConfig skillConfig)
     {
-        teamHero.curHp = Math.Min(teamHero.maxHp, teamHero.curHp + (int)suckHP);
+        // teamHero.curHp = Math.Min(teamHero.maxHp, teamHero.curHp + (int)suckHP);
     }
 
     public void HurtByReflect(uint bounceHP, SkillConfig skillConfig)
     {
-        teamHero.curHp = Math.Max(0, teamHero.curHp - (int)bounceHP);
+        // teamHero.curHp = Math.Max(0, teamHero.curHp - (int)bounceHP);
     }
 
 
@@ -386,22 +421,14 @@
     }
 
     // 浼ゅ杩樿鐪� 鏄惁闂伩 鏆村嚮 and so on 闇�瑕佹湁涓�涓狣amageType 鏈嶅姟鍣ㄥ簲璇ヤ細缁�
-    protected virtual BattleDmgInfo PopDamage(List<long> damageValues, long _totalDamage, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig, bool isLastHit)
+    protected virtual BattleDmgInfo PopDamage(List<long> damageValues, long _totalDamage, 
+        HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig, bool isLastHit,
+        long fromHp, long toHp)
     {
         BattleDmgInfo battleDmgInfo = new BattleDmgInfo(battleField.guid, damageValues, this, hurt, skillConfig, isLastHit);
 
-        int currentHurtHp = 0;
-        for (int i = 0; i < damageValues.Count; i++)
-        {
-            currentHurtHp += (int)damageValues[i];
-        }
-
-        bool isRecovery = battleDmgInfo.IsType(DamageType.Recovery);
-
-        long toHp = Math.Max(0, teamHero.curHp + (isRecovery ? currentHurtHp : -currentHurtHp));
-
-        heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp);
-        teamHero.curHp = toHp;
+        // 浣跨敤浼犲叆鐨� fromHp 鍜� toHp 鏇存柊琛�鏉℃樉绀�
+        heroInfoBar.UpdateHP(fromHp, toHp, teamHero.maxHp);
 
         // YYL TODO 鏄惁闇�瑕佹寕鍦ㄥ湪鑷韩鐨刦ollow鐐逛笂
         EventBroadcast.Instance.Broadcast(EventName.BATTLE_DAMAGE_TAKEN, battleDmgInfo);
@@ -468,6 +495,7 @@
     public void SetSpeedRatio(float ratio)
     {
         motionBase.SetSpeedRatio(ratio);
+        heroInfoBar.SetSpeedRatio(ratio);
     }
 
 

--
Gitblit v1.8.0