Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-09 c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831

 System/AssetVersion/AssetVersionUtility.cs

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

    public static bool priorAssetDownLoadDone {

        get {

            if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
            if (VersionUtility.Instance.NeedDownAsset())
            {

                return m_PriorAssetDownLoadDone;
            }

            else
            {
                return true;
            }

            else

            {

                switch (VersionConfig.Get().assetAccess)

                {

                    case InstalledAsset.NullAsset:

                    case InstalledAsset.HalfAsset:

                    case InstalledAsset.FullAsset:

                        return m_PriorAssetDownLoadDone;

                    case InstalledAsset.IngoreDownLoad:

                        return true;

                    default:

                        return true;

                }

            }

        }

    }

@@ -42,23 +32,13 @@
    static bool m_UnPriorAssetDownLoadDone = false;

    public static bool unPriorAssetDownLoadDone {

        get {

            if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
            if (VersionUtility.Instance.NeedDownAsset())
            {

                return m_UnPriorAssetDownLoadDone;
            }

            else
            {
                return true;
            }

            else

            {

                switch (VersionConfig.Get().assetAccess)

                {

                    case InstalledAsset.NullAsset:

                    case InstalledAsset.HalfAsset:

                    case InstalledAsset.FullAsset:

                        return m_UnPriorAssetDownLoadDone;

                    case InstalledAsset.IngoreDownLoad:

                        return true;

                    default:

                        return true;

                }

            }

        }

    }

@@ -193,7 +173,14 @@
        }

        else

        {

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

            if (Application.platform == RuntimePlatform.Android)
            {

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

            else

            {

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

            }

        }



        return path;

@@ -201,17 +188,14 @@

    public static bool IsUnpriorAssetDownLoadOk()

    {

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



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

        else

        {

            return true;

        }



        return unPriorAssetDownLoadDone;

    }