Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/Launch/LaunchBackGroundWin.cs

@@ -35,7 +35,7 @@


        protected override void OnPreOpen()

        {

            var sprite = Resources.Load<Sprite>("UI/Sprites/LoginBackGround");

            var sprite = BuiltInLoader.LoadSprite("LoginBackGround");

            useStaticBackGround = sprite != null;



            if (useStaticBackGround)