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

client_Zxw

2018-11-13 d2dd33cc0ca421e276d50abc46688f5db83aa42b

 Core/SFX/SFXPlayUtility.cs

@@ -18,7 +18,6 @@
    public SFXController PlayEffectAsync(int id, Transform parent, float scale = 1)

    {

        var config = Config.Instance.Get<EffectConfig>(id);

        Debug.LogFormat("[{0}] 开始异步加载: {1}", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), config.fxName);

        var bundleName = StringUtility.Contact(ResourcesPath.EFFECT_Folder_Name, config.packageName);

        if (AssetSource.effectFromEditor || AssetBundleUtility.Instance.JudgeExistAsset(bundleName, config.fxName))

        {

@@ -41,7 +40,6 @@
        }

        else

        {

            Debug.LogFormat("[{0}] 开始异步加载: {1}", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), config.fxName);

            AssetBundleUtility.Instance.Co_LoadAsset(bundleName, config.fxName, OnEffectLoaded);

            return null;

        }

@@ -55,7 +53,6 @@
            if (_prefab)

            {

                GameObjectPoolManager.Instance.CacheGameObject(_prefab, 1, false);

                Debug.LogFormat("[{0}] 异步加载: {1} 完毕", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), _prefab.name);

            }

        }

    }

@@ -134,7 +131,7 @@
        }

        else

        {

            Debug.LogFormat("[{0}] 开始异步加载: {1}", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), config.fxName);

            // Debug.LogFormat("[{0}] 开始异步加载: {1}", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), config.fxName);

            AssetBundleUtility.Instance.Co_LoadAsset(bundleName, config.fxName, OnEffectLoaded);

            return null;

        }