Merge branch 'master' into h5version

yyl

2026-02-11 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec

Merge branch 'master' into h5version

 Main/Component/UI/Common/RendererAdjuster.cs

@@ -9,6 +9,8 @@

    public int sortingOrder = 0;

    public int sortingOrderOffset = 0;

    public string customSortingLayer = "UI";

    public List<Renderer> renderers = new List<Renderer>();
@@ -63,7 +65,7 @@
        {
            if (renderer != null)
            {
                renderer.sortingOrder = sortingOrder;
                renderer.sortingOrder = sortingOrder + sortingOrderOffset;
                if (!string.IsNullOrEmpty(sortingLayer))
                {
                    renderer.sortingLayerName = sortingLayer;

 Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB420_tagMCTurnFightState.cs

@@ -1,7 +1,6 @@
using UnityEngine;
using System.Collections;
using LitJson;
using Codice.Client.BaseCommands;

// B4 20 回合制战斗状态 #tagMCTurnFightState


 Main/System/Battle/BattleObject/BattleObjectLayerMgr.cs

@@ -28,12 +28,14 @@

        }
        else
        
        {
            frontCharRendererAdjuster = battleObj.GetGameObject()?.AddMissingComponent<RendererAdjuster>();
            behindCharRendererAdjuster = battleObj.GetRectTransform()?.Find("Hero/Follower/BattleHeroInfoBar/BehindHero")?.gameObject?.AddMissingComponent<RendererAdjuster>();


            frontCharRendererAdjuster.canvasOffset = BattleConst.BattleFrontCharUIOffset;
            frontCharRendererAdjuster.sortingOrderOffset = BattleConst.BattleHeroOffset;
            behindCharRendererAdjuster.canvasOffset = BattleConst.BattleBehindCharUIOffset;
        }


 Main/System/TimingGift/TimingGiftWin.cs

@@ -241,6 +241,7 @@
        bgImage.SetSprite($"TimingGiftBg_{manager.selectTabGiftId}");
        bgImage.SetNativeSize();
        IconImage.SetSprite($"TimingGiftIcon_{manager.selectTabGiftId}");
        IconImage.SetNativeSize();
        giftNameText.text = config.GiftName;
        rateText.text = Language.Get("TimingGift02", ctgConfig.Percentage);
        rateNameText.text = Language.Get("TimingGift05");