From 71365e5c15d81759c04d7aab953fa757fb183f9b Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 12 十一月 2025 18:54:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Guild/GuildViewListCell.cs | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/Main/System/Guild/GuildViewListCell.cs b/Main/System/Guild/GuildViewListCell.cs
index 2cd56f6..50d99e2 100644
--- a/Main/System/Guild/GuildViewListCell.cs
+++ b/Main/System/Guild/GuildViewListCell.cs
@@ -2,20 +2,21 @@
using UnityEngine.UI;
+//鍏細鏌ユ壘鍒楄〃锛屼篃鏄帓琛屾
public class GuildViewListCell : CellView
{
[SerializeField] Image rankImg;
[SerializeField] Transform rankTextTf;
[SerializeField] Text rankText;
- [SerializeField] Image guildEmblemImg;
+ [SerializeField] GuildEmblemCell guildEmblem;
[SerializeField] Text guildLevelText;
[SerializeField] Text guildNameText;
[SerializeField] Text leaderNameText;
[SerializeField] Text totalFightPowerText;
- [SerializeField] Text limitText;
[SerializeField] Button opearteBtn;
[SerializeField] Text opearteBtnText;
[SerializeField] Text guildMemberCountText;
+ [SerializeField] Button seeGuildBtn;
public void Display(int index)
@@ -27,6 +28,7 @@
{
rankImg.SetActive(true);
rankImg.SetSprite("guildnum" + guildInfo.Rank);
+ rankImg.SetNativeSize();
rankTextTf.SetActive(false);
}
else
@@ -35,12 +37,44 @@
rankTextTf.SetActive(true);
rankText.text = guildInfo.Rank.ToString();
}
+ guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.5f);
guildLevelText.text = Language.Get("L1094") + guildInfo.FamilyLV;
guildNameText.text = guildInfo.FamilyName;
leaderNameText.text = guildInfo.LeaderName;
- totalFightPowerText.text = guildInfo.totalFightPower.ToString();
+ totalFightPowerText.text = UIHelper.ReplaceLargeArtNum(guildInfo.totalFightPower);
+ var config = FamilyConfig.Get(guildInfo.FamilyLV);
+ guildMemberCountText.text = guildInfo.MemberCount + "/" + config.MemberMax;
+
+ var state = GuildManager.Instance.GetRequestState(guildInfo);
+
+ string key = "";
+ switch (state)
+ {
+ case 1:
+ key = "Guild_17";
+ break;
+ case 2:
+ key = "Guild_21";
+ break;
+ default:
+ key = "Guild_22";
+ break;
+ }
+ opearteBtnText.text = Language.Get(key);
+
+ int familyID = guildInfo.FamilyID;
+ opearteBtn.AddListener(() =>
+ {
+ GuildManager.Instance.SendApplyGuild(familyID, state == 2 ? 1 : 0);
+ });
+
+ seeGuildBtn.AddListener(() =>
+ {
+ UIManager.Instance.OpenWindow<GuildPreviewWin>(guildID);
+ });
}
+
}
--
Gitblit v1.8.0