Removed camera shake and hit effect for attacks that do 0 damage for both party memebers and enemy attacks
This commit is contained in:
@@ -489,7 +489,7 @@ public class GMScript : MonoBehaviour
|
|||||||
}else if(PlayerPrefs.GetInt("GameMode") == 2 && level > PlayerPrefs.GetInt("ChallengeHighScore")){
|
}else if(PlayerPrefs.GetInt("GameMode") == 2 && level > PlayerPrefs.GetInt("ChallengeHighScore")){
|
||||||
PlayerPrefs.SetInt("ChallengeHighScore", level-1);
|
PlayerPrefs.SetInt("ChallengeHighScore", level-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
audioPlayer.PlayOneShot(SoundEffects[1]);
|
audioPlayer.PlayOneShot(SoundEffects[1]);
|
||||||
SceneManager.LoadScene("Mode Select Scene");
|
SceneManager.LoadScene("Mode Select Scene");
|
||||||
}
|
}
|
||||||
@@ -730,7 +730,7 @@ public class GMScript : MonoBehaviour
|
|||||||
|
|
||||||
DisplayDamageText((int)damage, display, partyMember);
|
DisplayDamageText((int)damage, display, partyMember);
|
||||||
|
|
||||||
if(!shield && !enemyShield)
|
if(!shield && !enemyShield && damage != 0)
|
||||||
{
|
{
|
||||||
Hit.SetActive(true);
|
Hit.SetActive(true);
|
||||||
|
|
||||||
@@ -745,7 +745,7 @@ public class GMScript : MonoBehaviour
|
|||||||
Hit.SetActive(false);
|
Hit.SetActive(false);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
yield return new WaitForSeconds(1);
|
yield return new WaitForSeconds(1.5f);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -857,7 +857,7 @@ public class GMScript : MonoBehaviour
|
|||||||
|
|
||||||
DisplayDamageText(attack, PartyDamageText, (Colours)attackColour);
|
DisplayDamageText(attack, PartyDamageText, (Colours)attackColour);
|
||||||
|
|
||||||
if(!shield && !enemyShield)
|
if(!shield && !enemyShield && attack != 0)
|
||||||
{
|
{
|
||||||
EnemyHit.SetActive(true);
|
EnemyHit.SetActive(true);
|
||||||
|
|
||||||
@@ -872,7 +872,7 @@ public class GMScript : MonoBehaviour
|
|||||||
EnemyHit.SetActive(false);
|
EnemyHit.SetActive(false);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
yield return new WaitForSeconds(1);
|
yield return new WaitForSeconds(1.5f);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user