diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 94819bd8..b262d1bb 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077 m_currentHash: serializedVersion: 2 - Hash: 589e22fe6cd2fe0e25d89bd44a35bcbc + Hash: 5d095a69a9cdfb1725b1970d9ea73af3 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Art/Animations/Characters/Butterfly/Bottle_breaking.anim b/Assets/Art/Animations/Characters/Butterfly/Bottle_breaking.anim new file mode 100644 index 00000000..08798c29 --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/Bottle_breaking.anim @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bottle_breaking + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 189697122, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - time: 0.06666667 + value: {fileID: -1909002889, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - time: 0.13333334 + value: {fileID: 1558355578, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - time: 0.2 + value: {fileID: 1034699291, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - time: 0.26666668 + value: {fileID: -2049972490, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 30 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 189697122, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - {fileID: -1909002889, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - {fileID: 1558355578, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - {fileID: 1034699291, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - {fileID: -2049972490, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.3 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Butterfly/Bottle_breaking.anim.meta b/Assets/Art/Animations/Characters/Butterfly/Bottle_breaking.anim.meta new file mode 100644 index 00000000..c8ce1756 --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/Bottle_breaking.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ffdb9d6e604209f46947e5c1cbc84c06 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Butterfly/Butterfly_Bottle.controller b/Assets/Art/Animations/Characters/Butterfly/Butterfly_Bottle.controller new file mode 100644 index 00000000..585b5a68 --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/Butterfly_Bottle.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6003804408019435689 +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: -5307821166185472800} + m_Position: {x: 80, y: 280, 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: -5307821166185472800} +--- !u!1102 &-5307821166185472800 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bottle_breaking + 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: ffdb9d6e604209f46947e5c1cbc84c06, 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: Butterfly_Bottle + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6003804408019435689} + 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} diff --git a/Assets/Art/Animations/Characters/Butterfly/Butterfly_Bottle.controller.meta b/Assets/Art/Animations/Characters/Butterfly/Butterfly_Bottle.controller.meta new file mode 100644 index 00000000..18c29aaa --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/Butterfly_Bottle.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 117ea4e1a9a05d1449227094620990e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Butterfly/bottle_whole.anim b/Assets/Art/Animations/Characters/Butterfly/bottle_whole.anim new file mode 100644 index 00000000..024f8a9a --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/bottle_whole.anim @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: bottle_whole + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1909002889, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - time: 0.06666667 + value: {fileID: -1909002889, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - time: 0.13333334 + value: {fileID: 1558355578, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - time: 0.2 + value: {fileID: 1034699291, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - time: 0.26666668 + value: {fileID: -2049972490, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 30 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1909002889, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - {fileID: -1909002889, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - {fileID: 1558355578, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - {fileID: 1034699291, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + - {fileID: -2049972490, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.3 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Butterfly/bottle_whole.anim.meta b/Assets/Art/Animations/Characters/Butterfly/bottle_whole.anim.meta new file mode 100644 index 00000000..bd2a070a --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/bottle_whole.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb928614ea33d2248b0111d692dde12a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.png b/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.png new file mode 100644 index 00000000..5fb6ff93 Binary files /dev/null and b/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.png differ diff --git a/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.png.meta b/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.png.meta new file mode 100644 index 00000000..a9deab79 --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.png.meta @@ -0,0 +1,294 @@ +fileFormatVersion: 2 +guid: 88ebd40823d503a44af6d726c6b5aab5 +TextureImporter: + internalIDToNameTable: [] + 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: 50 + 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: iOS + 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: 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: WindowsStoreApps + 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: butterfly_bottle0001 + rect: + serializedVersion: 2 + x: 1 + y: 1694 + width: 230 + height: 353 + alignment: 9 + pivot: {x: 0.54347825, y: 0.0509915} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 818684c2b9a81f040ba52c66f3bd8ffb + internalID: -1317397836 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: butterfly_bottle0010 + rect: + serializedVersion: 2 + x: 233 + y: 1695 + width: 286 + height: 352 + alignment: 9 + pivot: {x: 0.48601398, y: 0.0028409092} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d2e26d456613c414a891a21373d7e563 + internalID: 189697122 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: butterfly_bottle0012 + rect: + serializedVersion: 2 + x: 1 + y: 1210 + width: 476 + height: 482 + alignment: 9 + pivot: {x: 0.5840336, y: 0.016597511} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b881034128731d144a6e0e21ed1bbd92 + internalID: -1909002889 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: butterfly_bottle0014 + rect: + serializedVersion: 2 + x: 479 + y: 1139 + width: 491 + height: 553 + alignment: 9 + pivot: {x: 0.592668, y: -0.07775769} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 34d0ad34c7113e9458950d5786836a54 + internalID: 1558355578 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: butterfly_bottle0016 + rect: + serializedVersion: 2 + x: 1 + y: 791 + width: 601 + height: 346 + alignment: 9 + pivot: {x: 0.5357737, y: -0.0433526} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6bdf5d15df30ac9478e491fab79e7384 + internalID: 1034699291 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: butterfly_bottle0018 + rect: + serializedVersion: 2 + x: 521 + y: 1884 + width: 407 + height: 163 + alignment: 9 + pivot: {x: 0.6093366, y: 0.5092025} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e9d4bd12cbd256a478f498e1705b3750 + internalID: -2049972490 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: a43d45d547058764b9c7736a01a176bf + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + butterfly_bottle0001: -1317397836 + butterfly_bottle0010: 189697122 + butterfly_bottle0012: -1909002889 + butterfly_bottle0014: 1558355578 + butterfly_bottle0016: 1034699291 + butterfly_bottle0018: -2049972490 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.tpsheet b/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.tpsheet new file mode 100644 index 00000000..557c34d9 --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.tpsheet @@ -0,0 +1,21 @@ +# +# Sprite sheet data for Unity. +# +# To import these sprites into your Unity project, download "TexturePackerImporter": +# https://www.codeandweb.com/texturepacker/unity +# +# $TexturePacker:SmartUpdate:7e4012bafb9e0dc5f1a09fab8f0933ae:623edb46e428a105939a0ec8cbd2a4f4:536c3ad91c589edb78e5a083400aa456$ +# +:format=40300 +:texture=butterfly_bottle.png +:size=1024x2048 +:pivotpoints=enabled +:borders=disabled +:alphahandling=ClearTransparentPixels + +butterfly_bottle0001;1;1694;230;353; 0.5434782608695652;0.05099150141643061; 0;0;0;0; 8;230;337;230;38;177;4;104;0;37;15;6;46;0;352;177;353; 6;5;6;7;1;5;7;3;4;5;1;2;3;1;3;5;0;1;7 +butterfly_bottle0010;233;1695;286;352; 0.486013986013986;0.0028409090909090606; 0;0;0;0; 20;215;308;286;261;264;197;188;156;196;147;260;178;271;50;211;16;109;0;120;37;83;7;25;25;5;56;0;149;71;154;62;183;46;161;7;176;0;294;97;352; 18;15;18;19;17;18;15;17;15;16;0;3;15;12;13;14;11;9;10;11;12;9;4;7;9;9;12;14;7;8;9;3;9;14;4;5;6;4;6;7;3;4;9;3;14;15;0;1;2;0;2;3;0;15;19 +butterfly_bottle0012;1;1210;476;482; 0.5840336134453782;0.016597510373444035; 0;0;0;0; 41;310;422;401;338;426;243;401;212;476;137;462;71;389;0;383;59;341;46;332;90;318;88;387;221;358;230;361;266;285;269;283;236;241;234;241;200;206;230;159;303;220;370;171;434;184;462;219;482;66;130;133;115;136;92;162;74;131;18;64;4;38;33;0;111;63;143;164;364;154;338;154;263;120;277;80;240;47;273;95;366;121;386; 35;20;22;23;20;21;22;14;16;19;16;17;18;16;18;19;14;19;20;14;15;16;0;14;20;14;0;1;11;12;13;9;10;11;3;9;11;7;8;9;5;6;7;4;5;7;3;4;7;3;7;9;2;3;11;2;11;13;14;1;13;13;1;2;0;20;23;24;31;32;30;28;29;26;27;28;30;26;28;26;30;24;26;24;25;24;30;31;34;39;40;38;36;37;38;39;36;34;35;36;34;36;39;33;34;40 +butterfly_bottle0014;479;1139;491;553; 0.5926680244399185;-0.07775768535262206; 0;0;0;0; 33;72;132;73;125;141;95;113;71;159;52;113;0;35;4;0;133;491;144;473;91;426;117;413;79;388;96;365;94;313;233;465;245;105;297;114;195;83;198;45;162;8;181;43;309;309;507;326;421;341;307;245;270;199;299;193;337;158;336;182;372;235;427;226;536;279;553; 25;3;5;6;3;4;5;1;3;6;1;2;3;1;6;7;0;1;7;10;14;15;13;14;10;13;10;12;10;11;12;8;9;10;8;10;15;18;19;20;18;20;21;16;17;18;16;18;21;22;31;32;27;29;30;27;28;29;27;30;24;23;24;30;25;26;27;27;24;25;22;23;30;22;30;31 +butterfly_bottle0016;1;791;601;346; 0.5357737104825291;-0.043352601156069426; 0;0;0;0; 33;601;75;553;47;491;56;491;12;441;0;330;94;424;162;506;130;523;166;569;170;152;179;121;152;132;135;189;110;173;97;205;65;162;15;88;19;58;92;9;109;0;138;91;214;433;284;371;241;389;202;356;139;331;142;312;106;278;119;225;215;197;258;265;299;417;346; 27;7;8;9;2;6;7;5;6;2;0;7;9;2;3;4;5;2;4;1;2;7;0;1;7;11;20;21;18;19;20;18;11;12;17;18;14;14;15;16;12;13;14;17;14;16;18;12;14;11;18;20;10;11;21;23;31;32;29;30;31;29;31;23;26;27;28;24;25;26;23;24;26;29;23;26;29;26;28;22;23;32 +butterfly_bottle0018;521;1884;407;163; 0.6093366093366094;0.50920245398773; 0;0;0;0; 17;350;136;382;136;407;39;363;14;253;0;183;14;163;30;67;5;60;27;0;49;16;144;81;149;164;110;179;141;204;123;243;162;301;163; 15;14;15;16;12;13;14;8;11;12;10;8;9;6;12;14;10;11;8;4;14;16;8;6;7;6;8;12;5;6;14;4;5;14;0;3;4;0;2;3;0;1;2;0;4;16 diff --git a/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.tpsheet.meta b/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.tpsheet.meta new file mode 100644 index 00000000..e36382da --- /dev/null +++ b/Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.tpsheet.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d67be9c7dfdb8a845ba5e3b2371bf485 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External/Plugins/codeandweb.com/Editor/SettingsTexturePackerImporter.txt b/Assets/External/Plugins/codeandweb.com/Editor/SettingsTexturePackerImporter.txt index aed2d9f3..a17b5b45 100644 --- a/Assets/External/Plugins/codeandweb.com/Editor/SettingsTexturePackerImporter.txt +++ b/Assets/External/Plugins/codeandweb.com/Editor/SettingsTexturePackerImporter.txt @@ -1,5 +1,6 @@ version: 2 tpsheetFileNames: +- Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.tpsheet - Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_1.tpsheet - Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_2.tpsheet - Assets/Art/Sprites/Spritesheets/Characters/Gardener/Gardener-IdleRun.tpsheet @@ -30,6 +31,7 @@ tpsheetFileNames: - Assets/Art/Sprites/Spritesheets/Quarry/Trees&Bushes/Trees.tpsheet - Assets/External/Plugins/codeandweb.com/Example/SpriteSheet/sprites.tpsheet textureFileNames: +- Assets/Art/Animations/Characters/Butterfly/butterfly_bottle.png - Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_1.png - Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_2.png - Assets/Art/Sprites/Spritesheets/Characters/Gardener/Gardener-IdleRun.png @@ -88,5 +90,6 @@ normalmapFileNames: - - - +- - Assets/External/Plugins/codeandweb.com/Example/SpriteSheet/sprites_n.png enableDebugOutput: 0 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 79f441f4..88614d9b 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -442187,6 +442187,96 @@ Transform: - {fileID: 627816177} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &768267913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 768267914} + - component: {fileID: 768267916} + m_Layer: 0 + m_Name: Bottle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &768267914 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768267913} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.16, y: -3.06, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1046094549} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &768267916 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768267913} + 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: 9dfc825aed78fcd4ba02077103263b40, 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: 0 + m_Sprite: {fileID: -1317397836, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.6, y: 7.06} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &768791149 PrefabInstance: m_ObjectHideFlags: 0 @@ -443784,6 +443874,119 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} +--- !u!1 &859765886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 859765887} + - component: {fileID: 859765889} + - component: {fileID: 859765888} + m_Layer: 0 + m_Name: BreakingBottle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &859765887 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 859765886} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.15999985, y: -3.0600014, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2136071208} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &859765888 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 859765886} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 117ea4e1a9a05d1449227094620990e1, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &859765889 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 859765886} + 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: 9dfc825aed78fcd4ba02077103263b40, 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: 0 + m_Sprite: {fileID: -1317397836, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.6, y: 7.06} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &862617145 GameObject: m_ObjectHideFlags: 0 @@ -447391,6 +447594,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 768267914} - {fileID: 1351976589} m_Father: {fileID: 1471606854} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -454160,7 +454364,7 @@ GameObject: - component: {fileID: 1351976591} - component: {fileID: 1351976590} m_Layer: 0 - m_Name: Animation + m_Name: Butterfly m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -460780,6 +460984,96 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f645a67c7970b124cacb6450fefdebad, type: 3} +--- !u!1 &1679697300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1679697302} + - component: {fileID: 1679697301} + m_Layer: 0 + m_Name: butterfly_bottle0001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1679697301 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679697300} + 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: 9dfc825aed78fcd4ba02077103263b40, 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: 0 + m_Sprite: {fileID: -1899403440, guid: 88ebd40823d503a44af6d726c6b5aab5, 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.8, y: 2.79} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1679697302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679697300} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 23.766657, y: 43.09835, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1682217633 stripped Animator: m_CorrespondingSourceObject: {fileID: 1798693240065965692, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} @@ -470446,6 +470740,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 859765887} - {fileID: 2143678520} - {fileID: 495112254} - {fileID: 1807522040} @@ -472407,3 +472702,4 @@ SceneRoots: - {fileID: 1374202465} - {fileID: 519077570} - {fileID: 708284666} + - {fileID: 1679697302}