From dc7922d80c1d133b6261b8af1d521567d2c0a35d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 30 十月 2025 16:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/BattleObject/BattleObject.cs | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/Main/System/Battle/BattleObject/BattleObject.cs b/Main/System/Battle/BattleObject/BattleObject.cs
index 3c0bb25..f868dee 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,7 @@
motionBase.Release();
motionBase = null;
+ buffMgr.onIsControlChanged -= OnControledChange;
buffMgr.Release();
buffMgr = null;
teamHero = null;
@@ -136,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();
+ }
}
}
@@ -280,7 +301,7 @@
// 杩欓噷
- if (dmgInfo.IsType(DamageType.Dodge))
+ if (dmgInfo.IsType(DamageType.Dodge) && !buffMgr.isControled[BattleConst.HardControlGroup])
{
if (isLastHit)
{
@@ -293,6 +314,8 @@
OnDodgeBegin();
}
}
+
+
bool isFatalAttack = (null != deadPack) && isLastHit;
@@ -307,10 +330,21 @@
}
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);
+ }
+ }
+ }
+
}
@@ -470,6 +504,7 @@
public void SetSpeedRatio(float ratio)
{
motionBase.SetSpeedRatio(ratio);
+ heroInfoBar.SetSpeedRatio(ratio);
}
--
Gitblit v1.8.0