This commit is contained in:
IsaacWarhol
2026-02-02 15:25:09 -08:00
parent 65001c0ecb
commit 4253e33ed4
11 changed files with 52 additions and 26 deletions

BIN
Assets/New Terrain 3.asset Normal file

Binary file not shown.

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 40219f8a95431408d9c8d514cd1e5aeb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 15600000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

BIN
Assets/Scenes/Intro1.unity LFS Normal file

Binary file not shown.

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 33eab63e55f9d400dbae1c6473a49d95
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Binary file not shown.

View File

@@ -108,8 +108,17 @@ public class IntroWagon : MonoBehaviour
transform.rotation = Quaternion.Euler(currentEuler);
transform.position += transform.forward * 2.25f * 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<PlayerMovement>().energy = 0;
@@ -120,7 +129,7 @@ public class IntroWagon : MonoBehaviour
timer3 += Time.deltaTime;
if (timer3 > .8 && timer3 < .9)
{
npc.GetComponent<MouthOpenClose>().whatToSay = "You had me scared for a moment there!";
npc.GetComponent<MouthOpenClose>().whatToSay = "It looks like the city is under attack!";
npc.gameObject.GetComponent<MouthOpenClose>().interacted = true;
npc.gameObject.GetComponent<MouthOpenClose>().prompt.SetActive(false);

View File

@@ -120,14 +120,13 @@ public class PlayerMovement : MonoBehaviour
moveInput = walkAction.ReadValue<Vector2>();
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<Vector2>();
@@ -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()

View File

@@ -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

View File

@@ -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