From a2786894c7f3dad3583fc2d098d6642d7eef9f03 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Mon, 21 Dec 2020 18:23:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
index 441482c..bdad9c7 100644
--- a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
+++ b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
@@ -604,9 +604,9 @@
fillBulletTime = 0.1f;
//这里需要替换特效
- // var poolable = Core.Utilities.Poolable.TryGetPoolable<Core.Utilities.Poolable>(woodProjectile_SP);
- // go = poolable.gameObject;
- go = Instantiate(woodProjectile_SP);
+ 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;
--
Gitblit v1.9.1