Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-09 c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831

 System/ClientVersion/VersionUtility.cs

@@ -115,7 +115,7 @@
    {

        if (IsMaoErGame())

        {

            return versionInfo.downAsset == 0 && versionInfo.VersionCount > 0;

            return versionInfo != null && versionInfo.downAsset == 0 && versionInfo.VersionCount > 0;

        }

        else

        {

@@ -125,7 +125,7 @@


    public bool NeedNormalUpdate()

    {

        return versionInfo.downAsset == 1 && versionInfo.VersionCount > 0;

        return versionInfo != null && versionInfo.downAsset == 1 && versionInfo.VersionCount > 0;

    }



    public string GetApkLocalUrl()

@@ -249,8 +249,6 @@


    private void OnMaoErVersionCheckResult(bool ok, string result)

    {

        Debug.LogFormat("猫耳强更请求返回结果 result：{0}：{1}", ok, result);



        if (ok)

        {

            try

@@ -281,6 +279,49 @@
        }

    }



    public bool InIosAuditTime()

    {

        DateTime dateTime;



        try

        {

            var textAsset = Resources.Load<UnityEngine.TextAsset>("Config/AuditTime");

            var content = string.Empty;

            if (textAsset != null)

            {

                content = textAsset.text;

                if (DateTime.TryParse(content, out dateTime))

                {

                    return DateTime.Now < dateTime;

                }

                else

                {

                    return false;

                }

            }

            else

            {

                return false;

            }

        }

        catch (System.Exception ex)

        {

            return false;

        }

    }



    public bool NeedDownAsset()

    {

        if (versionInfo != null && versionInfo.downAsset == 1 && VersionConfig.Get().assetAccess != InstalledAsset.IngoreDownLoad)

        {

            return true;

        }

        else

        {

            return false;

        }

    }



    public class VersionInfo

    {

        public int ForceCount;