diff --git a/Assets/New Terrain 3.asset b/Assets/New Terrain 3.asset new file mode 100644 index 0000000..e216542 Binary files /dev/null and b/Assets/New Terrain 3.asset differ 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 6463b8b..d934fa7 100644 Binary files a/Assets/New Terrain.asset and b/Assets/New Terrain.asset differ diff --git a/Assets/Scenes/Intro1.unity b/Assets/Scenes/Intro1.unity new file mode 100644 index 0000000..abe9fd2 --- /dev/null +++ b/Assets/Scenes/Intro1.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7e5b2ea168a8065b0a9472c30394e357512b1c64efcec54d439d7b4aab63eed +size 11879 diff --git a/Assets/Scenes/Intro1.unity.meta b/Assets/Scenes/Intro1.unity.meta new file mode 100644 index 0000000..49fab31 --- /dev/null +++ b/Assets/Scenes/Intro1.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 33eab63e55f9d400dbae1c6473a49d95 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 1434ed5..cea3b5c 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e1003c51cda3d341e62a5105b7c007291fd0c7f8993784e1f4c72b1df066aa8 -size 194777 +oid sha256:2d88560316b1b20d8dbb04075de7b6a518812e0a47eed7350634d81e02dca992 +size 194790 diff --git a/Assets/Scenes/Scene1-1.unity b/Assets/Scenes/Scene1-1.unity index e05f4f9..54d2bc8 100644 --- a/Assets/Scenes/Scene1-1.unity +++ b/Assets/Scenes/Scene1-1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:913942c92e4d0d59e3486e6ce09036c2d7fcdd2f4ad93d109d90a253c098688f -size 1436858 +oid sha256:657db47bef637801abc77180a7c3caeaa4b40df3c82a5fbb7c2fe1d5095e347a +size 1460810 diff --git a/Assets/Scripts/IntroWagon.cs b/Assets/Scripts/IntroWagon.cs index cf57c7b..b7678b4 100644 --- a/Assets/Scripts/IntroWagon.cs +++ b/Assets/Scripts/IntroWagon.cs @@ -108,8 +108,17 @@ public class IntroWagon : MonoBehaviour transform.rotation = Quaternion.Euler(currentEuler); transform.position += transform.forward * 2.25f * Time.deltaTime; - 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); + if (Time.deltaTime > 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