From 257d1bd2d25df4d0bf0152925e50237fe6758771 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期四, 11 六月 2026 19:17:20 +0800
Subject: [PATCH] 588 公会攻防战
---
Main/System/GuildAtkDefBat/GuildAtkDefBatManager.cs | 18 ++++++++----------
Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs | 8 --------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Main/System/GuildAtkDefBat/GuildAtkDefBatManager.cs b/Main/System/GuildAtkDefBat/GuildAtkDefBatManager.cs
index 64d038b..8219eca 100644
--- a/Main/System/GuildAtkDefBat/GuildAtkDefBatManager.cs
+++ b/Main/System/GuildAtkDefBat/GuildAtkDefBatManager.cs
@@ -223,7 +223,6 @@
targetInfo.ServerID = sourceData.ServerID;
targetInfo.EmblemID = sourceData.EmblemID;
targetInfo.EmblemWord = UIHelper.ServerStringTrim(sourceData.EmblemWord);
- targetInfo.IsDismiss = sourceData.IsDismiss;
targetInfo.TotalStar = sourceData.TotalStar;
targetInfo.OverState = sourceData.OverState;
targetInfo.BatMemCount = sourceData.BatMemCount;
@@ -423,8 +422,8 @@
if (BatState == 1 && MyFamilyInfo != null)
{
int overState = MyFamilyInfo.OverState;
- if (overState == 1 || overState == 3) return 4;
- if (overState == 2 || overState == 4) return 5;
+ if (overState == 1) return 4;
+ if (overState == 2) return 5;
}
return 1;
@@ -883,8 +882,7 @@
/// <summary>
/// 鑾峰彇鎴戠殑鍓╀綑寮�鍚鏁�
/// 浠呭湪浼戞垬鏈�(BatState==1)鍙紑鍚�
- /// 瀵规墜鍏細鏈В鏁�: 鏈夊弬涓庢垬鏂�(BatCnt>0)鐨勭帺瀹跺彲寮�鍚�1娆�
- /// 瀵规墜鍏細宸茶В鏁�: 鎵�鏈夊弬璧涙垚鍛樺潎鍙紑鍚�1娆�
+ /// 鍙傛垬涓斿凡鎴樻枟鎴愬憳鍙紑鍚�1娆�
/// 姣忎汉鏈�澶�1娆�
/// </summary>
public int GetMyOpenRemainCount()
@@ -900,15 +898,15 @@
if (!MyFamilyMembers.TryGetValue(myPlayerId, out var myMem))
return 0;
+ // 鏈弬涓庢垬鏂椾笉鑳藉紑鍚�
+ if (myMem.BatCnt <= 0)
+ return 0;
+
// 宸插紑鍚繃鍒欎笉鑳藉啀娆″紑鍚�
if (myMem.GridNum > 0)
return 0;
- // 瀵规墜鍏細宸茶В鏁�: 鎵�鏈夊弬璧涙垚鍛樺潎鍙紑鍚�
- if (EnemyFamilyInfo != null && EnemyFamilyInfo.IsDismiss == 1)
- return 1;
-
- // 瀵规墜鍏細鏈В鏁�: 鍙傛垬鎴愬憳鍧囧彲寮�鍚�1娆★紙宸插紑鍚殑琚� GridNum 杩囨护锛�
+ // 鍙傛垬涓斿凡鎴樻枟鎴愬憳鍙紑鍚�1娆★紙宸插紑鍚殑琚� GridNum 杩囨护锛�
return 1;
}
diff --git a/Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs b/Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs
index 0a25ab1..9e73c03 100644
--- a/Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs
+++ b/Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs
@@ -86,14 +86,6 @@
return;
}
- // 瀵规墜鍏細宸茶В鏁ｏ紝涓嶅彲杩涘叆鎴樻枟
- var enemyInfo = GuildAtkDefBatManager.Instance.EnemyFamilyInfo;
- if (enemyInfo != null && enemyInfo.IsDismiss == 1)
- {
- SysNotifyMgr.Instance.ShowTip("GuildAtkDefBat6");
- return;
- }
-
bool hasEligibility = GuildAtkDefBatManager.Instance.HasMyJoinEligibility();
if (!hasEligibility)
{
--
Gitblit v1.8.0