diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/HidingTreePLACEHOLDER.png.meta b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/HidingTreePLACEHOLDER.png.meta index fc940e43..07bfa16e 100644 --- a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/HidingTreePLACEHOLDER.png.meta +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/HidingTreePLACEHOLDER.png.meta @@ -134,7 +134,7 @@ TextureImporter: width: 3208 height: 2484 alignment: 9 - pivot: {x: 0.49802017, y: 0.15865843} + pivot: {x: 0.5, y: 0.1} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LuringSpotDPLACEHOLDER.png b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LuringSpotDPLACEHOLDER.png new file mode 100644 index 00000000..0db41268 Binary files /dev/null and b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LuringSpotDPLACEHOLDER.png differ diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LuringSpotDPLACEHOLDER.png.meta b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LuringSpotDPLACEHOLDER.png.meta new file mode 100644 index 00000000..0d1f62b6 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/LuringSpotDPLACEHOLDER.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: ea3872c995702e04baebf37cd37626f6 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8928052460210529247 + second: LuringSpotDPLACEHOLDER_0 + 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: LuringSpotDPLACEHOLDER_0 + rect: + serializedVersion: 2 + x: 12 + y: 7 + width: 575 + height: 278 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 12c591d179f291480800000000000000 + internalID: -8928052460210529247 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + LuringSpotDPLACEHOLDER_0: -8928052460210529247 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LuringSpotDPLACEHOLDER.mat b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LuringSpotDPLACEHOLDER.mat new file mode 100644 index 00000000..5cd2ab68 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LuringSpotDPLACEHOLDER.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: LuringSpotDPLACEHOLDER + 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: ea3872c995702e04baebf37cd37626f6, 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/LuringSpotDPLACEHOLDER.mat.meta b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LuringSpotDPLACEHOLDER.mat.meta new file mode 100644 index 00000000..cba43df5 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/Materials/LuringSpotDPLACEHOLDER.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 927cba2ce619c3d438cea66ee1bc77aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/SignPlaceholder.png b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/SignPlaceholder.png new file mode 100644 index 00000000..7c16c933 Binary files /dev/null and b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/SignPlaceholder.png differ diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/SignPlaceholder.png.meta b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/SignPlaceholder.png.meta new file mode 100644 index 00000000..b7680c44 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Placeholders/SignPlaceholder.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 5f4dc8160acb88f47908cdfa8d633948 +TextureImporter: + internalIDToNameTable: + - first: + 213: 8882433697162667315 + second: SignPlaceholder_0 + 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: SignPlaceholder_0 + rect: + serializedVersion: 2 + x: 2 + y: 3 + width: 132 + height: 115 + 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: 335275ce26eb44b70800000000000000 + internalID: 8882433697162667315 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 386cf20705a154847969f36b36a53926 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + SignPlaceholder_0: 8882433697162667315 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index a05dde66..4e39aca9 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -1944,7 +1944,7 @@ TilemapRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: cba74e1bf006eed439d8cc2938aeddf1, type: 2} + - {fileID: 2100000, guid: 927cba2ce619c3d438cea66ee1bc77aa, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -429476,7 +429476,7 @@ Transform: m_GameObject: {fileID: 368957766} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -63.1, y: 78.8, z: 0} + m_LocalPosition: {x: -74.36, y: 58.35, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -431206,6 +431206,93 @@ PolygonCollider2D: - {x: 61.286705, y: -30.626768} - {x: 53.694706, y: -58.7692} m_UseDelaunayMesh: 0 +--- !u!1 &552754829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 552754830} + - component: {fileID: 552754831} + m_Layer: 0 + m_Name: Sign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &552754830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552754829} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.856, y: -0.618, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1923065564} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &552754831 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552754829} + 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: 1 + m_Sprite: {fileID: 8882433697162667315, guid: 5f4dc8160acb88f47908cdfa8d633948, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.32, y: 1.15} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &561092052 PrefabInstance: m_ObjectHideFlags: 0 @@ -435895,7 +435982,7 @@ MonoBehaviour: CustomLookAtTarget: 0 Lens: FieldOfView: 60 - OrthographicSize: 18.154158 + OrthographicSize: 15 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -440456,7 +440543,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 18.154158 + orthographic size: 15 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -442639,6 +442726,94 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1917048286} m_PrefabAsset: {fileID: 0} +--- !u!1 &1923065562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1923065564} + - component: {fileID: 1923065563} + m_Layer: 0 + m_Name: LureSpotD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1923065563 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1923065562} + 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: -8928052460210529247, guid: ea3872c995702e04baebf37cd37626f6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.75, y: 2.78} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1923065564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1923065562} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -73.71, y: 56.93, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 552754830} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1926702336 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} @@ -444556,7 +444731,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 588897581313790951, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -444576,11 +444751,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.026 objectReference: {fileID: 0} - target: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: m_LocalPosition.z @@ -444650,6 +444825,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 7446805773477066560, guid: a74f9c023604a5745bf509a011dc12cf, type: 3} + - target: {fileID: 8875860401447896107, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -445004,6 +445183,10 @@ PrefabInstance: propertyPath: m_Name value: HidingTree objectReference: {fileID: 0} + - target: {fileID: 5328317679980282276, guid: 65ec1c071829bf649a3393368237ad7f, type: 3} + propertyPath: m_LocalPosition.y + value: -1.23 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -445460,11 +445643,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} propertyPath: m_LocalPosition.x - value: -31.4 + value: -54.88 objectReference: {fileID: 0} - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} propertyPath: m_LocalPosition.y - value: 73.3 + value: 57.23 objectReference: {fileID: 0} - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} propertyPath: m_LocalPosition.z @@ -445834,14 +446017,15 @@ SceneRoots: - {fileID: 5320929981885366459} - {fileID: 7530821580781571560} - {fileID: 8013274907828598643} - - {fileID: 3978117984697153445} - {fileID: 3708074769586677211} + - {fileID: 3978117984697153445} + - {fileID: 1923065564} + - {fileID: 368957768} + - {fileID: 5541405231515088532} - {fileID: 5061531048637107478} - {fileID: 322941695315393326} - {fileID: 1373293420} - {fileID: 1032520927} - - {fileID: 368957768} - - {fileID: 5541405231515088532} - {fileID: 1295249126} - {fileID: 520186664} - {fileID: 1328912324} diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBirdFlying_AnimController.controller b/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBirdFlying_AnimController.controller new file mode 100644 index 00000000..ed61b32e --- /dev/null +++ b/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBirdFlying_AnimController.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9082460045118270542 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: soundBird_flying + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d2469df5202f749479c5a5e5d86c5997, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: soundBirdFlying_AnimController + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8344227429564898380} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &8344227429564898380 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -9082460045118270542} + m_Position: {x: 30, y: 220, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -9082460045118270542} diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBirdFlying_AnimController.controller.meta b/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBirdFlying_AnimController.controller.meta new file mode 100644 index 00000000..63575862 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Animations/soundBirdFlying_AnimController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a272088daa2501d44bfa885ef01b18db +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: