From d62516f0cb9a7d2b701b8530c61e62e9f78dfb38 Mon Sep 17 00:00:00 2001 From: DamianCorazza <79833283+DamianCorazza@users.noreply.github.com> Date: Fri, 12 Sep 2025 12:49:07 +0200 Subject: [PATCH] Added Bird Spawning and Copied behaviour for the hammer bird --- .../InteractWithFootballBird.asset | 19 + .../InteractWithFootballBird.asset.meta | 8 + .../PlaceFootballInLureSpotA.asset | 3 +- .../InteractWithHammerBird.asset | 19 + .../InteractWithHammerBird.asset.meta | 8 + .../HammerBirdPuzzle/PlaceNailsinlureC.asset | 3 +- .../Environment/Placeholders/LureSpotA.prefab | 194 ++- .../PrefabsPLACEHOLDER/FootballBird.prefab | 161 +++ .../FootballBird.prefab.meta | 7 + .../PrefabsPLACEHOLDER/HammerBird.prefab | 157 +++ .../PrefabsPLACEHOLDER/HammerBird.prefab.meta | 7 + Assets/Scenes/Levels/Quarry.unity | 1051 +++++++++++++++-- Assets/Scripts/Animation/BirdEyesBehavior.cs | 3 + .../DamianExperiments/DistanceMeasurer.cs | 26 +- 14 files changed, 1515 insertions(+), 151 deletions(-) create mode 100644 Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset create mode 100644 Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset.meta create mode 100644 Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset create mode 100644 Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset.meta create mode 100644 Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab create mode 100644 Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab.meta create mode 100644 Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab create mode 100644 Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab.meta diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset b/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset new file mode 100644 index 00000000..6239c56f --- /dev/null +++ b/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.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: InteractWithFootballBird + m_EditorClassIdentifier: + stepId: InteractFootballBird + displayName: Interact Football Bird + description: Take a picture of the Football bird + icon: {fileID: 0} + unlocks: [] diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset.meta b/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset.meta new file mode 100644 index 00000000..aed7df47 --- /dev/null +++ b/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0df54e69020c39e44b3b486cd6ac475a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset b/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset index 9a56ceaf..227eedcc 100644 --- a/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset +++ b/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset @@ -16,4 +16,5 @@ MonoBehaviour: displayName: Football in luring spot A description: Place the Football into luring spot A icon: {fileID: 0} - unlocks: [] + unlocks: + - {fileID: 11400000, guid: 0df54e69020c39e44b3b486cd6ac475a, type: 2} diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset new file mode 100644 index 00000000..5cf5a442 --- /dev/null +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.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: InteractWithHammerBird + m_EditorClassIdentifier: + stepId: InteractHammerBird + displayName: Interact With HammerBird + description: TAke picture of the HammerBird + icon: {fileID: 0} + unlocks: [] diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset.meta b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset.meta new file mode 100644 index 00000000..653918fb --- /dev/null +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 829fc7c8046e0844f93bf810dc1f0ebd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset b/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset index e13bc81a..65ad0238 100644 --- a/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset +++ b/Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset @@ -16,4 +16,5 @@ MonoBehaviour: displayName: Nails In Lure C description: Place the Nails in the Luring Spot C icon: {fileID: 0} - unlocks: [] + unlocks: + - {fileID: 11400000, guid: 829fc7c8046e0844f93bf810dc1f0ebd, type: 2} diff --git a/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab b/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab index 65a4d1e3..b7942450 100644 --- a/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab +++ b/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab @@ -87,6 +87,116 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3617455498829757156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4388395494483065101} + - component: {fileID: 4237100461469772044} + - component: {fileID: 2472695135799577718} + m_Layer: 0 + m_Name: FootballBird + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4388395494483065101 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3617455498829757156} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.8479085, y: -0.13594438, z: 0} + m_LocalScale: {x: 0.5, y: 0.50000006, z: 0.50000006} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1924342418841580} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4237100461469772044 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3617455498829757156} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &2472695135799577718 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3617455498829757156} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7249528695393012044 GameObject: m_ObjectHideFlags: 0 @@ -100,6 +210,7 @@ GameObject: - component: {fileID: 5475802662781903683} - component: {fileID: 8818689886719637838} - component: {fileID: 8578055200319571631} + - component: {fileID: 3487003259787903584} m_Layer: 10 m_Name: LureSpotA m_TagString: Untagged @@ -271,17 +382,67 @@ MonoBehaviour: m_Calls: [] onItemSlotRemoved: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 7602419655779381936} + m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp + m_MethodName: NoItem + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 onCorrectItemSlotted: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 7602419655779381936} + m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp + m_MethodName: CorrectItem + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 onIncorrectItemSlotted: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 7602419655779381936} + m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp + m_MethodName: IncorrectItem + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 onForbiddenItemSlotted: m_PersistentCalls: m_Calls: [] slottedItemRenderer: {fileID: 4110666412151536905} +--- !u!114 &3487003259787903584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7249528695393012044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2226aecbed4b1f143a5a5c5be4236957, type: 3} + m_Name: + m_EditorClassIdentifier: + playerToPlaceDistance: 40 + birdEyes: {fileID: 7602419655779381936} --- !u!1001 &7700829900874995671 PrefabInstance: m_ObjectHideFlags: 0 @@ -388,15 +549,36 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8828658103663197825, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5210033153524231666, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + - {fileID: 4408373410605328204, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + insertIndex: -1 + addedObject: {fileID: 4388395494483065101} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} +--- !u!4 &1924342418841580 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_PrefabInstance: {fileID: 7700829900874995671} + m_PrefabAsset: {fileID: 0} --- !u!4 &5375394469162727687 stripped Transform: m_CorrespondingSourceObject: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} m_PrefabInstance: {fileID: 7700829900874995671} m_PrefabAsset: {fileID: 0} +--- !u!114 &7602419655779381936 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 243176356944356711, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_PrefabInstance: {fileID: 7700829900874995671} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13d59d3c42170824b8f92557822d9bf0, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab new file mode 100644 index 00000000..a394c3dd --- /dev/null +++ b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab @@ -0,0 +1,161 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &9194176465486785202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: itemData + value: + objectReference: {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalScale.x + value: 0.8000001 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalScale.y + value: 0.8000001 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalScale.z + value: 0.26666668 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.y + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.x + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.y + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 2.24 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 2.11 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 2.52 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 3.07 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Name + value: FootballBird + objectReference: {fileID: 0} + - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.x + value: 2.24 + objectReference: {fileID: 0} + - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.y + value: 2.11 + objectReference: {fileID: 0} + - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 804776353370782802, guid: b187e41d8728aba4b90917cc22005463, type: 3} + - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: isOneTime + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: characterToInteract + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + insertIndex: -1 + addedObject: {fileID: 1972611059221495588} + m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} +--- !u!1 &1784002662241348359 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + m_PrefabInstance: {fileID: 9194176465486785202} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1972611059221495588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1784002662241348359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: + stepData: {fileID: 11400000, guid: 0df54e69020c39e44b3b486cd6ac475a, type: 2} diff --git a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab.meta b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab.meta new file mode 100644 index 00000000..5d983906 --- /dev/null +++ b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9b2d5618c8cc81743b982c6cc8d95871 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab new file mode 100644 index 00000000..9de7b161 --- /dev/null +++ b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab @@ -0,0 +1,157 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &9194176465486785202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: itemData + value: + objectReference: {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.x + value: 54.83 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.y + value: -35.53 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.x + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.y + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 2.24 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 2.11 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 2.08 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 2.83 + objectReference: {fileID: 0} + - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Name + value: HammerBird + objectReference: {fileID: 0} + - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.x + value: 2.24 + objectReference: {fileID: 0} + - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Size.y + value: 2.11 + objectReference: {fileID: 0} + - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -5464640192890044756, guid: 1bf1b8625c66fa142a1ac7ce275cd4a6, type: 3} + - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: characterToInteract + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + insertIndex: -1 + addedObject: {fileID: 1972611059221495588} + m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} +--- !u!1 &1784002662241348359 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + m_PrefabInstance: {fileID: 9194176465486785202} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1972611059221495588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1784002662241348359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: + stepData: {fileID: 11400000, guid: 829fc7c8046e0844f93bf810dc1f0ebd, type: 2} diff --git a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab.meta b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab.meta new file mode 100644 index 00000000..856740f4 --- /dev/null +++ b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e3d6494020df3a34f88a89f0ee9a3527 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 0d19c506..da6ce55d 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -1271,6 +1271,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 166674237} m_PrefabAsset: {fileID: 0} +--- !u!4 &183513579 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + m_PrefabInstance: {fileID: 8013274907828598643} + m_PrefabAsset: {fileID: 0} --- !u!1001 &196802142 PrefabInstance: m_ObjectHideFlags: 0 @@ -1340,6 +1345,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!1001 &197176882 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6629276459160142542, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8282617218565496284, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_Name + value: TinyBushA (6) + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.x + value: -81.09 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.y + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} --- !u!1001 &202259175 PrefabInstance: m_ObjectHideFlags: 0 @@ -427842,11 +427908,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} propertyPath: m_LocalPosition.x - value: -0.05 + value: -67.9 objectReference: {fileID: 0} - target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} propertyPath: m_LocalPosition.y - value: -2.16 + value: 13.5 objectReference: {fileID: 0} - target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} propertyPath: m_LocalPosition.z @@ -428225,11 +428291,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.x - value: -90.69 + value: -81.13 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.y - value: -29.22 + value: -27.83 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.z @@ -428548,6 +428614,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 357509430} m_PrefabAsset: {fileID: 0} +--- !u!4 &364850365 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + m_PrefabInstance: {fileID: 1985009703} + m_PrefabAsset: {fileID: 0} --- !u!1001 &365273989 PrefabInstance: m_ObjectHideFlags: 0 @@ -429019,11 +429090,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.x - value: -85.76 + value: -80.92 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.y - value: -59.33 + value: -59.71 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.z @@ -429949,6 +430020,175 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 498313310} m_PrefabAsset: {fileID: 0} +--- !u!1001 &498726572 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1020445172872290040, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_Name + value: SlottedItemC + objectReference: {fileID: 0} + - target: {fileID: 1178648129422731606, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalPosition.x + value: 13.17 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalPosition.y + value: 26.6 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832307215058812520, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_FlipX + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832307215058812520, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalPosition.x + value: -11.08 + objectReference: {fileID: 0} + - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalPosition.y + value: -1.33 + objectReference: {fileID: 0} + - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.925592 + objectReference: {fileID: 0} + - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalRotation.z + value: -0.3785226 + objectReference: {fileID: 0} + - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -44.484 + objectReference: {fileID: 0} + - target: {fileID: 6258593095132504700, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 3009302558630513478, guid: 3aefb78ee1b7f6e4685d0fff00e24e3d, type: 3} + - target: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_Name + value: LureSpotC + objectReference: {fileID: 0} + - target: {fileID: 7442421452951837692, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.53 + objectReference: {fileID: 0} + - target: {fileID: 7442421452951837692, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalPosition.y + value: 1.22 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: itemData + value: + objectReference: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 498726573} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 498726573} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: NoItem + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CorrectItem + objectReference: {fileID: 0} + - target: {fileID: 8780874672293486880, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_Name + value: BirdEyesC + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 3617455498829757156, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + insertIndex: 0 + addedObject: {fileID: 1422870261} + - targetCorrespondingSourceObject: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1810769815} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} +--- !u!114 &498726573 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7602419655779381936, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + m_PrefabInstance: {fileID: 498726572} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13d59d3c42170824b8f92557822d9bf0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &498726574 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + m_PrefabInstance: {fileID: 498726572} + m_PrefabAsset: {fileID: 0} +--- !u!4 &498726575 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + m_PrefabInstance: {fileID: 498726572} + m_PrefabAsset: {fileID: 0} --- !u!1001 &501860764 PrefabInstance: m_ObjectHideFlags: 0 @@ -429963,7 +430203,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalPosition.x - value: -91.22 + value: -81.73 objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalPosition.y @@ -431967,6 +432207,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 848644516} m_PrefabAsset: {fileID: 0} +--- !u!1001 &848791135 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6629276459160142542, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8282617218565496284, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_Name + value: TinyBushA (7) + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.x + value: -80.4 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.y + value: -10.87 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} --- !u!1001 &862735499 PrefabInstance: m_ObjectHideFlags: 0 @@ -432619,8 +432920,12 @@ Transform: - {fileID: 304536402} - {fileID: 1524524064} - {fileID: 1484810513} + - {fileID: 1482575304} + - {fileID: 1158551582} + - {fileID: 1269931624} - {fileID: 429827026} - {fileID: 1288735762} + - {fileID: 1159351782} - {fileID: 752930750} - {fileID: 561092053} - {fileID: 1507935578} @@ -433946,11 +434251,11 @@ PrefabInstance: objectReference: {fileID: 3182619} - target: {fileID: 5409891338185859165, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.x - value: -0.22846493 + value: -0.22846495 objectReference: {fileID: 0} - target: {fileID: 5409891338185859165, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.y - value: -3.364711 + value: -3.3647113 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -434180,7 +434485,7 @@ Transform: m_GameObject: {fileID: 1137411209} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.05, y: -2.16, z: -10} + m_LocalPosition: {x: -67.9, y: 13.5, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -434199,7 +434504,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: BoundingShape2D: {fileID: 219531026} - Damping: 2 + Damping: 3 SlowingDistance: 20 OversizeWindow: Enabled: 0 @@ -434220,7 +434525,7 @@ MonoBehaviour: m_EditorClassIdentifier: TrackerSettings: BindingMode: 4 - PositionDamping: {x: 2, y: 2, z: 1} + PositionDamping: {x: 2, y: 0.5, z: 1} AngularDampingMode: 0 RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 1 @@ -434539,6 +434844,154 @@ PolygonCollider2D: - {x: 62.893696, y: 23.336433} - {x: 61.783947, y: -104.23136} m_UseDelaunayMesh: 0 +--- !u!1001 &1158551581 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 965792696} + m_Modifications: + - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_Name + value: TreeSingle (124) + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.x + value: -88.06 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.y + value: -40.54 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.w + value: -0.99944 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.z + value: -0.033461478 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 3.835 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_FlipX + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!4 &1158551582 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 1158551581} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1159351781 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 965792696} + m_Modifications: + - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_Name + value: TreeSingle (126) + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.x + value: -87.28 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.y + value: -71.15 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.w + value: -0.99974394 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.z + value: -0.022630066 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 2.593 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_FlipX + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!4 &1159351782 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 1159351781} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1175135178 PrefabInstance: m_ObjectHideFlags: 0 @@ -435227,17 +435680,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.957} ---- !u!114 &1254302309 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7602419655779381936, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_PrefabInstance: {fileID: 8013274907828598643} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 13d59d3c42170824b8f92557822d9bf0, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1256486233 PrefabInstance: m_ObjectHideFlags: 0 @@ -435307,6 +435749,133 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!1001 &1267386603 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8282617218565496284, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_Name + value: TinyBushA (5) + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.x + value: -79.71 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.y + value: 18.07 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} +--- !u!1001 &1269931623 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 965792696} + m_Modifications: + - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_Name + value: TreeSingle (125) + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.x + value: -90.23 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.y + value: -27.078793 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.w + value: -0.9995075 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.z + value: 0.031381357 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -3.597 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!4 &1269931624 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 1269931623} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1282112587 PrefabInstance: m_ObjectHideFlags: 0 @@ -435395,11 +435964,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.x - value: -84.93 + value: -80.93 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.y - value: -73.84 + value: -74.16 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.z @@ -436463,6 +437032,89 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1718039814} m_PrefabAsset: {fileID: 0} +--- !u!1 &1422870260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1422870261} + - component: {fileID: 1422870262} + m_Layer: 6 + m_Name: CollisionWithWorld + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1422870261 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422870260} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.09, y: 0.54, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 498726575} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &1422870262 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422870260} + 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, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 1.1843929, y: 1.2762203} + - {x: -0.08161932, y: 1.3230627} + - {x: -0.17280048, y: 0.4588033} + - {x: 1.0673996, y: 0.40602326} + m_UseDelaunayMesh: 0 --- !u!1001 &1430501396 PrefabInstance: m_ObjectHideFlags: 0 @@ -436477,11 +437129,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.x - value: -79.23 + value: -73.86 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.y - value: -8.09 + value: -9.55 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.z @@ -436743,6 +437395,76 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} +--- !u!1001 &1482575303 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 965792696} + m_Modifications: + - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_Name + value: TreeSingle (123) + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.x + value: -85.02 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.y + value: -54.28 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.w + value: -0.99944 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.z + value: -0.033461478 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 3.835 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_FlipX + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!4 &1482575304 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 1482575303} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1484810512 PrefabInstance: m_ObjectHideFlags: 0 @@ -436757,11 +437479,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.x - value: -88.06 + value: -78.52727 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.y - value: -49.86 + value: -49.44277 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.z @@ -436769,7 +437491,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalRotation.w - value: -0.9992209 + value: -0.99944 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalRotation.x @@ -436781,7 +437503,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalRotation.z - value: 0.03946654 + value: -0.033461478 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -436793,7 +437515,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -4.524 + value: 3.835 objectReference: {fileID: 0} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_FlipX @@ -437119,11 +437841,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.x - value: -91.05 + value: -81.29 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.y - value: -37.39 + value: -36.71 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.z @@ -437907,7 +438629,7 @@ Transform: m_GameObject: {fileID: 1653475490} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.05, y: -2.16, z: -10} + m_LocalPosition: {x: -45.3748, y: 14.467753, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -438015,11 +438737,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.x - value: -80.33 + value: -72.47 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.y - value: -14 + value: -14.98 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.z @@ -438897,6 +439619,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1802938374} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1810769814 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 498726574} + m_Modifications: + - target: {fileID: 1784002662241348359, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_Name + value: HammerBird + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalScale.x + value: 0.8000001 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalScale.y + value: 0.8000001 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalScale.z + value: 0.26666668 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalPosition.x + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalPosition.y + value: 0.57 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} +--- !u!4 &1810769815 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + m_PrefabInstance: {fileID: 1810769814} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1821647537 PrefabInstance: m_ObjectHideFlags: 0 @@ -439363,11 +440159,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: -83.85 + value: -74.74 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: 8.75 + value: 7.64 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -439655,7 +440451,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalPosition.x - value: -93.860016 + value: -87.29 objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalPosition.y @@ -439939,6 +440735,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1855590167} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1985009703 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 183513579} + m_Modifications: + - target: {fileID: 1784002662241348359, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_Name + value: FootballBird + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalPosition.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalPosition.y + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} --- !u!1001 &1990424113 PrefabInstance: m_ObjectHideFlags: 0 @@ -440879,7 +441732,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.x - value: -92.06 + value: -84.43 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.y @@ -441114,6 +441967,10 @@ PrefabInstance: propertyPath: m_Name value: LureSpotC objectReference: {fileID: 0} + - target: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -441994,6 +442851,22 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1178648129422731606, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: m_LocalPosition.x value: 66.69 @@ -442038,93 +442911,13 @@ PrefabInstance: propertyPath: m_Name value: LureSpotA objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1254302309} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1254302309} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: NoItem - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1254302309} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: CorrectItem - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: IncorrectItem - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: BirdEyesBehavior, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: BirdEyesBehavior, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: BirdEyesBehavior, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 3617455498829757156, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + insertIndex: -1 + addedObject: {fileID: 364850365} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} --- !u!1660057539 &9223372036854775807 @@ -442153,6 +442946,9 @@ SceneRoots: - {fileID: 5288063114372713135} - {fileID: 1477361338} - {fileID: 1855602864} + - {fileID: 1267386603} + - {fileID: 197176882} + - {fileID: 848791135} - {fileID: 1044802807} - {fileID: 4596770314561390347} - {fileID: 2099596042} @@ -442161,6 +442957,7 @@ SceneRoots: - {fileID: 1670940125} - {fileID: 7530821580781571560} - {fileID: 8013274907828598643} + - {fileID: 498726572} - {fileID: 3708074769586677211} - {fileID: 815620523195828801} - {fileID: 5061531048637107478} diff --git a/Assets/Scripts/Animation/BirdEyesBehavior.cs b/Assets/Scripts/Animation/BirdEyesBehavior.cs index 916f56a4..553af13a 100644 --- a/Assets/Scripts/Animation/BirdEyesBehavior.cs +++ b/Assets/Scripts/Animation/BirdEyesBehavior.cs @@ -5,6 +5,7 @@ public class BirdEyesBehavior : MonoBehaviour { private StateMachine statemachine; private Animator animator; + public bool correctItemIsIn; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { @@ -20,11 +21,13 @@ public class BirdEyesBehavior : MonoBehaviour public void CorrectItem() { + correctItemIsIn = true; animator.SetTrigger("RightGuess"); } public void IncorrectItem() { + correctItemIsIn = false; animator.SetTrigger("WrongGuess"); } public void NoItem() diff --git a/Assets/Scripts/DamianExperiments/DistanceMeasurer.cs b/Assets/Scripts/DamianExperiments/DistanceMeasurer.cs index 916f2c88..91b31d2f 100644 --- a/Assets/Scripts/DamianExperiments/DistanceMeasurer.cs +++ b/Assets/Scripts/DamianExperiments/DistanceMeasurer.cs @@ -2,10 +2,9 @@ using UnityEngine; public class Distancemeasurer : MonoBehaviour { - public float playerDistanceFar; - public float playerDistanceClose; + public float playerToPlaceDistance; public BirdEyesBehavior birdEyes; - private Vector2 eyesPosition; + private Vector2 placePosition; private Vector2 playerPosition; private float distance; private GameObject player; @@ -13,28 +12,23 @@ public class Distancemeasurer : MonoBehaviour // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { - eyesPosition = transform.position; + placePosition = transform.position; player = GameObject.FindWithTag("Player"); playerPosition = player.transform.position; - distance = Vector2.Distance(eyesPosition, playerPosition); + distance = Vector2.Distance(placePosition, playerPosition); } // Update is called once per frame + // TODO: Make this less expensive by not doing it every frame void Update() { playerPosition = player.transform.position; - distance = Vector2.Distance(eyesPosition, playerPosition); - Debug.Log("Distance to player: " + distance); - if (distance > playerDistanceFar) + distance = Vector2.Distance(placePosition, playerPosition); + //Debug.Log("Distance to player: " + distance); + if (distance > playerToPlaceDistance && birdEyes.correctItemIsIn == true) { - birdEyes.NoItem(); - } else if (distance > playerDistanceClose) - { - birdEyes.IncorrectItem(); - } else - { - birdEyes.CorrectItem(); - } + birdEyes.BirdReveal(); + } }