From 07a542a99010c4a4b76e26262b1319cd1371ff30 Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Fri, 25 Feb 2022 21:33:29 +0100 Subject: [PATCH 1/3] fuck moving platforms --- .../Moving_Platform_Medium.prefab | 13 +-- Assets/Resources/Playable/Player.prefab | 4 +- Assets/Scenes/OverDevScene.unity | 88 ++++++++++++------- Assets/Scripts/Platforms/MovingPlatform.cs | 15 ++-- .../Layouts/CurrentMaximizeLayout.dwlt | 34 +++---- 5 files changed, 90 insertions(+), 64 deletions(-) diff --git a/Assets/Prefabs/Platforms/MovingPlatforms/Moving_Platform_Medium.prefab b/Assets/Prefabs/Platforms/MovingPlatforms/Moving_Platform_Medium.prefab index 737ce0c..5a1dacb 100644 --- a/Assets/Prefabs/Platforms/MovingPlatforms/Moving_Platform_Medium.prefab +++ b/Assets/Prefabs/Platforms/MovingPlatforms/Moving_Platform_Medium.prefab @@ -95,19 +95,19 @@ Rigidbody2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3453266731971349118} - m_BodyType: 2 + m_BodyType: 1 m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 m_AngularDrag: 0.05 - m_GravityScale: 1 + m_GravityScale: 0 m_Material: {fileID: 0} - m_Interpolate: 0 + m_Interpolate: 1 m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 + m_CollisionDetection: 1 + m_Constraints: 4 --- !u!61 &3453266731971349116 BoxCollider2D: m_ObjectHideFlags: 0 @@ -146,5 +146,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1637c8c06cf9fae4eb7bfa1a0ebb0e55, type: 3} m_Name: m_EditorClassIdentifier: - xOffset: 10 + xOffset: 5 yOffset: 0 + speed: 0.05 diff --git a/Assets/Resources/Playable/Player.prefab b/Assets/Resources/Playable/Player.prefab index df85e0a..bf087f0 100644 --- a/Assets/Resources/Playable/Player.prefab +++ b/Assets/Resources/Playable/Player.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 698768804} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.5, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 2, z: 1} + m_LocalScale: {x: 0.1, y: 1.3, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7008207192594766311} @@ -73,7 +73,7 @@ Transform: m_GameObject: {fileID: 2083070160} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 2, z: 1} + m_LocalScale: {x: 0.1, y: 1.3, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7008207192594766311} diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index c37e835..982b8d9 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -176,31 +176,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3453266731971349115, guid: 821831f062ee52848b6bda27fba0b001, type: 3} propertyPath: m_BodyType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3453266731971349115, guid: 821831f062ee52848b6bda27fba0b001, type: 3} - propertyPath: m_Constraints - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3453266731971349115, guid: 821831f062ee52848b6bda27fba0b001, type: 3} - propertyPath: m_Interpolate - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3453266731971349115, guid: 821831f062ee52848b6bda27fba0b001, type: 3} - propertyPath: m_GravityScale - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3453266731971349115, guid: 821831f062ee52848b6bda27fba0b001, type: 3} - propertyPath: m_CollisionDetection - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3453266731971349117, guid: 821831f062ee52848b6bda27fba0b001, type: 3} propertyPath: speed - value: 0.05 - objectReference: {fileID: 0} - - target: {fileID: 3453266731971349117, guid: 821831f062ee52848b6bda27fba0b001, type: 3} - propertyPath: xOffset - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3453266731971349118, guid: 821831f062ee52848b6bda27fba0b001, type: 3} propertyPath: m_Name @@ -208,6 +188,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 821831f062ee52848b6bda27fba0b001, type: 3} +--- !u!4 &175005001 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3453266731971349113, guid: 821831f062ee52848b6bda27fba0b001, type: 3} + m_PrefabInstance: {fileID: 53543450} + m_PrefabAsset: {fileID: 0} --- !u!1 &387708699 GameObject: m_ObjectHideFlags: 0 @@ -2610,6 +2595,53 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3} +--- !u!1 &1023957098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1023957099} + - component: {fileID: 1023957100} + m_Layer: 3 + m_Name: MovingPlatformTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1023957099 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023957098} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.55, z: 0} + m_LocalScale: {x: 6, y: 0.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 175005001} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1023957100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023957098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} + m_Name: + m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294966848 --- !u!4 &1053905692 stripped Transform: m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} @@ -3056,22 +3088,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 698768805, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2083070161, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - target: {fileID: 7008207192594766305, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 7008207192594766310, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_RootOrder value: 2 diff --git a/Assets/Scripts/Platforms/MovingPlatform.cs b/Assets/Scripts/Platforms/MovingPlatform.cs index 9516e5b..40959a6 100644 --- a/Assets/Scripts/Platforms/MovingPlatform.cs +++ b/Assets/Scripts/Platforms/MovingPlatform.cs @@ -17,10 +17,12 @@ namespace Platforms private bool _goingToFuturePos; private Rigidbody2D _platformRigidbody; + private CollisionChecker _movingPlatformTrigger; private void Awake() { _platformRigidbody = GetComponent(); + _movingPlatformTrigger = GetComponentInChildren(); } private void Start() @@ -58,19 +60,22 @@ namespace Platforms public void Move(float value) { - var position = transform.position; + //var position = transform.position; switch (_goingToFuturePos) { case true: - _platformRigidbody.MovePosition(new Vector2(position.x + speed * GetDecision(xOffset), - position.y + speed * GetDecision(yOffset))); + //_platformRigidbody.MovePosition(new Vector2(position.x + speed * GetDecision(xOffset), + //position.y + speed * GetDecision(yOffset))); + + transform.position = Vector3.MoveTowards(transform.position, _futurePos, speed * Time.deltaTime); if (Math.Abs(_futurePos.x - transform.position.x) < VerificationOffset && Math.Abs(_futurePos.y - transform.position.y) < VerificationOffset) _goingToFuturePos = false; break; case false: - _platformRigidbody.MovePosition(new Vector2(position.x + speed * -GetDecision(xOffset), - position.y + speed * -GetDecision(yOffset))); + //_platformRigidbody.MovePosition(new Vector2(position.x + speed * -GetDecision(xOffset), + //position.y + speed * -GetDecision(yOffset))); + transform.position = Vector3.MoveTowards(transform.position, _originalPos, speed * Time.deltaTime); if (Math.Abs(_originalPos.x - transform.position.x) < VerificationOffset && Math.Abs(_originalPos.y - transform.position.y) < VerificationOffset) _goingToFuturePos = true; diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 34b7600..fa7e086 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 12715 + controlID: 20106 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 12684 + controlID: 20029 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 327affff247fffffe294ffff0efbffff + m_ExpandedIDs: e079ffff307affff327affff247fffffe294ffff0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -307,7 +307,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000b0630000126400001464000016640000186400001a6400001c64000020640000166500002065000028650000 + m_ExpandedIDs: ffffffff00000000b0630000126400001464000016640000186400001a6400001c6400001e6400001665000020650000fe660000847d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -332,10 +332,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 237.80002} m_SelectedIDs: 307affff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000b0630000126400001464000016640000186400001a6400001c64000020640000166500002065000028650000 + m_ExpandedIDs: ffffffff00000000b0630000126400001464000016640000186400001a6400001c6400001e6400001665000020650000fe660000847d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -415,7 +415,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 12762 + controlID: 20107 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -435,8 +435,8 @@ MonoBehaviour: y: 0 width: 880 height: 514.4 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 10} @@ -690,9 +690,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 7.612222, y: -1.4387107, z: -0.2254653} + m_Target: {x: 8.355493, y: -13.468705, z: 0.011292132} speed: 2 - m_Value: {x: 7.612222, y: -1.4387107, z: -0.2254653} + m_Value: {x: 8.355493, y: -13.468705, z: 0.011292132} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -743,9 +743,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 9.087455 + m_Target: 8.870777 speed: 2 - m_Value: 9.087455 + m_Value: 8.870777 m_Ortho: m_Target: 1 speed: 2 @@ -789,8 +789,8 @@ MonoBehaviour: y: 514.4 width: 880 height: 216.39996 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -843,8 +843,8 @@ MonoBehaviour: y: 0 width: 352 height: 730.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} From 1ca81682f865c20a057963a6ad8154523a10c183 Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Fri, 25 Feb 2022 21:38:09 +0100 Subject: [PATCH 2/3] Created camera script --- Assets/Prefabs/Camera/Camera.prefab | 17 +++++++++++++-- Assets/Scenes/OverDevScene.unity | 16 -------------- Assets/Scripts/Camera.meta | 8 +++++++ Assets/Scripts/Camera/CameraPlayerFinder.cs | 21 +++++++++++++++++++ .../Scripts/Camera/CameraPlayerFinder.cs.meta | 11 ++++++++++ 5 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 Assets/Scripts/Camera.meta create mode 100644 Assets/Scripts/Camera/CameraPlayerFinder.cs create mode 100644 Assets/Scripts/Camera/CameraPlayerFinder.cs.meta diff --git a/Assets/Prefabs/Camera/Camera.prefab b/Assets/Prefabs/Camera/Camera.prefab index d290775..35501eb 100644 --- a/Assets/Prefabs/Camera/Camera.prefab +++ b/Assets/Prefabs/Camera/Camera.prefab @@ -116,7 +116,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2662163039882375475} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.536235, y: 1.9904585, z: -9.967962} + m_LocalPosition: {x: 14.936234, y: -8.049541, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -271,6 +271,7 @@ GameObject: m_Component: - component: {fileID: 2662163040849090937} - component: {fileID: 2662163040849090936} + - component: {fileID: 2020098282085569797} m_Layer: 0 m_Name: CM vcam1 m_TagString: Untagged @@ -286,7 +287,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2662163040849090938} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.536235, y: 1.9904585, z: -9.967962} + m_LocalPosition: {x: 14.936234, y: -8.049541, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -332,3 +333,15 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 2662163039850151874} +--- !u!114 &2020098282085569797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2662163040849090938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca616a2edfacfd54fb236cd92b9e2dea, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index 982b8d9..e3006b6 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -3011,14 +3011,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2662163039882375472, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} - propertyPath: m_LocalPosition.x - value: 14.936234 - objectReference: {fileID: 0} - - target: {fileID: 2662163039882375472, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} - propertyPath: m_LocalPosition.y - value: -8.049541 - objectReference: {fileID: 0} - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} propertyPath: m_RootOrder value: 3 @@ -3071,14 +3063,6 @@ PrefabInstance: propertyPath: m_Follow value: objectReference: {fileID: 1053905692} - - target: {fileID: 2662163040849090937, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} - propertyPath: m_LocalPosition.x - value: 14.936234 - objectReference: {fileID: 0} - - target: {fileID: 2662163040849090937, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} - propertyPath: m_LocalPosition.y - value: -8.049541 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} --- !u!1001 &7008207193554258683 diff --git a/Assets/Scripts/Camera.meta b/Assets/Scripts/Camera.meta new file mode 100644 index 0000000..84bd87a --- /dev/null +++ b/Assets/Scripts/Camera.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1dd4ed9ed15bfbe4e826cb0763b86e43 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Camera/CameraPlayerFinder.cs b/Assets/Scripts/Camera/CameraPlayerFinder.cs new file mode 100644 index 0000000..a0a79e8 --- /dev/null +++ b/Assets/Scripts/Camera/CameraPlayerFinder.cs @@ -0,0 +1,21 @@ +using Cinemachine; +using UnityEngine; + +namespace Camera +{ + public class CameraPlayerFinder : MonoBehaviour + { + private CinemachineVirtualCamera _cinemachineVirtualCamera; + + private void Awake() + { + _cinemachineVirtualCamera = GetComponent(); + } + + private void Update() + { + if (_cinemachineVirtualCamera.Follow == null) + _cinemachineVirtualCamera.Follow = GameObject.Find("Player").transform; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Camera/CameraPlayerFinder.cs.meta b/Assets/Scripts/Camera/CameraPlayerFinder.cs.meta new file mode 100644 index 0000000..43e7770 --- /dev/null +++ b/Assets/Scripts/Camera/CameraPlayerFinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ca616a2edfacfd54fb236cd92b9e2dea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 67456993baedcc55df2e700a895ebb98f5c8b274 Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Fri, 25 Feb 2022 21:52:09 +0100 Subject: [PATCH 3/3] Corrected camera script --- Assets/Scenes/SyntriaxDevScene.unity | 379 +++--------------- Assets/Scripts/Camera/CameraPlayerFinder.cs | 4 +- UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 24 +- 4 files changed, 72 insertions(+), 339 deletions(-) diff --git a/Assets/Scenes/SyntriaxDevScene.unity b/Assets/Scenes/SyntriaxDevScene.unity index ca41e25..0825e47 100644 --- a/Assets/Scenes/SyntriaxDevScene.unity +++ b/Assets/Scenes/SyntriaxDevScene.unity @@ -123,330 +123,63 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &246737789 -GameObject: +--- !u!1001 &199922620 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 246737790} - - component: {fileID: 246737791} - m_Layer: 0 - m_Name: CM vcam1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &246737790 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246737789} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -26.94, y: 2.8600001, z: -9.967962} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 408858488} - m_Father: {fileID: 2043469238} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &246737791 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246737789} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 60 - OrthographicSize: 13 - NearClipPlane: 0.3 - FarClipPlane: 1000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - m_SensorSize: {x: 1.7777778, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 408858488} ---- !u!1 &408858487 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 408858488} - - component: {fileID: 408858490} - - component: {fileID: 408858489} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &408858488 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408858487} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.536235, y: 1.9904585, z: 7.6195736} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 246737790} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &408858489 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408858487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 1 - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 0 - m_TargetMovementOnly: 1 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_CameraDistance: 10 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_DeadZoneDepth: 0 - m_UnlimitedSoftZone: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 - m_GroupFramingMode: 2 - m_AdjustmentMode: 0 - m_GroupFramingSize: 0.8 - m_MaxDollyIn: 5000 - m_MaxDollyOut: 5000 - m_MinimumDistance: 1 - m_MaximumDistance: 5000 - m_MinimumFOV: 3 - m_MaximumFOV: 60 - m_MinimumOrthoSize: 1 - m_MaximumOrthoSize: 5000 ---- !u!114 &408858490 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408858487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &756014883 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 756014884} - - component: {fileID: 756014887} - - component: {fileID: 756014886} - - component: {fileID: 756014885} - - component: {fileID: 756014888} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &756014884 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756014883} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -26.94, y: 2.8600001, z: -9.967962} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2043469238} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &756014885 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756014883} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 2 - m_CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] ---- !u!81 &756014886 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756014883} - m_Enabled: 1 ---- !u!20 &756014887 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756014883} - m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.8867924, g: 0.14556777, b: 0.5208201, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 13 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &756014888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756014883} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab05ed6eadc14e3418fc3a9ea31919d3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &2043469237 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2043469238} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2043469238 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2043469237} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 26.6, y: 0.8, z: -0.03203782} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 756014884} - - {fileID: 246737790} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalPosition.x + value: -6.536235 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalPosition.y + value: -1.9904585 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalPosition.z + value: -0.03203782 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2662163039948621855, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_Name + value: Camera (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} --- !u!1001 &516972629445516078 PrefabInstance: m_ObjectHideFlags: 0 @@ -464,7 +197,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8835447878742992447, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8835447878742992447, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Camera/CameraPlayerFinder.cs b/Assets/Scripts/Camera/CameraPlayerFinder.cs index a0a79e8..edbdf2b 100644 --- a/Assets/Scripts/Camera/CameraPlayerFinder.cs +++ b/Assets/Scripts/Camera/CameraPlayerFinder.cs @@ -14,8 +14,8 @@ namespace Camera private void Update() { - if (_cinemachineVirtualCamera.Follow == null) - _cinemachineVirtualCamera.Follow = GameObject.Find("Player").transform; + if (_cinemachineVirtualCamera.Follow == null && GameObject.FindWithTag("Player") != null) + _cinemachineVirtualCamera.Follow = GameObject.FindWithTag("Player").transform; } } } \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index ebac16e..802d507 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561 flags: 0 RecentlyUsedSceneGuid-2: - value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e + value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d flags: 0 RecentlyUsedSceneGuid-3: - value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d + value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index fa7e086..7f678f0 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 20106 + controlID: 22082 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 20029 + controlID: 22060 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e079ffff307affff327affff247fffffe294ffff0efbffff + m_ExpandedIDs: 882fffff8432ffffe079fffffe79ffff307affff327affff247fffffe294ffff0efbffff32c90000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -307,7 +307,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000b0630000126400001464000016640000186400001a6400001c6400001e6400001665000020650000fe660000847d0000 + m_ExpandedIDs: ffffffff00000000b0630000126400001464000016640000186400001a6400001c640000166500001a650000fe660000007a0000f0c60000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -332,10 +332,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 237.80002} - m_SelectedIDs: 307affff + scrollPos: {x: 0, y: 69.80002} + m_SelectedIDs: 782fffff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000b0630000126400001464000016640000186400001a6400001c6400001e6400001665000020650000fe660000847d0000 + m_ExpandedIDs: ffffffff00000000b0630000126400001464000016640000186400001a6400001c640000166500001a650000fe660000007a0000f0c60000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -351,7 +351,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 6} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -360,8 +360,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 307affff - m_LastClickedInstanceID: -34256 + m_SelectedInstanceIDs: 782fffff + m_LastClickedInstanceID: -53384 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -415,7 +415,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 20107 + controlID: 22083 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -884,7 +884,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -34256 + m_LastInspectedObjectInstanceID: -53384 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0