diff --git a/Assets/Scenes/GrandCanyon.unity b/Assets/Scenes/GrandCanyon.unity index 1f08dab65..c0606a765 100644 --- a/Assets/Scenes/GrandCanyon.unity +++ b/Assets/Scenes/GrandCanyon.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1421388808} - m_IndirectSpecularColor: {r: 0.06699521, g: 0.22289085, b: 0.49677116, a: 1} + m_IndirectSpecularColor: {r: 0.06697763, g: 0.22287329, b: 0.4967534, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scripts/Gamestate/PlayerManager.cs b/Assets/Scripts/Gamestate/PlayerManager.cs index 13966964b..4e6d23a9d 100644 --- a/Assets/Scripts/Gamestate/PlayerManager.cs +++ b/Assets/Scripts/Gamestate/PlayerManager.cs @@ -154,6 +154,11 @@ private void Update() GunHolder.transform.forward = inputManager.transform.forward; UpdateAimAngleCmd(movement.AimAngle.y); } + +#if UNITY_EDITOR + if (Keyboard.current.iKey.isPressed) + healthController.GoInvincible(); +#endif } // Hijinks for syncing aim from server to players diff --git a/Assets/Scripts/HealthController.cs b/Assets/Scripts/HealthController.cs index 922ef37f2..8f24bbc28 100644 --- a/Assets/Scripts/HealthController.cs +++ b/Assets/Scripts/HealthController.cs @@ -33,6 +33,14 @@ private void Start() Player = GetComponent(); } +#if UNITY_EDITOR + public void GoInvincible() + { + maxhHealth = 100000000; + currentHealth = maxhHealth; + } +#endif + public void DealDamage(DamageInfo info) { if (!isNetworked) diff --git a/Assets/Scripts/Interactables/ConveyorBeltDirector.cs b/Assets/Scripts/Interactables/ConveyorBeltDirector.cs index 93bfd3648..b3e168956 100644 --- a/Assets/Scripts/Interactables/ConveyorBeltDirector.cs +++ b/Assets/Scripts/Interactables/ConveyorBeltDirector.cs @@ -1,4 +1,7 @@ using UnityEngine; +#if UNITY_EDITOR +using UnityEngine.InputSystem; +#endif public class ConveyorBeltDirector : MonoBehaviour { @@ -53,4 +56,12 @@ private void FlipArrows() leftArrow.enabled = direction > 0; rightArrow.enabled = direction < 0; } + +#if UNITY_EDITOR + private void Update() + { + if (Keyboard.current.oKey.isPressed) + Flip(true); + } +#endif }