hch
2025-11-21 eb27e5fd31f73b998a4bbd85511a31e40b8c61b7
Main/System/Battle/BattleObject/BattleObject.cs
@@ -101,8 +101,15 @@
        var heroInfoBarScale = heroInfoBar.transform.localScale;
        heroInfoBarScale.x *= Camp == BattleCamp.Red ? 1 : -1;
        heroInfoBar.transform.localScale = heroInfoBarScale;
        heroInfoBar.SetActive(true);
        if (battleField is StoryBattleField && (battleField as StoryBattleField).battleState == StoryBattleState.Break)
        {
            //主线关卡休息中的不显示血条
            heroInfoBar.SetActive(false);
        }
        else
        {
            heroInfoBar.SetActive(true);
        }
        SetFront();
    }
@@ -162,20 +169,20 @@
    public void OnObjInfoRefresh(H0418_tagObjInfoRefresh _refreshInfo)
    {
        // 天子的挑战拦截血条逻辑
        // 天子的挑战拦截血条,不拦截怒气
        BattleObject boss = battleField.FindBoss();
        if (boss != null && battleField.MapID == 30020 && boss.ObjID == _refreshInfo.ObjID)
        if (boss != null && battleField.MapID == 30020 && boss.ObjID == _refreshInfo.ObjID && _refreshInfo.RefreshType != (ushort)PlayerDataType.XP)
            return;
        switch ((PlayerDataType)_refreshInfo.RefreshType)
        {
            case PlayerDataType.HP:
                long toHp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
                heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp);
                heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp, false);
                teamHero.curHp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
                break;
            case PlayerDataType.MaxHP:
                teamHero.maxHp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
                heroInfoBar.UpdateHP(teamHero.curHp, teamHero.curHp, teamHero.maxHp);
                heroInfoBar.UpdateHP(teamHero.curHp, teamHero.curHp, teamHero.maxHp, false);
                break;
            case PlayerDataType.XP:
                long toXp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
@@ -188,33 +195,33 @@
        }
    }
    public void ObjPropertyRefreshView(HB418_tagSCObjPropertyRefreshView vNetData)
    {
        // 天子的挑战拦截血条逻辑
        BattleObject boss = battleField.FindBoss();
        if (boss != null && battleField.MapID == 30020 && boss.ObjID == vNetData.ObjID)
            return;
        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;
        }
    }
    // public void ObjPropertyRefreshView(HB418_tagSCObjPropertyRefreshView vNetData)
    // {
    //     // 天子的挑战拦截血条,不拦截怒气
    //     BattleObject boss = battleField.FindBoss();
    //     if (boss != null && battleField.MapID == 30020 && boss.ObjID == vNetData.ObjID && vNetData.RefreshType != (ushort)PlayerDataType.XP)
    //         return;
    //     switch ((PlayerDataType)vNetData.RefreshType)
    //     {
    //         case PlayerDataType.HP:
    //             long toHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
    //             heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp, false);
    //             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, false);
    //             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;
    //     }
    // }
    //  眩晕
    public bool IsStunned()
@@ -307,7 +314,7 @@
        //  这里
        if (dmgInfo.IsType(DamageType.Dodge) && !buffMgr.isControled[BattleConst.HardControlGroup])
        if (dmgInfo.IsType(DamageType.Dodge) /*&& !buffMgr.isControled[BattleConst.HardControlGroup]*/)//如果被控制了还闪避了 要看看服务器怎么处理了
        {
            if (isLastHit)
            {
@@ -340,16 +347,16 @@
            {
                battleField.battleEffectMgr.PlayEffect(this, 19999, heroRectTrans, Camp);
            }
            else
            // else
            // {
            if ((dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsRealdamage()))
            {
                if ((dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsRealdamage()))
                if (!buffMgr.isControled[BattleConst.HardControlGroup])
                {
                    if (!buffMgr.isControled[BattleConst.HardControlGroup])
                    {
                        motionBase.PlayAnimation(MotionName.hit, false);
                    }
                    motionBase.PlayAnimation(MotionName.hit, false);
                }
            }
            // }
        }
    }
@@ -364,6 +371,12 @@
            .SetEase(Ease.OutCubic);
        motionBase.ShowIllusionShadow(true);
        DamageNumConfig damageNumConfig = DamageNumConfig.Get((int)DamageType.Dodge);
        string dodgeStr = ((char)damageNumConfig.prefix).ToString();
        heroInfoBar.ShowTips(dodgeStr, true, false);
        tween.onComplete += () =>
        {
@@ -391,7 +404,8 @@
    public virtual void OnDeath(Action _onDeathAnimationComplete)
    {
        motionBase.PlayAnimation(MotionName.dead, false, () =>
        buffMgr.RemoveAllBuff();
        motionBase.PlayDeadAnimation(() =>
        {
            teamHero.isDead = true;
            OnDeadAnimationComplete();
@@ -404,6 +418,7 @@
        //  或许看看溶解特效? YYL TODO
        heroGo.SetActive(false);
        //  防止给死亡对象又上buff
        buffMgr.RemoveAllBuff();
    }
@@ -411,6 +426,7 @@
    {
        // 处理复活逻辑
        teamHero.curHp = GeneralDefine.GetFactValue(vNetData.HP, vNetData.HPEx);
        teamHero.isDead = false;
        heroGo.SetActive(true);
        motionBase.PlayAnimation(MotionName.idle, true);
    }
@@ -428,8 +444,7 @@
        }
        else
        {
            // 使用传入的 fromHp 和 toHp 更新血条显示
            heroInfoBar.UpdateHP(battleHurtParam.fromHp, battleHurtParam.toHp, teamHero.maxHp);
            heroInfoBar.UpdateDamage(battleDmgInfo);
            // YYL TODO 是否需要挂在在自身的follow点上
            EventBroadcast.Instance.Broadcast(EventName.BATTLE_DAMAGE_TAKEN, battleDmgInfo);
@@ -473,7 +488,7 @@
    public void PerformDrop()
    {
        if (null == m_battleDrops || m_battleDrops.dropItemPackIndex.Count == 0)
        if (null == m_battleDrops)
            return;
        EventBroadcast.Instance.Broadcast<string, BattleDrops, Action>(
@@ -501,6 +516,63 @@
        heroInfoBar.SetSpeedRatio(ratio);
    }
    public void OnObjPropertyRefreshView(HB418_tagSCObjPropertyRefreshView vNetData)
    {
        // 天子的挑战拦截血条,不拦截怒气
        BattleObject boss = battleField.FindBoss();
        if (boss != null && battleField.MapID == 30020 && boss.ObjID == vNetData.ObjID && vNetData.RefreshType != (ushort)PlayerDataType.XP)
            return;
        // public uint ObjID;
        // public ushort RefreshType;    // 同0418刷新类型,如血量、怒气
        // public uint AttackTypes;    // 飘字类型汇总,支持多种类型并存,如无视防御且暴击同时被格挡,二进制或运算最终值;0-失败;1-普通;2-回血;5-格挡;6-无视防御;7-暴击;9-闪避
        // public uint Value;    // 更新值
        // public uint ValueEx;    // 更新值,如果是大数值的此值为整除亿部分
        // public byte DiffType;    // 变化类型,0-减少;1-增加
        // public uint DiffValue;    // 变化值
        // public uint DiffValueEx;    // 变化值,如果是大数值的此值为整除亿部分
        // public uint SkillID;    // 使用的技能表ID
        // public uint RelatedSkillID;    // 关联的技能ID,一般是主技能ID,非主技能额外触发的为0
        long diffValue = GeneralDefine.GetFactValue(vNetData.DiffValue, vNetData.DiffValueEx);
        diffValue *= vNetData.DiffType == 0 ? -1 : 1;
        long newValue = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
        switch ((PlayerDataType)vNetData.RefreshType)
        {
            case PlayerDataType.HP:
                long toHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
                heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp, true);
                teamHero.curHp = newValue;
                break;
            case PlayerDataType.MaxHP:
                teamHero.maxHp = newValue;
                heroInfoBar.UpdateHP(teamHero.curHp, teamHero.curHp, teamHero.maxHp, true);
                break;
            case PlayerDataType.XP:
                long toXp = newValue;
                heroInfoBar.UpdateXP(teamHero.rage, toXp, 100);
                teamHero.rage = (int)newValue;
                DamageNumConfig damageNumConfig = DamageNumConfig.Get((int)DamageType.RageUp);
                string message = BattleUtility.ConvertToArtFont(damageNumConfig, diffValue);
                heroInfoBar.ShowTips(new BattleHeroInfoBar.TipsInfo()
                {
                    message = message,
                    useArtText = true,
                    followCharacter = true,
                    scaleRatio = 1f,
                    isRage = true
                });
                break;
            default:
                Debug.LogError("BattleObject.ObjPropertyRefreshView 出现意外类型 " + vNetData.RefreshType.ToString());
                break;
        }
    }
#if UNITY_EDITOR_STOP_USING
    public void EditorRevive()