diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 480e504a..8e4c5ea7 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077 m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: 8453796ea514a8db40e72d511ee4981c m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png b/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png new file mode 100644 index 00000000..b6a63b6a Binary files /dev/null and b/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png differ diff --git a/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png.meta b/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png.meta new file mode 100644 index 00000000..57abb121 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 668c87ebe73766b4db3e746ff563ad69 +TextureImporter: + internalIDToNameTable: + - first: + 213: 844622183060740761 + second: VanHorn_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 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: VanHorn_0 + rect: + serializedVersion: 2 + x: 6 + y: 5 + width: 1014 + height: 560 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 99a10c68663b8bb00800000000000000 + internalID: 844622183060740761 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 139ed722a885930418cf53c13f07ee08 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + VanHorn_0: 844622183060740761 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index c1cbf89d..8650e1e8 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -3364,11 +3364,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} propertyPath: m_LocalPosition.x - value: -15.5 + value: -8.45 objectReference: {fileID: 0} - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} propertyPath: m_LocalPosition.y - value: 11.659996 + value: 22.23 objectReference: {fileID: 0} - target: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} propertyPath: m_LocalPosition.z @@ -3687,15 +3687,15 @@ PrefabInstance: objectReference: {fileID: 5354429476588687777, guid: 3e3572e2fbf4ff54380698853f8ab0aa, type: 3} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingLayer - value: -1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingLayerID - value: 622133659 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -435820,6 +435820,154 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 474389476} m_PrefabAsset: {fileID: 0} +--- !u!1 &477911179 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 477911181} + - component: {fileID: 477911180} + - component: {fileID: 477911182} + m_Layer: 6 + m_Name: HonkVan + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &477911180 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 477911179} + 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_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 844622183060740761, guid: 668c87ebe73766b4db3e746ff563ad69, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.14, y: 5.6} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &477911181 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 477911179} + serializedVersion: 2 + m_LocalRotation: {x: 0.16886805, y: -0.20227915, z: 0.7163939, w: 0.64602363} + m_LocalPosition: {x: -89.78, y: 88.36, z: 0} + m_LocalScale: {x: 2.15, y: 2.15, z: 2.15} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 149.469, y: 178.709, z: 275.561} +--- !u!60 &477911182 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 477911179} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.14, y: 5.6} + newSize: {x: 10.14, y: 5.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 2.2757857, y: 2.821073} + - {x: -0.36286634, y: 2.9950478} + - {x: -3.4852796, y: 2.5341988} + - {x: -3.5728161, y: -1.6707145} + - {x: -3.1224277, y: -1.9745836} + - {x: -2.9748297, y: -2.466637} + - {x: -2.4734945, y: -2.682305} + - {x: -0.9284875, y: -2.1239066} + - {x: -0.09412837, y: -2.2568245} + - {x: 2.0889058, y: -1.5573757} + m_UseDelaunayMesh: 0 --- !u!1001 &486936930 PrefabInstance: m_ObjectHideFlags: 0 @@ -438656,15 +438804,15 @@ PrefabInstance: objectReference: {fileID: 1597045161386275989, guid: 1ff916930ee2da84a944393ccde4ef00, type: 3} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingLayer - value: -1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingLayerID - value: 622133659 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -457673,15 +457821,15 @@ PrefabInstance: objectReference: {fileID: 5490517706564299302, guid: 89d6c00990280a34daf9879f70645f29, type: 3} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingLayer - value: -1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} propertyPath: m_SortingLayerID - value: 622133659 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -468478,3 +468626,4 @@ SceneRoots: - {fileID: 1548124686061025687} - {fileID: 1070397503} - {fileID: 841182293} + - {fileID: 477911181}