Merge branch 'master' into 【1.4】聚魂功能

client_linchunjie

2018-12-20 bf4e1051ef18bf57299d3c830f921864b6fda444

 System/ClientVersion/VersionUtility.cs

@@ -281,22 +281,6 @@
        {

            step = Step.Completed;

            WindowCenter.Instance.CloseImmediately<VersionUpdateWin>();



            if (Application.platform == RuntimePlatform.Android)

            {

                var dllPath1 = ResourcesPath.Instance.ExternalStorePath + "Assembly-CSharp-firstpass.dll";

                if (File.Exists(dllPath1))

                {

                    File.Delete(dllPath1);

                }



                var dllPath2 = ResourcesPath.Instance.ExternalStorePath + "Assembly-CSharp.dll";

                if (File.Exists(dllPath2))

                {

                    File.Delete(dllPath2);

                }

            }



            SDKUtility.Instance.InstallAPK(GetApkLocalUrl());

        }

        else