From d0d289d502fe85e9bb597ced1b41c73b8bc75889 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 14 三月 2019 10:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeWinModel.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/System/Compose/New/ComposeWinModel.cs b/System/Compose/New/ComposeWinModel.cs
index 7819202..b3f3941 100644
--- a/System/Compose/New/ComposeWinModel.cs
+++ b/System/Compose/New/ComposeWinModel.cs
@@ -913,22 +913,23 @@
if (!matDict.ContainsKey(itemModel.itemId))
{
Dictionary<int, int> bindDict = new Dictionary<int, int>();
- if (!bindDict.ContainsKey(itemModel.isBind))
- {
- bindDict.Add(itemModel.isBind, itemModel.count);
- }
+ //if (!bindDict.ContainsKey(itemModel.isBind))
+ //{
+ // bindDict.Add(itemModel.isBind, itemModel.count);
+ //}
matDict.Add(itemModel.itemId, bindDict);
}
else
{
- if (!matDict[itemModel.itemId].ContainsKey(itemModel.isBind))
- {
- matDict[itemModel.itemId].Add(itemModel.isBind, itemModel.count);
- }
- else
- {
- matDict[itemModel.itemId][itemModel.isBind] += itemModel.count;
- }
+ matDict[itemModel.itemId][0] += itemModel.count;
+ //if (!matDict[itemModel.itemId].ContainsKey(itemModel.isBind))
+ //{
+ // matDict[itemModel.itemId].Add(itemModel.isBind, itemModel.count);
+ //}
+ //else
+ //{
+
+ //}
}
}
--
Gitblit v1.8.0