From 1cbfc536951a446b6eb6a02ae6abde333c69dc1a Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 31 十月 2025 19:30:29 +0800
Subject: [PATCH] 0312 修复商店中购买武将的拥有数量(主体不算-1);公会大厅入口
---
Main/System/Guild/GuildEmblemCell.cs | 16 ++++++++++++++--
Main/System/Store/BuyItemWin.cs | 8 +++++++-
Main/System/Guild/GuildBaseWin.cs | 2 +-
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index c316e96..ef5e6c9 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -70,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;
diff --git a/Main/System/Guild/GuildEmblemCell.cs b/Main/System/Guild/GuildEmblemCell.cs
index a12a4f4..b10f7aa 100644
--- a/Main/System/Guild/GuildEmblemCell.cs
+++ b/Main/System/Guild/GuildEmblemCell.cs
@@ -11,7 +11,7 @@
[SerializeField] Image emblemIcon;
[SerializeField] UIFrame frame;
[SerializeField] UIEffectPlayer uiEffect;
- [Header("瀛� F9E29F 鍖呰竟 683C00 瀛楀彿36 Y:-9")]
+ [Header("浠g爜宸插鐞� 瀛� F9E29F 鍖呰竟 683C00 瀛楀彿72 Y:-18")]
[SerializeField] Text emblemNameText; //瀛� F9E29F 鍖呰竟 683C00 瀛楀彿36 Y-9
public void Display(int emblemID, string emblemName, float _scale = 1f)
@@ -52,7 +52,19 @@
emblemIcon.SetNativeSize();
}
emblemIcon.rectTransform.localScale = new Vector3(_scale, _scale, _scale);
- emblemNameText.text = emblemName;
+ if (emblemNameText != null)
+ {
+ emblemNameText.text = emblemName;
+ emblemNameText.fontSize = 72;
+ emblemNameText.rectTransform.localPosition = new Vector3(0, -18, 0);
+ emblemNameText.color = new Color32(255, 222, 159, 255);
+ var outline = emblemNameText.GetComponent<OutlineEx>();
+ if (outline != null)
+ {
+ emblemNameText.GetComponent<OutlineEx>().OutlineColor = new Color32(104, 60, 0, 255);
+ }
+ }
+
}
}
diff --git a/Main/System/Store/BuyItemWin.cs b/Main/System/Store/BuyItemWin.cs
index c4c99b9..ad0a322 100644
--- a/Main/System/Store/BuyItemWin.cs
+++ b/Main/System/Store/BuyItemWin.cs
@@ -103,6 +103,12 @@
return UIHelper.GetMoneyCnt(config.EffectValueB1);
}
- return PackManager.Instance.GetItemCountByID(PackType.Item, id);
+ var count = PackManager.Instance.GetItemCountByID(GeneralDefine.GetPackTypeByItemType(config.Type), id);
+ if (config.Type == 150)
+ {
+ count = Math.Max(0, count - 1);
+ }
+
+ return count;
}
}
--
Gitblit v1.8.0