From e7e206de7ea26e0037d60ff0c3e9943950340a18 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期五, 12 六月 2026 12:13:32 +0800
Subject: [PATCH] 588 公会攻防战 公会排行榜没战斗过的不上榜

---
 Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs b/Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs
index 4fb33bd..17b5ac2 100644
--- a/Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs
+++ b/Main/System/GuildAtkDefBat/GuildAtkDefBatBattlePanelWin.cs
@@ -39,12 +39,18 @@
     private int m_CachedDisplayState;
     private List<HA525_tagSCFamilyAtkDefBatInfo.tagSCFamilyAtkDefBatMem> m_SortedDefenders;
     private List<HA525_tagSCFamilyAtkDefBatInfo.tagSCFamilyAtkDefBatMem> m_RemainingDefenders;
+    private bool m_DeferBattleScrollerRefresh;
 
     protected override void InitComponent()
     {
         base.InitComponent();
         funPresetDefBtn.AddListener(() =>
         {
+            if (GuildAtkDefBatManager.Instance.GetGuildBattleDisplayState() == 3)
+            {
+                SysNotifyMgr.Instance.ShowTip("GuildAtkDefBat7");
+                return;
+            }
             FuncPresetManager.Instance.ClickBattlePreset((int)BattlePreSetType.GuildAtkDefBat);
         });
         funPresetAtkBtn.AddListener(() =>
@@ -101,7 +107,9 @@
         else if (displayState == 3)
             functionOrder = 1; // 婵�鎴樻湡榛樿鏁屾柟鎴樺満
 
+        m_DeferBattleScrollerRefresh = true;
         base.OnPreOpen();
+        m_DeferBattleScrollerRefresh = false;
         scroller.OnRefreshCell += OnRefreshCell;
         GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
         GuildAtkDefBatManager.Instance.OnUpdateAtkDefBatInfoEvent += OnUpdateAtkDefBatInfoEvent;
@@ -125,6 +133,7 @@
     {
         OnDayRefresh();
         Display();
+        RefreshBattleScroller();
     }
 
     private void OnDayRefresh()
@@ -162,6 +171,11 @@
     {
         DisplayInfo();
         DisplayTime();
+    }
+
+    protected override void NextFrameAfterOpen()
+    {
+        base.NextFrameAfterOpen();
         RefreshBattleScroller();
     }
 
@@ -214,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);
@@ -237,6 +251,9 @@
 
     protected override void OpenSubUIByTabIndex()
     {
+        if (m_DeferBattleScrollerRefresh)
+            return;
+
         RefreshBattleScroller();
     }
 

--
Gitblit v1.8.0