From ecc3785d3b3150173a572e4e6d15fa802cd6a6d2 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 23 十月 2025 11:51:52 +0800
Subject: [PATCH] 125 战斗 战斗层级变更
---
Main/System/Battle/BattleConst.cs | 42 +++++++++++++++------
Main/System/Battle/StoryBossBattleWin.cs | 5 --
Main/System/Battle/UIComp/SkillTips.cs | 14 ++++++-
Main/System/Battle/BattleField/BattleRootNode.cs | 7 ++-
Main/System/Battle/BoneFieldBattleWin.cs | 3 -
Main/System/Battle/ArenaBattleWin.cs | 2 -
6 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/Main/System/Battle/ArenaBattleWin.cs b/Main/System/Battle/ArenaBattleWin.cs
index 7802024..be8a5d1 100644
--- a/Main/System/Battle/ArenaBattleWin.cs
+++ b/Main/System/Battle/ArenaBattleWin.cs
@@ -13,7 +13,6 @@
[SerializeField] Text textSpeed;
[SerializeField] Button btnPass;
[SerializeField] Button btnPause;
- [SerializeField] RendererAdjuster buttonsAdjuster;
private BattleRootNode battleRootNode = null;
private BattleField battleField;
@@ -190,7 +189,6 @@
}
ui.SetBattleField(battleField);
battleField.UpdateCanvas(canvas);
- buttonsAdjuster.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
textSpeed.text = (BattleManager.Instance.speedIndex + 1).ToString();
DisplayHpInfo();
DisplayPlayerInfo();
diff --git a/Main/System/Battle/BattleConst.cs b/Main/System/Battle/BattleConst.cs
index 78a5d56..3e69a80 100644
--- a/Main/System/Battle/BattleConst.cs
+++ b/Main/System/Battle/BattleConst.cs
@@ -47,9 +47,20 @@
// 婵�娲昏嫳闆勫悗鐗规晥|婵�娲昏嫳闆剕婵�娲昏嫳闆勫墠鐗规晥
- public const int BattleBlackTransparentMaskOffset = 100;
+ // ---------------------2025銆�10.23鏇存柊
+ // 鐜板湪鏈熸湜 钂欑増涓嶈鍘嬩綇UI 鏇存敼绛栫暐
+ // 閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>姝ｅ父UI>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>搴曞浘
+ // 閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>姝ｅ父UI>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>[搴曞浘]
+ public static int BattleBackgroundOrder
+ {
+ get
+ {
+ return UnactiveHeroBackSortingOrder - 1;
+ }
+ }
+ //閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>[姝ｅ父UI]>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>搴曞浘
public static int BattleWinSortingOrder
{
get
@@ -83,12 +94,13 @@
}
}
+ //閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>姝ｅ父UI>榛戣壊钂欑増>[鏈彈褰卞搷鑻遍泟]>搴曞浘
// 闈炴縺娲昏嫳闆勭殑灞傜骇
public static int UnactiveHeroSortingOrder
{
get
{
- return BattleWinSortingOrder + BattleBlackTransparentMaskOffset - 50;
+ return BattleWinSortingOrder - 3;
}
}
@@ -110,7 +122,8 @@
}
}
- // 鎸℃澘鐨勫眰绾�
+ //閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>姝ｅ父UI>[榛戣壊钂欑増]>鏈彈褰卞搷鑻遍泟>搴曞浘
+ // 榛戣壊钂欑増鐨勫眰绾�
public static int BlockerSortingOrder
{
get
@@ -119,23 +132,16 @@
}
}
+ //閲婃斁鎶�鑳借嫳闆�>[鍙楀奖鍝嶈嫳闆刔>姝ｅ父UI>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>搴曞浘
// 婵�娲昏嫳闆勭殑灞傜骇
public static int ActiveHeroSortingOrder
{
get
{
- return BattleWinSortingOrder + BattleBlackTransparentMaskOffset + 50;
+ return BattleWinSortingOrder + 1;
}
}
- // 閲婃斁鎶�鑳介挓鐨勮嫳闆勫眰绾�
- public static int ActiveHeroActionSortingOrder
- {
- get
- {
- return ActiveHeroSortingOrder + 1;
- }
- }
// 婵�娲昏嫳闆勭殑鍚庣壒鏁�
public static int ActiveHeroBackSortingOrder
@@ -154,4 +160,16 @@
return ActiveHeroSortingOrder + 1;
}
}
+
+ //[閲婃斁鎶�鑳借嫳闆刔>鍙楀奖鍝嶈嫳闆�>姝ｅ父UI>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>搴曞浘
+ // 閲婃斁鎶�鑳介挓鐨勮嫳闆勫眰绾�
+ public static int ActiveHeroActionSortingOrder
+ {
+ get
+ {
+ return ActiveHeroFrontSortingOrder + 1;
+ }
+ }
+
+
}
\ No newline at end of file
diff --git a/Main/System/Battle/BattleField/BattleRootNode.cs b/Main/System/Battle/BattleField/BattleRootNode.cs
index 198a2da..f9bd1b6 100644
--- a/Main/System/Battle/BattleField/BattleRootNode.cs
+++ b/Main/System/Battle/BattleField/BattleRootNode.cs
@@ -33,9 +33,11 @@
public RectTransform battleNodePos1;
public RectTransform battleNodePos2;
- public RendererAdjuster rendererAdjuster;
+ public RendererAdjuster skillMaskAdjuster;
public RendererAdjuster battleStartAdjuster;
+
+ public RendererAdjuster backgroundAdjuster;
void Awake()
{
@@ -63,8 +65,9 @@
public void SetSortingOrder()
{
- rendererAdjuster.SetSortingOrder(BattleConst.BlockerSortingOrder);
+ skillMaskAdjuster.SetSortingOrder(BattleConst.BlockerSortingOrder);
battleStartAdjuster.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);//鏈�楂樺眰
+ backgroundAdjuster.SetSortingOrder(BattleConst.BattleBackgroundOrder);//鏈�浣庡眰
}
public Transform skillBackNode;
diff --git a/Main/System/Battle/BoneFieldBattleWin.cs b/Main/System/Battle/BoneFieldBattleWin.cs
index c42370f..d9fa190 100644
--- a/Main/System/Battle/BoneFieldBattleWin.cs
+++ b/Main/System/Battle/BoneFieldBattleWin.cs
@@ -25,8 +25,6 @@
[SerializeField]
private Button btnPause;
- public RendererAdjuster buttonsAdjuster;
-
public BossLifeBar bossLifeBar;
@@ -158,7 +156,6 @@
ui.SetBattleField(battleField);
battleField.UpdateCanvas(canvas);
- buttonsAdjuster.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
textSpeed.text = (BattleManager.Instance.speedIndex + 1).ToString();
}
diff --git a/Main/System/Battle/StoryBossBattleWin.cs b/Main/System/Battle/StoryBossBattleWin.cs
index 76f6173..c821d4e 100644
--- a/Main/System/Battle/StoryBossBattleWin.cs
+++ b/Main/System/Battle/StoryBossBattleWin.cs
@@ -26,10 +26,7 @@
[SerializeField]
private Button btnPause;
- public RendererAdjuster buttonsAdjuster;
-
public BossLifeBar bossLifeBar;
-
public SkillWordCell[] skillWordCells;
@@ -291,10 +288,10 @@
ui.SetBattleField(battleField);
battleField.UpdateCanvas(canvas);
- buttonsAdjuster.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
Refresh();
+ battleField.OnRoundChange -= OnRoundChange;
battleField.OnRoundChange += OnRoundChange;
textSpeed.text = (BattleManager.Instance.speedIndex + 1).ToString();
diff --git a/Main/System/Battle/UIComp/SkillTips.cs b/Main/System/Battle/UIComp/SkillTips.cs
index 08aca89..8e7d942 100644
--- a/Main/System/Battle/UIComp/SkillTips.cs
+++ b/Main/System/Battle/UIComp/SkillTips.cs
@@ -6,9 +6,9 @@
public class SkillTips : MonoBehaviour
{
- public const float tweenDuration = 1f;
+ public const float tweenDuration = 0.5f;
- public const float delayDuration = 0.4f;
+ public const float delayDuration = 0.6f;
public const float beginingX = 400f;
@@ -65,6 +65,11 @@
seq.OnComplete(() =>
{
tween2 = null;
+ // 鎭㈠鍥剧墖 alpha锛屼繚璇佷笅娆℃樉绀烘椂鍙
+ if (imageBg != null) { var cc = imageBg.color; cc.a = 1f; imageBg.color = cc; }
+ if (imgIcon != null) { var cc = imgIcon.color; cc.a = 1f; imgIcon.color = cc; }
+ if (imgSkillName != null) { var cc = imgSkillName.color; cc.a = 1f; imgSkillName.color = cc; }
+
transform.localPosition = isRed ? new Vector3(-beginingX, posY, 0f) : new Vector3(beginingX, posY, 0f);
gameObject.SetActive(false);
});
@@ -94,6 +99,11 @@
tween3.Kill();
tween3 = null;
}
+
+ // 琚己鍒跺仠姝㈡椂涔熼渶瑕佹仮澶� alpha
+ if (imageBg != null) { var cc = imageBg.color; cc.a = 1f; imageBg.color = cc; }
+ if (imgIcon != null) { var cc = imgIcon.color; cc.a = 1f; imgIcon.color = cc; }
+ if (imgSkillName != null) { var cc = imgSkillName.color; cc.a = 1f; imgSkillName.color = cc; }
}
}
--
Gitblit v1.8.0