From d165af063d7365e143d92c3a950a0b52e683a66e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 23 一月 2026 15:33:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/ItemTip/ItemTipUtility.cs | 67 ++++++++++-----------------------
1 files changed, 21 insertions(+), 46 deletions(-)
diff --git a/Main/System/ItemTip/ItemTipUtility.cs b/Main/System/ItemTip/ItemTipUtility.cs
index ea18a42..fadcf96 100644
--- a/Main/System/ItemTip/ItemTipUtility.cs
+++ b/Main/System/ItemTip/ItemTipUtility.cs
@@ -20,6 +20,7 @@
BoxChooseItem, //瀹濈鑷�夌墿鍝�
TreasurePavilion, //鍙ゅ疂鐗╁搧锛堢鐗囷級
Hero, //姝﹀皢
+ Mingge, //鍛芥牸
}
public class TipData
@@ -297,26 +298,8 @@
mainTipData.guid = PackManager.Instance.GetItemGUIDByID(itemId, true, PackType.DropItem);
}
- // mainTipData = CreateNormalEquipData(itemId);
- // if (item.isAuctionEquip && !item.legendProperty.Equals(default(LegendProperty)))
- // {
- // mainTipData.legendProperty = item.legendProperty;
- // mainTipData.baseInfo.score = item.score;
- // mainTipData.baseInfo.isPreview = false;
- // }
-
- // if (item.compare)
- // {
- // if (ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))
- // {
- // var equipedGuid = equipModel.GetEquip(new Int2(config.LV, config.EquipPlace));
- // if (equipedGuid != string.Empty)
- // {
- // secondaryData = CreateNormalEquipData(equipedGuid, false);
- // }
- // }
- // }
break;
+
default:
mainTipData = CreateItemData(itemId);
break;
@@ -380,32 +363,13 @@
mainTipData = new TipData() { guid = guid };
break;
default:
- // if (item.isAuction)
- // {
- // mainTipData = CreateEquipAuctionData(guid, operatable);
- // if (ItemLogicUtility.Instance.IsJobCompatibleItem(item.itemId))
- // {
- // var equipedGuid = equipModel.GetEquip(new Int2(item.config.LV, item.config.EquipPlace));
- // if (equipedGuid != string.Empty)
- // {
- // secondaryData = CreateNormalEquipData(equipedGuid, false);
- // }
- // }
- // }
- // else
- // {
- // mainTipData = CreateNormalEquipData(guid, operatable);
- // var equipedGuid = equipModel.GetEquip(new Int2(item.config.LV, item.config.EquipPlace));
- // if (equipedGuid != guid)
- // {
- // secondaryData = CreateNormalEquipData(equipedGuid, false);
- // }
- // }
break;
}
break;
-
+ case TipType.Mingge:
+ mainTipData = new TipData() { guid = guid };
+ break;
default:
mainTipData = CreateItemData(guid, operatable);
break;
@@ -425,11 +389,9 @@
case TipType.BoxChooseItem:
UIManager.Instance.OpenWindow<ChooseItemsWin>();
break;
- // case TipType.TreasurePavilion:
- // TreasurePavilionModel.Instance.selectGubao = item.config.EffectValueA1;
- // TreasurePavilionModel.Instance.showTipFromPiece = item.itemId;
- // WindowCenter.Instance.OpenIL<TreasurePavilionTipWin>();
- // break;
+ case TipType.Mingge:
+ // UIManager.Instance.OpenWindow<MinggeWin>();
+ break;
default:
UIManager.Instance.OpenWindow<ItemTipWin>();
break;
@@ -1679,6 +1641,19 @@
return TipType.TreasurePavilion;
case 150:
return TipType.Hero;
+ case 201:
+ case 202:
+ case 203:
+ case 204:
+ case 205:
+ case 206:
+ case 207:
+ case 208:
+ case 209:
+ case 210:
+ case 211:
+ case 212:
+ return TipType.Mingge;
default:
return TipType.Item;
}
--
Gitblit v1.8.0