From aa84cb62bebb9c8a4e586bcc1ec28eb7a16a8860 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 26 一月 2026 18:10:34 +0800
Subject: [PATCH] 422 子 【内政】命格系统 / 【内政】命格系统-客户端
---
Main/System/Guild/GuildManager.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Main/System/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index 52201d3..f6e8e11 100644
--- a/Main/System/Guild/GuildManager.cs
+++ b/Main/System/Guild/GuildManager.cs
@@ -39,7 +39,7 @@
public byte[] donateCntList;
public event Action DonateCntListEvent;
- public event Action<bool> EnterOrQuitGuildEvent; //杩涘叆鎴栭��鍑哄叕浼氫簨浠�
+ public event Action<bool> EnterOrQuitGuildEvent; //true杩涘叆鎴杅alse閫�鍑哄叕浼氫簨浠�
public override void Init()
@@ -76,7 +76,7 @@
void OnPlayerLoginOk()
{
UpdateDonateRedPoint();
-
+ QueryZBGFamilyInfo();
}
void PlayerDataRefreshEvent(PlayerDataType type)
@@ -121,7 +121,7 @@
EnterOrQuitGuildEvent?.Invoke(false);
}
- //娉ㄦ剰涓婄嚎閫氱煡鍏細鏁版嵁鏃朵篃浼氳Е鍙�
+ //娉ㄦ剰涓婄嚎閫氱煡鍏細鏁版嵁鏃朵篃浼氳Е鍙�; 浣嗘柇绾块噸杩炰笉浼氳Е鍙�
public async UniTask AfterEnterGuild()
{
//杩欓噷杩樻病鏈夊叕浼氭暟鎹�, 鍚庣画鐨勫寘浼氭洿鏂板叕浼氭暟鎹�
@@ -446,9 +446,7 @@
#region 鍏細鑷畾涔夎褰�
public void UpdateFamilyAction(HA513_tagMCFamilyActionInfo _package)
{
- if (PlayerDatas.Instance.fairyData == null ||
- PlayerDatas.Instance.fairyData.fairy == null ||
- PlayerDatas.Instance.fairyData.fairy.FamilyID != _package.FamilyID)
+ if (PlayerDatas.Instance.baseData.FamilyId != _package.FamilyID)
{
return;
}
@@ -743,7 +741,7 @@
return;
}
lastChangeMarkTime = Time.time;
- if (UIManager.Instance.IsOpened<GuildHallWin>())
+ if ((netPack.Type == 1 || netPack.Type == 2) && UIManager.Instance.IsOpened<GuildBaseWin>())
{
RequestGuildData();
}
@@ -844,8 +842,13 @@
//鐧诲綍鍚庨娆℃墦寮�鏌ヨ锛屾崲鏂颁粰鐩熸煡璇�
public void QueryZBGFamilyInfo()
{
+ if (PlayerDatas.Instance.baseData.FamilyId == 0)
+ {
+ return;
+ }
if (isQueryZBGYet)
return;
+
QueryFamilyAction((int)PlayerDatas.Instance.baseData.FamilyId, ZBGFamilyActionType);
@@ -862,8 +865,14 @@
return false;
}
bool restart = false;
- if (vNetData.FamilyActionList.Length == 1 && vNetData.FamilyActionList[0].Value1 == 1)
+
+ for (int i = 0; i < vNetData.FamilyActionList.Length; i++)
{
+ int playerID = (int)vNetData.FamilyActionList[i].Value1;
+ if (playerID != 1)
+ {
+ continue;
+ }
if (familyZBGActions.ContainsKey(1) && familyZBGActions[1].Time != vNetData.FamilyActionList[0].Time)
{
familyZBGActions.Clear();
@@ -872,6 +881,7 @@
}
}
+
for (int i = 0; i < vNetData.FamilyActionList.Length; i++)
{
int playerID = (int)vNetData.FamilyActionList[i].Value1;
--
Gitblit v1.8.0