From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/OSActivity/OSRankHeroCallGiftCell.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/Main/System/OSActivity/OSRankHeroCallGiftCell.cs b/Main/System/OSActivity/OSRankHeroCallGiftCell.cs
index 49dcc70..5c35800 100644
--- a/Main/System/OSActivity/OSRankHeroCallGiftCell.cs
+++ b/Main/System/OSActivity/OSRankHeroCallGiftCell.cs
@@ -1,5 +1,6 @@
锘縰sing System.Collections.Generic;
using System.Linq;
+using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.UI;
@@ -7,6 +8,7 @@
{
[SerializeField] ImageEx vipImage;
[SerializeField] TextEx vipText;
+ [SerializeField] OutlineEx vipTextOutline;
[SerializeField] ImageEx rateImage;
[SerializeField] TextEx rateText;
[SerializeField] Text nameText;
@@ -28,8 +30,16 @@
id -= 100000000;
var ctgConfig = CTGConfig.Get(id);
nameText.text = ctgConfig.Title;
+
vipImage.SetActive(ctgConfig.VipLevel > 0);
- vipText.text = ctgConfig.VipLevel > 0 ? Language.Get($"VipLevelInfo{ctgConfig.VipLevel}") : string.Empty;
+ if (ctgConfig.VipLevel > 0)
+ {
+ vipImage.SetSprite($"VipLevel{ctgConfig.VipLevel}");
+ vipText.text = Language.Get($"VipLevelInfo{ctgConfig.VipLevel}");
+ vipText.color = InvestModel.Instance.GetTextColor(ctgConfig.VipLevel);
+ vipTextOutline.OutlineColor = InvestModel.Instance.GetOutlineColor(ctgConfig.VipLevel);
+ }
+
rateImage.SetActive(true);
rateText.text = Language.Get("DailySpecials07", ctgConfig.Percentage);
for (int i = 0; i < itemCells.Length; i++)
@@ -40,7 +50,7 @@
itemCell.SetActive(true);
int itemID = ctgConfig.GainItemList[i][0];
itemCell.Init(new ItemCellModel(itemID, true, ctgConfig.GainItemList[i][1]));
- itemCell.button.SetListener(() => ItemTipUtility.Show(itemID));
+ itemCell.SetClickListener(() => ItemTipUtility.Show(itemID));
}
else
{
@@ -61,16 +71,21 @@
SysNotifyMgr.Instance.ShowTip("ActivityOver");
return;
}
- if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.PrivilegeCard) && ctgConfig.VipLevel == 1 && !InvestModel.Instance.IsInvested(InvestModel.monthCardType))
+ if (ctgConfig.VipLevel > 0 && !FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.PrivilegeCard))
{
- SysNotifyMgr.Instance.ShowTip("MinggeAuto5");
- UIManager.Instance.OpenWindow<PrivilegeCardWin>();
+ SysNotifyMgr.Instance.ShowTip("MinggeAuto8");
return;
}
- if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.PrivilegeCard) && ctgConfig.VipLevel == 2 && !InvestModel.Instance.IsInvested(InvestModel.foreverCardType))
+ if (ctgConfig.VipLevel == 1 && !InvestModel.Instance.IsInvested(InvestModel.monthCardType))
+ {
+ SysNotifyMgr.Instance.ShowTip("MinggeAuto5");
+ UIManager.Instance.OpenWindowAsync<PrivilegeCardWin>().Forget();
+ return;
+ }
+ if (ctgConfig.VipLevel == 2 && !InvestModel.Instance.IsInvested(InvestModel.foreverCardType))
{
SysNotifyMgr.Instance.ShowTip("MinggeAuto7");
- UIManager.Instance.OpenWindow<PrivilegeCardWin>();
+ UIManager.Instance.OpenWindowAsync<PrivilegeCardWin>().Forget();
return;
}
@@ -108,7 +123,7 @@
itemCell.SetActive(true);
int itemID = awards[i][0];
itemCell.Init(new ItemCellModel(itemID, true, awards[i][1]));
- itemCell.button.SetListener(() => ItemTipUtility.Show(itemID));
+ itemCell.SetClickListener(() => ItemTipUtility.Show(itemID));
}
else
{
--
Gitblit v1.8.0