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

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -319,9 +319,7 @@


        void HeadButton()

        {

            // DesignDebug.Log("头像点击框");

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<RolePanel>();

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

        }



        void OnPromoteBtn()