trey/DougDiggem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add pause menu

Browse Source
This commit is contained in:
Trey Shaw
2026-04-15 20:47:08 -05:00
parent 77625e7ad5
commit 46ec37309d
13 changed files with 5980 additions and 8102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Doug.prefab
+393 -4
View File
@@ -481,6 +481,7 @@ Transform:
- {fileID: 7557613548437949332}
- {fileID: 4497923176373106572}
- {fileID: 5562995395109305721}
- {fileID: 4912141646191296772}
m_Father: {fileID: 5056434560497563343}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1125603919066053951
@@ -875,6 +876,118 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2224365324496764932
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3539603623064926047}
- component: {fileID: 4327863251967237271}
- component: {fileID: 5853307117920602168}
- component: {fileID: 425346278670060512}
m_Layer: 0
m_Name: Hook
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3539603623064926047
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2224365324496764932}
serializedVersion: 2
m_LocalRotation: {x: 0.60816044, y: 0.25875628, z: 0.6905512, w: 0.29381147}
m_LocalPosition: {x: 0.1109866, y: 0.081797495, z: 0.063700035}
m_LocalScale: {x: 0.044682946, y: 0.04468295, z: 0.02127847}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4912141646191296772}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 46.923}
--- !u!33 &4327863251967237271
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2224365324496764932}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5853307117920602168
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2224365324496764932}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &425346278670060512
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2224365324496764932}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2257686476074821330
GameObject:
m_ObjectHideFlags: 0
@@ -1071,6 +1184,118 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &3383803907815417999
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 800413527618061279}
- component: {fileID: 5808647788581163567}
- component: {fileID: 679585356186139854}
- component: {fileID: 6130631655629471205}
m_Layer: 0
m_Name: Graphics (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &800413527618061279
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3383803907815417999}
serializedVersion: 2
m_LocalRotation: {x: 0.45486292, y: 0.47949305, z: 0.51648575, w: 0.54445267}
m_LocalPosition: {x: 0.1214, y: 0.0776, z: -0.0206}
m_LocalScale: {x: 0.033143807, y: 0.15052864, z: 0.030040754}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4912141646191296772}
m_LocalEulerAnglesHint: {x: 0, y: 82.74, z: 86.98}
--- !u!33 &5808647788581163567
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3383803907815417999}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &679585356186139854
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3383803907815417999}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &6130631655629471205
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3383803907815417999}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &3424469979721106716
GameObject:
m_ObjectHideFlags: 0
@@ -1654,7 +1879,7 @@ MonoBehaviour:
altUseTimeSec: 0
inUse: 0
shootForce: 10
testBall: {fileID: 7664016258760507437, guid: 0b0365667a94c474bb3cc42312aac1db, type: 3}
ball: {fileID: 7664016258760507437, guid: 0b0365667a94c474bb3cc42312aac1db, type: 3}
ballLifeTime: 5
--- !u!1 &4672178086213347511
GameObject:
@@ -2154,6 +2379,59 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6104215866556849460
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4912141646191296772}
- component: {fileID: 6038027350876930962}
m_Layer: 0
m_Name: GrappleGun
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &4912141646191296772
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6104215866556849460}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3539603623064926047}
- {fileID: 4982369430241200918}
- {fileID: 800413527618061279}
m_Father: {fileID: 6581087177990818461}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6038027350876930962
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6104215866556849460}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 70102eddcaad3044d9ac0ec62519caad, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::GrappleGun
useTimeSec: 0.2
altUseTimeSec: 0
inUse: 0
range: 5
hookStickTime: 0.2
hook: {fileID: 2224365324496764932}
--- !u!1 &6169192211327620812
GameObject:
m_ObjectHideFlags: 0
@@ -2293,7 +2571,7 @@ Transform:
m_GameObject: {fileID: 6233083279635182816}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.49347007, z: 0}
m_LocalPosition: {x: 0, y: -0.78, z: 0}
m_LocalScale: {x: 1, y: 3, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -2469,6 +2747,118 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6874027526435261889
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4982369430241200918}
- component: {fileID: 2974524997077103125}
- component: {fileID: 4683339968417362321}
- component: {fileID: 6854971480795012501}
m_Layer: 0
m_Name: Graphics
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4982369430241200918
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6874027526435261889}
serializedVersion: 2
m_LocalRotation: {x: 0.45486292, y: 0.47949305, z: 0.51648575, w: 0.54445267}
m_LocalPosition: {x: 0.127, y: 0.041000016, z: -0.06199996}
m_LocalScale: {x: 0.063083, y: 0.06308299, z: 0.030040754}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4912141646191296772}
m_LocalEulerAnglesHint: {x: 0, y: 82.74, z: 86.98}
--- !u!33 &2974524997077103125
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6874027526435261889}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &4683339968417362321
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6874027526435261889}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &6854971480795012501
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6874027526435261889}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6923950202799821203
GameObject:
m_ObjectHideFlags: 0
@@ -2748,11 +3138,10 @@ MonoBehaviour:
- {fileID: 2884873557578242522}
- {fileID: 6033266832729015012}
- {fileID: 5907675754202653673}
- {fileID: 6038027350876930962}
walkSpeed: 2
sprintMultiplier: 1.5
gravity: 1
jumpForce: 8.01
jumpTime: 0.5
--- !u!114 &5478143440182735446
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/PauseMenu.cs
+25
View File
@@ -0,0 +1,25 @@
using UnityEngine;
using UnityEngine.UI;
public class PauseMenu : MonoBehaviour
{
public Button SaveButton;
public Button DeleteSaveButton;
public Button QuitButton;
public void ReloadReferences()
{
// pull all game objs here
}
void Start()
{
SaveButton.onClick.AddListener(SaveSystem.Save);
DeleteSaveButton.onClick.AddListener(SaveSystem.ClearSave);
}
void Update()
{
}
}
Assets/PauseMenu.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 9657fbe2c0c3ae74b8f542c62a1f38a2
Assets/Scenes/SampleScene.unity
+136 -4045
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/TestScene2.unity
+60 -4051
View File
File diff suppressed because it is too large Load Diff
Assets/Scripts/Management/GameManager.cs
+5
View File
@@ -14,6 +14,7 @@ public class GameManager : MonoBehaviour
public PlayerManager PlayerManager { get; private set; }
public Inventory Inventory { get; private set; }
public Storybools Storybools { get; private set; }
public PauseMenu PauseMenu { get; private set; }
// Are we currently in a scene transition?
private bool isTransitioningScenes = false;
@@ -52,6 +53,10 @@ private void ReloadReferences()
Instance.DialogueManager = GetComponent<DialogueManager>();
Instance.DialogueManager.ReloadReferences();
Instance.PauseMenu = GameObject.FindWithTag("PauseMenu").GetComponent<PauseMenu>();
Instance.PauseMenu.ReloadReferences();
Instance.PauseMenu.gameObject.SetActive(false);
Instance.Inventory = GetComponent<Inventory>();
Instance.TimeManager = GetComponent<TimeManager>();
Instance.PlayerManager = GetComponent<PlayerManager>();
Assets/Scripts/Management/PlayerController.cs
+38 -2
View File
@@ -1,4 +1,5 @@
using System.Collections;
using Unity.VisualScripting.Antlr3.Runtime;
using UnityEngine;
using static UnityEngine.GraphicsBuffer;
@@ -18,7 +19,9 @@ public class PlayerController : MonoBehaviour
private CameraController cameraController;
private Vector3 moveDir;
private bool hasControl = true; // set this to false if we want to stop reading player inputs
private bool canUseTools = true; // set this to false if we want to stop reading player tool use
private bool isSprinting = false;
private bool paused = false;
// Mathematical plane used to catch the raycast from camera to get direction for
// looking at the mouse
@@ -39,6 +42,27 @@ void Update()
moveDir = Vector3.zero;
groundPlane.distance = -DougBody.transform.position.y;
// TODO: Move input detection somewhere else
if (Input.GetKeyDown(KeyCode.Escape))
{
if (!paused)
{
Time.timeScale = 0;
canUseTools = false;
hasControl = false;
GameManager.Instance.PauseMenu.gameObject.SetActive(true);
}
else
{
Time.timeScale = 1;
canUseTools = true;
hasControl = true;
GameManager.Instance.PauseMenu.gameObject.SetActive(false);
}
paused = !paused;
}
if (hasControl)
{
if (!tools[GameManager.Instance.PlayerManager.CurrentToolIndex].inUse)
@@ -47,7 +71,7 @@ void Update()
TryInteract();
}
ToolUseDetector();
CheckWeaponChange();
ApplyWalk();
// TODO: This is just for testing, remove or clean up if used
@@ -63,7 +87,11 @@ void Update()
}
}
CheckWeaponChange();
if (canUseTools)
{
ToolUseDetector();
}
CheckSprint();
ApplyGravity();
DoMovement();
@@ -257,6 +285,14 @@ public void SetCharacterControl(bool hasControl)
this.hasControl = hasControl;
}
/// <summary>
/// Sets the character's "canUseTools" bool. Tool use input is ignored when false
/// </summary>
public void SetCharacterCanUseTools(bool canUseTools)
{
this.canUseTools = canUseTools;
}
/// <summary>
/// Gets the character's "hasControl" bool. All input is ignored when false
/// </summary>
Assets/Scripts/Management/SaveSystem.cs
+13
View File
@@ -41,6 +41,19 @@ public static void Save()
File.WriteAllText(SaveFileName(), JsonUtility.ToJson(_saveData, true));
}
public static void ClearSave()
{
try
{
File.Delete(SaveFileName());
Debug.Log("File deleted successfully. Stop and restart player.");
}
catch (FileNotFoundException)
{
// file doesn't exist, don't need to do anything
}
}
private static void HandleSaveData()
{
GameManager.Instance.SaveStoryBools(ref _saveData.StoryboolData);
Assets/Scripts/Tools/GrappleGun.cs
+128
View File
@@ -0,0 +1,128 @@
using System.Collections;
using UnityEngine;
public class GrappleGun : Tool
{
[Header("Grapple Gun Parameters")]
public float range;
public float hookStickTime;
public GameObject hook;
bool isMoving = false;
bool stuckInTarget = false;
private Vector3 hookBaseLocation;
private Transform hookParent;
private void Start()
{
hookBaseLocation = hook.transform.localPosition;
hookParent = hook.transform.parent;
}
IEnumerator GoToTarget(Vector3 target)
{
GameManager.Instance.GetPlayerController().SetCharacterControl(false);
isMoving = true;
Vector3 startPosition = hook.transform.position;
float elapsedTime = 0f;
while (elapsedTime < hookStickTime)
{
float t = elapsedTime / hookStickTime;
hook.transform.position = Vector3.Lerp(startPosition, target, t);
elapsedTime += Time.deltaTime;
yield return null;
}
// Ensure final position is exact
hook.transform.position = target;
hook.transform.parent = null;
isMoving = false;
stuckInTarget = true;
StartCoroutine(MovePlayerToTarget(target));
}
IEnumerator MovePlayerToTarget(Vector3 target)
{
Transform player = GameManager.Instance.GetPlayerController().transform;
Vector3 startPosition = player.position;
float elapsedTime = 0f;
while (elapsedTime < hookStickTime)
{
float t = elapsedTime / hookStickTime;
player.position = Vector3.Lerp(startPosition, target, t);
elapsedTime += Time.deltaTime;
yield return null;
}
// Ensure final position is exact
player.position = target;
stuckInTarget = false;
hook.transform.parent = hookParent;
hook.transform.localPosition = hookBaseLocation;
isMoving = false;
stuckInTarget = false;
GameManager.Instance.GetPlayerController().SetCharacterControl(true);
}
IEnumerator ShootAndMiss()
{
GameManager.Instance.GetPlayerController().SetCharacterControl(false);
isMoving = true;
// move to edge of range and don't stick anywhere
Vector3 startPosition = hook.transform.position;
Vector3 target = transform.position + (transform.forward * range);
float elapsedTime = 0f;
while (elapsedTime < hookStickTime)
{
float t = elapsedTime / hookStickTime;
hook.transform.position = Vector3.Lerp(startPosition, target, t);
elapsedTime += Time.deltaTime;
yield return null;
}
hook.transform.localPosition = hookBaseLocation;
isMoving = false;
stuckInTarget = false;
GameManager.Instance.GetPlayerController().SetCharacterControl(true);
}
public override void Use()
{
if (stuckInTarget || isMoving)
{
StopAllCoroutines();
hook.transform.parent = hookParent;
hook.transform.localPosition = hookBaseLocation;
isMoving = false;
stuckInTarget = false;
GameManager.Instance.GetPlayerController().SetCharacterControl(true);
}
else
{
RaycastHit hit;
if (Physics.Raycast(transform.position, transform.forward, out hit, range))
{
StartCoroutine(GoToTarget(hit.point));
}
else
{
StartCoroutine(ShootAndMiss());
}
}
}
public override void UseAlt()
{
throw new System.NotImplementedException();
}
}
Assets/Scripts/Tools/GrappleGun.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 70102eddcaad3044d9ac0ec62519caad
Assets/UI.prefab
+5170
View File
File diff suppressed because it is too large Load Diff
Assets/UI.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6d1ef2b53d3ef0446852da522af66b73
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: