From 9fb3c8e114a67c0cdf353b32b1b50e90414fd597 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 25 二月 2026 16:34:07 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/System/Guild/GuildManager.cs |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/Main/System/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index 4366d50..c37afb5 100644
--- a/Main/System/Guild/GuildManager.cs
+++ b/Main/System/Guild/GuildManager.cs
@@ -64,6 +64,7 @@
     private void OnRefreshFairyInfo()
     {
         UpdateRequestRedpoint();
+        UpdateDonateRedPoint();
     }
 
     void OnBeforePlayerDataInitialize()
@@ -77,6 +78,8 @@
     void OnBeforePlayerDataInitializeEx()
     {
         isQueryZBGYet = false;
+        //澧為噺鐨勫舰寮�
+        PlayerDatas.Instance.fairyData.ClearData();
     }
 
     void OnPlayerLoginOk()
@@ -170,7 +173,24 @@
 
 
     //鐝嶅疂闃�(琛屽晢)
-    public int zhenbaogeCutState = 0;
+    int m_ZhenbaogeCutState = 0;
+    public int zhenbaogeCutState
+    {
+        get
+        {
+            if (familyZBGActions.Count - 1 >= 50)
+            {
+                //鐮嶄环浜烘暟瓒呰繃涓婇檺鍚庡彲鐩存帴璐拱
+                m_ZhenbaogeCutState = 1;
+            }
+            return m_ZhenbaogeCutState;
+        }
+        set
+        {
+
+            m_ZhenbaogeCutState = value;
+        }
+    }
     public int zhenbaogeBuyState = 0;
     public bool needCheckCutCD = false;
     public event Action UpdateZhenbaogeEvent;

--
Gitblit v1.8.0