From ca72a86a38c255c51df9d9376bf86bdeda92deb6 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 13 十一月 2025 18:58:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Guild/GuildBaseWin.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index 5227648..ef5e6c9 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -16,7 +16,7 @@
[SerializeField] Text guildNameText;
[SerializeField] Text guildMemberCountText;
[SerializeField] Button rankBtn;
-
+ [SerializeField] Button storeBtn;
[SerializeField] Button requestBtn;
@@ -32,8 +32,13 @@
{
// UIManager.Instance.OpenWindow<GuildRequestWin>();
});
-
+
guildHawkerBtn.AddListener(OpenHawker);
+ storeBtn.AddListener(() =>
+ {
+ StoreModel.Instance.selectStoreFuncType = StoreFunc.Guild;
+ UIManager.Instance.OpenWindow<StoreBaseWin>();
+ });
}
@@ -65,7 +70,7 @@
void ShowGuildInfo()
{
- emblemCell.Display(PlayerDatas.Instance.fairyData.fairy.EmblemID, PlayerDatas.Instance.fairyData.fairy.EmblemWord, 0.5f);
+ emblemCell.Display(PlayerDatas.Instance.fairyData.fairy.EmblemID, PlayerDatas.Instance.fairyData.fairy.EmblemWord, 0.8f);
guildNameText.text = PlayerDatas.Instance.fairyData.fairy.FamilyName;
var config = FamilyConfig.Get(PlayerDatas.Instance.fairyData.fairy.FamilyLV);
guildMemberCountText.text = PlayerDatas.Instance.fairyData.fairy.MemberCount + "/" + config.MemberMax;
--
Gitblit v1.8.0