From 003d879535560c7bf953eac7fadf8361321f9c10 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 14 一月 2019 16:46:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 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