Merge branch 'master' into Equip

client_Wu Xijin

2019-03-05 efa5f8d07fc3321f6ac5f5d97fb422db28d0886f

 Core/SFX/SFXPlayUtility.cs

@@ -148,6 +148,7 @@
        }



        EffectConfig _effectModel = EffectConfig.Get(id);

        
        if (_effectModel.setParent > 0)

        {

            _controller.transform.SetParent(parent);