Main/System/Battle/BattleObject/BattleObject.cs
@@ -32,13 +32,13 @@
    public BattleObjectBuffMgr buffMgr;
    public BattleObjectLayerMgr layerMgr;
    public int ObjID { get; set; }
    public BattleCamp Camp { get; protected set; }
    public TeamHero teamHero { get; protected set; }
    // public BuffMgr buffMgr;
    public MotionBase motionBase;
@@ -84,9 +84,11 @@
        Camp = _camp;
        motionBase = new MotionBase();
        motionBase.Init(heroGo.GetComponentInChildren<SkeletonGraphic>(true));
        motionBase.onAnimationComplete += OnAnimationComplete;
        buffMgr = new BattleObjectBuffMgr();
        buffMgr.Init(this);
        layerMgr = new BattleObjectLayerMgr();
        layerMgr.Init(this);
        renderers = heroGo.GetComponentsInChildren<Renderer>(true);
@@ -98,6 +100,8 @@
        heroInfoBarScale.x *= Camp == BattleCamp.Red ? 1 : -1;
        heroInfoBar.transform.localScale = heroInfoBarScale;
        heroInfoBar.SetActive(true);
        SetFront();
    }
@@ -105,6 +109,7 @@
    {
        motionBase.Run();
        heroInfoBar.Run();
        buffMgr.Run();
    }
    public virtual void Pause()
@@ -119,7 +124,6 @@
    public virtual void Destroy()
    {
        motionBase.onAnimationComplete -= OnAnimationComplete;
        motionBase.Release();
        motionBase = null;
@@ -144,14 +148,39 @@
                break;
            case PlayerDataType.MaxHP:
                teamHero.maxHp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
                heroInfoBar.UpdateHP(teamHero.curHp, teamHero.curHp, teamHero.maxHp);
                break;
            case PlayerDataType.XP:
                long toXp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
                heroInfoBar.UpdateHP(teamHero.rage, toXp, 100);
                heroInfoBar.UpdateXP(teamHero.rage, toXp, 100);
                teamHero.rage = (int)GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
                break;
            default:
                BattleDebug.LogError("BattleObject.ObjInfoRefresh 出现意外类型 " + _refreshInfo.RefreshType.ToString());
                Debug.LogError("BattleObject.ObjInfoRefresh 出现意外类型 " + _refreshInfo.RefreshType.ToString());
                break;
        }
    }
    public void ObjPropertyRefreshView(HB418_tagSCObjPropertyRefreshView vNetData)
    {
        switch ((PlayerDataType)vNetData.RefreshType)
        {
            case PlayerDataType.HP:
                long toHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
                heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp);
                teamHero.curHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
                break;
            case PlayerDataType.MaxHP:
                teamHero.maxHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
                heroInfoBar.UpdateHP(teamHero.curHp, teamHero.curHp, teamHero.maxHp);
                break;
            case PlayerDataType.XP:
                long toXp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
                heroInfoBar.UpdateXP(teamHero.rage, toXp, 100);
                teamHero.rage = (int)GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
                break;
            default:
                Debug.LogError("BattleObject.ObjPropertyRefreshView 出现意外类型 " + vNetData.RefreshType.ToString());
                break;
        }
    }
@@ -239,14 +268,24 @@
        return true;
    }
    public virtual void Hurt(List<long> damageValues, long _totalDamage, uint attackType)
    public virtual void Hurt(List<long> damageValues, long _totalDamage, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig)
    {
        PopDamage(teamHero.curHp, damageValues, attackType);
        BattleDmgInfo dmgInfo = PopDamage(damageValues, _totalDamage, hurt, skillConfig);
        motionBase.PlayAnimation(MotionName.hit, false);
        if (dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsRealdamage())
        {
            motionBase.PlayAnimation(MotionName.hit, false);
        }
    }
        //  扣血
        teamHero.curHp -= _totalDamage;
    public void SuckHp(uint suckHP, SkillConfig skillConfig)
    {
    }
    public void HurtByReflect(uint bounceHP, SkillConfig skillConfig)
    {
    }
    //  闪避开始
@@ -254,14 +293,14 @@
    {
        float pingpongTime = 0.2f;
        RectTransform rectTrans = heroRectTrans;
        var tween = rectTrans.DOAnchorPos(new Vector3(-50, 50, 0), pingpongTime)
        var tween = rectTrans.DOAnchorPos(new Vector3(-30, 0, 0), pingpongTime)
            .SetEase(Ease.OutCubic);
        battleField.battleTweenMgr.OnPlayTween(tween);
    }
    //  闪避结束
    public virtual void OnDodgeEnd()
    public virtual void OnDodgeEnd(Action _complete = null)
    {
        float pingpongTime = 0.2f;
        RectTransform rectTrans = heroRectTrans;
@@ -269,30 +308,30 @@
        var tween = rectTrans.DOAnchorPos(Vector3.zero, pingpongTime)
                            .SetEase(Ease.OutCubic);
        tween.onComplete += () =>
        {
            _complete?.Invoke();
        };
        battleField.battleTweenMgr.OnPlayTween(tween);
    }
    public virtual void OnDeath(Action _onDeathAnimationComplete)
    {
        BattleDebug.LogError(ObjID + " OnDeath called");
        onDeathAnimationComplete = _onDeathAnimationComplete;
        motionBase.PlayAnimation(MotionName.dead, false);
    }
    protected virtual void OnAnimationComplete(MotionName motionName)
    {
        if (motionName == MotionName.dead)
        motionBase.PlayAnimation(MotionName.dead, false, () =>
        {
            teamHero.isDead = true;
            OnDeadAnimationComplete();
            onDeathAnimationComplete?.Invoke();
            onDeathAnimationComplete = null;
        }
            _onDeathAnimationComplete?.Invoke();
        });
    }
    protected virtual void OnDeadAnimationComplete()
    {
        //  或许看看溶解特效? YYL TODO
        heroGo.SetActive(false);
        buffMgr.RemoveAllBuff();
    }
    public void OnReborn(HB423_tagMCTurnFightObjReborn vNetData)
@@ -304,21 +343,29 @@
    }
    // 伤害还要看 是否闪避 暴击 and so on 需要有一个DamageType 服务器应该会给
    protected virtual void PopDamage(long curHp, List<long> damageValues, uint attackType)
    protected virtual BattleDmgInfo PopDamage(List<long> damageValues, long _totalDamage, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, SkillConfig skillConfig)
    {
        //  其实应该通知出去给UI界面解耦 让UI界面自己来显示的 YYL TODO
        //  播放伤害数字
        //  这里可以实现一个伤害数字的弹出效果
        //  比如使用一个UI组件来显示伤害数字
        foreach (var damage in damageValues)
        BattleDmgInfo battleDmgInfo = new BattleDmgInfo(battleField.guid, damageValues, this, hurt, skillConfig);
        if (battleDmgInfo.IsType(DamageType.Dodge))
        {
            Debug.Log($"Damage: {damage}");
            OnDodgeBegin();
            DodgeFinishAction dodgeFinish = new DodgeFinishAction(battleField, this);
            battleField.recordPlayer.InsertRecord(dodgeFinish);
        }
        BattleDmgInfo battleDmgInfo = new BattleDmgInfo(battleField.guid, damageValues, this, (int)attackType);
        int currentHurtHp = 0;
        for (int i = 0; i < damageValues.Count; i++)
        {
            currentHurtHp += (int)damageValues[i];
        }
        heroInfoBar.UpdateHP(teamHero.curHp, Math.Max(0, teamHero.curHp - currentHurtHp), teamHero.maxHp);
        teamHero.curHp = Math.Max(0, teamHero.curHp - currentHurtHp);
        // YYL TODO 是否需要挂在在自身的follow点上
        EventBroadcast.Instance.Broadcast(EventName.BATTLE_DAMAGE_TAKEN, battleDmgInfo);
        return battleDmgInfo;
    }
    public RectTransform GetAliasTeamNode()
@@ -342,8 +389,11 @@
        //  休息状态
        //  多一个zzz的一个特效
        heroGo.SetActive(true);
        motionBase.PlayAnimation(MotionName.idle, true);
        motionBase.HaveRest();
        heroRectTrans.anchoredPosition = Vector2.zero;
        heroInfoBar.SetActive(false);
        SetFront();
    }
    public void PushDropItems(BattleDrops _battleDrops)
@@ -353,7 +403,7 @@
    public void PerformDrop()
    {
        if (null == battleDrops)
        if (null == battleDrops || battleDrops.dropItemPackIndex.Count == 0)
            return;
        EventBroadcast.Instance.Broadcast<string, BattleDrops, Action>(
@@ -365,6 +415,20 @@
        battleDrops = null;
    }
    public void SetBack()
    {
        layerMgr.SetBack();
    }
    public void SetFront()
    {
        layerMgr.SetFront();
    }
    public void SetSpeedRatio(float ratio)
    {
        motionBase.SetSpeedRatio(ratio);
    }
#if UNITY_EDITOR_STOP_USING