3335 配置表读取重构,修改配置表读取接口1

client_Wu Xijin

2019-02-13 2df58aeacbf1177ec01167bdeccfe89d6a8d5804

 Core/SFX/SFXPlayUtility.cs

@@ -17,7 +17,7 @@


    public SFXController PlayEffectAsync(int id, Transform parent, float scale = 1)

    {

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

        var config = EffectConfig.Get(id);

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

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

        {

@@ -32,7 +32,7 @@


    public SFXController PlayEffectAsync(int id, GActor parent, float scale = 1)

    {

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

        var config = EffectConfig.Get(id);

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

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

        {

@@ -72,7 +72,7 @@


    public SFXController PlayBattleEffect(int id, GActor actor, float scale = 1f)

    {

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

        EffectConfig _effectModel = EffectConfig.Get(id);



        if (_effectModel == null)

        {

@@ -126,7 +126,7 @@


    public SFXController PlayEffectAsync(int id, Vector3 position, Vector3 forward, float scale = 1)

    {

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

        var config = EffectConfig.Get(id);

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

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

        {

@@ -152,7 +152,7 @@
            return null;

        }



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

        EffectConfig _effectModel = EffectConfig.Get(id);

        if (_effectModel.setParent > 0)

        {

            _controller.transform.SetParent(parent);

@@ -172,7 +172,7 @@


        _controller.gameObject.SetActive(true);



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

        var config = EffectConfig.Get(id);

        if (config != null)

        {

            SoundPlayer.Instance.PlayUIAudio(config.audio);

@@ -200,7 +200,7 @@
        _controller.transform.localScale = Vector3.one * scale;

        _controller.gameObject.SetActive(true);



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

        var config = EffectConfig.Get(id);

        if (config != null)

        {

            SoundPlayer.Instance.PlayUIAudio(config.audio);

@@ -228,7 +228,7 @@
        _controller.transform.localScale = Vector3.one * scale;

        _controller.gameObject.SetActive(true);



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

        var config = EffectConfig.Get(id);

        if (config != null)

        {

            SoundPlayer.Instance.PlayUIAudio(config.audio);

@@ -313,7 +313,7 @@
        GameObject _sfx = GameObjectPoolManager.Instance.RequestGameObject(_prefab);



        SFXController _controller = _sfx.AddMissingComponent<SFXController>();

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

        _controller.config = EffectConfig.Get(id);



        return _controller;

    }