Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-09-26 fb4b1ed3c3366f993136e1f9a442bb2dc6d758ab

 System/SystemSetting/SettingEffectMgr.cs

@@ -146,7 +146,6 @@
    {

        if (!_isAutoHangUp)

        {

            DebugEx.Log("请开启自动挂机，否则无法出售");

            return;

        }

        DealBagItem();

@@ -225,7 +224,7 @@
    private int rebornPrice;

    private void OnPlayerDie()

    {

        if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

        if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

        {

            WindowCenter.Instance.Close<FunctionForecastWin>();

        }