Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/ClientVersion/VersionUtility.cs

@@ -146,7 +146,12 @@


    public string GetApkRemoteUrl()

    {

        if (IsMaoErGame())

        if (versionInfo == null)

        {

            return string.Empty;

        }



        if (IsMaoErGame() && versionInfo.downAsset == 0)

        {

            if (maoerVersion.Keys.Contains("url"))

            {