diff --git a/Assets/Prefabs/Cameras/InspectCam.prefab b/Assets/Prefabs/Cameras/InspectCam.prefab
index 670b2bf628dd82a68e46548e47f5ddbcd730e8e0..6a45ff99f62c87b3585338a67c61cb78f5e19af9 100644
--- a/Assets/Prefabs/Cameras/InspectCam.prefab
+++ b/Assets/Prefabs/Cameras/InspectCam.prefab
@@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 5536199078444872747}
- component: {fileID: 1923617857188208866}
- component: {fileID: 2664970880633489085}
- m_Layer: 7
+ m_Layer: 0
m_Name: InspectCircle
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -105,7 +105,7 @@ CircleCollider2D:
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
- m_Bits: 0
+ m_Bits: 4
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
@@ -149,7 +149,7 @@ GameObject:
- component: {fileID: 7974285841828021923}
- component: {fileID: 2034252809945211491}
- component: {fileID: 2619982602428527997}
- m_Layer: 0
+ m_Layer: 2
m_Name: InspectCam
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -248,3 +248,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_smoothSpeed: 0.01
+ controllerLookMultiplier: 2
diff --git a/Assets/Prefabs/Items/Item TestPrefab.prefab b/Assets/Prefabs/Items/Item TestPrefab.prefab
index 377ea2c9add237d10144cf8782a21584bd006470..3963b3192273bc35c0ebc6e4eae10feee06b6ddd 100644
--- a/Assets/Prefabs/Items/Item TestPrefab.prefab
+++ b/Assets/Prefabs/Items/Item TestPrefab.prefab
@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 1546109869827525312}
- component: {fileID: 7597534232165490596}
- component: {fileID: 5137325939875409178}
+ - component: {fileID: 256820311413041415}
m_Layer: 6
m_Name: Item TestPrefab
m_TagString: Untagged
@@ -149,3 +150,30 @@ BoxCollider2D:
m_AutoTiling: 0
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
+--- !u!50 &256820311413041415
+Rigidbody2D:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2168833137901655716}
+ m_BodyType: 1
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDamping: 0
+ m_AngularDamping: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 7
diff --git a/Assets/Prefabs/Triggers and Interactables/InspectParent.prefab b/Assets/Prefabs/Triggers and Interactables/InspectParent.prefab
index 33f3c2b30381fd800eb5b52e506f655c408b6224..0ad498004d87f37a4e340257192f9e6fedb70143 100644
--- a/Assets/Prefabs/Triggers and Interactables/InspectParent.prefab
+++ b/Assets/Prefabs/Triggers and Interactables/InspectParent.prefab
@@ -29,7 +29,8 @@ Transform:
m_LocalPosition: {x: 2.1, y: 7.3, z: 0}
m_LocalScale: {x: 11.089397, y: 11.089397, z: 11.089397}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 8645102501645899552}
m_Father: {fileID: 6738286568716323334}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2052892880101326381
@@ -97,7 +98,7 @@ GameObject:
m_Component:
- component: {fileID: 6738286568716323334}
- component: {fileID: 5564685101066006319}
- m_Layer: 0
+ m_Layer: 2
m_Name: InspectParent
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -112,12 +113,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621178633937439953}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -38, y: -44, z: 0}
m_LocalScale: {x: 6.828405, y: 6.828405, z: 6.828405}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1914426650443921231}
+ - {fileID: 5340218194974525511}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &5564685101066006319
@@ -150,7 +152,7 @@ BoxCollider2D:
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
@@ -166,3 +168,354 @@ BoxCollider2D:
m_AutoTiling: 0
m_Size: {x: 33.74838, y: 27.021685}
m_EdgeRadius: 0
+--- !u!1 &5643159614972003230
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8645102501645899552}
+ - component: {fileID: 2545953689058954467}
+ - component: {fileID: 1847017479072575583}
+ - component: {fileID: 8434075322476401607}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8645102501645899552
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5643159614972003230}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 4735761580389268427}
+ m_Father: {fileID: 1914426650443921231}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!223 &2545953689058954467
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5643159614972003230}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_VertexColorAlwaysGammaSpace: 0
+ m_AdditionalShaderChannelsFlag: 25
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &1847017479072575583
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5643159614972003230}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!114 &8434075322476401607
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5643159614972003230}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!1 &7191057786209197274
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4735761580389268427}
+ - component: {fileID: 5285798636744786087}
+ - component: {fileID: 6243498526066585832}
+ m_Layer: 5
+ m_Name: Press X/Button East to exit
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4735761580389268427
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7191057786209197274}
+ 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: []
+ m_Father: {fileID: 8645102501645899552}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 665, y: -453}
+ m_SizeDelta: {x: 200, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5285798636744786087
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7191057786209197274}
+ m_CullTransparentMesh: 1
+--- !u!114 &6243498526066585832
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7191057786209197274}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: Pres X/Button East To exit
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 36
+ m_fontSizeBase: 36
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 256
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_TextWrappingMode: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 0
+ m_ActiveFontFeatures: 6e72656b
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_EmojiFallbackSupport: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: -93.45892, y: 0, z: -219.90332, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1001 &8661544306122886219
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 6738286568716323334}
+ m_Modifications:
+ - target: {fileID: 1546109869827525312, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 1546109869827525312, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 2017843817
+ objectReference: {fileID: 0}
+ - target: {fileID: 2168833137901655716, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_Name
+ value: Item TestPrefab
+ objectReference: {fileID: 0}
+ - target: {fileID: 2168833137901655716, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_Layer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -7
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5137325939875409178, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ propertyPath: m_IsTrigger
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 2168833137901655716, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 7455065094257196421}
+ m_SourcePrefab: {fileID: 100100000, guid: 13e420976eeca2148a256867a663277f, type: 3}
+--- !u!4 &5340218194974525511 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ m_PrefabInstance: {fileID: 8661544306122886219}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &7361910501891791599 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2168833137901655716, guid: 13e420976eeca2148a256867a663277f, type: 3}
+ m_PrefabInstance: {fileID: 8661544306122886219}
+ m_PrefabAsset: {fileID: 0}
+--- !u!50 &7455065094257196421
+Rigidbody2D:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7361910501891791599}
+ m_BodyType: 1
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDamping: 0
+ m_AngularDamping: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 7
diff --git a/Assets/Scenes/PersistentDataScene.unity b/Assets/Scenes/PersistentDataScene.unity
index 36b85561c452c49f6a03b011128a3f4c7a407e9f..2da2313c5ab8abe9bf1c65bf5e5630dd0cd8a045 100644
--- a/Assets/Scenes/PersistentDataScene.unity
+++ b/Assets/Scenes/PersistentDataScene.unity
@@ -119,84 +119,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1001 &3707956
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 2019001338}
- m_Modifications:
- - target: {fileID: 1546109869827525312, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_SortingLayer
- value: 3
- objectReference: {fileID: 0}
- - target: {fileID: 1546109869827525312, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_SortingLayerID
- value: 2017843817
- objectReference: {fileID: 0}
- - target: {fileID: 2168833137901655716, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_Name
- value: Item TestPrefab
- objectReference: {fileID: 0}
- - target: {fileID: 2168833137901655716, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_Layer
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalPosition.x
- value: -7
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalPosition.y
- value: 4.8
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5137325939875409178, guid: 13e420976eeca2148a256867a663277f, type: 3}
- propertyPath: m_IsTrigger
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 13e420976eeca2148a256867a663277f, type: 3}
---- !u!4 &3707957 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 3616311886809383948, guid: 13e420976eeca2148a256867a663277f, type: 3}
- m_PrefabInstance: {fileID: 3707956}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &575295046
GameObject:
m_ObjectHideFlags: 0
@@ -529,11 +451,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 2621178633937439953, guid: d700d6c20a122ab4fad0ced62f534e50, type: 3}
m_PrefabInstance: {fileID: 2199834503016237200}
m_PrefabAsset: {fileID: 0}
---- !u!4 &2019001338 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 6738286568716323334, guid: d700d6c20a122ab4fad0ced62f534e50, type: 3}
- m_PrefabInstance: {fileID: 2199834503016237200}
- m_PrefabAsset: {fileID: 0}
--- !u!61 &2019001339 stripped
BoxCollider2D:
m_CorrespondingSourceObject: {fileID: 5564685101066006319, guid: d700d6c20a122ab4fad0ced62f534e50, type: 3}
@@ -551,14 +468,6 @@ PrefabInstance:
propertyPath: m_Name
value: InspectParent
objectReference: {fileID: 0}
- - target: {fileID: 2621178633937439953, guid: d700d6c20a122ab4fad0ced62f534e50, type: 3}
- propertyPath: m_Layer
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 2621178633937439953, guid: d700d6c20a122ab4fad0ced62f534e50, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 6738286568716323334, guid: d700d6c20a122ab4fad0ced62f534e50, type: 3}
propertyPath: m_LocalPosition.x
value: -38
@@ -601,10 +510,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 6738286568716323334, guid: d700d6c20a122ab4fad0ced62f534e50, type: 3}
- insertIndex: -1
- addedObject: {fileID: 3707957}
+ m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d700d6c20a122ab4fad0ced62f534e50, type: 3}
--- !u!1001 &2734949670699370985
@@ -785,10 +691,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 1923617857188208866, guid: 6fe6d8c954c8cb64fac18ace4535fabc, type: 3}
- propertyPath: m_ExcludeLayers.m_Bits
- value: 4
- objectReference: {fileID: 0}
- target: {fileID: 2034252809945211491, guid: 6fe6d8c954c8cb64fac18ace4535fabc, type: 3}
propertyPath: BoundingShape2D
value:
@@ -837,14 +739,6 @@ PrefabInstance:
propertyPath: m_Name
value: InspectCam
objectReference: {fileID: 0}
- - target: {fileID: 5223178010616561911, guid: 6fe6d8c954c8cb64fac18ace4535fabc, type: 3}
- propertyPath: m_Layer
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 5223178010616561911, guid: 6fe6d8c954c8cb64fac18ace4535fabc, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -860,15 +754,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 705342412960654648, guid: d2abf783fa8e2194e9522f7baa4376d1, type: 3}
propertyPath: m_LocalPosition.x
- value: 15.3
+ value: -23.700005
objectReference: {fileID: 0}
- target: {fileID: 705342412960654648, guid: d2abf783fa8e2194e9522f7baa4376d1, type: 3}
propertyPath: m_LocalPosition.y
- value: 2.1
+ value: 3.0000021
objectReference: {fileID: 0}
- target: {fileID: 705342412960654648, guid: d2abf783fa8e2194e9522f7baa4376d1, type: 3}
propertyPath: m_LocalPosition.z
- value: -10
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 705342412960654648, guid: d2abf783fa8e2194e9522f7baa4376d1, type: 3}
propertyPath: m_LocalRotation.w
@@ -904,7 +798,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1918065106318474983, guid: d2abf783fa8e2194e9522f7baa4376d1, type: 3}
propertyPath: orthographic size
- value: 6.1
+ value: 59.36962
objectReference: {fileID: 0}
- target: {fileID: 5853782183218433015, guid: d2abf783fa8e2194e9522f7baa4376d1, type: 3}
propertyPath: DefaultBlend.Style
diff --git a/Assets/Scripts/Interactable/InteractCursor.cs b/Assets/Scripts/Interactable/InteractCursor.cs
index c7d22302c8e90bf6bb180b86cb54e2408da6b449..000a731ff4e48e9f1ab2749d8e642090479e3e1e 100644
--- a/Assets/Scripts/Interactable/InteractCursor.cs
+++ b/Assets/Scripts/Interactable/InteractCursor.cs
@@ -7,7 +7,8 @@ public class InteractCursor : MonoBehaviour
{
private IInteractable m_currentInteractable;
private InputAction m_Interact;
-
+
+
private void Start()
{
m_Interact = InputSystem.actions.FindAction("Interact");
@@ -15,13 +16,15 @@ public class InteractCursor : MonoBehaviour
private void Update()
{
- if (m_Interact.WasPerformedThisFrame())
+ if (m_Interact.WasPressedThisFrame())
{
+ Debug.Log("Interact");
m_currentInteractable?.OnInteract();
}
}
+
- private void OnTriggerEnter(Collider other)
+ private void OnTriggerEnter2D(Collider2D other)
{
Debug.Log("Enter");
@@ -32,10 +35,11 @@ public class InteractCursor : MonoBehaviour
if (other.TryGetComponent(out IInteractable interactable))
{
m_currentInteractable = interactable;
+ Debug.Log(m_currentInteractable);
}
}
- private void OnTriggerExit(Collider other)
+ private void OnTriggerExit2D(Collider2D other)
{
if (other.TryGetComponent(out SpriteRenderer sprite))
{
diff --git a/Assets/Scripts/Managers/InitialSceneLoader.prefab b/Assets/Scripts/Managers/InitialSceneLoader.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..662db2f883ed6e8f9c565a9d593159285f3d2d4b
--- /dev/null
+++ b/Assets/Scripts/Managers/InitialSceneLoader.prefab
@@ -0,0 +1,49 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4066518135242739432
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2422048203710069721}
+ - component: {fileID: 8811656296834559896}
+ m_Layer: 0
+ m_Name: InitialSceneLoader
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2422048203710069721
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4066518135242739432}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -27.378498, y: -8.536811, z: 18.332066}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8811656296834559896
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4066518135242739432}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 296c558a0ef8ed2479422bac0d2f9084, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ targetScene:
+ m_SceneAsset: {fileID: 102900000, guid: 1319caf5bcd473a45bd34bef39dfc2ee, type: 3}
+ m_SceneName: PersistentDataScene
diff --git a/Assets/Scripts/Managers/InitialSceneLoader.prefab.meta b/Assets/Scripts/Managers/InitialSceneLoader.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..27404018de8b991b892de5f7f97e7b7d5c5f8928
--- /dev/null
+++ b/Assets/Scripts/Managers/InitialSceneLoader.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fef83d11c6c2c8045bf74b06a9fc42b9
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Managers/SceneLoader.cs b/Assets/Scripts/Managers/SceneLoader.cs
index 5e33fa29aff9acccd21dd49b8aebcf2861119aed..e5ef9cb676fab04c04574778ee8c0280decccc73 100644
--- a/Assets/Scripts/Managers/SceneLoader.cs
+++ b/Assets/Scripts/Managers/SceneLoader.cs
@@ -7,10 +7,9 @@ public class SceneLoader : MonoBehaviour
{
[SerializeField] private SceneField targetScene;
- private void OnTriggerEnter2D(Collider2D other)
+ private void Start()
{
- //check if other is player ideally
- SceneManager.LoadScene(targetScene);
+ SceneManager.LoadScene(targetScene, LoadSceneMode.Additive);
}
}
diff --git a/Assets/Scripts/Utility/CameraFollow.cs b/Assets/Scripts/Utility/CameraFollow.cs
index bb79563f3aa01f933af0c2e7ceff8aa97d838ea3..7fd44fba0227d16917bb7555938ed003f38349ae 100644
--- a/Assets/Scripts/Utility/CameraFollow.cs
+++ b/Assets/Scripts/Utility/CameraFollow.cs
@@ -7,19 +7,41 @@ using UnityEngine.Serialization;
public class CameraFollow : MonoBehaviour
{
[FormerlySerializedAs("smoothSpeed")] [SerializeField] private float m_smoothSpeed = 0.125f;
+ [FormerlySerializedAs("lookSensitivityMultiplier")] [SerializeField] private float controllerLookMultiplier = 5f;
+ private float finalSmoothSpeed;
private InputAction LookInput;
+ private Vector2 m_desiredPosition;
+ private Vector2 m_smoothedPosition;
private void Start()
{
LookInput = InputSystem.actions.FindAction("Look");
+ LookInput.performed += OnLook;
}
- private void LateUpdate()
+ private void OnLook(InputAction.CallbackContext context)
{
- Vector2 mousePosition = Camera.main.ScreenToWorldPoint(Input.mousePosition);
- Vector2 desiredPosition = new Vector2 (mousePosition.x, mousePosition.y);
- Vector2 smoothedPosition = Vector2.Lerp(transform.position, desiredPosition, m_smoothSpeed);
+
+ if (context.control.device is Gamepad)
+ {
+ Vector2 inputVector = LookInput.ReadValue<Vector2>();
+ m_desiredPosition =
+ new Vector2(transform.position.x + inputVector.x, transform.position.y + inputVector.y);
+ finalSmoothSpeed = controllerLookMultiplier;
- transform.position = new Vector3(smoothedPosition.x, smoothedPosition.y, transform.position.z);
+ }
+ else if (context.control.device is Mouse)
+ {
+ Vector2 mousePosition = Camera.main.ScreenToWorldPoint(Input.mousePosition);
+ m_desiredPosition = new Vector2 (mousePosition.x, mousePosition.y);
+ finalSmoothSpeed = m_smoothSpeed;
+ }
+
+ }
+ private void Update()
+ {
+ m_smoothedPosition = Vector2.Lerp(transform.position, m_desiredPosition, finalSmoothSpeed);
+ transform.position = new Vector3(m_smoothedPosition.x, m_smoothedPosition.y, transform.position.z);
}
+
}
diff --git a/Assets/Settings/UniversalRP.asset b/Assets/Settings/UniversalRP.asset
index fccfdda1738b4d41398daf04d826e0f861af49cf..e88db67984cf457d00c70fc4639eed63423072e8 100644
--- a/Assets/Settings/UniversalRP.asset
+++ b/Assets/Settings/UniversalRP.asset
@@ -78,6 +78,7 @@ MonoBehaviour:
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
+ m_AllowPostProcessAlphaOutput: 0
m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1
m_SupportScreenSpaceLensFlare: 1
@@ -98,34 +99,35 @@ MonoBehaviour:
obsoleteHasProbeVolumes:
m_Keys: []
m_Values:
- m_PrefilteringModeMainLightShadows: 1
+ m_PrefilteringModeMainLightShadows: 4
m_PrefilteringModeAdditionalLight: 4
- m_PrefilteringModeAdditionalLightShadows: 1
- m_PrefilterXRKeywords: 0
- m_PrefilteringModeForwardPlus: 1
- m_PrefilteringModeDeferredRendering: 1
- m_PrefilteringModeScreenSpaceOcclusion: 1
- m_PrefilterDebugKeywords: 0
- m_PrefilterWriteRenderingLayers: 0
- m_PrefilterHDROutput: 0
- m_PrefilterSSAODepthNormals: 0
- m_PrefilterSSAOSourceDepthLow: 0
- m_PrefilterSSAOSourceDepthMedium: 0
- m_PrefilterSSAOSourceDepthHigh: 0
- m_PrefilterSSAOInterleaved: 0
- m_PrefilterSSAOBlueNoise: 0
- m_PrefilterSSAOSampleCountLow: 0
- m_PrefilterSSAOSampleCountMedium: 0
- m_PrefilterSSAOSampleCountHigh: 0
- m_PrefilterDBufferMRT1: 0
- m_PrefilterDBufferMRT2: 0
- m_PrefilterDBufferMRT3: 0
- m_PrefilterSoftShadowsQualityLow: 0
- m_PrefilterSoftShadowsQualityMedium: 0
- m_PrefilterSoftShadowsQualityHigh: 0
+ m_PrefilteringModeAdditionalLightShadows: 0
+ m_PrefilterXRKeywords: 1
+ m_PrefilteringModeForwardPlus: 0
+ m_PrefilteringModeDeferredRendering: 0
+ m_PrefilteringModeScreenSpaceOcclusion: 0
+ m_PrefilterDebugKeywords: 1
+ m_PrefilterWriteRenderingLayers: 1
+ m_PrefilterHDROutput: 1
+ m_PrefilterAlphaOutput: 1
+ m_PrefilterSSAODepthNormals: 1
+ m_PrefilterSSAOSourceDepthLow: 1
+ m_PrefilterSSAOSourceDepthMedium: 1
+ m_PrefilterSSAOSourceDepthHigh: 1
+ m_PrefilterSSAOInterleaved: 1
+ m_PrefilterSSAOBlueNoise: 1
+ m_PrefilterSSAOSampleCountLow: 1
+ m_PrefilterSSAOSampleCountMedium: 1
+ m_PrefilterSSAOSampleCountHigh: 1
+ m_PrefilterDBufferMRT1: 1
+ m_PrefilterDBufferMRT2: 1
+ m_PrefilterDBufferMRT3: 1
+ m_PrefilterSoftShadowsQualityLow: 1
+ m_PrefilterSoftShadowsQualityMedium: 1
+ m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0
- m_PrefilterScreenCoord: 0
- m_PrefilterNativeRenderPass: 0
+ m_PrefilterScreenCoord: 1
+ m_PrefilterNativeRenderPass: 1
m_PrefilterUseLegacyLightmaps: 0
m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0
diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
index e526cd7b8e05c2e42a12903040323d77353e8a39..69fa0936ce1d94c995453af72bad7530efddf76f 100644
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
@@ -56,7 +56,17 @@ MonoBehaviour:
- rid: 7752762179098771476
- rid: 3114554863623077888
m_RuntimeSettings:
- m_List: []
+ m_List:
+ - rid: 7752762179098771456
+ - rid: 7752762179098771457
+ - rid: 7752762179098771459
+ - rid: 7752762179098771461
+ - rid: 7752762179098771462
+ - rid: 7752762179098771464
+ - rid: 7752762179098771466
+ - rid: 7752762179098771468
+ - rid: 7752762179098771472
+ - rid: 7752762179098771476
m_AssetVersion: 8
m_ObsoleteDefaultVolumeProfile: {fileID: 0}
m_RenderingLayerNames:
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 45883534299e0d21f44832f7e6aa68dce19b5db2..85128c23e848014224c1e9f281fb0ed05c7089b3 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -9,8 +9,8 @@ EditorBuildSettings:
path: Assets/Scenes/Jo's Prototyping Scene.unity
guid: 8c9cfa26abfee488c85f1582747f6a02
- enabled: 1
- path: Assets/Scenes/TeleportTestScene.unity
- guid: a2a0fe29742a8b7409c3802b01cb25b7
+ path: Assets/Scenes/PersistentDataScene.unity
+ guid: 1319caf5bcd473a45bd34bef39dfc2ee
m_configObjects:
com.unity.input.settings: {fileID: 11400000, guid: 364ed7d7d36d34e49ada37279e4d6e71, type: 2}
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}