Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 Main/System/Battle/UIComp/BattleHeroInfoBar.cs

@@ -55,7 +55,7 @@
    protected List<TipsInfo> messages = new List<TipsInfo>();
    protected List<BattleTips> tipsList = new List<BattleTips>();
    protected List<HB428_tagSCBuffRefresh> buffList = new List<HB428_tagSCBuffRefresh>();
    
    [SerializeField] ButtonEx buffInfoButton;
    protected Sequence hpTween;
    protected Tween xpTween;
    protected Tween shieldTween1;
@@ -199,6 +199,23 @@
                        cell.SetActive(false);
                    }
                }


                buffInfoButton.SetListener(() =>
                {
                    if (datas.IsNullOrEmpty()) return;

                    string clickBuffBattleName = battleObject?.battleField?.ToString();
                    if (clickBuffBattleName == BattleConst.StoryBattleField) return;

                    EventBroadcast.Instance.Broadcast(EventName.BATTLE_CLICK_BUFF, new BattleClickBuffData()
                    {
                        isMySide = battleObject?.Camp == BattleCamp.Red,
                        heroID = (battleObject as HeroBattleObject)?.teamHero?.heroId ?? 0,
                        skinID = (battleObject as HeroBattleObject)?.teamHero?.SkinID ?? 0,
                        datas = datas,
                    });
                });
            }
            else
            {