From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/System/Guild/GuildBossManager.cs |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Main/System/Guild/GuildBossManager.cs b/Main/System/Guild/GuildBossManager.cs
index 01e3f73..02c70f1 100644
--- a/Main/System/Guild/GuildBossManager.cs
+++ b/Main/System/Guild/GuildBossManager.cs
@@ -100,12 +100,14 @@
     {
         DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
         GuildManager.Instance.EnterOrQuitGuildEvent += EnterOrQuitGuildEvent;
+        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
         ParseConfig();
     }
     public override void Release()
     {
         DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
         GuildManager.Instance.EnterOrQuitGuildEvent -= EnterOrQuitGuildEvent;
+        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;
     }
 
     void OnBeforePlayerDataInitializeEventOnRelogin()
@@ -123,6 +125,10 @@
         taofaPlayerData.Clear();
     }
 
+    private void OnRefreshFairyInfo()
+    {
+        UpdateRedpoint();
+    }
 
     void EnterOrQuitGuildEvent(bool isEnter)
     {
@@ -314,7 +320,7 @@
             Job = playerInfo.Job,
             Name = playerInfo.Name,
             FacePic = playerInfo.FacePic,
-            FightPower = (ulong)playerInfo.FightPower,
+            FightPower = playerInfo.FightPower,
             RealmLV = playerInfo.RealmLV,
             ServerID = playerInfo.ServerID,
             TitleID = playerInfo.TitleID,
@@ -331,7 +337,7 @@
     {
         redPoint.state = RedPointState.None;
 
-        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Guild))
+        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.GuildBoss))
         {
             return;
         }
@@ -374,7 +380,7 @@
     public int Job;
     public string Name;
     public int FacePic;
-    public ulong FightPower;
+    public long FightPower;
     public int RealmLV;
     public int ServerID;
     public int TitleID;

--
Gitblit v1.8.0