From 4c6d58af44cd4235501e15a78bf79674ba2fcc4a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 15 一月 2019 10:41:31 +0800
Subject: [PATCH] Merge branch 'master' into GrowthFund
---
System/SystemSetting/SettingEffectMgr.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index fddfa33..19028ed 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -201,6 +201,14 @@
{
if (playerPack.GetReaminGridCount(PackType.rptItem) < 5 && modelInterface.isPackResetOk)
{
+ if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoSell)
+ && !isStartOneKeySell
+ && modelInterface.GetSellItemList().Count > 0)
+ {
+ modelInterface.SendOneKeySellQuest(modelInterface.GetSellItemList());
+ return;
+ }
+
if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoDevour) && !isStartDecompose)
{
if(playerPack.IsReachMinDecomposeNum())
@@ -208,14 +216,6 @@
playerPack.SendEquipdevourQuest();
return;
}
- }
-
- if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoSell)
- && !isStartOneKeySell
- && modelInterface.GetSellItemList().Count > 0)
- {
- modelInterface.SendOneKeySellQuest(modelInterface.GetSellItemList());
- return;
}
}
}
--
Gitblit v1.8.0