Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-09-21 06bac38d743f3f99a294f20e5b02af6d53676b0b

 System/AssetVersion/AssetVersionUtility.cs

@@ -18,6 +18,12 @@
    static bool m_PriorAssetDownLoadDone = false;

    public static bool priorAssetDownLoadDone {

        get {

            if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
            {
                return true;
            }

            else

            {

            switch (VersionConfig.Get().assetAccess)

            {

                case InstalledAsset.NullAsset:

@@ -31,10 +37,17 @@
            }

        }

    }

    }



    static bool m_UnPriorAssetDownLoadDone = false;

    public static bool unPriorAssetDownLoadDone {

        get {

            if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
            {
                return true;
            }

            else

            {

            switch (VersionConfig.Get().assetAccess)

            {

                case InstalledAsset.NullAsset:

@@ -45,6 +58,7 @@
                    return true;

                default:

                    return true;

                }

            }

        }

    }

@@ -179,7 +193,7 @@
        }

        else

        {

            path = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, _assetKey);

            path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, _assetKey);

        }



        return path;

@@ -187,6 +201,11 @@

    public static bool IsUnpriorAssetDownLoadOk()

    {

        if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
        {
            return true;
        }



        if (VersionConfig.Get().assetAccess == InstalledAsset.IngoreDownLoad)

        {

            return true;