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/ItemTip/ItemTipWayWin.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Main/System/ItemTip/ItemTipWayWin.cs b/Main/System/ItemTip/ItemTipWayWin.cs
index 90d1726..ff5f6ea 100644
--- a/Main/System/ItemTip/ItemTipWayWin.cs
+++ b/Main/System/ItemTip/ItemTipWayWin.cs
@@ -3,7 +3,6 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
-using Cysharp.Threading.Tasks;
public class ItemTipWayWin : UIBase
{
@@ -103,7 +102,7 @@
if (StoreModel.Instance.CheckPopBuyWin(shopID))
{
StoreModel.Instance.buyShopID = shopID;
- UIManager.Instance.OpenWindowAsync<BuyItemWin>().Forget();
+ UIManager.Instance.OpenWindow<BuyItemWin>();
}
break;
case 2:
@@ -113,11 +112,11 @@
RechargeManager.Instance.selectTabIndex = index;
if (UIManager.Instance.IsOpened<StoreBaseWin>())
{
- UIManager.Instance.GetUI<StoreBaseWin>().ClickFuncBtn(1);
+ UIManager.Instance.GetUI<StoreBaseWin>().ClickFuncBtn(2);
}
else
{
- UIManager.Instance.OpenWindowAsync<StoreBaseWin>(1).Forget();
+ UIManager.Instance.OpenWindow<StoreBaseWin>(2);
}
break;
case 3:
@@ -128,7 +127,7 @@
}
if (!UIManager.Instance.IsOpened<TimingGiftWin>())
{
- UIManager.Instance.OpenWindowAsync<TimingGiftWin>(int.Parse(way.CustomValue)).Forget();
+ UIManager.Instance.OpenWindow<TimingGiftWin>(int.Parse(way.CustomValue));
}
break;
case 0:
--
Gitblit v1.8.0