From 5a4e34c8a85737c0fa5b5775122da31155cbaef3 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 09 二月 2026 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Guild/GuildPreviewWin.cs |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Main/System/Guild/GuildPreviewWin.cs b/Main/System/Guild/GuildPreviewWin.cs
index fc4166c..bb219c9 100644
--- a/Main/System/Guild/GuildPreviewWin.cs
+++ b/Main/System/Guild/GuildPreviewWin.cs
@@ -29,6 +29,7 @@
 
     int guildID;
     int leaderID;
+    int leaderServerID;
     protected override void InitComponent()
     {
         opearteBtn.AddListener(() =>
@@ -47,7 +48,7 @@
 
         leaderAvatar.AddListener(() =>
         {
-            OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID);
+            OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID);
         });
     }
 
@@ -67,10 +68,22 @@
 
     void Display()
     {
-        var guildInfo = GuildManager.Instance.guildsDict[guildID];
+        FairyData guildInfo = null;
+        if (GuildManager.Instance.guildsDict.ContainsKey(guildID))
+        {
+            guildInfo = GuildManager.Instance.guildsDict[guildID];
+        }
+        else
+        {
+            if (GuildManager.Instance.viewGuildsDict.ContainsKey(guildID))
+            {
+                guildInfo = GuildManager.Instance.viewGuildsDict[guildID];
+            }
+        }
         if (guildInfo == null) return;
         leaderID = guildInfo.LeaderID;
-        OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, (int)ViewPlayerType.viewGuildLeader);
+        leaderServerID = guildInfo.ServerID;
+        OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID, (int)ViewPlayerType.viewGuildLeader);
 
         var config = FamilyConfig.Get(guildInfo.FamilyLV);
         guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);

--
Gitblit v1.8.0