Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/AssetVersion/AssetVersionUtility.cs

@@ -18,16 +18,23 @@
    static bool m_PriorAssetDownLoadDone = false;

    public static bool priorAssetDownLoadDone {

        get {

            switch (VersionConfig.Get().assetAccess)

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

            else

            {

                case InstalledAsset.NullAsset:

                case InstalledAsset.HalfAsset:

                case InstalledAsset.FullAsset:

                    return m_PriorAssetDownLoadDone;

                case InstalledAsset.IngoreDownLoad:

                    return true;

                default:

                    return true;

                switch (VersionConfig.Get().assetAccess)

                {

                    case InstalledAsset.NullAsset:

                    case InstalledAsset.HalfAsset:

                    case InstalledAsset.FullAsset:

                        return m_PriorAssetDownLoadDone;

                    case InstalledAsset.IngoreDownLoad:

                        return true;

                    default:

                        return true;

                }

            }

        }

    }

@@ -35,16 +42,23 @@
    static bool m_UnPriorAssetDownLoadDone = false;

    public static bool unPriorAssetDownLoadDone {

        get {

            switch (VersionConfig.Get().assetAccess)

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

            else

            {

                case InstalledAsset.NullAsset:

                case InstalledAsset.HalfAsset:

                case InstalledAsset.FullAsset:

                    return m_UnPriorAssetDownLoadDone;

                case InstalledAsset.IngoreDownLoad:

                    return true;

                default:

                    return true;

                switch (VersionConfig.Get().assetAccess)

                {

                    case InstalledAsset.NullAsset:

                    case InstalledAsset.HalfAsset:

                    case InstalledAsset.FullAsset:

                        return m_UnPriorAssetDownLoadDone;

                    case InstalledAsset.IngoreDownLoad:

                        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,13 +201,18 @@

    public static bool IsUnpriorAssetDownLoadOk()

    {

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



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

        {

            return true;

        }



        return unPriorAssetDownLoadDone;

    }

    
    }





}