Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-25 63beb1b9460e1056cb527ec6a3772c6e8e6001a4

Merge remote-tracking branch 'origin/master' into Cross_Server

 System/GatheringSoul/GatherSoulResolveWin.cs

@@ -58,6 +58,7 @@


        protected override void OnPreOpen()

        {

            m_AutoResolveToggle.isOn = model.autoResolve;

            model.resolveItems.Clear();

            m_QualitySort.gameObject.SetActive(false);

            qualitySortOpen = false;


 System/GatheringSoul/GatheringSoulModel.cs

@@ -40,6 +40,8 @@
                if (value != now)

                {

                    QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.GatherSoulAutoResolve, value);

                    QuickSetting.Instance.SendPackage();

                    CheckAutoResolve();

                }

            }

        }

@@ -1379,7 +1381,7 @@
            List<int> list;

            if (virtualPack.TryGetItems(PackType.rptGatherSoul, out list))

            {

                if (capacity - list.Count > autoResolveRemainCount)

                if (capacity - list.Count >= autoResolveRemainCount)

                {

                    return;

                }