From 34179ffa10e510ba71522cb2bd1fd978b7fcbbe1 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期四, 16 七月 2026 11:26:37 +0800
Subject: [PATCH] Revert "634 H5适配 获得英雄展示动态立绘的时机放到OnOpen"

---
 Main/System/GuildAtkDefBat/GuildAtkDefBatChallengeWin.cs |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Main/System/GuildAtkDefBat/GuildAtkDefBatChallengeWin.cs b/Main/System/GuildAtkDefBat/GuildAtkDefBatChallengeWin.cs
index 0a271c7..59c5126 100644
--- a/Main/System/GuildAtkDefBat/GuildAtkDefBatChallengeWin.cs
+++ b/Main/System/GuildAtkDefBat/GuildAtkDefBatChallengeWin.cs
@@ -124,10 +124,7 @@
 
         int displayState = manager.GetGuildBattleDisplayState();
         if (displayState != 3)
-        {
-            ScrollTip.ShowTip("Guild attack-defense battle is not active");
             return;
-        }
 
         if (!manager.HasMyJoinEligibility())
         {
@@ -137,24 +134,26 @@
 
         if (manager.GetMyRemainingChallengeCount() <= 0)
         {
-            ScrollTip.ShowTip("Challenge is unavailable");
+            SysNotifyMgr.Instance.ShowTip("GuildAtkDefBat5");
             return;
         }
 
         if (manager.IsPropertyKilled(targetMem.KilledState, difficultyIndex))
         {
-            ScrollTip.ShowTip("Challenge is unavailable");
             DisplayDifficulties();
             return;
         }
 
         GuildAtkDefBatManager.Instance.CurrentChallengeTargetPlayerID = targetMem.PlayerID;
+        UIManager.Instance.GetUI<GuildAtkDefBatBattlePanelWin>()?.SaveScrollPositionForNextOpen();
         BattleManager.Instance.SendTurnFight(
             (uint)GuildAtkDefBatManager.DataMapID,
             0,
             1,
             targetMem.PlayerID,
-            new[] { (uint)defBaseAttrPer, 0u });
+            new[] { (uint)defBaseAttrPer, 0u },
+            true,
+            targetMem.ServerID);
         CloseWindow();
     }
 

--
Gitblit v1.8.0