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 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Main/System/Guild/GuildBossManager.cs b/Main/System/Guild/GuildBossManager.cs
index b96ceef..02c70f1 100644
--- a/Main/System/Guild/GuildBossManager.cs
+++ b/Main/System/Guild/GuildBossManager.cs
@@ -320,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,
@@ -380,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