Merge branch 'master' into GrowthFund

client_Zxw

2019-01-15 4c6d58af44cd4235501e15a78bf79674ba2fcc4a

 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;

            }

        }

    }