Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

2025-10-30 dc7922d80c1d133b6261b8af1d521567d2c0a35d

 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();
            }
        }
    }

@@ -269,10 +292,30 @@
    }

    public virtual void Hurt(List<long> damageValues, long _totalDamage,
        HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig, bool isLastHit,
        HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig, int hitIndex,
        BattleDrops battleDrops, HB422_tagMCTurnFightObjDead deadPack)
    {
        BattleDmgInfo dmgInfo = PopDamage(damageValues, _totalDamage, hurt, skillConfig);
        bool isLastHit = hitIndex >= skillConfig.DamageDivide.Length - 1;
        bool firstHit = hitIndex == 0;
        BattleDmgInfo dmgInfo = PopDamage(damageValues, _totalDamage, hurt, skillConfig, isLastHit);


        //  这里
        if (dmgInfo.IsType(DamageType.Dodge) && !buffMgr.isControled[BattleConst.HardControlGroup])
        {
            if (isLastHit)
            {
                DodgeFinishAction dodgeFinish = new DodgeFinishAction(battleField, this);
                battleField.recordPlayer.InsertRecord(dodgeFinish);
            }

            if (firstHit)
            {
                OnDodgeBegin();
            }
        }



        bool isFatalAttack = (null != deadPack) && isLastHit;

@@ -287,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);
                    }
                }
            }

        }


@@ -307,7 +361,7 @@
    }


    const float pingpongTime = 0.2f;
    const float pingpongTime = 0.4f;
    //  闪避开始
    public virtual void OnDodgeBegin()
    {
@@ -368,16 +422,9 @@
    }

    // 伤害还要看 是否闪避 暴击 and so on 需要有一个DamageType 服务器应该会给
    protected virtual BattleDmgInfo PopDamage(List<long> damageValues, long _totalDamage, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig)
    protected virtual BattleDmgInfo PopDamage(List<long> damageValues, long _totalDamage, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig, bool isLastHit)
    {
        BattleDmgInfo battleDmgInfo = new BattleDmgInfo(battleField.guid, damageValues, this, hurt, skillConfig);

        if (battleDmgInfo.IsType(DamageType.Dodge))
        {
            OnDodgeBegin();
            DodgeFinishAction dodgeFinish = new DodgeFinishAction(battleField, this);
            battleField.recordPlayer.InsertRecord(dodgeFinish);
        }
        BattleDmgInfo battleDmgInfo = new BattleDmgInfo(battleField.guid, damageValues, this, hurt, skillConfig, isLastHit);

        int currentHurtHp = 0;
        for (int i = 0; i < damageValues.Count; i++)
@@ -457,6 +504,7 @@
    public void SetSpeedRatio(float ratio)
    {
        motionBase.SetSpeedRatio(ratio);
        heroInfoBar.SetSpeedRatio(ratio);
    }