From 79fac9db1029ab746c954ccde258bfd9c54de2e0 Mon Sep 17 00:00:00 2001 From: Damian Date: Tue, 30 Sep 2025 12:21:51 +0200 Subject: [PATCH] Commit to have everything at home --- .../Birds/FootballBird/footballBirdIdle.anim | 121 ++++++++++++------ Assets/Scenes/Levels/Quarry.unity | 78 +++++++++-- 2 files changed, 150 insertions(+), 49 deletions(-) diff --git a/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim b/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim index 82b0a9ea..2cad808e 100644 --- a/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim +++ b/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim @@ -21,35 +21,65 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -4526961168388097183, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.06666667 - value: {fileID: 6678378708250765366, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.15 - value: {fileID: 5257109183276098871, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.21666667 - value: {fileID: -6365386246741988032, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: -5887797107415598781, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.033333335 + value: {fileID: 4182169172090052087, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.083333336 + value: {fileID: 5581204054166165482, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.11666667 + value: {fileID: 6281513458818790246, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.16666667 + value: {fileID: -2157038173507977873, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.2 + value: {fileID: 7675767991158271130, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.23333333 + value: {fileID: -3809834153560938047, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.28333333 - value: {fileID: -6166410269971174550, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.35 - value: {fileID: -697087381347587415, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.43333334 - value: {fileID: -8526899043302120773, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.5 - value: {fileID: -2697202594669319986, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 7797799588708644691, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.31666666 + value: {fileID: -3694855373773427773, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.36666667 + value: {fileID: -772774839854160401, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.4 + value: {fileID: 2775065027350882613, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.45 + value: {fileID: -5969551015847070333, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.48333332 + value: {fileID: -6815726516011099956, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.51666665 + value: {fileID: 3018889940081707026, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.56666666 - value: {fileID: 1537021138919000452, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 3490090362724945448, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.6 + value: {fileID: 4386831219829939925, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.65 - value: {fileID: -441064275176934823, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: -6530143234255615529, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.68333334 + value: {fileID: 7096009967814692052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.71666664 - value: {fileID: -3513104290579005075, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.78333336 - value: {fileID: -3332844303632730036, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 6319826433179223563, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.76666665 + value: {fileID: -5952344288683761052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.8 + value: {fileID: -7201094444470444464, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.85 - value: {fileID: -1408805331151090596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 2104556673111889494, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.8833333 + value: {fileID: -3089917731664936424, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.93333334 - value: {fileID: 7381092181848048596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 8331946793720757423, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.96666664 + value: {fileID: -3625782473088726632, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 1 - value: {fileID: -3846425930340267890, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: -7661119854620563729, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 1.05 + value: {fileID: -5647685865876279807, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 1.0833334 + value: {fileID: 7992653244893361835, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 1.1333333 + value: {fileID: 5254102076834024576, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 1.1666666 + value: {fileID: -523328932758371747, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} attribute: m_Sprite path: classID: 212 @@ -72,27 +102,42 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: -4526961168388097183, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 6678378708250765366, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 5257109183276098871, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -6365386246741988032, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -6166410269971174550, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -697087381347587415, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -8526899043302120773, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -2697202594669319986, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 1537021138919000452, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -441064275176934823, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -3513104290579005075, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -3332844303632730036, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -1408805331151090596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 7381092181848048596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -3846425930340267890, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + - {fileID: -5887797107415598781, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 4182169172090052087, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 5581204054166165482, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 6281513458818790246, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -2157038173507977873, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 7675767991158271130, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -3809834153560938047, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 7797799588708644691, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -3694855373773427773, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -772774839854160401, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 2775065027350882613, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -5969551015847070333, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -6815726516011099956, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 3018889940081707026, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 3490090362724945448, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 4386831219829939925, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -6530143234255615529, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 7096009967814692052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 6319826433179223563, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -5952344288683761052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -7201094444470444464, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 2104556673111889494, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -3089917731664936424, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 8331946793720757423, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -3625782473088726632, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -7661119854620563729, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -5647685865876279807, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 7992653244893361835, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 5254102076834024576, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -523328932758371747, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 1.1833333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index d86045cb..ba114e47 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -434790,11 +434790,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalPosition.x - value: 64.02 + value: 60.12 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalPosition.y - value: 33.47 + value: 34.71 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalPosition.z @@ -435233,7 +435233,8 @@ GameObject: m_Component: - component: {fileID: 552754830} - component: {fileID: 552754831} - m_Layer: 0 + - component: {fileID: 552754832} + m_Layer: 6 m_Name: Sign m_TagString: Untagged m_Icon: {fileID: 0} @@ -435248,12 +435249,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -27.55, y: 51.64, z: 0} + m_LocalScale: {x: 4.8086, y: 4.8086, z: 4.8086} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1923065564} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &552754831 SpriteRenderer: @@ -435312,7 +435313,58 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 +--- !u!60 &552754832 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552754829} + 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.2} + oldSize: {x: 1.32, y: 1.15} + newSize: {x: 1.32, y: 1.15} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.64769787, y: 0.056594986} + - {x: 0.57684666, y: 0.06930435} + - {x: 0.58312255, y: 0.42421705} + - {x: -0.38253227, y: 0.42578614} + m_UseDelaunayMesh: 0 --- !u!1001 &561092052 PrefabInstance: m_ObjectHideFlags: 0 @@ -453908,8 +453960,7 @@ Transform: m_LocalPosition: {x: -84.21, y: 75.91, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 552754830} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1926702336 stripped @@ -458134,6 +458185,10 @@ PrefabInstance: propertyPath: m_Name value: BallTree objectReference: {fileID: 0} + - target: {fileID: 8897661028274890141, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -458521,11 +458576,11 @@ SceneRoots: - {fileID: 1923065564} - {fileID: 368957768} - {fileID: 487455852} + - {fileID: 552754830} - {fileID: 322941695315393326} - {fileID: 1373293420} - {fileID: 1032520927} - {fileID: 1295249126} - - {fileID: 520186664} - {fileID: 1328912324} - {fileID: 2117822310} - {fileID: 122256018} @@ -458535,3 +458590,4 @@ SceneRoots: - {fileID: 719063943} - {fileID: 1631506257} - {fileID: 317149914} + - {fileID: 520186664}