Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 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>();

        }