From 9a600764c640d0b0c9e4925b7401e2a115000514 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 17 十月 2018 10:37:49 +0800
Subject: [PATCH] 2138 五行装备合成一键放入，如果有绑定装备，没有二次确认弹窗
---
System/Compose/New/ComposeWinModel.cs | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/System/Compose/New/ComposeWinModel.cs b/System/Compose/New/ComposeWinModel.cs
index 241d6be..13e52d2 100644
--- a/System/Compose/New/ComposeWinModel.cs
+++ b/System/Compose/New/ComposeWinModel.cs
@@ -542,22 +542,15 @@
if(fixedMat.Count > 0 && unfixedMat.Count > 0)
{
- if(isFixedBind && isUnFixedBind)
+ if(isFixedBind != isUnFixedBind
+ || (isFixedBind == isUnFixedBind && fixedNoBindRecord != unfixedNoBindRecord))
{
- return false;
+ return true;
}
else
{
- if (isFixedBind || isUnFixedBind)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return false;
}
-
}
else if(fixedMat.Count > 0)
{
--
Gitblit v1.8.0