From 1618f5f0a18aff64ec092ad1c8478f2840057b63 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期四, 11 六月 2026 18:16:46 +0800
Subject: [PATCH] 588 公会攻防战 提交主干和分支11
---
Main/System/GuildAtkDefBat/GuildAtkDefBatTreasureWin.cs | 12 ++++++++++--
Main/System/GuildAtkDefBat/GuildAtkDefBatVictoryWin.cs | 4 ++--
Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs | 7 ++++++-
Main/System/Guild/GuildBaseWin.cs | 2 +-
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index a862e87..b5e88b1 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -200,7 +200,7 @@
/// </summary>
void UpdateGuildBattleCountdown()
{
- int state = GuildAtkDefBatManager.Instance.BatState;
+ int state = GuildAtkDefBatManager.Instance.GetGuildBattleDisplayState();
bool show = state == 2 || state == 3;
GuildBattleCountDownTime.SetActive(show);
if (!show) return;
diff --git a/Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs b/Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs
index 1825f1b..17b5ac2 100644
--- a/Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs
+++ b/Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs
@@ -46,6 +46,11 @@
base.InitComponent();
funPresetDefBtn.AddListener(() =>
{
+ if (GuildAtkDefBatManager.Instance.GetGuildBattleDisplayState() == 3)
+ {
+ SysNotifyMgr.Instance.ShowTip("GuildAtkDefBat7");
+ return;
+ }
FuncPresetManager.Instance.ClickBattlePreset((int)BattlePreSetType.GuildAtkDefBat);
});
funPresetAtkBtn.AddListener(() =>
@@ -223,7 +228,7 @@
void ShowTop3()
{
- atkCntImage.SetActive(GuildAtkDefBatManager.Instance.BatState == 3);
+ atkCntImage.SetActive(GuildAtkDefBatManager.Instance.GetGuildBattleDisplayState() == 3);
var sortedMembers = GuildAtkDefBatManager.Instance.GetSortedFamilyMembers();
int top3Count = Mathf.Min(top3NameText.Length, sortedMembers.Count);
diff --git a/Main/System/GuildAtkDefBat/GuildAtkDefBatTreasureWin.cs b/Main/System/GuildAtkDefBat/GuildAtkDefBatTreasureWin.cs
index e147392..30710d5 100644
--- a/Main/System/GuildAtkDefBat/GuildAtkDefBatTreasureWin.cs
+++ b/Main/System/GuildAtkDefBat/GuildAtkDefBatTreasureWin.cs
@@ -10,6 +10,8 @@
[SerializeField] ButtonEx awardButton;
[SerializeField] ButtonEx lastLineButton;
[SerializeField] ButtonEx nextLineButton;
+ [SerializeField] ImageEx lastLineImage;
+ [SerializeField] ImageEx nextLineImage;
[SerializeField] ImageEx timeImage;
[SerializeField] TextEx timeText;
[SerializeField] ScrollerController scroller;
@@ -167,8 +169,14 @@
}
scroller.Restart();
- lastLineButton.SetActive(currentTopRow > 0);
- nextLineButton.SetActive(currentTopRow < totalRows - MAX_ROWS);
+ int displayState = manager.GetGuildBattleDisplayState();
+ bool isTrucePeriod = displayState == 4 || displayState == 5;
+ lastLineButton.SetActive(isTrucePeriod && currentTopRow > 0);
+ nextLineButton.SetActive(isTrucePeriod && currentTopRow < totalRows - MAX_ROWS);
+
+ string showStr = displayState == 4 ? "GuildAtkDefBatTreasureBlue" : "GuildAtkDefBatTreasureRed";
+ lastLineImage.SetSprite(showStr);
+ nextLineImage.SetSprite(showStr);
}
void OnRefreshCell(ScrollerDataType type, CellView cell)
diff --git a/Main/System/GuildAtkDefBat/GuildAtkDefBatVictoryWin.cs b/Main/System/GuildAtkDefBat/GuildAtkDefBatVictoryWin.cs
index a0056ef..38c61a7 100644
--- a/Main/System/GuildAtkDefBat/GuildAtkDefBatVictoryWin.cs
+++ b/Main/System/GuildAtkDefBat/GuildAtkDefBatVictoryWin.cs
@@ -9,7 +9,7 @@
[SerializeField] AvatarCell enemyAvatar;
[SerializeField] TextEx myNameText;
[SerializeField] TextEx enemyNameText;
- [SerializeField] RichText scoreText;
+ [SerializeField] TextEx scoreText;
[SerializeField] TextEx txtFuncName;
[SerializeField] ScrollerController scroller;
[SerializeField] ButtonEx detailBtn;
@@ -123,7 +123,7 @@
// 鏄剧ず澧炲姞鐨勬槦鏁帮紙鏄熸槦鍥炬爣 + 鏁板�硷級
scoreText.SetActive(true);
int addStar = jsonData.ContainsKey("addStar") ? (int)jsonData["addStar"] : 0;
- scoreText.text = Language.Get("GuildAtkDefBat22", "GuildAtkDefBatBattleEx_img_47", addStar);
+ scoreText.text = $"+{addStar}";
}
int funcId = (int)FuncOpenEnum.GuildAtkDefBat;
--
Gitblit v1.8.0