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

Fixed new script errors

Switched to object oriented script inheritance for button controls
parent fe97c814
No related branches found
No related tags found
No related merge requests found
......@@ -621,6 +621,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
pauseMenuUI: {fileID: 317084716}
setControls: {fileID: 1626280555}
--- !u!114 &144327963
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2853,8 +2854,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ded7d7b215a32a1469819ac05cdafa31, type: 3}
m_Name:
m_EditorClassIdentifier:
keyboardActive: 0
gamepadActive: 0
--- !u!1 &1369061718 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4986825442229921683, guid: 4b56a3686f4feb74c9cb5d61e9cc5126,
......@@ -3238,6 +3237,52 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300006, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, type: 3}
--- !u!1 &1626280554
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1626280556}
- component: {fileID: 1626280555}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1626280555
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1626280554}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bcf796b53737e2f48b6e53b4ca4f2e62, type: 3}
m_Name:
m_EditorClassIdentifier:
jump: 0
pickup: 0
pause: 0
--- !u!4 &1626280556
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1626280554}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.1, y: 0.99, z: 3.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1639425696
GameObject:
m_ObjectHideFlags: 3
......@@ -3859,6 +3904,11 @@ PrefabInstance:
propertyPath: jumpHeight
value: 60
objectReference: {fileID: 0}
- target: {fileID: 2263208524363619896, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525,
type: 3}
propertyPath: setControls
value:
objectReference: {fileID: 1626280555}
- target: {fileID: 2263208524363619896, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525,
type: 3}
propertyPath: groundDistance
......@@ -3879,6 +3929,11 @@ PrefabInstance:
propertyPath: distance
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2263208524393207164, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525,
type: 3}
propertyPath: setControls
value:
objectReference: {fileID: 1626280555}
- target: {fileID: 2263208524393207166, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525,
type: 3}
propertyPath: m_RootOrder
......
......@@ -14,11 +14,11 @@ public class HoldableObject : MonoBehaviour
bool canGrab;
SetControls setControls;
public SetControls setControls;
private void Start()
{
setControls = new SetControls();
setControls.GetComponent<SetControls>();
}
private void Update()
......
......@@ -7,11 +7,11 @@ public class PauseMenu : MonoBehaviour
public static bool GameIsPaused = false;
public GameObject pauseMenuUI;
SetControls setControls;
public SetControls setControls;
private void Start()
{
setControls = new SetControls();
setControls.GetComponent<SetControls>();
}
// Update is called once per frame
......
......@@ -6,7 +6,7 @@ public class ThirdPersonMovement : MonoBehaviour
{
public CharacterController controller;
public Transform cam;
SetControls setControls;
public SetControls setControls;
//Player Speed
public float speed = 6f;
......@@ -29,7 +29,7 @@ public class ThirdPersonMovement : MonoBehaviour
private void Start()
{
setControls = new SetControls();
setControls.GetComponent<SetControls>();
}
// Update is called once per frame
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment