From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/PlayerProfile/RenameWin.cs | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/Main/System/PlayerProfile/RenameWin.cs b/Main/System/PlayerProfile/RenameWin.cs
index 13aff3b..9d206a9 100644
--- a/Main/System/PlayerProfile/RenameWin.cs
+++ b/Main/System/PlayerProfile/RenameWin.cs
@@ -1,7 +1,6 @@
using System;
using UnityEngine;
using UnityEngine.UI;
-using Cysharp.Threading.Tasks;
public class RenameWin : UIBase
{
@@ -9,8 +8,8 @@
[SerializeField] Button btnOk;
[SerializeField] Button btnRandom;
[SerializeField] TextEx txtFirst;
- [SerializeField] TextEx txtMoney;
- [SerializeField] ImageEx imgMoney;
+ [SerializeField] TextEx txtNeedCount;
+ [SerializeField] ImageEx imgIcon;
RenameManager manager { get { return RenameManager.Instance; } }
protected override void InitComponent()
@@ -20,32 +19,12 @@
{
input.text = manager.GetSafeRandomName();
});
+
btnOk.SetListener(() =>
{
bool isFirstRename = manager.IsFirstRename();
- if (!isFirstRename && !UIHelper.CheckMoneyCount(manager.moneyType, manager.moneyNeed))
- {
- string title = Language.Get("Mail101");
- string info = Language.Get("PlayerProfile22", RichTextMsgReplaceConfig.GetRichReplace("MONEY", manager.moneyType));
- ConfirmCancel.ShowPopConfirm(title, info, (bool isOk) =>
- {
- if (isOk)
- {
- if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Recharge, true))
- return;
- RechargeManager.Instance.selectTabIndex = 1;
- if (UIManager.Instance.IsOpened<StoreBaseWin>())
- {
- UIManager.Instance.GetUI<StoreBaseWin>().ClickFuncBtn(1);
- }
- else
- {
- UIManager.Instance.OpenWindowAsync<StoreBaseWin>(1).Forget();
- }
- }
- });
+ if (!isFirstRename && !UIHelper.CheckItemCount(manager.costItemID, 1, 2))
return;
- }
if (!manager.CheckNameLimit(input.text, out var errorCode))
{
@@ -63,7 +42,7 @@
base.OnPreOpen();
manager.OnUpdatePlayerNameCountEvent += OnUpdatePlayerNameCount;
manager.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
- PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
+ PackManager.Instance.RefreshItemEvent += OnRefreshItemEvent;
Display();
}
@@ -72,11 +51,15 @@
base.OnPreClose();
manager.OnUpdatePlayerNameCountEvent -= OnUpdatePlayerNameCount;
manager.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
- PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
+ PackManager.Instance.RefreshItemEvent -= OnRefreshItemEvent;
}
- private void PlayerDataRefresh(PlayerDataType type)
+ private void OnRefreshItemEvent(PackType type, int index, int itemID)
{
+ if (type != PackType.Item)
+ return;
+ if (itemID != manager.costItemID)
+ return;
Display();
}
@@ -94,8 +77,12 @@
{
bool isFirstRename = manager.IsFirstRename();
txtFirst.SetActive(isFirstRename);
- txtMoney.SetActive(!isFirstRename);
- imgMoney.SetIconWithMoneyType(manager.moneyType);
- txtMoney.text = UIHelper.ShowUseMoney(manager.moneyType, manager.moneyNeed);
+ txtNeedCount.SetActive(!isFirstRename);
+
+ if (!isFirstRename)
+ {
+ imgIcon.SetItemSprite(manager.costItemID);
+ txtNeedCount.text = UIHelper.ShowUseItem(PackType.Item, manager.costItemID, 1);
+ }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0