From 253708a909854ed535edea1bb62d4dfdc84c4a00 Mon Sep 17 00:00:00 2001 From: Damian Date: Tue, 9 Sep 2025 14:30:37 +0200 Subject: [PATCH] Added Camera limits to town map and made some puzzle updates in quarry --- .../PlaceFootballInLureSpotA.asset | 19 ++ .../PlaceFootballInLureSpotA.asset.meta | 8 + .../HammerBirdPuzzle/InteractWLawnMower.asset | 20 +++ .../InteractWLawnMower.asset.meta | 8 + .../HammerBirdPuzzle/PickUpNails.asset | 20 +++ .../HammerBirdPuzzle/PickUpNails.asset.meta | 8 + .../HammerBirdPuzzle/PlaceNailsinlureC.asset | 19 ++ .../PlaceNailsinlureC.asset.meta | 8 + Assets/Data/Settings/DefaultSettings.asset | 8 + .../Environment/Placeholders/Lawnmower.prefab | 145 +++++++++++++-- .../Scenes/Levels/AppleHillsOverworld.unity | 70 +++++++- Assets/Scenes/Levels/Quarry.unity | 166 ++++++++++++++++-- 12 files changed, 466 insertions(+), 33 deletions(-) create mode 100644 Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset create mode 100644 Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset.meta create mode 100644 Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset create mode 100644 Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset.meta create mode 100644 Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset create mode 100644 Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset.meta create mode 100644 Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset create mode 100644 Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset.meta diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset b/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset new file mode 100644 index 00000000..9a56ceaf --- /dev/null +++ b/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3} + m_Name: PlaceFootballInLureSpotA + m_EditorClassIdentifier: + stepId: PlaceFootball + displayName: Football in luring spot A + description: Place the Football into luring spot A + icon: {fileID: 0} + unlocks: [] diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset.meta b/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset.meta new file mode 100644 index 00000000..27b91d88 --- /dev/null +++ b/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0fb0ab2b55d93a24685e9f6651adcf30 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset new file mode 100644 index 00000000..33cbaff4 --- /dev/null +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3} + m_Name: InteractWLawnMower + m_EditorClassIdentifier: + stepId: IntWLawnmower + displayName: Start Lawnmower + description: Start up the lawnmower so the Gardener runs after it. + icon: {fileID: 0} + unlocks: + - {fileID: 11400000, guid: f9da68caaae2a244885a13cf2e2e45c0, type: 2} diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset.meta b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset.meta new file mode 100644 index 00000000..4ad50664 --- /dev/null +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea383d1dee861f54c9a1d4f32a2f6afc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset b/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset new file mode 100644 index 00000000..2f8c439d --- /dev/null +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3} + m_Name: PickUpNails + m_EditorClassIdentifier: + stepId: PickNails + displayName: Pick up Nails + description: Pick up some nails from the back of the van once the gaardener is + gone. + icon: {fileID: 0} + unlocks: [] diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset.meta b/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset.meta new file mode 100644 index 00000000..52eaf4d4 --- /dev/null +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9da68caaae2a244885a13cf2e2e45c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset b/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset new file mode 100644 index 00000000..e13bc81a --- /dev/null +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3} + m_Name: PlaceNailsinlureC + m_EditorClassIdentifier: + stepId: PlaceNailsinC + displayName: Nails In Lure C + description: Place the Nails in the Luring Spot C + icon: {fileID: 0} + unlocks: [] diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset.meta b/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset.meta new file mode 100644 index 00000000..06083583 --- /dev/null +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 28848561ff31fe24ea9f8590dee0bf8f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/DefaultSettings.asset b/Assets/Data/Settings/DefaultSettings.asset index 99564aa3..91579bd1 100644 --- a/Assets/Data/Settings/DefaultSettings.asset +++ b/Assets/Data/Settings/DefaultSettings.asset @@ -56,3 +56,11 @@ MonoBehaviour: allowedItems: - {fileID: 11400000, guid: 6934dcb56c610c44da228f7f24ca13c9, type: 2} forbiddenItems: [] + - slotItem: {fileID: 11400000, guid: aaf36cd26cf74334e9c7db6c1b03b3fb, type: 2} + allowedItems: + - {fileID: 11400000, guid: c50330645a2b9d549aae3639bdfcea19, type: 2} + forbiddenItems: [] + - slotItem: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2} + allowedItems: + - {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2} + forbiddenItems: [] diff --git a/Assets/Prefabs/Environment/Placeholders/Lawnmower.prefab b/Assets/Prefabs/Environment/Placeholders/Lawnmower.prefab index 05f1cb08..708ed39e 100644 --- a/Assets/Prefabs/Environment/Placeholders/Lawnmower.prefab +++ b/Assets/Prefabs/Environment/Placeholders/Lawnmower.prefab @@ -1,5 +1,88 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3087383321790609411 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5065775115499084617} + - component: {fileID: 4498953762721413943} + m_Layer: 6 + m_Name: LawnmowerCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5065775115499084617 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3087383321790609411} + serializedVersion: 2 + 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: 8049523385480426504} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &4498953762721413943 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3087383321790609411} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.2} + oldSize: {x: 3.87, y: 4.92} + newSize: {x: 3.87, y: 4.92} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 1.2170562, y: 1.116602} + - {x: -1.1152315, y: 1.7497016} + - {x: -1.906739, y: 0.047059774} + - {x: 0.7646272, y: -0.35416} + m_UseDelaunayMesh: 0 --- !u!1 &4940025602237181209 GameObject: m_ObjectHideFlags: 0 @@ -10,8 +93,11 @@ GameObject: m_Component: - component: {fileID: 8049523385480426504} - component: {fileID: 4972892989515032591} - - component: {fileID: 5788022472340583219} - m_Layer: 6 + - component: {fileID: 7695719922005140445} + - component: {fileID: 4901186366144297979} + - component: {fileID: 5264516637087018658} + - component: {fileID: 8801225172547510663} + m_Layer: 10 m_Name: Lawnmower m_TagString: Untagged m_Icon: {fileID: 0} @@ -30,7 +116,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 5065775115499084617} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4972892989515032591 @@ -88,8 +175,8 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 ---- !u!60 &5788022472340583219 -PolygonCollider2D: +--- !u!61 &7695719922005140445 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -122,7 +209,7 @@ PolygonCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: 1.4760001} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.2} @@ -132,10 +219,42 @@ PolygonCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: 1.2170562, y: 1.116602} - - {x: -1.1152315, y: 1.7497016} - - {x: -1.906739, y: 0.047059774} - - {x: 0.7646272, y: -0.35416} - m_UseDelaunayMesh: 0 + m_Size: {x: 3.87, y: 4.92} + m_EdgeRadius: 0 +--- !u!114 &4901186366144297979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940025602237181209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5264516637087018658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940025602237181209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: + stepData: {fileID: 11400000, guid: ea383d1dee861f54c9a1d4f32a2f6afc, type: 2} +--- !u!114 &8801225172547510663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940025602237181209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 833a4ccef651449e973e623d9107bef5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/Levels/AppleHillsOverworld.unity b/Assets/Scenes/Levels/AppleHillsOverworld.unity index 5bf09be6..dbdb43c9 100644 --- a/Assets/Scenes/Levels/AppleHillsOverworld.unity +++ b/Assets/Scenes/Levels/AppleHillsOverworld.unity @@ -130,6 +130,7 @@ GameObject: - component: {fileID: 100481744} - component: {fileID: 100481743} - component: {fileID: 100481745} + - component: {fileID: 100481746} m_Layer: 0 m_Name: CinemachineCamera m_TagString: Untagged @@ -214,6 +215,26 @@ MonoBehaviour: RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 1 FollowOffset: {x: 0, y: 0, z: -10} +--- !u!114 &100481746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 100481742} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: + BoundingShape2D: {fileID: 1269425238} + Damping: 1 + SlowingDistance: 10 + OversizeWindow: + Enabled: 0 + MaxWindowSize: 0 + Padding: 0 + m_LegacyMaxWindowSize: -2 --- !u!1001 &109902894 PrefabInstance: m_ObjectHideFlags: 0 @@ -847,7 +868,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c119ffb87b2a16d4f925ff5d5ffd7092, type: 3} m_Name: m_EditorClassIdentifier: - ShouldPlayIntro: 0 + ShouldPlayIntro: 1 --- !u!95 &948124911 Animator: serializedVersion: 7 @@ -1176,6 +1197,7 @@ GameObject: m_Component: - component: {fileID: 1269425237} - component: {fileID: 1269425236} + - component: {fileID: 1269425238} m_Layer: 0 m_Name: BackgroundMap m_TagString: Untagged @@ -1253,6 +1275,52 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1269425238 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269425235} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 19.2, y: 10.8} + newSize: {x: 19.2, y: 10.8} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 19.2, y: 10.8} + m_EdgeRadius: 0 --- !u!4 &1309036670 stripped Transform: m_CorrespondingSourceObject: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index a111c2db..e95aa0b5 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -550,7 +550,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2229719486490501062, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_SortingOrder - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2229719486490501062, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_SpriteSortPoint @@ -429084,12 +429084,12 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 109.55722, y: -27.474209} - - {x: 126.69129, y: -27.460072} - - {x: 127.00237, y: -35.900967} - - {x: 113.79652, y: -34.32546} - - {x: 90.43431, y: -38.9221} - - {x: 90.48423, y: -27.891117} + - - {x: 113.48414, y: -31.779633} + - {x: 126.64398, y: -33.37411} + - {x: 126.67119, y: -35.806343} + - {x: 113.22877, y: -34.27815} + - {x: 83.43209, y: -40.436092} + - {x: 83.198135, y: -37.684765} m_UseDelaunayMesh: 0 --- !u!1001 &441644110 PrefabInstance: @@ -435021,6 +435021,24 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.957} +--- !u!1 &1232192831 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + m_PrefabInstance: {fileID: 815620523195828801} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1232192838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232192831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: + stepData: {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2} --- !u!1001 &1256486233 PrefabInstance: m_ObjectHideFlags: 0 @@ -440137,6 +440155,101 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 2085509836} m_PrefabAsset: {fileID: 0} +--- !u!1 &2095613874 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8970564951337804570, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} + m_PrefabInstance: {fileID: 1827970313029684639} + m_PrefabAsset: {fileID: 0} +--- !u!212 &2095613875 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 2788039117732113137, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} + m_PrefabInstance: {fileID: 1827970313029684639} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2095613877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095613874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: + stepData: {fileID: 11400000, guid: f9da68caaae2a244885a13cf2e2e45c0, type: 2} +--- !u!114 &2095613878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095613874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3} + m_Name: + m_EditorClassIdentifier: + itemData: {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2} + iconRenderer: {fileID: 2095613875} +--- !u!114 &2095613879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095613874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &2095613880 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095613874} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2.24, y: 2.11} + newSize: {x: 2.24, y: 2.11} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 2.24, y: 2.11} + m_EdgeRadius: 0 --- !u!1001 &2099596042 PrefabInstance: m_ObjectHideFlags: 0 @@ -440606,7 +440719,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1232192838} m_SourcePrefab: {fileID: 100100000, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} --- !u!212 &815620523195828802 stripped SpriteRenderer: @@ -440627,11 +440743,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7219454279404501638, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} propertyPath: m_LocalPosition.x - value: 22.81 + value: 20.8 objectReference: {fileID: 0} - target: {fileID: 7219454279404501638, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} propertyPath: m_LocalPosition.y - value: 6.21 + value: -1.4 objectReference: {fileID: 0} - target: {fileID: 7219454279404501638, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} propertyPath: m_LocalPosition.z @@ -440669,10 +440785,26 @@ PrefabInstance: propertyPath: m_Name value: Nails objectReference: {fileID: 0} + - target: {fileID: 8970564951337804570, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8970564951337804570, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} + insertIndex: -1 + addedObject: {fileID: 2095613880} + - targetCorrespondingSourceObject: {fileID: 8970564951337804570, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} + insertIndex: -1 + addedObject: {fileID: 2095613879} + - targetCorrespondingSourceObject: {fileID: 8970564951337804570, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} + insertIndex: -1 + addedObject: {fileID: 2095613878} + - targetCorrespondingSourceObject: {fileID: 8970564951337804570, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} + insertIndex: -1 + addedObject: {fileID: 2095613877} m_SourcePrefab: {fileID: 100100000, guid: b0d90c8a07405f24489d3a27d10d9bf9, type: 3} --- !u!1001 &2428672463423402429 PrefabInstance: @@ -440812,17 +440944,13 @@ PrefabInstance: propertyPath: m_Name value: Lawnmower objectReference: {fileID: 0} - - target: {fileID: 4972892989515032591, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} - propertyPath: m_SortingOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalPosition.x - value: 13.2 + value: 41.58 objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalPosition.y - value: -2.2 + value: -7.24 objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalPosition.z @@ -441712,11 +441840,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4092047856540417737, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} propertyPath: m_LocalPosition.x - value: -12.46 + value: -18.63 objectReference: {fileID: 0} - target: {fileID: 4092047856540417737, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} propertyPath: m_LocalPosition.y - value: -22.38 + value: -27.22 objectReference: {fileID: 0} - target: {fileID: 4092047856540417737, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} propertyPath: m_LocalPosition.z