From 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 16:10:43 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/TimingGift/TimingGiftWin.cs | 1 +
Main/Component/UI/Common/RendererAdjuster.cs | 4 +++-
Main/System/Battle/BattleObject/BattleObjectLayerMgr.cs | 2 ++
Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB420_tagMCTurnFightState.cs | 1 -
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Main/Component/UI/Common/RendererAdjuster.cs b/Main/Component/UI/Common/RendererAdjuster.cs
index b7e635e..76dd43b 100644
--- a/Main/Component/UI/Common/RendererAdjuster.cs
+++ b/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;
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB420_tagMCTurnFightState.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB420_tagMCTurnFightState.cs
index 84065e7..e7ef653 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB420_tagMCTurnFightState.cs
+++ b/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
diff --git a/Main/System/Battle/BattleObject/BattleObjectLayerMgr.cs b/Main/System/Battle/BattleObject/BattleObjectLayerMgr.cs
index 1989ad4..1db2927 100644
--- a/Main/System/Battle/BattleObject/BattleObjectLayerMgr.cs
+++ b/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;
}
diff --git a/Main/System/TimingGift/TimingGiftWin.cs b/Main/System/TimingGift/TimingGiftWin.cs
index 7f6ae67..6444fbe 100644
--- a/Main/System/TimingGift/TimingGiftWin.cs
+++ b/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");
--
Gitblit v1.8.0