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/GuildPreviewWin.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/Main/System/Guild/GuildPreviewWin.cs b/Main/System/Guild/GuildPreviewWin.cs
index c5a5ab1..8a30fe6 100644
--- a/Main/System/Guild/GuildPreviewWin.cs
+++ b/Main/System/Guild/GuildPreviewWin.cs
@@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.UI;
@@ -46,9 +47,12 @@
SysNotifyMgr.Instance.ShowTip("GuildSys8");
});
- leaderAvatar.AddListener(() =>
+ leaderAvatar.SetOnLoaded(() =>
{
- OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID);
+ leaderAvatar.AddListener(() =>
+ {
+ OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID);
+ });
});
}
@@ -68,7 +72,18 @@
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;
leaderServerID = guildInfo.ServerID;
@@ -118,8 +133,8 @@
}
var leaderInfo = OtherPlayerDetailManager.Instance.GetViewPlayerData(playerID);
- leaderAvatar.InitUI(AvatarHelper.GetAvatarModel(0, leaderInfo.Face, leaderInfo.FacePic));
- leaderTitle.InitUI(leaderInfo.RealmLV, leaderInfo.TitleID);
+ leaderAvatar.InitUI(AvatarHelper.GetAvatarModel(0, leaderInfo.Face, leaderInfo.FacePic)).Forget();
+ leaderTitle.InitUI(leaderInfo.RealmLV, leaderInfo.TitleID).Forget();
leaderLevelText.text = leaderInfo.LV.ToString();
guildJobText.text = RichTextMsgReplaceConfig.GetRichReplace("FAMILY", 3);
leaderFightPowerText.text = UIHelper.ReplaceLargeArtNum(leaderInfo.FightPower);
--
Gitblit v1.8.0