From 3f2ff5434c7fed23ed50baeefeb5e0e6c8f1267f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 13 三月 2025 15:16:45 +0800
Subject: [PATCH] 0312 本职业橙色套装分解默认不选中，本职业橙色套装TIP增加合成按钮，修复装备分解界面只显示最多40件的问题
---
System/KnapSack/Logic/EquipDevourWin.cs | 5 +++--
System/KnapSack/Logic/PackModel.cs | 16 ++++++++++------
System/ItemTip/ItemTipUtility.cs | 11 ++++++++++-
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/System/ItemTip/ItemTipUtility.cs b/System/ItemTip/ItemTipUtility.cs
index e3e0952..ce1f39e 100644
--- a/System/ItemTip/ItemTipUtility.cs
+++ b/System/ItemTip/ItemTipUtility.cs
@@ -1829,7 +1829,16 @@
{
if (isEquip)
{
- operates.Add(ItemOperateType.putOn);
+ operates.Add(ItemOperateType.putOn);
+
+ if (!item.config.JumpComposeCondi.IsNullOrEmpty())
+ {
+ var jumpId = 0;
+ if (composeModel.CheckComposeItemById(item.itemId, out jumpId))
+ {
+ operates.Add(ItemOperateType.compose);
+ }
+ }
}
if (isSpiritWeapon)
diff --git a/System/KnapSack/Logic/EquipDevourWin.cs b/System/KnapSack/Logic/EquipDevourWin.cs
index 2b57b0e..0a53b7c 100644
--- a/System/KnapSack/Logic/EquipDevourWin.cs
+++ b/System/KnapSack/Logic/EquipDevourWin.cs
@@ -86,12 +86,12 @@
isOpen = true;
playerPack.selectDevourlist.Clear();
devourModellist = playerPack.GetDevourModellist();
-
- InitUI();
+
}
protected override void OnAfterOpen()
{
+ InitUI();
this.transform.SetAsLastSibling();
OnRefreshColor(playerPack.colorType);
@@ -132,6 +132,7 @@
private void InitUI()
{
+ sumGridNum = Math.Max(100, (int)(devourModellist.Count * 1.5));
playerPack.GetSelectDevourList();
CreateCell();
isOpen = false;
diff --git a/System/KnapSack/Logic/PackModel.cs b/System/KnapSack/Logic/PackModel.cs
index f580996..d2c186d 100644
--- a/System/KnapSack/Logic/PackModel.cs
+++ b/System/KnapSack/Logic/PackModel.cs
@@ -1385,12 +1385,16 @@
}
}
- if (ItemLogicUtility.Instance.IsFightUp(model.itemId, model.score) != 1 && !model.isAuction)
+ //1. 闈炴媿鍗栬澶�
+ //2. 瑁呭鍝佽川灏忎簬绛変簬褰撳墠閫夋嫨鐨勫搧璐�
+ //3. 闈炴湰鑱屼笟鐨勫瑁呰澶�
+ //4. 闈炴垬鏂楀姏鎻愬崌鐨勮澶�
+ if (!model.isAuction && model.config.ItemColor <= (int)colorType
+ && !(ItemLogicUtility.Instance.IsJobCompatibleItem(model.itemId)
+ && model.config.ItemColor == 4 && model.config.SuiteiD != 0)
+ && ItemLogicUtility.Instance.IsFightUp(model.itemId, model.score) != 1)
{
- if (model.config.ItemColor <= (int)colorType)
- {
- return true;
- }
+ return true;
}
}
}
@@ -1514,7 +1518,7 @@
SettingEffectMgr.Instance.isStartDecompose = true;
isAutoDecompose = auto;
- recordAutoDecomNum = Math.Min(items.Count, 100);
+ recordAutoDecomNum = Math.Min(items.Count, 100); //鍗曟鏈�澶�100浠跺垎瑙�
var package = new CA32C_tagCMEquipDecompose();
var indexLists = new ushort[recordAutoDecomNum];
var idlist = new uint[recordAutoDecomNum];
--
Gitblit v1.8.0