barrierfx

jjooyoun · Apr 22, 2017 · b58cf06 · b58cf06
1 parent 36d9745
commit b58cf06
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/Assets/Script/Entity.cs b/Assets/Script/Entity.cs
@@ -429,7 +429,10 @@ void OnTriggerEnter(Collider other){
 				//Debug.Log (otherEnt.entityName + ": in here");
 				if(PowerUp.hasShield && IsAtMaxScale){
 					otherEnt.Invisiblify(true);
-					PlayPEAtPosition (otherEnt.onCollidedFX, transform.position);
+					if(otherEnt.entityName == BARRIER_NAME) {
+						PlayPEAtPosition( Resources.Load(BRICK_DESTROY_FX_PATH) as GameObject,transform.position);
+					}
+					else PlayPEAtPosition (otherEnt.onCollidedFX, transform.position);
 					return;
 				}
 
@@ -449,16 +452,19 @@ void OnTriggerEnter(Collider other){
 					if(otherEnt.entityName == BARRIER_NAME) {
 						PlayPEAtPosition( Resources.Load(BRICK_DESTROY_FX_PATH) as GameObject,transform.position);
 					}
-					else if (PowerUp.hasFire) {
-						Debug.Log ("Dretoy Water FX");
+					else{
 						PlayPEAtPosition (otherEnt.onCollidedFX, transform.position);
 					}
 					return;
 				}
 
 				//ATMAXSCALE HERE??
-				if(IsAtMaxScale) 
-					PlayPEAtPosition (otherEnt.onCollidedFX, transform.position);
+				if(IsAtMaxScale){
+					if(otherEnt.entityName == BARRIER_NAME) {
+						PlayPEAtPosition( Resources.Load(BRICK_DESTROY_FX_PATH) as GameObject,transform.position);
+					}
+					else PlayPEAtPosition (otherEnt.onCollidedFX, transform.position);
+				}
 
 				if (otherEnt.entityType == ENTITY_TYPE.ENEMY) {
 					otherEnt.Invisiblify(true);