From 1c10e7531918e4fe9dae0878f88e3e892db2c82f Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 29 八月 2018 10:34:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/ItemTipsModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/KnapSack/Logic/ItemTipsModel.cs b/System/KnapSack/Logic/ItemTipsModel.cs
index 37ec49c..8df84eb 100644
--- a/System/KnapSack/Logic/ItemTipsModel.cs
+++ b/System/KnapSack/Logic/ItemTipsModel.cs
@@ -18,7 +18,7 @@
public Dictionary<int, List<int>> equipLegendAttrTypeDict { get; private set; }
public Dictionary<int, Dictionary<int, string>> wingsLegendAttrColorDict { get; private set; }
private Dictionary<int, int> itemComposeTypeDict;
-
+ public int[] NotComposeIds { get; private set;}
public Dictionary<string, Dictionary<LegendAttrType, int>> legendAttrCntPreviewDict { get; private set; } // key 鍝佽川+鏄熺骇 value 灞炴�ф潯鐩暟
public Dictionary<int, Dictionary<LegendAttrType, List<int>>> legendAttrIDPreviewDict { get; private set; } // key 瑁呭浣� value 灞炴�х被鍨嬶紝灞炴�D
public Dictionary<int, Dictionary<int, int>> legendAttrColorValuePreviewDict { get; private set; } // key 灞炴�D value 瑁呭鍝佽川锛屽睘鎬ф暟鍊�
@@ -118,7 +118,7 @@
FuncConfigConfig itemComposeTypeFunc = Config.Instance.Get<FuncConfigConfig>("BagCompound");
itemComposeTypeDict = ConfigParse.GetDic<int, int>(itemComposeTypeFunc.Numerical1);
-
+ NotComposeIds = ConfigParse.GetMultipleStr<int>(itemComposeTypeFunc.Numerical2);
FuncConfigConfig legendAttrCountPreview = Config.Instance.Get<FuncConfigConfig>("LegendAttrCountPreview");
JsonData legendAttrCntData = JsonMapper.ToObject(legendAttrCountPreview.Numerical1);
@@ -621,7 +621,7 @@
if (!isOverdue)
{
- if (itemComposeTypeDict.ContainsKey(attrData.itemConfig.Type))
+ if (itemComposeTypeDict.ContainsKey(attrData.itemConfig.Type) && !NotComposeIds.Contains(attrData.itemId))
{
attrData.SetTipsFuncBtn(ItemWinBtnType.compose, (ItemWinBtnType, ItemAttrData) => {
bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(attrData.itemId);
--
Gitblit v1.8.0