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

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 System/MainInterfacePanel/LowSettingTip.cs

@@ -63,10 +63,9 @@


        void Role1Button()

        {

           
            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<RolePanel>();

           /* DesignDebug.Log("角色按钮")*/;



            ModelCenter.Instance.GetModel<RoleModel>().OpenRolePanel();



        }

        void OnClickBagualuBtn()

        {