From 9ab4578f31965ce53fca320d4468054445843ea8 Mon Sep 17 00:00:00 2001 From: Garrett Kaiser Date: Wed, 4 Feb 2026 14:03:52 -0800 Subject: [PATCH] w --- Assets/New Terrain 3.asset | Bin 0 -> 557364 bytes Assets/New Terrain 3.asset.meta | 8 ++++++++ Assets/New Terrain.asset | Bin 1959084 -> 1959084 bytes Assets/Scenes/Intro1.unity | 3 +++ Assets/Scenes/Intro1.unity.meta | 7 +++++++ Assets/Scenes/Main Menu.unity | 4 ++-- Assets/Scenes/Scene1-1.unity | 3 --- Assets/Scripts/IntroWagon.cs | 15 ++++++++++++--- Assets/Scripts/PlayerMovement.cs | 19 +++++++++---------- Assets/Settings/DefaultVolumeProfile.asset | 12 ++++++------ Assets/Settings/SampleSceneProfile.asset | 6 +++--- 11 files changed, 50 insertions(+), 27 deletions(-) create mode 100644 Assets/New Terrain 3.asset create mode 100644 Assets/New Terrain 3.asset.meta create mode 100644 Assets/Scenes/Intro1.unity create mode 100644 Assets/Scenes/Intro1.unity.meta delete mode 100644 Assets/Scenes/Scene1-1.unity diff --git a/Assets/New Terrain 3.asset b/Assets/New Terrain 3.asset new file mode 100644 index 0000000000000000000000000000000000000000..e216542d4353fbace67949b9405402cb8f2b8cf6 GIT binary patch literal 557364 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 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7e? zfdYeQePZdrNFxCP1PBlyK!5-N0t5&UAV7cs0RjXF93t?kmmCskCP07y0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5Fqe>6c{WNMg6}4_~JuF@yb(0 Ik>5q}KXE0Rod5s; literal 0 HcmV?d00001 diff --git a/Assets/New Terrain 3.asset.meta b/Assets/New Terrain 3.asset.meta new file mode 100644 index 0000000..a04bb02 --- /dev/null +++ b/Assets/New Terrain 3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40219f8a95431408d9c8d514cd1e5aeb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 15600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/New Terrain.asset b/Assets/New Terrain.asset index 6463b8bdf28226634396d8a1fbb642021eeaf723..d934fa797e0b018b68f1e16619d071875ec6b382 100644 GIT binary patch delta 135 zcmWN=rwxEW06@{ud+*Ji#9?j&M#5f#z%mF1g~hTJ|0VDGw(HwYsV%o$#jeDmghrhP kOoCQl(tl6+-$DRYnM~P{Ee-N%K{r~^~ delta 133 zcmWN=rxAca006-u=bV#!i-!s*>E#OqmO?NnES9dgo!RS?*C)^AUN^BTaVVitr$Lhz iZ8~)6(PzMr5o0DynK5U 0) + { + player.transform.position = Vector3.MoveTowards(player.transform.position, playerKeeper.transform.position, Mathf.Infinity * Time.deltaTime); + npc.transform.position = Vector3.MoveTowards(npc.transform.position, npcKeeper.transform.position, Mathf.Infinity * Time.deltaTime); + + } + else + { + player.transform.position = Vector3.MoveTowards(player.transform.position, playerKeeper.transform.position, Mathf.Infinity); + npc.transform.position = Vector3.MoveTowards(npc.transform.position, npcKeeper.transform.position, Mathf.Infinity); + } npc.transform.rotation = npcKeeper.transform.rotation; player.GetComponent().energy = 0; @@ -120,7 +129,7 @@ public class IntroWagon : MonoBehaviour timer3 += Time.deltaTime; if (timer3 > .8 && timer3 < .9) { - npc.GetComponent().whatToSay = "You had me scared for a moment there!"; + npc.GetComponent().whatToSay = "It looks like the city is under attack!"; npc.gameObject.GetComponent().interacted = true; npc.gameObject.GetComponent().prompt.SetActive(false); diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 87b5f1a..d7efaf9 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -120,14 +120,13 @@ public class PlayerMovement : MonoBehaviour moveInput = walkAction.ReadValue(); - if (runAction.WasPressedThisFrame() && moveAnimationInputY == 1 && !running) + if (runAction.WasPressedThisFrame() && !running) { running = true; } - else if (runAction.WasPressedThisFrame() && moveAnimationInputY == 2 && running) + else if (runAction.WasPressedThisFrame() && running) { running = false; - moveAnimationInputY = 1; } playerCam.lookInput = lookAction.ReadValue(); @@ -285,18 +284,18 @@ public class PlayerMovement : MonoBehaviour //Debug.Log(controller.isGrounded); - if (canWalk /*&& !running*/) + if (canWalk && !running) { Vector3 move = new Vector3(moveInput.x * speed, 0, moveInput.y * speed); Vector3 move2 = transform.TransformDirection(move); controller.Move(move2 * Time.deltaTime); } - //else if (canWalk && running) - //{ - // Vector3 move = new Vector3(moveInput.x * speed, 0, moveInput.y * runSpeed); - // Vector3 move2 = transform.TransformDirection(move); - // controller.Move(move2 * Time.deltaTime); - //} + else if (canWalk && running) + { + Vector3 move = new Vector3(moveInput.x * speed, 0, moveInput.y * runSpeed); + Vector3 move2 = transform.TransformDirection(move); + controller.Move(move2 * Time.deltaTime); + } controller.Move(velocity * Time.deltaTime); } private void MyInput() diff --git a/Assets/Settings/DefaultVolumeProfile.asset b/Assets/Settings/DefaultVolumeProfile.asset index 0156f9a..9e208ce 100644 --- a/Assets/Settings/DefaultVolumeProfile.asset +++ b/Assets/Settings/DefaultVolumeProfile.asset @@ -189,10 +189,10 @@ MonoBehaviour: active: 1 type: m_OverrideState: 1 - m_Value: 2 + m_Value: 0 intensity: m_OverrideState: 1 - m_Value: 0.694 + m_Value: 0 response: m_OverrideState: 1 m_Value: 0.8 @@ -852,7 +852,7 @@ MonoBehaviour: active: 1 intensity: m_OverrideState: 1 - m_Value: 0.302 + m_Value: 0 --- !u!114 &6940869943325143175 MonoBehaviour: m_ObjectHideFlags: 3 @@ -887,13 +887,13 @@ MonoBehaviour: m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 - m_Value: 0.32 + m_Value: 0 smoothness: m_OverrideState: 1 - m_Value: 0.311 + m_Value: 0.2 rounded: m_OverrideState: 1 - m_Value: 1 + m_Value: 0 --- !u!114 &7518938298396184218 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index 073f808..c41e85e 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} m_Name: Bloom m_EditorClassIdentifier: - active: 1 + active: 0 skipIterations: m_OverrideState: 1 m_Value: 0 @@ -59,7 +59,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} m_Name: Vignette m_EditorClassIdentifier: - active: 1 + active: 0 color: m_OverrideState: 0 m_Value: {r: 0, g: 0, b: 0, a: 1} @@ -104,7 +104,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3} m_Name: Tonemapping m_EditorClassIdentifier: - active: 1 + active: 0 mode: m_OverrideState: 1 m_Value: 1