From f451fbfbd49717de57628a878e4500e50b38e5fc Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 22 一月 2026 17:18:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Guild/GuildManager.cs | 2 +-
Main/System/LineupRecommend/LineupRecommendCell.cs | 11 ++++++++++-
Main/System/Guild/GuildBossManager.cs | 2 +-
Main/System/Guild/GuildChangeBroadcastWin.cs | 4 ++++
Main/System/LineupRecommend/LineupRecommendManager.cs | 13 +++++++++++++
Main/System/Guild/GuildBaseWin.cs | 2 ++
6 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index da9c7ed..82e55e7 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -67,6 +67,8 @@
{
if (PlayerDatas.Instance.fairyData.fairy == null)
return;
+
+ GuildManager.Instance.RequestGuildData();
GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
GlobalTimeEvent.Instance.fiveSecondEvent += OnFiveSecondEvent;
ChatManager.Instance.OnUpdateTalkEvent += OnUpdateTalkEvent;
diff --git a/Main/System/Guild/GuildBossManager.cs b/Main/System/Guild/GuildBossManager.cs
index a9a8ebe..01e3f73 100644
--- a/Main/System/Guild/GuildBossManager.cs
+++ b/Main/System/Guild/GuildBossManager.cs
@@ -305,7 +305,7 @@
var playerInfo = PlayerDatas.Instance.fairyData.GetMember(playerId);
if (playerInfo == null)
{
- return taofaPlayerData.ContainsKey(playerId) ? taofaPlayerData[playerId] : null;
+ return taofaPlayerData.ContainsKey(playerId) ? taofaPlayerData[playerId] : new MemberData();
}
return new MemberData()
diff --git a/Main/System/Guild/GuildChangeBroadcastWin.cs b/Main/System/Guild/GuildChangeBroadcastWin.cs
index dde5d6c..d48120b 100644
--- a/Main/System/Guild/GuildChangeBroadcastWin.cs
+++ b/Main/System/Guild/GuildChangeBroadcastWin.cs
@@ -27,6 +27,10 @@
protected override void OnPreOpen()
{
+ var guildInfo = PlayerDatas.Instance.fairyData.fairy;
+ if (guildInfo == null)
+ return;
+ inputField.placeholder.GetComponent<Text>().text = string.IsNullOrEmpty(guildInfo.Broadcast) ? Language.Get("Guild_62") : guildInfo.Broadcast; ;
inputField.text = string.Empty;
}
diff --git a/Main/System/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index d7fc442..f6e8e11 100644
--- a/Main/System/Guild/GuildManager.cs
+++ b/Main/System/Guild/GuildManager.cs
@@ -741,7 +741,7 @@
return;
}
lastChangeMarkTime = Time.time;
- if (UIManager.Instance.IsOpened<GuildHallWin>())
+ if ((netPack.Type == 1 || netPack.Type == 2) && UIManager.Instance.IsOpened<GuildBaseWin>())
{
RequestGuildData();
}
diff --git a/Main/System/LineupRecommend/LineupRecommendCell.cs b/Main/System/LineupRecommend/LineupRecommendCell.cs
index 6e90a42..440d8cb 100644
--- a/Main/System/LineupRecommend/LineupRecommendCell.cs
+++ b/Main/System/LineupRecommend/LineupRecommendCell.cs
@@ -53,7 +53,16 @@
txtLineupDesc.text = GetDesc(recommendID);
btnUse.SetListener(() =>
{
- ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), Language.Get("LineupRecommend06"),
+ bool hasHeroAll = manager.HasHeroAll(recommendID);
+ if (hasHeroAll)
+ {
+ manager.UseTeam(recommendID);
+ return;
+ }
+
+ ConfirmCancel.ShowPopConfirm(
+ Language.Get("L1003"),
+ Language.Get("LineupRecommend06"),
(bool isOK) =>
{
if (isOK)
diff --git a/Main/System/LineupRecommend/LineupRecommendManager.cs b/Main/System/LineupRecommend/LineupRecommendManager.cs
index b325678..45ab008 100644
--- a/Main/System/LineupRecommend/LineupRecommendManager.cs
+++ b/Main/System/LineupRecommend/LineupRecommendManager.cs
@@ -175,6 +175,19 @@
return false;
}
+ // 鎷ユ湁鎵�鏈夋帹鑽愭灏�
+ public bool HasHeroAll(int recommendID)
+ {
+ if (!TryGetHeroIDListByRecommendID(recommendID, out int[] heroIDArr) || heroIDArr.IsNullOrEmpty())
+ return false;
+ foreach (var heroID in heroIDArr)
+ {
+ if (!HeroManager.Instance.HasHero(heroID))
+ return false;
+ }
+ return true;
+ }
+
public void UseTeam(int recommendID)
{
if (!LineupRecommendConfig.HasKey(recommendID))
--
Gitblit v1.8.0