From 1503afaa0a68776a36259d0f9e231830f87a26c0 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 25 十一月 2025 15:49:30 +0800
Subject: [PATCH] 0312 定制装备图标显示等级，定制tip显示统一接口，非掉落获得装备立即弹框
---
Main/System/Equip/EquipTipWin.cs | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/Main/System/Equip/EquipTipWin.cs b/Main/System/Equip/EquipTipWin.cs
index 942df61..c12924e 100644
--- a/Main/System/Equip/EquipTipWin.cs
+++ b/Main/System/Equip/EquipTipWin.cs
@@ -31,21 +31,31 @@
AppointItemConfig customEquipAppointItemConfig;
protected override void OnPreOpen()
{
- bool isShowCustomEquip = ItemTipUtility.isShowCustomEquip;
- if (isShowCustomEquip)
+ if (ItemTipUtility.mainTipData.appointID != 0)
{
- int customEquipItemId = ItemTipUtility.customEquipItemId;
- int customEquipAppointItemId = ItemTipUtility.customEquipAppointItemId;
+ int customEquipItemId = ItemTipUtility.mainTipData.itemId;
+ int customEquipAppointItemId = ItemTipUtility.mainTipData.appointID;
if (!ItemConfig.HasKey(customEquipItemId))
+ {
+ DelayCloseWindow().Forget();
return;
+ }
if (!AppointItemConfig.HasKey(customEquipAppointItemId))
+ {
+ DelayCloseWindow().Forget();
return;
+ }
customEquipItemConfig = ItemConfig.Get(customEquipItemId);
customEquipAppointItemConfig = AppointItemConfig.Get(customEquipAppointItemId);
Display(customEquipItemConfig, customEquipAppointItemConfig);
}
else
{
+ if (string.IsNullOrEmpty(ItemTipUtility.mainTipData.guid))
+ {
+ DelayCloseWindow().Forget();
+ return;
+ }
equip = PackManager.Instance.GetItemByGuid(ItemTipUtility.mainTipData.guid);
Display(equip);
}
@@ -56,15 +66,14 @@
//鍏堢缉灏忥紝杩欐牱涓嶄細鍥犱负闂撮殧甯т骇鐢熸槑鏄剧殑闂儊
uieffect.transform.localScale = Vector3.zero;
- bool isShowCustomEquip = ItemTipUtility.isShowCustomEquip;
- if (isShowCustomEquip)
+ if (ItemTipUtility.mainTipData.appointID != 0)
{
- RefreshEffect(customEquipItemConfig).Forget();
+ RefreshEffect(customEquipItemConfig.ItemColor).Forget();
}
else
{
//鐗规晥鏄剧ず渚濊禆rect鐨勬帓鐗堬紝鏀惧湪涓嬩竴甯�
- RefreshEffect(equip).Forget();
+ RefreshEffect(equip.config.ItemColor).Forget();
}
}
@@ -72,6 +81,8 @@
protected override void OnPreClose()
{
equip = null;
+ customEquipItemConfig = null;
+ customEquipAppointItemConfig = null;
}
public void Display(ItemModel equip)
@@ -186,10 +197,10 @@
}
//寤惰繜澶勭悊鐗规晥澶у皬
- async UniTask RefreshEffect(ItemModel equip)
+ async UniTask RefreshEffect(int itemColor)
{
await UniTask.DelayFrame(3);
- int effectID = EquipModel.Instance.equipUIEffects[Math.Min(equip.config.ItemColor, EquipModel.Instance.equipUIEffects.Length) - 1];
+ int effectID = EquipModel.Instance.equipUIEffects[Math.Min(itemColor, EquipModel.Instance.equipUIEffects.Length) - 1];
if (effectID == 0)
{
uieffect.Stop();
@@ -203,23 +214,7 @@
}
}
- //寤惰繜澶勭悊鐗规晥澶у皬
- async UniTask RefreshEffect(ItemConfig itemConfig)
- {
- await UniTask.DelayFrame(3);
- int effectID = EquipModel.Instance.equipUIEffects[Math.Min(itemConfig.ItemColor, EquipModel.Instance.equipUIEffects.Length) - 1];
- if (effectID == 0)
- {
- uieffect.Stop();
- }
- else
- {
- uieffect.effectId = effectID;
- //璁＄畻楂樺害缂╂斁姣斾緥 鐗规晥鏄剧ず渚濊禆rect鐨勬帓鐗�
- uieffect.transform.localScale = new Vector3(0.98f, bgRect.rect.height / uieffect.GetComponent<RectTransform>().rect.height, 1);
- uieffect.Play();
- }
- }
+
}
--
Gitblit v1.8.0