From b724107be42277d70cc533686915ad2866a70906 Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Mon, 15 Mar 2021 12:52:43 +0000 Subject: [PATCH] Added the cursor script to the camera prefab. One problem is that the cursor needs to be visible and contained to the window in the artifiact screen. Will catch up with Cinder about this. --- game/Assets/Prefabs/Cameras.prefab | 13 ++++ game/Assets/Scenes/Main.unity | 61 ++++--------------- .../{ => Scripts/Camera}/HideandLockCursor.cs | 0 .../Camera}/HideandLockCursor.cs.meta | 0 4 files changed, 24 insertions(+), 50 deletions(-) rename game/Assets/{ => Scripts/Camera}/HideandLockCursor.cs (100%) rename game/Assets/{ => Scripts/Camera}/HideandLockCursor.cs.meta (100%) diff --git a/game/Assets/Prefabs/Cameras.prefab b/game/Assets/Prefabs/Cameras.prefab index 4ee65ba..3c73d12 100644 --- a/game/Assets/Prefabs/Cameras.prefab +++ b/game/Assets/Prefabs/Cameras.prefab @@ -45,6 +45,7 @@ GameObject: - component: {fileID: 5661344207112327336} - component: {fileID: 5661344207112327337} - component: {fileID: 5661344207112327338} + - component: {fileID: 8137033370021049976} m_Layer: 0 m_Name: Main_Camera m_TagString: Untagged @@ -183,6 +184,18 @@ MonoBehaviour: m_CameraActivatedEvent: m_PersistentCalls: m_Calls: [] +--- !u!114 &8137033370021049976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5661344207112327339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d54716c6690d97469638748463784b8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5661344207311831626 GameObject: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index e5d8787..665beea 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -2366,15 +2366,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.018175313 + value: -0.018175315 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.04656925 + value: 0.04656926 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.00084747054 + value: 0.0008474709 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -2490,11 +2490,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.053433217 + value: -0.05343322 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.0125784045 + value: 0.012578402 objectReference: {fileID: 0} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.Value @@ -2626,11 +2626,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.00044057518 + value: 0.0004405789 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.00010371301 + value: -0.000103713945 objectReference: {fileID: 0} - target: {fileID: 4676633833077728949, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LookaheadTime @@ -2652,6 +2652,10 @@ PrefabInstance: propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 100768696} + - target: {fileID: 9122906920607805875, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} --- !u!4 &783507384 stripped @@ -3095,49 +3099,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} m_PrefabInstance: {fileID: 3060674079167321163} m_PrefabAsset: {fileID: 0} ---- !u!1 &937985419 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 937985421} - - component: {fileID: 937985420} - m_Layer: 0 - m_Name: CursorScript - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &937985420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 937985419} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9d54716c6690d97469638748463784b8, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &937985421 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 937985419} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -25.443398, y: 1.5614629, z: 83.52339} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &938783181 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} diff --git a/game/Assets/HideandLockCursor.cs b/game/Assets/Scripts/Camera/HideandLockCursor.cs similarity index 100% rename from game/Assets/HideandLockCursor.cs rename to game/Assets/Scripts/Camera/HideandLockCursor.cs diff --git a/game/Assets/HideandLockCursor.cs.meta b/game/Assets/Scripts/Camera/HideandLockCursor.cs.meta similarity index 100% rename from game/Assets/HideandLockCursor.cs.meta rename to game/Assets/Scripts/Camera/HideandLockCursor.cs.meta