diff --git a/Assets/Prefabs/Pet/Fighter.prefab b/Assets/Prefabs/Pet/Fighter.prefab index c7c7f652085533563df969098d52fce0903c3978..834c0a6b78723716cc72825358d8db01eb0e4bff 100644 --- a/Assets/Prefabs/Pet/Fighter.prefab +++ b/Assets/Prefabs/Pet/Fighter.prefab @@ -5603,7 +5603,7 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 0.5 - m_Speed: 40 + m_Speed: 10 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 @@ -5643,8 +5643,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: intervalAttack: 0.7 - initialDamage: 5 - currentDamage: 0 + initialDamage: 20 + currentDamage: 20 --- !u!114 &270236614910849043 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Pet/FighterAttack.cs b/Assets/Scripts/Pet/FighterAttack.cs index 138fd4b092d34e09ef00d88f8d21736f175b3a86..471a0f0908f500c512c2d4bfe317a8c041dfbdba 100644 --- a/Assets/Scripts/Pet/FighterAttack.cs +++ b/Assets/Scripts/Pet/FighterAttack.cs @@ -7,7 +7,7 @@ using static UnityEngine.GraphicsBuffer; public class FighterAttack : PausibleObject { public float intervalAttack = 0.7f; - public double initialDamage = 5; + public double initialDamage = 20; public double currentDamage; PetHealth health; GameObject enemy; diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs index b5e485b5558b028742eace51d531c462db32c4c5..aaba4ef52a3b6a1755fc309135c747341484d784 100644 --- a/Assets/Scripts/Player/PlayerShooting.cs +++ b/Assets/Scripts/Player/PlayerShooting.cs @@ -88,9 +88,15 @@ namespace Nightmare public void DisableEffects () { // Disable the line renderer and the light. - gunLine.enabled = false; - faceLight.enabled = false; - gunLight.enabled = false; + try + { + gunLine.enabled = false; + faceLight.enabled = false; + gunLight.enabled = false; + } catch (System.Exception) + { + // Do nothing + } } diff --git a/Assets/Scripts/Weapon/ShotgunShooting.cs b/Assets/Scripts/Weapon/ShotgunShooting.cs index 8c5a491e4ffb16c0d77b6dc101a2cd70882221ab..dcf35628a9188a30a0036249fe5091f7ea6b4671 100644 --- a/Assets/Scripts/Weapon/ShotgunShooting.cs +++ b/Assets/Scripts/Weapon/ShotgunShooting.cs @@ -65,13 +65,19 @@ namespace Nightmare public void DisableEffects() { - // Disable the line renderer and the light. - for (int i = 0; i < 10; i++) + try + { + // Disable the line renderer and the light. + for (int i = 0; i < 10; i++) + { + gunLines[i].enabled = false; + } + faceLight.enabled = false; + gunLight.enabled = false; + } catch (System.Exception) { - gunLines[i].enabled = false; + // Do nothing } - faceLight.enabled = false; - gunLight.enabled = false; } public void PowerUp()