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

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 System/SystemSetting/SettingEffectMgr.cs

@@ -126,14 +126,14 @@


    private void OnStartHandupAI()

    {

        DesignDebug.Log("OnStartHandupAI");

        DebugEx.Log("OnStartHandupAI");

        _isAutoHangUp = true;

        RefreshBagItem();

    }

    

    private void OnStopHandupAI()

    {

        DesignDebug.Log("OnStopHandupAI");

        DebugEx.Log("OnStopHandupAI");

        _isAutoHangUp = false;

    }



@@ -157,7 +157,7 @@
    {

        if (!_isAutoHangUp)

        {

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

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

            return;

        }



@@ -265,7 +265,7 @@
    {

        while(true)

        {

            DesignDebug.Log("PlayerReborn");

            DebugEx.Log("PlayerReborn");

            time -= 1;

            if (time <= 0 && DeadModel.playerIsDie)

            {