diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LawnMowerMovingPLACEHOLDER.png b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LawnMowerMovingPLACEHOLDER.png new file mode 100644 index 00000000..6b5eca8e Binary files /dev/null and b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LawnMowerMovingPLACEHOLDER.png differ diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LawnMowerMovingPLACEHOLDER.png.meta b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LawnMowerMovingPLACEHOLDER.png.meta new file mode 100644 index 00000000..e4b6e2d0 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LawnMowerMovingPLACEHOLDER.png.meta @@ -0,0 +1,325 @@ +fileFormatVersion: 2 +guid: 464f70d7647a22a4aa688ffc2b6654cc +TextureImporter: + internalIDToNameTable: + - first: + 213: -4444670910754578914 + second: LawnMowerMovingPLACEHOLDER_0 + - first: + 213: 6348190279078284696 + second: LawnMowerMovingPLACEHOLDER_1 + - first: + 213: 5233908553689211412 + second: LawnMowerMovingPLACEHOLDER_2 + - first: + 213: -877913300417174042 + second: LawnMowerMovingPLACEHOLDER_3 + - first: + 213: 7052581180763600252 + second: LawnMowerMovingPLACEHOLDER_4 + - first: + 213: 4839952163610979709 + second: LawnMowerMovingPLACEHOLDER_5 + - first: + 213: -5099098398506052249 + second: LawnMowerMovingPLACEHOLDER_6 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: LawnMowerMovingPLACEHOLDER_0 + rect: + serializedVersion: 2 + x: 24 + y: 13 + width: 569 + height: 380 + alignment: 9 + pivot: {x: 0.5, y: 0.2} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e1e16f40b5b5152c0800000000000000 + internalID: -4444670910754578914 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: LawnMowerMovingPLACEHOLDER_1 + rect: + serializedVersion: 2 + x: 415 + y: 7 + width: 16 + height: 20 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 89d8c07bc6d491850800000000000000 + internalID: 6348190279078284696 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: LawnMowerMovingPLACEHOLDER_2 + rect: + serializedVersion: 2 + x: 632 + y: 13 + width: 569 + height: 380 + alignment: 9 + pivot: {x: 0.5, y: 0.2} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4122681691492a840800000000000000 + internalID: 5233908553689211412 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: LawnMowerMovingPLACEHOLDER_3 + rect: + serializedVersion: 2 + x: 1013 + y: 12 + width: 24 + height: 24 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6e52b01318601d3f0800000000000000 + internalID: -877913300417174042 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: LawnMowerMovingPLACEHOLDER_4 + rect: + serializedVersion: 2 + x: 1239 + y: 13 + width: 569 + height: 380 + alignment: 9 + pivot: {x: 0.5, y: 0.2} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c75f40db73dcfd160800000000000000 + internalID: 7052581180763600252 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: LawnMowerMovingPLACEHOLDER_5 + rect: + serializedVersion: 2 + x: 1861 + y: 12 + width: 569 + height: 380 + alignment: 9 + pivot: {x: 0.5, y: 0.2} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d7d6ae189d6fa2340800000000000000 + internalID: 4839952163610979709 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: LawnMowerMovingPLACEHOLDER_6 + rect: + serializedVersion: 2 + x: 2242 + y: 11 + width: 24 + height: 24 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 7659842d50d5c39b0800000000000000 + internalID: -5099098398506052249 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 3d4135416001629439aa7297ef718481 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + LawnMowerMovingPLACEHOLDER_0: -4444670910754578914 + LawnMowerMovingPLACEHOLDER_1: 6348190279078284696 + LawnMowerMovingPLACEHOLDER_2: 5233908553689211412 + LawnMowerMovingPLACEHOLDER_3: -877913300417174042 + LawnMowerMovingPLACEHOLDER_4: 7052581180763600252 + LawnMowerMovingPLACEHOLDER_5: 4839952163610979709 + LawnMowerMovingPLACEHOLDER_6: -5099098398506052249 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LawnMowerMovingPLACEHOLDER.mat b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LawnMowerMovingPLACEHOLDER.mat new file mode 100644 index 00000000..b2364307 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LawnMowerMovingPLACEHOLDER.mat @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LawnMowerMovingPLACEHOLDER + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 464f70d7647a22a4aa688ffc2b6654cc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LawnMowerMovingPLACEHOLDER.mat.meta b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LawnMowerMovingPLACEHOLDER.mat.meta new file mode 100644 index 00000000..2e737c0e --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LawnMowerMovingPLACEHOLDER.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cba74e1bf006eed439d8cc2938aeddf1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Characters/AnneLise_Camera.prefab b/Assets/Prefabs/Characters/AnneLise_Camera.prefab index 93c250ba..25c135cd 100644 --- a/Assets/Prefabs/Characters/AnneLise_Camera.prefab +++ b/Assets/Prefabs/Characters/AnneLise_Camera.prefab @@ -198,84 +198,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2067418934294973060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1685551316860627076} - - component: {fileID: 6018414269269671285} - m_Layer: 6 - m_Name: AnnaLiseCollider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1685551316860627076 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2067418934294973060} - 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.2000002} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 8523100300591212744} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &6018414269269671285 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2067418934294973060} - 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_Size: {x: 1, y: 1} - m_EdgeRadius: 0 --- !u!1 &5172497182660285677 GameObject: m_ObjectHideFlags: 0 @@ -313,7 +235,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7204028979372864050} - - {fileID: 1685551316860627076} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7273455074532059757 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 4334ae0c..621635ac 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -438,7 +438,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 6629276459160142542, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_SortingLayer @@ -458,11 +458,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: 50.05282 + value: 81.10762 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: 63.271416 + value: 11.748135 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -474,15 +474,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -571,6 +571,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 63234684} m_PrefabAsset: {fileID: 0} +--- !u!4 &85026788 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + m_PrefabInstance: {fileID: 5288063114372713135} + m_PrefabAsset: {fileID: 0} --- !u!1 &90258300 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5236930998804014616, guid: 3346526f3046f424196615241a307104, type: 3} @@ -599,19 +604,7 @@ MonoBehaviour: m_Calls: [] characterArrived: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 538228069} - m_TargetAssemblyTypeName: AnneLiseBehaviour, AppleHillsScripts - m_MethodName: GotoSpot - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 733706650} - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] interactionComplete: m_PersistentCalls: m_Calls: [] @@ -957,6 +950,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 109528606} m_PrefabAsset: {fileID: 0} +--- !u!4 &116821030 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 1256486233} + m_PrefabAsset: {fileID: 0} --- !u!1 &117006416 GameObject: m_ObjectHideFlags: 0 @@ -1367,7 +1365,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_Name @@ -1375,11 +1373,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.x - value: 57.9812 + value: 89.036 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.y - value: 68.469185 + value: 16.945904 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.z @@ -1391,15 +1389,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1436,7 +1434,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 6629276459160142542, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_FlipX @@ -1448,11 +1446,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: -81.09 + value: -50.035194 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: 3.5 + value: -48.02328 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -1464,15 +1462,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1700,7 +1698,7 @@ TilemapRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 30218a8abac166c479b995ed09ed2aa9, type: 2} + - {fileID: 2100000, guid: cba74e1bf006eed439d8cc2938aeddf1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -428133,6 +428131,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 267666324} m_PrefabAsset: {fileID: 0} +--- !u!4 &270418878 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 196802142} + m_PrefabAsset: {fileID: 0} --- !u!1001 &272973495 PrefabInstance: m_ObjectHideFlags: 0 @@ -428290,6 +428293,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 282954629} m_PrefabAsset: {fileID: 0} +--- !u!4 &285952825 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} + m_PrefabInstance: {fileID: 1670940125} + m_PrefabAsset: {fileID: 0} --- !u!1001 &298509668 PrefabInstance: m_ObjectHideFlags: 0 @@ -429272,6 +429280,23 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 429827025} m_PrefabAsset: {fileID: 0} +--- !u!1 &430675494 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1102400833121127473, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + m_PrefabInstance: {fileID: 1101333109} + m_PrefabAsset: {fileID: 0} +--- !u!114 &430675499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 430675494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ad080e6ca3114e4e96ccc33655d3dff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &437446538 GameObject: m_ObjectHideFlags: 0 @@ -429357,6 +429382,11 @@ PolygonCollider2D: - {x: 83.43209, y: -40.436092} - {x: 83.198135, y: -37.684765} m_UseDelaunayMesh: 0 +--- !u!4 &439404262 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} + m_PrefabInstance: {fileID: 2099596042} + m_PrefabAsset: {fileID: 0} --- !u!1001 &441644110 PrefabInstance: m_ObjectHideFlags: 0 @@ -430281,13 +430311,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3fc964bec385174f85a143f2fcff121, type: 3} +--- !u!4 &526812634 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} + m_PrefabInstance: {fileID: 1430501396} + m_PrefabAsset: {fileID: 0} --- !u!1001 &526986595 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 1675621340022220935, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_Name @@ -430307,11 +430342,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalPosition.x - value: 54.01 + value: 85.0648 objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalPosition.y - value: 62.53 + value: 11.006718 objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalPosition.z @@ -430323,15 +430358,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -430560,6 +430595,11 @@ MonoBehaviour: m_EditorClassIdentifier: luredBird: {fileID: 1212556098} annaLiseSpot: {fileID: 1482721234} +--- !u!4 &589140675 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + m_PrefabInstance: {fileID: 28205340} + m_PrefabAsset: {fileID: 0} --- !u!1 &589217856 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6865758097422051095, guid: 3346526f3046f424196615241a307104, type: 3} @@ -431631,6 +431671,58 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 752930749} m_PrefabAsset: {fileID: 0} +--- !u!1 &764788850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 764788851} + m_Layer: 0 + m_Name: Bushes and decorations + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &764788851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764788850} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -31.0548, y: 51.52328, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1045750401} + - {fileID: 1226458587} + - {fileID: 1195627204} + - {fileID: 85026788} + - {fileID: 1446072995} + - {fileID: 1185030192} + - {fileID: 1707431187} + - {fileID: 2144703707} + - {fileID: 1666087348} + - {fileID: 1219325244} + - {fileID: 1370055784} + - {fileID: 439404262} + - {fileID: 526812634} + - {fileID: 1756247657} + - {fileID: 285952825} + - {fileID: 589140675} + - {fileID: 1456920209} + - {fileID: 270418878} + - {fileID: 116821030} + - {fileID: 965792696} + - {fileID: 1541560530} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &768791149 PrefabInstance: m_ObjectHideFlags: 0 @@ -432171,7 +432263,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 6629276459160142542, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_FlipX @@ -432183,11 +432275,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: -80.4 + value: -49.3452 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: -10.87 + value: -62.39328 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -432199,15 +432291,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -432760,8 +432852,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965792695} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.70466, y: 46.34938, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 37.75946, y: -5.1739006, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -432915,7 +433007,7 @@ Transform: - {fileID: 459948551} - {fileID: 449723280} - {fileID: 1019773519} - m_Father: {fileID: 0} + m_Father: {fileID: 764788851} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &967977839 PrefabInstance: @@ -433628,7 +433720,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 6629276459160142542, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_SortingLayer @@ -433648,11 +433740,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: -89.6 + value: -58.545197 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: 71.1 + value: 19.576717 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -433664,15 +433756,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -433772,11 +433864,11 @@ Transform: m_GameObject: {fileID: 1045750399} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.09764775, w: 0.9952211} - m_LocalPosition: {x: -69.51, y: 39.76, z: 0} + m_LocalPosition: {x: -38.4552, y: -11.763283, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 764788851} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.207} --- !u!1001 &1059330637 PrefabInstance: @@ -433930,6 +434022,28 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1060556403} m_PrefabAsset: {fileID: 0} +--- !u!1 &1070236892 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} + m_PrefabInstance: {fileID: 3268506515308568021} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1070236898 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} + m_PrefabInstance: {fileID: 3268506515308568021} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1070236899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070236892} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1073425382 GameObject: m_ObjectHideFlags: 0 @@ -434139,10 +434253,18 @@ PrefabInstance: propertyPath: _masterTangent value: objectReference: {fileID: 1188630144} + - target: {fileID: 780600094299918916, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1102400833121127473, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_Name value: Gardener objectReference: {fileID: 0} + - target: {fileID: 1102400833121127473, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1364249540559639639, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.x value: -1.1700002 @@ -434153,11 +434275,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2264394306674147778, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.x - value: 34.11415 + value: 23.49 objectReference: {fileID: 0} - target: {fileID: 2264394306674147778, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.y - value: 12.308173 + value: -4.02 objectReference: {fileID: 0} - target: {fileID: 2264394306674147778, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.z @@ -434209,16 +434331,39 @@ PrefabInstance: objectReference: {fileID: 3182619} - target: {fileID: 5409891338185859165, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.x - value: -0.22846493 + value: -0.22846437 objectReference: {fileID: 0} - target: {fileID: 5409891338185859165, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.y - value: -3.364711 + value: -3.3647108 + objectReference: {fileID: 0} + - target: {fileID: 6418503932309983819, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6418503932309983819, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7508885060277519207, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8242272023601642381, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_LocalPosition.x + value: 3.26 + objectReference: {fileID: 0} + - target: {fileID: 8242272023601642381, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_LocalPosition.y + value: -1.69 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1102400833121127473, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + insertIndex: -1 + addedObject: {fileID: 430675499} m_SourcePrefab: {fileID: 100100000, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} --- !u!1001 &1129047100 PrefabInstance: @@ -435086,6 +435231,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 833a4ccef651449e973e623d9107bef5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1185030192 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + m_PrefabInstance: {fileID: 1855602864} + m_PrefabAsset: {fileID: 0} --- !u!4 &1188630144 stripped Transform: m_CorrespondingSourceObject: {fileID: 1364249540559639639, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} @@ -435333,11 +435483,11 @@ Transform: m_GameObject: {fileID: 1195627202} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.0034941393, w: 0.9999939} - m_LocalPosition: {x: -13.1, y: 57.68, z: 0} + m_LocalPosition: {x: 17.9548, y: 6.156719, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 764788851} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.4} --- !u!1001 &1199480499 PrefabInstance: @@ -435561,6 +435711,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1217164923} m_PrefabAsset: {fileID: 0} +--- !u!4 &1219325244 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + m_PrefabInstance: {fileID: 1044802807} + m_PrefabAsset: {fileID: 0} --- !u!1 &1226458585 GameObject: m_ObjectHideFlags: 0 @@ -435642,11 +435797,11 @@ Transform: m_GameObject: {fileID: 1226458585} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.069385216, w: 0.99758995} - m_LocalPosition: {x: 7.41, y: 63.63, z: 0} + m_LocalPosition: {x: 38.464798, y: 12.10672, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 764788851} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.957} --- !u!1 &1252931343 stripped GameObject: @@ -435659,7 +435814,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_Name @@ -435667,11 +435822,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.x - value: 40.48 + value: 71.5348 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.y - value: 68.04 + value: 16.51672 objectReference: {fileID: 0} - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_LocalPosition.z @@ -435728,7 +435883,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 8282617218565496284, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_Name @@ -435736,11 +435891,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: -79.71 + value: -48.655197 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: 18.07 + value: -33.45328 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -435752,15 +435907,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -435779,6 +435934,89 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} +--- !u!1 &1267682458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1267682461} + - component: {fileID: 1267682460} + - component: {fileID: 1267682459} + m_Layer: 0 + m_Name: LawnmowerStateMachine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1267682459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267682458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultState: {fileID: 0} + currentState: {fileID: 0} + _unityEventsFolded: 0 + verbose: 0 + allowReentry: 0 + returnToDefaultOnDisable: 1 + OnStateExited: + m_PersistentCalls: + m_Calls: [] + OnStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateExited: + m_PersistentCalls: + m_Calls: [] + OnLastStateEntered: + m_PersistentCalls: + m_Calls: [] + OnLastStateExited: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1267682460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267682458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1267682461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267682458} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 42.56, y: -6.97, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1070236898} + - {fileID: 1481757350} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1269931623 PrefabInstance: m_ObjectHideFlags: 0 @@ -436536,11 +436774,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.x - value: -8.17 + value: -15.6 objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.y - value: -20.82 + value: -20.5 objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.z @@ -436793,6 +437031,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} +--- !u!4 &1370055784 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} + m_PrefabInstance: {fileID: 4596770314561390347} + m_PrefabAsset: {fileID: 0} --- !u!1 &1373293417 GameObject: m_ObjectHideFlags: 0 @@ -437027,7 +437270,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 3889930985169105948, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_Name @@ -437035,11 +437278,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.x - value: -73.86 + value: -42.8052 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.y - value: -9.55 + value: -61.07328 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.z @@ -437051,15 +437294,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -437157,6 +437400,16 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1990424113} m_PrefabAsset: {fileID: 0} +--- !u!4 &1446072995 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + m_PrefabInstance: {fileID: 1477361338} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1456920209 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} + m_PrefabInstance: {fileID: 526986595} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1462232583 PrefabInstance: m_ObjectHideFlags: 0 @@ -437242,7 +437495,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 6629276459160142542, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_SortingOrder @@ -437258,11 +437511,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: -82 + value: -50.945198 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: 33.7 + value: -17.82328 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -437274,15 +437527,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -437301,6 +437554,50 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} +--- !u!1 &1481757349 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1481757350} + - component: {fileID: 1481757351} + m_Layer: 0 + m_Name: LawnmowerMoving + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1481757350 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1481757349} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -16.164562, y: 4.7475395, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1267682461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1481757351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1481757349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1482575303 PrefabInstance: m_ObjectHideFlags: 0 @@ -437902,8 +438199,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1541560529} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 67.42617, y: -43.2401, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 98.48097, y: -94.76338, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -437917,7 +438214,7 @@ Transform: - {fileID: 1979553424} - {fileID: 1463799736} - {fileID: 1413812638} - m_Father: {fileID: 0} + m_Father: {fileID: 764788851} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1544539799 PrefabInstance: @@ -438628,7 +438925,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 3889930985169105948, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_Name @@ -438648,11 +438945,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.x - value: -72.47 + value: -41.4152 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.y - value: -14.98 + value: -66.50328 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.z @@ -438664,15 +438961,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -438691,13 +438988,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f645a67c7970b124cacb6450fefdebad, type: 3} +--- !u!4 &1666087348 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + m_PrefabInstance: {fileID: 848791135} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1670940125 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 3889930985169105948, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_Name @@ -438717,11 +439019,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.x - value: -65.96 + value: -34.905197 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.y - value: -53.66 + value: -105.18328 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.z @@ -438733,15 +439035,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -438904,6 +439206,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1693995484} m_PrefabAsset: {fileID: 0} +--- !u!4 &1707431187 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + m_PrefabInstance: {fileID: 1267386603} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1718039814 PrefabInstance: m_ObjectHideFlags: 0 @@ -439203,6 +439510,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1753842381} m_PrefabAsset: {fileID: 0} +--- !u!4 &1756247657 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} + m_PrefabInstance: {fileID: 1655345416} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1758157935 PrefabInstance: m_ObjectHideFlags: 0 @@ -439988,7 +440300,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 8282617218565496284, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_Name @@ -439996,11 +440308,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: -74.74 + value: -43.685196 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: 7.64 + value: -43.88328 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -440012,15 +440324,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -441245,7 +441557,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 3889930985169105948, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_Name @@ -441257,11 +441569,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.x - value: -41.19 + value: -10.135199 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.y - value: 10.1 + value: -41.42328 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.z @@ -441273,15 +441585,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -441427,8 +441739,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 2067418934294973060, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} + m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} @@ -441646,6 +441957,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 2132554617} m_PrefabAsset: {fileID: 0} +--- !u!4 &2144703707 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} + m_PrefabInstance: {fileID: 197176882} + m_PrefabAsset: {fileID: 0} --- !u!1001 &322941695315393326 PrefabInstance: m_ObjectHideFlags: 0 @@ -441843,7 +442159,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1267682461} m_Modifications: - target: {fileID: 4901186366144297979, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: isOneTime @@ -441859,11 +442175,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalPosition.x - value: 41.58 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalPosition.y - value: -7.24 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalPosition.z @@ -441875,15 +442191,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -441900,7 +442216,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1070236899} m_SourcePrefab: {fileID: 100100000, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} --- !u!1001 &3485393201986366005 PrefabInstance: @@ -442009,6 +442328,38 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 538228069} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: GotoSpot + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: AnneLiseBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 733706650} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_LocalPosition.x value: -9.54 @@ -442085,7 +442436,8 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 488333850132012697, guid: 3346526f3046f424196615241a307104, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: @@ -442214,7 +442566,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 3889930985169105948, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_Name @@ -442222,11 +442574,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.x - value: -41.88 + value: -10.825201 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.y - value: 4.78 + value: -46.743282 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalPosition.z @@ -442238,15 +442590,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -442385,7 +442737,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 764788851} m_Modifications: - target: {fileID: 8282617218565496284, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_Name @@ -442393,11 +442745,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.x - value: -54.52 + value: -23.4652 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.y - value: 5.22 + value: -46.30328 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalPosition.z @@ -442409,15 +442761,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -442715,11 +443067,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 1076287748960351692, guid: 453e95ae096d01f4ea84920eaa52e63b, type: 3} propertyPath: m_LocalPosition.x - value: -5.5 + value: -12.93 objectReference: {fileID: 0} - target: {fileID: 1076287748960351692, guid: 453e95ae096d01f4ea84920eaa52e63b, type: 3} propertyPath: m_LocalPosition.y - value: -20.8 + value: -20.48 objectReference: {fileID: 0} - target: {fileID: 1076287748960351692, guid: 453e95ae096d01f4ea84920eaa52e63b, type: 3} propertyPath: m_LocalPosition.z @@ -442872,9 +443224,7 @@ SceneRoots: m_Roots: - {fileID: 1653475493} - {fileID: 1073425384} - - {fileID: 1045750401} - - {fileID: 1226458587} - - {fileID: 1195627204} + - {fileID: 764788851} - {fileID: 264885659} - {fileID: 1137411211} - {fileID: 312860098} @@ -442882,35 +443232,16 @@ SceneRoots: - {fileID: 1363194738} - {fileID: 2926576032425091693} - {fileID: 1794862441} - - {fileID: 965792696} - - {fileID: 1541560530} - - {fileID: 3268506515308568021} - {fileID: 7535757761066548300} - {fileID: 7731287911925225729} - {fileID: 4656836127232412646} - {fileID: 5320929981885366459} - - {fileID: 5288063114372713135} - - {fileID: 1477361338} - - {fileID: 1855602864} - - {fileID: 1267386603} - - {fileID: 197176882} - - {fileID: 848791135} - - {fileID: 1044802807} - - {fileID: 4596770314561390347} - - {fileID: 2099596042} - - {fileID: 1430501396} - - {fileID: 1655345416} - - {fileID: 1670940125} - {fileID: 7530821580781571560} - {fileID: 8013274907828598643} - {fileID: 3978117984697153445} - {fileID: 3708074769586677211} - {fileID: 5061531048637107478} - {fileID: 322941695315393326} - - {fileID: 28205340} - - {fileID: 526986595} - - {fileID: 196802142} - - {fileID: 1256486233} - {fileID: 3485393201986366005} - {fileID: 1373293420} - {fileID: 1032520927} @@ -442922,3 +443253,4 @@ SceneRoots: - {fileID: 2117822310} - {fileID: 122256018} - {fileID: 1101333109} + - {fileID: 1267682461} diff --git a/Assets/Scripts/DamianExperiments/Gardener.prefab b/Assets/Scripts/DamianExperiments/Gardener.prefab new file mode 100644 index 00000000..8c9828e2 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/Gardener.prefab @@ -0,0 +1,186 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &277562128272848195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 249029427890415945} + - component: {fileID: 8669923946467467544} + m_Layer: 0 + m_Name: GardenerChaseState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &249029427890415945 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277562128272848195} + 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: 3773641007251837342} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8669923946467467544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277562128272848195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5634601970195484129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5969249088313380091} + - component: {fileID: 8741941670841680830} + m_Layer: 0 + m_Name: GardenerIdleState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5969249088313380091 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5634601970195484129} + 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: 3773641007251837342} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8741941670841680830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5634601970195484129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7821713087316151254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3773641007251837342} + - component: {fileID: 3270057320425534415} + - component: {fileID: 8244548860977619315} + - component: {fileID: 3901496808324947611} + m_Layer: 0 + m_Name: Gardener + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3773641007251837342 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7821713087316151254} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 35.9931, y: 1.21847, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5969249088313380091} + - {fileID: 249029427890415945} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3270057320425534415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7821713087316151254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8244548860977619315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7821713087316151254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultState: {fileID: 0} + currentState: {fileID: 0} + _unityEventsFolded: 0 + verbose: 0 + allowReentry: 0 + returnToDefaultOnDisable: 1 + OnStateExited: + m_PersistentCalls: + m_Calls: [] + OnStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateExited: + m_PersistentCalls: + m_Calls: [] + OnLastStateEntered: + m_PersistentCalls: + m_Calls: [] + OnLastStateExited: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3901496808324947611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7821713087316151254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ad080e6ca3114e4e96ccc33655d3dff, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scripts/DamianExperiments/Gardener.prefab.meta b/Assets/Scripts/DamianExperiments/Gardener.prefab.meta new file mode 100644 index 00000000..a4f8e080 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/Gardener.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e6a6dfa92b2dc4940bfc687954961caa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DamianExperiments/SoundGenerator.cs b/Assets/Scripts/DamianExperiments/GardenerBehaviour.cs similarity index 77% rename from Assets/Scripts/DamianExperiments/SoundGenerator.cs rename to Assets/Scripts/DamianExperiments/GardenerBehaviour.cs index c3266031..709eedc2 100644 --- a/Assets/Scripts/DamianExperiments/SoundGenerator.cs +++ b/Assets/Scripts/DamianExperiments/GardenerBehaviour.cs @@ -1,6 +1,8 @@ using UnityEngine; +using Pixelplacement; -public class SoundGenerator : MonoBehaviour + +public class GardenerBehaviour : MonoBehaviour { // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() diff --git a/Assets/Scripts/DamianExperiments/GardenerBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/GardenerBehaviour.cs.meta new file mode 100644 index 00000000..bd2287a7 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/GardenerBehaviour.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4ad080e6ca3114e4e96ccc33655d3dff \ No newline at end of file diff --git a/Assets/Scripts/DamianExperiments/SoundGenerator.cs.meta b/Assets/Scripts/DamianExperiments/SoundGenerator.cs.meta deleted file mode 100644 index f6e8da07..00000000 --- a/Assets/Scripts/DamianExperiments/SoundGenerator.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 6975820127985294189da1bb0aff735b \ No newline at end of file