Skip to content
Snippets Groups Projects
Commit fb53011b authored by Tinki's avatar Tinki
Browse files

Various Bug Fixes

Jump now no longer dependant on users FPS.

Being too close to objects no longer prevents player from picking up.

removed "player" placeholder from world.
parent ad45fc8e
No related branches found
No related tags found
No related merge requests found
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3108991643093276671
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2336958921900281157}
- component: {fileID: 1711737658247791328}
- component: {fileID: 3469362832407279146}
- component: {fileID: 2874478248463091733}
- component: {fileID: 2874478248463091729}
m_Layer: 9
m_Name: book pile
m_TagString: HoldableObject
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2336958921900281157
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3108991643093276671}
m_LocalRotation: {x: -0.69895244, y: 0.107077524, z: 0.10707753, w: 0.6989524}
m_LocalPosition: {x: 10.162802, y: -3.27, z: 4.4754443}
m_LocalScale: {x: 100, y: 100, z: 100}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1711737658247791328
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3108991643093276671}
m_Mesh: {fileID: -5495902117074765545, guid: 9ae754745b8f1f04b8d5bf3720f34e1d, type: 3}
--- !u!23 &3469362832407279146
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3108991643093276671}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: -3846018093981099296, guid: 9ae754745b8f1f04b8d5bf3720f34e1d, type: 3}
- {fileID: -6478536213147159724, guid: 9ae754745b8f1f04b8d5bf3720f34e1d, type: 3}
- {fileID: -876546973899608171, guid: 9ae754745b8f1f04b8d5bf3720f34e1d, type: 3}
- {fileID: 4874126678125670354, guid: 9ae754745b8f1f04b8d5bf3720f34e1d, type: 3}
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_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!54 &2874478248463091733
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3108991643093276671}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &2874478248463091729
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3108991643093276671}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.017078146, y: 0.014520441, z: 0.010159291}
m_Center: {x: 0.0016274117, y: 0.000030498544, z: -0.0010203562}
fileFormatVersion: 2
guid: 43169b95226d1d549b57a40cc2ba19e1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -81,7 +81,7 @@ public class ThirdPersonMovement : MonoBehaviour
if (Input.GetKeyDown(KeyCode.Space) && isGrounded || setControls.jump && isGrounded)
{
velocity.y = Mathf.Sqrt(jumpHeight);
velocity.y = Mathf.Sqrt(jumpHeight * Time.deltaTime);
}
//Fix Jump Edge Glitch
......
......@@ -5,6 +5,7 @@ using UnityEngine;
public class ScoreCount : MonoBehaviour
{
public GameObject door;
public GameObject scoreCountUI;
public int score = 0;
public int messCount = 1;
......@@ -16,6 +17,15 @@ public class ScoreCount : MonoBehaviour
{
door.GetComponent<BoxCollider>().enabled = false;
door.GetComponent<MeshRenderer>().enabled = false;
ScoreText();
}
}
IEnumerator ScoreText()
{
scoreCountUI.SetActive(true);
yield return new WaitForSeconds(5);
scoreCountUI.SetActive(false);
}
}
......@@ -36,6 +36,9 @@ GraphicsSettings:
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment