From 55d3e764c623822c2d4593bef2827b804be7ed08 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 05 九月 2018 17:55:54 +0800
Subject: [PATCH] 1855 仙器替换界面点击不显示装备tips
---
System/KnapSack/New/CommonItemBaisc.cs | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/System/KnapSack/New/CommonItemBaisc.cs b/System/KnapSack/New/CommonItemBaisc.cs
index 2fbc06d..ab0c0fc 100644
--- a/System/KnapSack/New/CommonItemBaisc.cs
+++ b/System/KnapSack/New/CommonItemBaisc.cs
@@ -119,6 +119,8 @@
get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }
}
+ ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
+
/// <summary>
/// 鍒濆鍖栨暟鎹� bool鍊肩敤鏉ュ垽鏂槸鍚﹂渶瑕佸睍绀鸿瘎鍒嗛珮浣庢垨鑰呰亴涓氶檺鍒�
/// </summary>
@@ -195,33 +197,39 @@
bool isOverdue = modelInterface.IsOverdue(guid, itemId, useDataDic);
if (!isOverdue)
{
- ItemModel putOnModel = playerPack.GetItemModelByIndex(PackType.rptEquip, itemConfig.EquipPlace);
- if (itemConfig.EquipPlace == (int)RoleEquipType.retFairyCan)
+ int equipScore1 = 0;
+ if (tipsModel.compareAttrData != null)
{
- ItemModel fairyModel2 = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFairyCan2);
- if (fairyModel2 != null)
+ equipScore1 = tipsModel.compareAttrData.score;
+ }
+ else
+ {
+ ItemModel putOnModel = playerPack.GetItemModelByIndex(PackType.rptEquip, itemConfig.EquipPlace);
+ if (itemConfig.EquipPlace == (int)RoleEquipType.retFairyCan)
{
- if (putOnModel != null)
+ ItemModel fairyModel2 = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFairyCan2);
+ if (fairyModel2 != null)
{
- if (fairyModel2.equipScore < putOnModel.equipScore)
+ if (putOnModel != null)
{
- putOnModel = fairyModel2;
+ if (fairyModel2.equipScore < putOnModel.equipScore)
+ {
+ putOnModel = fairyModel2;
+ }
}
}
+ else
+ {
+ putOnModel = fairyModel2;
+ }
}
- else
+ if (putOnModel != null)
{
- putOnModel = fairyModel2;
+ equipScore1 = putOnModel.equipScore;
}
}
- int equipScore1 = 0;
- if (putOnModel != null)
- {
- equipScore1 = putOnModel.equipScore;
- }
-
+
int playerJob = PlayerDatas.Instance.baseData.Job;
-
if (playerJob == Math.Floor((double)itemConfig.JobLimit / 100) || itemConfig.JobLimit == 0)
{
if (equipScore1 > score)
--
Gitblit v1.8.0