Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle

wangguan

2020-12-12 938aa4da26e0109e16ded70d13a43c187498b901

 Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs

@@ -601,8 +601,9 @@
                        fillBulletTime = 0.1f;

                    //这里需要替换特效
                    var poolable = Core.Utilities.Poolable.TryGetPoolable<Core.Utilities.Poolable>(woodProjectile_SP);
                    go = poolable.gameObject;
                    // var poolable = Core.Utilities.Poolable.TryGetPoolable<Core.Utilities.Poolable>(woodProjectile_SP);
                    // go = poolable.gameObject;
                    go = Instantiate(woodProjectile_SP);
                    Damager tmpDamager = go.GetComponent<Damager>();
                    tmpDamager.damageMulti = 10.0f;
                    tmpDamager.damage = damagerProjectile.damage;