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 | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/Main/System/Guild/GuildPreviewWin.cs b/Main/System/Guild/GuildPreviewWin.cs
index eb15938..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;
@@ -22,7 +23,6 @@
[SerializeField] Text guildJobText;
[SerializeField] Text leaderNameText;
[SerializeField] Text leaderFightPowerText;
- [SerializeField] Button seePlayerBtn;
[SerializeField] Button opearteBtn;
[SerializeField] Text opearteBtnText;
@@ -30,6 +30,7 @@
int guildID;
int leaderID;
+ int leaderServerID;
protected override void InitComponent()
{
opearteBtn.AddListener(() =>
@@ -42,15 +43,16 @@
copyBtn.AddListener(() =>
{
- var guildInfo = GuildManager.Instance.guildsDict[guildID];
- if (guildInfo == null) return;
UIHelper.CopyToClipboard(guildNumText.text);
SysNotifyMgr.Instance.ShowTip("GuildSys8");
});
- seePlayerBtn.AddListener(() =>
+ leaderAvatar.SetOnLoaded(() =>
{
- OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID);
+ leaderAvatar.AddListener(() =>
+ {
+ OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID);
+ });
});
}
@@ -70,20 +72,32 @@
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, 1.3f);
+ guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);
guildMemberCountText.text = guildInfo.MemberCount + "/" + config.MemberMax;
totalFightPowerText.text = UIHelper.ReplaceLargeArtNum(guildInfo.totalFightPower);
guildLevelText.text = Language.Get("L1094") + guildInfo.FamilyLV;
guildNameText.text = guildInfo.FamilyName + Language.Get("L1039", ServerListCenter.Instance.GetServerName(guildInfo.ServerID));
guildNumText.text = GuildManager.Instance.EncryptGuildID(guildInfo.FamilyID);
leaderNameText.text = guildInfo.LeaderName;
- noticeText.text = guildInfo.Broadcast;
+ noticeText.text = string.IsNullOrEmpty(guildInfo.Broadcast) ? Language.Get("Guild_62") : guildInfo.Broadcast;
var state = GuildManager.Instance.GetRequestState(guildInfo);
@@ -119,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