From 2c1394feb6e6a3bf5f14ce5867b99263f61fb297 Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Tue, 23 May 2023 00:09:46 -0400 Subject: [PATCH] Munchy Monk Finalized (#432) * stache stuff (still needs more work but yeah) * new icon (TEMPORARY ICON!!!) * some placeholder animations * more two two jank fixed, almost there * superscroll + fixing early misses * made a few temporary changes to superscroll.cs, i will be modifying it further for ease of use but for now it isn't permanent * made real progress on stopping repeat inputs -game is basically broken for the time being, but i wanna push this so nothing theoretically breaks. ill fix it all tomorrow when im less tired * it's been a while since i've committed my changes * modifiers work again (idk if i broke that in this commit or it was already broken) * stacking logic is here!!! it always uses the latest objects' hit/miss/early function so it should be perfect. i might be able to improve on efficiency tho -FollowHand animation is broken again unfortunately :( * dumplings can now be individually colored, and are assigned their colors in Start(). the smear's colors are defined on Hit() (HitFunction() to be specific) , so that even when there are multiple stacked dumplings, they'll all be accurate. maybe some other stuff but i cannot remember * clean-up + integral fixes onto Monk Move and SingleSuperScroll i think ill add some more comments too * fixed some missing/early stuff + a check for whether you can hit or not * fixed FollowHand animation and the squishing/dumpling on top * cleaned up a ton of unused variables + checks + anims * added unused sound sequences -ig if somebody knows how to use them they can implement them but idk how to and it's not worth figuring out rn * more work on superscroll; there seems to be too many changes to the structure of the script to keep the single scrolling in with the tile scrolling, will combine if necessary tho * fanClub/arisa_dab * monk move!! still working on singlesuperscroll :sob: but i got the monk moving!! * a few optimizations + starting on new singlesuperscroll * ok ScrollObject is usable now oh my GOD i need to optimize how it looks and functions but rn it works like it will when it's done (theoretically) ev do ur work * a few things + new icon!! * scroll speeds are good now * finished except for the stache bop :sob: :sob: :sob: :sob: :sob: why isn't it working * im pring this now --------- Co-authored-by: ev <85412919+evdial@users.noreply.github.com> --- Assets/Resources/Games/munchyMonk.prefab | 2389 +++++++++++------ Assets/Resources/Games/munchyMonk.prefab.meta | 4 +- .../Editor/GameIcons/munchyMonk_mask.png.meta | 123 + .../DumplingsAnim.controller | 62 +- .../DumplingsAnim.controller.meta | 0 .../Animations/Dumplings/FollowHand.anim | 118 +- .../Animations/Dumplings/HitHead.anim | 118 +- .../MunchyMonk/Animations/Dumplings/Idle.anim | 2 +- .../Animations/Dumplings/IdleOnTop.anim | 178 ++ ...m1.controller.meta => IdleOnTop.anim.meta} | 4 +- .../Animations/Dumplings/Squish.anim | 213 ++ .../Animations/Dumplings/Squish.anim.meta | 8 + .../Animations/Dumplings/SquishIdle.anim | 53 + .../Animations/Dumplings/SquishIdle.anim.meta | 8 + .../Dumplings/TwoDumplingAnim1.controller | 159 -- .../Animations/Givers/TwoGiver/TwoGiveIn.anim | 90 - .../Animations/Monk/Arm/WristSlap.anim | 279 ++ .../Monk/{Stache => Brow}/BrowAnim.controller | 29 +- .../{Stache => Brow}/BrowAnim.controller.meta | 0 .../Animations/Monk/Brow/BrowBop.anim | 2 +- .../Games/MunchyMonk/Animations/Monk/Eat.anim | 670 +++-- .../OneDumpling.meta => Monk/Holder.meta} | 2 +- .../Animations/Monk/Holder/GoLeft.anim | 645 +++++ .../Animations/Monk/Holder/GoLeft.anim.meta | 8 + .../Animations/Monk/Holder/GoRight.anim | 663 +++++ .../Animations/Monk/Holder/GoRight.anim.meta | 8 + .../Holder/HolderAnim.controller} | 194 +- .../Holder/HolderAnim.controller.meta} | 2 +- .../Animations/Monk/Holder/IdleLeft.anim | 53 + .../Animations/Monk/Holder/IdleLeft.anim.meta | 8 + .../Animations/Monk/Holder/IdleRight.anim | 232 ++ .../Monk/Holder/IdleRight.anim.meta | 8 + .../{StacheBop.anim => Stache1Bop.anim} | 4 +- ...acheBop.anim.meta => Stache1Bop.anim.meta} | 0 .../{StacheIdle.anim => Stache1Idle.anim} | 4 +- ...heIdle.anim.meta => Stache1Idle.anim.meta} | 0 .../Animations/Monk/Stache/Stache2Idle.anim | 2 +- .../{Brow => Stache}/StacheAnim.controller | 106 +- .../StacheAnim.controller.meta | 0 .../Games/MunchyMonk/munchymonk.png.meta | 47 +- .../Games/MunchyMonk/munchymonkbg.png.meta | 54 +- Assets/Scripts/Common/ScrollObject.cs | 44 + Assets/Scripts/Common/ScrollObject.cs.meta | 11 + Assets/Scripts/Common/SuperScroll.cs | 11 +- Assets/Scripts/Games/MunchyMonk/Dumpling.cs | 97 +- Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs | 493 ++-- 46 files changed, 5474 insertions(+), 1731 deletions(-) create mode 100644 Assets/Resources/Sprites/Editor/GameIcons/munchyMonk_mask.png.meta rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/{OneDumpling => }/DumplingsAnim.controller (71%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/{OneDumpling => }/DumplingsAnim.controller.meta (100%) create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/IdleOnTop.anim rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/{TwoDumplingAnim1.controller.meta => IdleOnTop.anim.meta} (64%) create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Squish.anim create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Squish.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/SquishIdle.anim create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/SquishIdle.anim.meta delete mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim1.controller rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/{Stache => Brow}/BrowAnim.controller (81%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/{Stache => Brow}/BrowAnim.controller.meta (100%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/{Dumplings/OneDumpling.meta => Monk/Holder.meta} (77%) create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoRight.anim create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoRight.anim.meta rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/{Dumplings/TwoDumplingAnim2.controller => Monk/Holder/HolderAnim.controller} (58%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/{Dumplings/TwoDumplingAnim2.controller.meta => Monk/Holder/HolderAnim.controller.meta} (79%) create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleLeft.anim create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleLeft.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim create mode 100644 Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim.meta rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/{StacheBop.anim => Stache1Bop.anim} (99%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/{StacheBop.anim.meta => Stache1Bop.anim.meta} (100%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/{StacheIdle.anim => Stache1Idle.anim} (99%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/{StacheIdle.anim.meta => Stache1Idle.anim.meta} (100%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/{Brow => Stache}/StacheAnim.controller (75%) rename Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/{Brow => Stache}/StacheAnim.controller.meta (100%) create mode 100644 Assets/Scripts/Common/ScrollObject.cs create mode 100644 Assets/Scripts/Common/ScrollObject.cs.meta diff --git a/Assets/Resources/Games/munchyMonk.prefab b/Assets/Resources/Games/munchyMonk.prefab index 6adfee26..762f05f4 100644 --- a/Assets/Resources/Games/munchyMonk.prefab +++ b/Assets/Resources/Games/munchyMonk.prefab @@ -26,7 +26,8 @@ Transform: m_GameObject: {fileID: 44905915611796804} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.2980003, y: 1.7859999, z: 0} - m_LocalScale: {x: 0.61752665, y: 0.61752665, z: 0.61752665} + m_LocalScale: {x: 0.61752665, y: 0.61752665, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4775588767381400061} m_RootOrder: 2 @@ -42,6 +43,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -70,7 +72,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 50 + m_SortingOrder: 7300 m_Sprite: {fileID: 6395880424518939546, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -107,8 +109,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153838675149176458} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 16.56, y: -1.91, z: 0} - m_LocalScale: {x: 0.94, y: 0.94, z: 0.94} + m_LocalPosition: {x: 16.56, y: -1.39, z: 0} + m_LocalScale: {x: 0.94, y: 0.94, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2029306107555335210} - {fileID: 6911127574010514126} @@ -117,7 +120,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &7701772336829383192 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -130,10 +133,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &507897004172591125 GameObject: m_ObjectHideFlags: 0 @@ -161,6 +166,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.08, y: -0.89, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2671407606567406260} m_RootOrder: 2 @@ -176,6 +182,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -204,7 +211,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 200 m_Sprite: {fileID: -545335013845175510, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -216,137 +223,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &516631314887172409 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 863794931176398015} - - component: {fileID: 1436961393026862888} - - component: {fileID: 7406148916657929712} - - component: {fileID: 2274865543072549879} - m_Layer: 0 - m_Name: TwoDumpling1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &863794931176398015 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516631314887172409} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.4644, y: -2.4970002, z: 0} - m_LocalScale: {x: 0.605, y: 0.605, z: 0.605} - m_Children: [] - m_Father: {fileID: 5249558317707287682} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1436961393026862888 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516631314887172409} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 30 - m_Sprite: {fileID: -7446309801755540680, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &7406148916657929712 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516631314887172409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4c87c9f6cda1a0748b3d81a13719d112, type: 3} - m_Name: - m_EditorClassIdentifier: - inList: 0 - state: - gameObject: {fileID: 0} - early: 0 - perfect: 0 - late: 0 - createBeat: 0 - eligibleHitsList: [] - aceTimes: 0 - isEligible: 1 - triggersAutoplay: 1 - otherAnim: {fileID: 0} - startBeat: 0 - type: 2 - smearAnim: {fileID: 2870895561011074134} - anim: {fileID: 2274865543072549879} ---- !u!95 &2274865543072549879 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516631314887172409} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 814e109394736e842bbddcb48917ab9a, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &541415947006689009 GameObject: m_ObjectHideFlags: 0 @@ -373,6 +249,7 @@ Transform: 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: - {fileID: 7629481540367937291} - {fileID: 6228598716668433266} @@ -381,7 +258,7 @@ Transform: m_Father: {fileID: 525326701495472490} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &807376699474854874 +--- !u!1 &739212289150650231 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -389,40 +266,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5899539234238408660} - - component: {fileID: 277060060062477722} + - component: {fileID: 2529755070024774003} + - component: {fileID: 2802756388202944897} + - component: {fileID: 7014522824805942743} m_Layer: 0 - m_Name: refff + m_Name: SmallCloud_2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &5899539234238408660 + m_IsActive: 1 +--- !u!4 &2529755070024774003 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 807376699474854874} + m_GameObject: {fileID: 739212289150650231} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.06, y: 0.0489, z: 0} - m_LocalScale: {x: 1.7763563, y: 1.7763563, z: 1.7141987} + m_LocalPosition: {x: 13.31, y: 1.97, z: 0} + m_LocalScale: {x: -1.1075517, y: 1.1075516, z: 1.0410984} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6163636881912119569} - m_RootOrder: 0 + m_Father: {fileID: 6845626153017959875} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &277060060062477722 +--- !u!212 &2802756388202944897 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 807376699474854874} + m_GameObject: {fileID: 739212289150650231} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -451,13 +331,114 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 99 - m_Sprite: {fileID: 21300000, guid: e22893bf2b9d34d4882404855475e585, type: 3} + m_SortingOrder: -96 + m_Sprite: {fileID: -6109354006727621133, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.47, y: 8.96} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &7014522824805942743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739212289150650231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.15 + YSpeed: 0 + NegativeBounds: {x: -15, y: 0} + PositiveBounds: {x: 15, y: 0} +--- !u!1 &807376699474854874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5899539234238408660} + - component: {fileID: 277060060062477722} + m_Layer: 0 + m_Name: refff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5899539234238408660 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807376699474854874} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.09, y: 0.01, z: 0} + m_LocalScale: {x: 1.38, y: 1.3559992, z: 0.75393546} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6163636881912119569} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &277060060062477722 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807376699474854874} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 3912 + m_Sprite: {fileID: 21300000, guid: 7f77e0bb25424bb4f847aef3989f6a09, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.5803922} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 12.8, y: 7.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -489,7 +470,8 @@ Transform: m_GameObject: {fileID: 1134876823469298313} m_LocalRotation: {x: -0, y: -0, z: -0.7093236, w: 0.7048831} m_LocalPosition: {x: -22.379786, y: -1.065319, z: 0} - m_LocalScale: {x: 0.6005851, y: 0.6005851, z: 0.6005851} + m_LocalScale: {x: 0.6005851, y: 0.6005851, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6911127574010514126} m_RootOrder: 3 @@ -505,6 +487,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -533,7 +516,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 70 + m_SortingOrder: 2900 m_Sprite: {fileID: 5745174989593773125, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -555,8 +538,9 @@ GameObject: m_Component: - component: {fileID: 7934843796294291948} - component: {fileID: 1405959680346794173} + - component: {fileID: 2213174238203282286} m_Layer: 0 - m_Name: WideMountains + m_Name: Mountains_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -570,11 +554,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1205877575774920491} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.87, y: -1.7470119, z: 0} - m_LocalScale: {x: 1.5845579, y: 1.5845579, z: 1.5845578} + m_LocalPosition: {x: 2.8700001, y: -1.7026999, z: 0} + m_LocalScale: {x: 1.4994594, y: 1.4994594, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2169629160349170190} - m_RootOrder: 4 + m_Father: {fileID: 3208633507828300290} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1405959680346794173 SpriteRenderer: @@ -587,6 +572,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -621,13 +607,30 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 26.72, y: 4.94} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1456433975185408193 +--- !u!114 &2213174238203282286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205877575774920491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.06 + YSpeed: 0 + NegativeBounds: {x: -33, y: 0} + PositiveBounds: {x: 33, y: 0} +--- !u!1 &1432608525234180120 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -635,40 +638,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6228598716668433266} - - component: {fileID: 7331341725845227146} + - component: {fileID: 4842280282255754497} + - component: {fileID: 4677582251907154707} + - component: {fileID: 3319980781065202592} m_Layer: 0 - m_Name: ArmFill (1) + m_Name: MediumHills_2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6228598716668433266 +--- !u!4 &4842280282255754497 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1456433975185408193} + m_GameObject: {fileID: 1432608525234180120} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -26.669996, y: -1.5300002, z: 0} - m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 0.60059303} + m_LocalPosition: {x: 18, y: -0.48483998, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2029306107555335210} + m_Father: {fileID: 7355218572872366535} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7331341725845227146 +--- !u!212 &4677582251907154707 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1456433975185408193} + m_GameObject: {fileID: 1432608525234180120} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -697,7 +703,108 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 25 + m_SortingOrder: -97 + m_Sprite: {fileID: -9215271416018340848, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.8, y: 9.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &3319980781065202592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432608525234180120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.1 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} +--- !u!1 &1456433975185408193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6228598716668433266} + - component: {fileID: 7331341725845227146} + m_Layer: 0 + m_Name: ArmFill (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6228598716668433266 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456433975185408193} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -26.669996, y: -1.5300002, z: 0} + m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2029306107555335210} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7331341725845227146 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456433975185408193} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 1900 m_Sprite: {fileID: 3618119950039578974, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 0.9607843, g: 0.13725491, b: 0.9254902, a: 1} m_FlipX: 0 @@ -735,7 +842,8 @@ Transform: m_GameObject: {fileID: 1661288258919714369} m_LocalRotation: {x: -0, y: -0, z: 0.09958023, w: 0.99502957} m_LocalPosition: {x: -1.2, y: -4.51, z: 0} - m_LocalScale: {x: 0.9901156, y: 0.9901156, z: 0.9901157} + m_LocalScale: {x: 0.9901156, y: 0.9901156, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2799632831073484558} m_RootOrder: 1 @@ -751,6 +859,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -779,7 +888,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 150 m_Sprite: {fileID: -8439069488565854616, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -791,6 +900,108 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1777252562074325679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2033653106037340311} + - component: {fileID: 7878433677621818399} + - component: {fileID: 8610999598766900212} + m_Layer: 0 + m_Name: MediumCloud + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2033653106037340311 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777252562074325679} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 19.46, y: 3.67, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6845626153017959875} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7878433677621818399 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777252562074325679} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -6971271607518691188, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.49, y: 2.67} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &8610999598766900212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777252562074325679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.15 + YSpeed: 0 + NegativeBounds: {x: -15, y: 0} + PositiveBounds: {x: 15, y: 0} --- !u!1 &2066204535219072923 GameObject: m_ObjectHideFlags: 0 @@ -817,7 +1028,8 @@ Transform: m_GameObject: {fileID: 2066204535219072923} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.53, y: -3.93, z: 0} - m_LocalScale: {x: 0.59433, y: 0.59433, z: 0.59433} + m_LocalScale: {x: 0.59433, y: 0.59433, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1415265751269166897} m_RootOrder: 4 @@ -833,6 +1045,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -873,7 +1086,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2136199085996446022 +--- !u!1 &2098238020394522322 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -881,40 +1094,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 987717339591541637} - - component: {fileID: 6603852189393251712} + - component: {fileID: 3184093280622031502} + - component: {fileID: 1539423100800681560} + - component: {fileID: 5153164108655908424} m_Layer: 0 - m_Name: Smear + m_Name: Mountains_2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &987717339591541637 + m_IsActive: 1 +--- !u!4 &3184093280622031502 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2136199085996446022} - m_LocalRotation: {x: -0, y: -0, z: -0.7093236, w: 0.7048831} - m_LocalPosition: {x: 1.95, y: 0.13, z: 0} - m_LocalScale: {x: 0.60059, y: 0.60059, z: 0.60059} + m_GameObject: {fileID: 2098238020394522322} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 36.31, y: -1.7026999, z: 0} + m_LocalScale: {x: 1.4994594, y: 1.4994594, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4775588767381400061} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.36} ---- !u!212 &6603852189393251712 + m_Father: {fileID: 3208633507828300290} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1539423100800681560 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2136199085996446022} + m_GameObject: {fileID: 2098238020394522322} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -943,7 +1159,108 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 70 + m_SortingOrder: -99 + m_Sprite: {fileID: -653001023094826149, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 26.72, y: 4.94} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &5153164108655908424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098238020394522322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.06 + YSpeed: 0 + NegativeBounds: {x: -33, y: 0} + PositiveBounds: {x: 33, y: 0} +--- !u!1 &2136199085996446022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 987717339591541637} + - component: {fileID: 6603852189393251712} + m_Layer: 0 + m_Name: Smear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &987717339591541637 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136199085996446022} + m_LocalRotation: {x: -0, y: -0, z: -0.7093236, w: 0.7048831} + m_LocalPosition: {x: 1.95, y: 0.13, z: 0} + m_LocalScale: {x: 0.60059, y: 0.60059, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4775588767381400061} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.36} +--- !u!212 &6603852189393251712 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136199085996446022} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 8000 m_Sprite: {fileID: 5745174989593773125, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -981,7 +1298,8 @@ Transform: m_GameObject: {fileID: 2138182652567016259} m_LocalRotation: {x: -0, y: -0, z: -0.13186875, w: 0.9912672} m_LocalPosition: {x: 0.54, y: -1.47, z: 0} - m_LocalScale: {x: 1.0429088, y: 1.0429088, z: 1.0429088} + m_LocalScale: {x: 1.0429088, y: 1.0429088, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2664941458956283857} m_RootOrder: 1 @@ -997,6 +1315,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1025,7 +1344,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 7 + m_SortingOrder: 500 m_Sprite: {fileID: 8640846828575382696, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1063,7 +1382,8 @@ Transform: m_GameObject: {fileID: 2289247019406452885} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -25.560001, y: -1.9699999, z: 0} - m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 0.60059303} + m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6911127574010514126} m_RootOrder: 0 @@ -1079,6 +1399,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1107,7 +1428,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 40 + m_SortingOrder: 2500 m_Sprite: {fileID: -6050273488799331327, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1146,9 +1467,10 @@ Transform: m_GameObject: {fileID: 2312111803680037490} m_LocalRotation: {x: -0, y: -0, z: -0.32880497, w: 0.94439787} m_LocalPosition: {x: -0.8, y: -1.06, z: 0} - m_LocalScale: {x: 0.713743, y: 0.889181, z: 0.71374285} + m_LocalScale: {x: 0.713743, y: 0.889181, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6927789378567616062} + m_Father: {fileID: 1320956615209280668} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -38.393} --- !u!212 &3384858249588073603 @@ -1162,6 +1484,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1190,9 +1513,9 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 15 + m_SortingOrder: 1500 m_Sprite: {fileID: 1605976402678978084, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -1204,7 +1527,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &7704824011753984293 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1217,10 +1540,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &2449787844559758918 GameObject: m_ObjectHideFlags: 0 @@ -1247,7 +1572,8 @@ Transform: m_GameObject: {fileID: 2449787844559758918} m_LocalRotation: {x: -0, y: -0, z: -0.7093236, w: 0.7048831} m_LocalPosition: {x: 1.95, y: 0.13, z: 0} - m_LocalScale: {x: 0.60059, y: 0.60059, z: 0.60059} + m_LocalScale: {x: 0.60059, y: 0.60059, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6289292209976872202} m_RootOrder: 3 @@ -1263,6 +1589,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1291,7 +1618,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 70 + m_SortingOrder: 6000 m_Sprite: {fileID: 5745174989593773125, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1303,6 +1630,108 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2505654211684262630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7553112033648447065} + - component: {fileID: 7991691583287168974} + - component: {fileID: 4629149202490261044} + m_Layer: 0 + m_Name: SmallCloud_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7553112033648447065 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2505654211684262630} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4, y: 1.97, z: 0} + m_LocalScale: {x: -1.1075517, y: 1.1075516, z: 1.0410984} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6845626153017959875} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7991691583287168974 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2505654211684262630} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -96 + m_Sprite: {fileID: -6109354006727621133, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.47, y: 8.96} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &4629149202490261044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2505654211684262630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.15 + YSpeed: 0 + NegativeBounds: {x: -15, y: 0} + PositiveBounds: {x: 15, y: 0} --- !u!1 &2533418371251927258 GameObject: m_ObjectHideFlags: 0 @@ -1313,8 +1742,9 @@ GameObject: m_Component: - component: {fileID: 5900937793740842020} - component: {fileID: 5387078332547408665} + - component: {fileID: 4656402600080682805} m_Layer: 0 - m_Name: LongMountain + m_Name: MediumHills_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1328,11 +1758,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2533418371251927258} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.72279, y: 0.6729882, z: 0} - m_LocalScale: {x: 1.1537356, y: 1.1537356, z: 1.1537355} + m_LocalPosition: {x: -7.1038, y: 0.51821, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2169629160349170190} - m_RootOrder: 3 + m_Father: {fileID: 7355218572872366535} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5387078332547408665 SpriteRenderer: @@ -1345,6 +1776,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1379,12 +1811,29 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 4.14, y: 9.46} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &4656402600080682805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2533418371251927258} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.28 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} --- !u!1 &2566738640794868358 GameObject: m_ObjectHideFlags: 0 @@ -1411,7 +1860,8 @@ Transform: m_GameObject: {fileID: 2566738640794868358} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 150, y: 1.4681876, z: 1.4681876} + m_LocalScale: {x: 150, y: 1.4681876, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2950275597470682702} - {fileID: 3835622964982616484} @@ -1429,6 +1879,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1457,13 +1908,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -100 + m_SortingOrder: -120 m_Sprite: {fileID: -7884854158050700277, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 0.88, y: 8.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1495,7 +1946,8 @@ Transform: m_GameObject: {fileID: 2745463685569105446} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.4, y: -4.76, z: 0} - m_LocalScale: {x: 0.6038735, y: 0.6038735, z: 0.6038735} + m_LocalScale: {x: 0.6038735, y: 0.6038735, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5613490525097808572} - {fileID: 2820416745583199669} @@ -1513,6 +1965,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1541,7 +1994,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 100 m_Sprite: {fileID: -8560562273732883090, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1553,6 +2006,40 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2767999938887310055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4664790396195204968} + m_Layer: 0 + m_Name: DesertHill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4664790396195204968 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2767999938887310055} + 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: + - {fileID: 7069306874276245283} + - {fileID: 6729417936343292177} + - {fileID: 4044215000492705279} + m_Father: {fileID: 2169629160349170190} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2848898258884908656 GameObject: m_ObjectHideFlags: 0 @@ -1563,8 +2050,9 @@ GameObject: m_Component: - component: {fileID: 6729417936343292177} - component: {fileID: 7316351011524415340} + - component: {fileID: 1309179661640359768} m_Layer: 0 - m_Name: DesertHill (1) + m_Name: DesertHillSprite2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1578,11 +2066,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2848898258884908656} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.21721, y: -3.0070117, z: 0} - m_LocalScale: {x: 1.1537356, y: 1.1537356, z: 1.1537355} + m_LocalPosition: {x: 6.0374, y: -2.9735, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2169629160349170190} - m_RootOrder: 10 + m_Father: {fileID: 4664790396195204968} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7316351011524415340 SpriteRenderer: @@ -1595,6 +2084,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1629,12 +2119,29 @@ SpriteRenderer: m_FlipX: 1 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 8.25, y: 2.68} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1309179661640359768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2848898258884908656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.5 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} --- !u!1 &2898546125529081447 GameObject: m_ObjectHideFlags: 0 @@ -1661,7 +2168,8 @@ Transform: m_GameObject: {fileID: 2898546125529081447} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.4599998, y: -0.62, z: 0} - m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 0.60059303} + m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6289292209976872202} m_RootOrder: 1 @@ -1677,6 +2185,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1705,7 +2214,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 45 + m_SortingOrder: 5200 m_Sprite: {fileID: 3618119950039578974, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 0.09045226, b: 0, a: 1} m_FlipX: 0 @@ -1743,7 +2252,8 @@ Transform: m_GameObject: {fileID: 2926790657427714056} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.7100004, y: -0.5400003, z: 0} - m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 0.60059303} + m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4775588767381400061} m_RootOrder: 0 @@ -1759,6 +2269,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1787,7 +2298,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 60 + m_SortingOrder: 7500 m_Sprite: {fileID: -6050273488799331327, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1799,6 +2310,39 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3023194725915466646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3208633507828300290} + m_Layer: 0 + m_Name: Mountains + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3208633507828300290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3023194725915466646} + 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: + - {fileID: 7934843796294291948} + - {fileID: 3184093280622031502} + m_Father: {fileID: 2169629160349170190} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3152210829155713986 GameObject: m_ObjectHideFlags: 0 @@ -1824,8 +2368,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3152210829155713986} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -14.3091, z: 0} - m_LocalScale: {x: 0.88, y: 21.6798, z: 1} + m_LocalPosition: {x: 0, y: -14.0716, z: 0} + m_LocalScale: {x: 0.84, y: 22.155056, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3429445985568152165} m_RootOrder: 1 @@ -1841,6 +2386,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1907,7 +2453,8 @@ Transform: m_GameObject: {fileID: 3296724260963387781} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.9, y: -5.31, z: 0} - m_LocalScale: {x: 0.67290044, y: 0.67290044, z: 0.67290044} + m_LocalScale: {x: 0.67290044, y: 0.67290044, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1415265751269166897} m_RootOrder: 3 @@ -1923,6 +2470,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1951,7 +2499,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 350 m_Sprite: {fileID: -4567597783422742960, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1989,7 +2537,8 @@ Transform: m_GameObject: {fileID: 3302407174212383176} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.82, y: -2.2, z: 0} - m_LocalScale: {x: 0.59433, y: 0.59433, z: 0.59433} + m_LocalScale: {x: 0.59433, y: 0.59433, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1415265751269166897} m_RootOrder: 5 @@ -2005,6 +2554,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2033,7 +2583,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: -1 m_Sprite: {fileID: 4821304094088801921, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2071,11 +2621,13 @@ Transform: 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: - {fileID: 168333956154290365} - {fileID: 3441632085760416725} + - {fileID: 950625167985768828} m_Father: {fileID: 6163636881912119569} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3426236198383799774 GameObject: @@ -2103,7 +2655,8 @@ Transform: m_GameObject: {fileID: 3426236198383799774} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.384458, y: -2.598796, z: 0} - m_LocalScale: {x: 0.6123394, y: 0.6123394, z: 0.6123394} + m_LocalScale: {x: 0.6123394, y: 0.6123394, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1415265751269166897} m_RootOrder: 6 @@ -2119,6 +2672,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2147,7 +2701,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 14 + m_SortingOrder: 300 m_Sprite: {fileID: 4814217994961053678, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2185,7 +2739,8 @@ Transform: m_GameObject: {fileID: 3839366164138925239} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -21.052998, y: -1.0710001, z: 0} - m_LocalScale: {x: 0.58887845, y: 0.58887845, z: 0.58887845} + m_LocalScale: {x: 0.58887845, y: 0.58887845, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2029306107555335210} m_RootOrder: 2 @@ -2201,6 +2756,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2229,7 +2785,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 25 + m_SortingOrder: 2100 m_Sprite: {fileID: -3127631648944981523, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2265,9 +2821,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4061874357033385591} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.28, y: 0.67, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.28, y: 0.66999996, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2664941458956283857} - {fileID: 5830078004604036766} @@ -2276,12 +2833,12 @@ Transform: - {fileID: 7456816249498937322} - {fileID: 4928703537534757983} - {fileID: 4643193760164954688} - m_Father: {fileID: 831714461830505250} - m_RootOrder: 1 + m_Father: {fileID: 1156341757066198576} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &8155799568250144337 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2294,10 +2851,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &4071919639106642331 GameObject: m_ObjectHideFlags: 0 @@ -2324,7 +2883,8 @@ Transform: m_GameObject: {fileID: 4071919639106642331} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6, y: -4.15, z: 0} - m_LocalScale: {x: 0.59433, y: 0.59433, z: 0.59433} + m_LocalScale: {x: 0.59433, y: 0.59433, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2223545248008591642} - {fileID: 8261465824874461497} @@ -2342,6 +2902,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2370,7 +2931,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 6 + m_SortingOrder: 400 m_Sprite: {fileID: 3328913364589298666, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2408,7 +2969,8 @@ Transform: m_GameObject: {fileID: 4312713017965012789} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.66239053, y: -0.9770253, z: 0} - m_LocalScale: {x: 0.94, y: 0.95175, z: 0.94} + m_LocalScale: {x: 0.94, y: 0.95175, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5613490525097808572} m_RootOrder: 0 @@ -2424,6 +2986,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2452,7 +3015,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 150 m_Sprite: {fileID: 7953426270202603213, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2476,7 +3039,7 @@ GameObject: - component: {fileID: 4496255832183162831} - component: {fileID: 5342086749115587097} m_Layer: 0 - m_Name: DumplingSmear + m_Name: DumplingSmear1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2491,7 +3054,8 @@ Transform: m_GameObject: {fileID: 4577846014379795925} m_LocalRotation: {x: -0, y: -0, z: -0.32880497, w: 0.94439787} m_LocalPosition: {x: -0.2, y: -1.67, z: 0} - m_LocalScale: {x: 0.713743, y: 0.97839886, z: 0.71374285} + m_LocalScale: {x: 0.713743, y: 0.97839886, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1320956615209280668} m_RootOrder: 1 @@ -2507,6 +3071,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2535,9 +3100,9 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 15 + m_SortingOrder: 1500 m_Sprite: {fileID: 1605976402678978084, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -2549,7 +3114,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &5342086749115587097 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2562,10 +3127,114 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &4647519946615352385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7291179574576903642} + - component: {fileID: 7101641661663874947} + - component: {fileID: 859935677193600499} + m_Layer: 0 + m_Name: MidShortHills + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7291179574576903642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4647519946615352385} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10.04, y: -2.33, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7355218572872366535} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7101641661663874947 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4647519946615352385} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -95 + m_Sprite: {fileID: 4293028737414108667, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, 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.14, y: 9.46} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &859935677193600499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4647519946615352385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.28 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} --- !u!1 &4699008434711184625 GameObject: m_ObjectHideFlags: 0 @@ -2593,6 +3262,7 @@ Transform: 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: - {fileID: 5899539234238408660} - {fileID: 2169629160349170190} @@ -2600,7 +3270,6 @@ Transform: - {fileID: 2554173831134354060} - {fileID: 525326701495472490} - {fileID: 4780003096125758277} - - {fileID: 6927789378567616062} - {fileID: 1320956615209280668} m_Father: {fileID: 0} m_RootOrder: 0 @@ -2617,41 +3286,118 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eaa148892e198444c9fa22a7565e1d76, type: 3} m_Name: m_EditorClassIdentifier: - SoundSequences: [] + SoundSequences: + - name: one_go + sequence: + game: 1 + force: 1 + clips: + - clip: munchyMonk/one_1 + beat: 0 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - clip: munchyMonk/one_2 + beat: 1 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - name: two_go + sequence: + game: 1 + force: 1 + clips: + - clip: munchyMonk/two_1 + beat: -0.5 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - clip: munchyMonk/two_2 + beat: 0 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - clip: munchyMonk/two_3 + beat: 1 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - clip: munchyMonk/two_4 + beat: 1.5 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - name: three_go + sequence: + game: 1 + force: 1 + clips: + - clip: munchyMonk/three_1 + beat: 0 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - clip: munchyMonk/three_2 + beat: 1 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - clip: munchyMonk/three_3 + beat: 2 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] + - clip: munchyMonk/three_4 + beat: 3 + pitch: 1 + volume: 1 + looping: 0 + offset: 0 + parameters: [] EligibleHits: [] scheduledInputs: [] firstEnable: 0 + dumplings: [] Baby: {fileID: 9030838172503822172} BrowHolder: {fileID: 5330488048195279595} StacheHolder: {fileID: 6761161352435120153} DumplingObj: {fileID: 6215383920913072889} - TwoDumplingObj1: {fileID: 516631314887172409} - TwoDumplingObj2: {fileID: 6750155312411716946} - DumplingSprite: {fileID: 1906072608615175757} - TwoDumplingSprite1: {fileID: 1436961393026862888} - TwoDumplingSprite2: {fileID: 4620030739486174870} - DumplingSmear: {fileID: 4496255832183162831} - TwoDumplingSmear1: {fileID: 2848898630376574492} - TwoDumplingSmear2: {fileID: 3384858249588073603} - MMParent: {fileID: 6163636881912119569} OneGiverAnim: {fileID: 6809288357990963551} TwoGiverAnim: {fileID: 7701772336829383192} ThreeGiverAnim: {fileID: 6495224626437450886} BrowAnim: {fileID: 3292085202543521318} StacheAnim: {fileID: 172082494198118750} + MonkHolderAnim: {fileID: 3449052525920353599} MonkAnim: {fileID: 1267849249056320680} MonkArmsAnim: {fileID: 8155799568250144337} - DumplingAnim: {fileID: 281185408784258692} - TwoDumpling1Anim: {fileID: 2274865543072549879} - TwoDumpling2Anim: {fileID: 411253409439128524} - SmearAnim: {fileID: 5342086749115587097} + dumplingSprites: + - {fileID: 386239251, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - {fileID: 386239251, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - {fileID: 386239251, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - {fileID: 386239251, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - {fileID: 386239251, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - {fileID: 386239251, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} lastReportedBeat: 0 - monkBop: 1 needBlush: 0 isStaring: 0 - firstTwoMissed: 0 - forceGrow: 0 - growLevel: 0 --- !u!1 &4728247956964418924 GameObject: m_ObjectHideFlags: 0 @@ -2678,43 +3424,12 @@ Transform: 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: - {fileID: 838801096863034419} m_Father: {fileID: 1320956615209280668} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4976901385788903237 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5249558317707287682} - m_Layer: 0 - m_Name: TwoDumplingHolder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &5249558317707287682 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4976901385788903237} - 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_Children: - - {fileID: 863794931176398015} - - {fileID: 3103403358463220564} - m_Father: {fileID: 6927789378567616062} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5004137005389582764 GameObject: m_ObjectHideFlags: 0 @@ -2742,6 +3457,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4.301448, y: -0.2649563, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2671407606567406260} m_RootOrder: 0 @@ -2757,6 +3473,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2785,7 +3502,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 200 m_Sprite: {fileID: 2096894050778430725, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2823,7 +3540,8 @@ Transform: m_GameObject: {fileID: 5005167435216901226} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.18, y: -1.75, z: 0} - m_LocalScale: {x: 0.9745213, y: 0.9745213, z: 0.9745213} + m_LocalScale: {x: 0.9745213, y: 0.9745213, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2664941458956283857} m_RootOrder: 0 @@ -2839,6 +3557,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2867,7 +3586,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 7 + m_SortingOrder: 500 m_Sprite: {fileID: -1441660721830477300, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2904,19 +3623,18 @@ Transform: m_GameObject: {fileID: 5249704345827524699} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.18, y: -0.19, z: 0} - m_LocalScale: {x: 0.94, y: 0.94, z: 0.94} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3429445985568152165} - {fileID: 590582792504222320} - - {fileID: 7761527580584799260} - - {fileID: 5900937793740842020} - - {fileID: 7934843796294291948} - - {fileID: 3847496326911153799} - - {fileID: 8086412976432979886} - - {fileID: 7069306874276245283} + - {fileID: 7355218572872366535} + - {fileID: 3208633507828300290} - {fileID: 6332278233260095964} + - {fileID: 7314583057274366728} - {fileID: 1871091660103544811} - - {fileID: 6729417936343292177} + - {fileID: 6845626153017959875} + - {fileID: 4664790396195204968} m_Father: {fileID: 6163636881912119569} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2947,6 +3665,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.024735164, w: 0.9996941} m_LocalPosition: {x: -2.213, y: -4.14, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2671407606567406260} m_RootOrder: 1 @@ -2962,6 +3681,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2990,7 +3710,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 200 m_Sprite: {fileID: -6038894927061569683, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3029,7 +3749,8 @@ Transform: m_GameObject: {fileID: 5326742123325797300} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.49, y: -1.500001, z: 0} - m_LocalScale: {x: 0.8450218, y: 0.8345894, z: 0.8345894} + m_LocalScale: {x: 0.8450218, y: 0.8345894, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4019222050678431080} m_Father: {fileID: 2712405704287867106} @@ -3046,6 +3767,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3074,7 +3796,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 9 + m_SortingOrder: 500 m_Sprite: {fileID: -5838665192725735556, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3088,7 +3810,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &172082494198118750 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3101,10 +3823,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &5330488048195279595 GameObject: m_ObjectHideFlags: 0 @@ -3131,6 +3855,7 @@ Transform: 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: - {fileID: 705948717492519649} m_Father: {fileID: 2671407606567406260} @@ -3162,7 +3887,8 @@ Transform: m_GameObject: {fileID: 5516703322854754306} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.9200001, y: -0.62, z: 0} - m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 0.60059303} + m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6289292209976872202} m_RootOrder: 0 @@ -3178,6 +3904,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3206,7 +3933,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 60 + m_SortingOrder: 5500 m_Sprite: {fileID: -6050273488799331327, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3244,6 +3971,7 @@ Transform: 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: - {fileID: 6297872380695716631} - {fileID: 4966359151152515068} @@ -3278,7 +4006,8 @@ Transform: m_GameObject: {fileID: 5581261824129941977} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.15, y: 3.16, z: 0} - m_LocalScale: {x: 0.61142194, y: 0.6038735, z: 0.6038735} + m_LocalScale: {x: 0.61142194, y: 0.6038735, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2999203713030519643} - {fileID: 3808185254394355244} @@ -3303,6 +4032,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3331,7 +4061,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 150 m_Sprite: {fileID: 4729902717272003802, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3370,7 +4100,8 @@ Transform: m_GameObject: {fileID: 5584816661429645807} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.9, y: 1.9, z: 0} - m_LocalScale: {x: 0.8450219, y: 0.8345894, z: 0.8345894} + m_LocalScale: {x: 0.8450219, y: 0.8345894, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1856044063768226938} m_RootOrder: 0 @@ -3386,6 +4117,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3414,7 +4146,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 9 + m_SortingOrder: 200 m_Sprite: {fileID: -6682347140601531886, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3428,7 +4160,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &3292085202543521318 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3441,10 +4173,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &5655808078371000402 GameObject: m_ObjectHideFlags: 0 @@ -3471,7 +4205,8 @@ Transform: m_GameObject: {fileID: 5655808078371000402} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.450001, y: -0.43999982, z: 0} - m_LocalScale: {x: 0.60059, y: 0.60059, z: 0.60059} + m_LocalScale: {x: 0.60059, y: 0.60059, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6289292209976872202} m_RootOrder: 2 @@ -3487,6 +4222,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3515,7 +4251,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 50 + m_SortingOrder: 5300 m_Sprite: {fileID: -2434628416656219332, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3527,108 +4263,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &5690978672299192079 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2340444065591003763} - - component: {fileID: 2848898630376574492} - - component: {fileID: 2870895561011074134} - m_Layer: 0 - m_Name: DumplingSmear1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2340444065591003763 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5690978672299192079} - m_LocalRotation: {x: -0, y: -0, z: -0.32880497, w: 0.94439787} - m_LocalPosition: {x: -0.07, y: -1.49, z: 0} - m_LocalScale: {x: 0.713743, y: 0.9146455, z: 0.71374285} - m_Children: [] - m_Father: {fileID: 6927789378567616062} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -38.393} ---- !u!212 &2848898630376574492 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5690978672299192079} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 15 - m_Sprite: {fileID: 1605976402678978084, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!95 &2870895561011074134 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5690978672299192079} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: ec988bcfb1c6d3349947d75ab118fd5a, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5713692358072737656 GameObject: m_ObjectHideFlags: 0 @@ -3655,7 +4289,8 @@ Transform: m_GameObject: {fileID: 5713692358072737656} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.32, y: 0.59, z: 0} - m_LocalScale: {x: 0.98419625, y: 0.98419625, z: 0.98419625} + m_LocalScale: {x: 0.98419625, y: 0.98419625, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2671407606567406260} - {fileID: 2799632831073484558} @@ -3664,7 +4299,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1267849249056320680 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3677,10 +4312,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &5726060143964963418 GameObject: m_ObjectHideFlags: 0 @@ -3707,7 +4344,8 @@ Transform: m_GameObject: {fileID: 5726060143964963418} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 14.4147, z: 0} - m_LocalScale: {x: 0.88, y: 21.4694, z: 1} + m_LocalScale: {x: 0.84, y: 21.4694, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3429445985568152165} m_RootOrder: 0 @@ -3723,6 +4361,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3790,6 +4429,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.02, y: 1.49, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2671407606567406260} m_RootOrder: 3 @@ -3805,6 +4445,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3833,7 +4474,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 160 m_Sprite: {fileID: 7784944344224955730, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3872,6 +4513,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.14, y: 1.49, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2671407606567406260} m_RootOrder: 4 @@ -3887,6 +4529,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3915,7 +4558,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 150 m_Sprite: {fileID: 7784944344224955730, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3954,8 +4597,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6215383920913072889} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.53, y: -3.37, z: 0} - m_LocalScale: {x: 0.605, y: 0.605, z: 0.605} + m_LocalPosition: {x: -2.46, y: -3.37, z: 0} + m_LocalScale: {x: 0.605, y: 0.605, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 168333956154290365} m_RootOrder: 0 @@ -3971,6 +4615,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3999,13 +4644,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 30 - m_Sprite: {fileID: -7446309801755540680, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + m_SortingOrder: 1000 + m_Sprite: {fileID: 386239251, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 0.25, y: 0.32} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -4023,25 +4668,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4c87c9f6cda1a0748b3d81a13719d112, type: 3} m_Name: m_EditorClassIdentifier: - inList: 0 - state: - gameObject: {fileID: 0} - early: 0 - perfect: 0 - late: 0 - createBeat: 0 - eligibleHitsList: [] - aceTimes: 0 - isEligible: 1 - triggersAutoplay: 1 - otherAnim: {fileID: 0} + dumplingColor: {r: 1, g: 1, b: 1, a: 1} startBeat: 0 - type: 1 + canDestroy: 0 smearAnim: {fileID: 5342086749115587097} anim: {fileID: 281185408784258692} + smearSr: {fileID: 4496255832183162831} + sr: {fileID: 1906072608615175757} --- !u!95 &281185408784258692 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4054,10 +4690,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &6249838359853358595 GameObject: m_ObjectHideFlags: 0 @@ -4084,7 +4722,8 @@ Transform: m_GameObject: {fileID: 6249838359853358595} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.55, y: -5.25, z: 0} - m_LocalScale: {x: 0.6062166, y: 0.6062166, z: 0.6062166} + m_LocalScale: {x: 0.6062166, y: 0.6062166, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1415265751269166897} m_RootOrder: 1 @@ -4100,6 +4739,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4128,7 +4768,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1 + m_SortingOrder: 200 m_Sprite: {fileID: 4078123855150933827, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4166,16 +4806,17 @@ Transform: m_GameObject: {fileID: 6291367272636632625} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.25, y: 0.38, z: 0} - m_LocalScale: {x: 0.94, y: 0.94, z: 0.94} + m_LocalScale: {x: 0.94, y: 0.94, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5426835785453495421} - - {fileID: 1415265751269166897} + - {fileID: 1156341757066198576} m_Father: {fileID: 6163636881912119569} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &3449052525920353599 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4183,97 +4824,17 @@ Animator: m_GameObject: {fileID: 6291367272636632625} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b6ba77b89884b6c429ea5ec6358f7af5, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &6310419962479901278 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3847496326911153799} - - component: {fileID: 1123811050435082389} - m_Layer: 0 - m_Name: CloudSmall - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3847496326911153799 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6310419962479901278} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.3927903, y: 1.9629881, z: 0} - m_LocalScale: {x: 1.1537356, y: 1.1537356, z: 1.1537355} - m_Children: [] - m_Father: {fileID: 2169629160349170190} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1123811050435082389 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6310419962479901278} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: -96 - m_Sprite: {fileID: -6109354006727621133, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &6492138136306635239 GameObject: m_ObjectHideFlags: 0 @@ -4300,6 +4861,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -24.35, y: -3.7, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8505819872657170028} - {fileID: 2443353364924448067} @@ -4308,6 +4870,40 @@ Transform: m_Father: {fileID: 4780003096125758277} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6500376375800310657 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7355218572872366535} + m_Layer: 0 + m_Name: MidHills + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7355218572872366535 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6500376375800310657} + 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: + - {fileID: 5900937793740842020} + - {fileID: 4842280282255754497} + - {fileID: 7291179574576903642} + m_Father: {fileID: 2169629160349170190} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6565935789177318324 GameObject: m_ObjectHideFlags: 0 @@ -4335,6 +4931,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.029878588, w: 0.9995536} m_LocalPosition: {x: -1.39, y: -0.61, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2671407606567406260} m_RootOrder: 6 @@ -4350,6 +4947,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4378,7 +4976,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 150 m_Sprite: {fileID: 1229315381013837462, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4416,7 +5014,8 @@ Transform: m_GameObject: {fileID: 6708307653083428751} m_LocalRotation: {x: -0, y: -0, z: -0.6969902, w: 0.7170807} m_LocalPosition: {x: 1.27, y: -1.41, z: 0} - m_LocalScale: {x: 1.0174909, y: 1.0049292, z: 1.0049292} + m_LocalScale: {x: 1.0174909, y: 1.0049292, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1280084572664218517} m_RootOrder: 0 @@ -4432,6 +5031,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4460,7 +5060,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 9 + m_SortingOrder: 500 m_Sprite: {fileID: -5838665192725735556, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4482,8 +5082,9 @@ GameObject: m_Component: - component: {fileID: 8086412976432979886} - component: {fileID: 7129764609925869669} + - component: {fileID: 5828880547652186327} m_Layer: 0 - m_Name: CloudBig + m_Name: BigCloud m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4497,11 +5098,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6720235045024052485} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.7872105, y: 3.4229882, z: 0} - m_LocalScale: {x: 1.1537356, y: 1.1537356, z: 1.1537355} + m_LocalPosition: {x: 5.5971994, y: 3.1895, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2169629160349170190} - m_RootOrder: 6 + m_Father: {fileID: 6845626153017959875} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7129764609925869669 SpriteRenderer: @@ -4514,6 +5116,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4542,149 +5145,35 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -92 + m_SortingOrder: -96 m_Sprite: {fileID: -886345551953287938, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 6.65, y: 3.57} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6750155312411716946 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3103403358463220564} - - component: {fileID: 4620030739486174870} - - component: {fileID: 7044940957782864366} - - component: {fileID: 411253409439128524} - m_Layer: 0 - m_Name: TwoDumpling2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3103403358463220564 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6750155312411716946} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.49, y: -3.42, z: 0} - m_LocalScale: {x: 0.8779902, y: 0.5146093, z: 0.589} - m_Children: [] - m_Father: {fileID: 5249558317707287682} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4620030739486174870 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6750155312411716946} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 32 - m_Sprite: {fileID: -7446309801755540680, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &7044940957782864366 +--- !u!114 &5828880547652186327 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6750155312411716946} + m_GameObject: {fileID: 6720235045024052485} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4c87c9f6cda1a0748b3d81a13719d112, type: 3} + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} m_Name: m_EditorClassIdentifier: - inList: 0 - state: - gameObject: {fileID: 0} - early: 0 - perfect: 0 - late: 0 - createBeat: 0 - eligibleHitsList: [] - aceTimes: 0 - isEligible: 1 - triggersAutoplay: 1 - otherAnim: {fileID: 0} - startBeat: 0 - type: 2.5 - smearAnim: {fileID: 7704824011753984293} - anim: {fileID: 411253409439128524} ---- !u!95 &411253409439128524 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6750155312411716946} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 514d460a64c303f47ad4585ff6d7f04b, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + AutoScroll: 1 + XSpeed: -0.15 + YSpeed: 0 + NegativeBounds: {x: -15, y: 0} + PositiveBounds: {x: 15, y: 0} --- !u!1 &6761161352435120153 GameObject: m_ObjectHideFlags: 0 @@ -4709,8 +5198,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6761161352435120153} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.19, y: -1.08, z: 0} + m_LocalPosition: {x: 0.19, y: -0.46, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1280084572664218517} m_Father: {fileID: 2671407606567406260} @@ -4742,7 +5232,8 @@ Transform: m_GameObject: {fileID: 6867122418596973856} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -26.13, y: -1.53, z: 0} - m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 0.60059303} + m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2029306107555335210} m_RootOrder: 0 @@ -4758,6 +5249,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4786,7 +5278,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 30 + m_SortingOrder: 2000 m_Sprite: {fileID: -6050273488799331327, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4824,7 +5316,8 @@ Transform: m_GameObject: {fileID: 7072800876503356019} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -20.483, y: -1.511, z: 0} - m_LocalScale: {x: 0.58887845, y: 0.58887845, z: 0.58887845} + m_LocalScale: {x: 0.58887845, y: 0.58887845, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6911127574010514126} m_RootOrder: 2 @@ -4840,6 +5333,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4868,7 +5362,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 35 + m_SortingOrder: 2200 m_Sprite: {fileID: -3127631648944981523, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4906,7 +5400,8 @@ Transform: m_GameObject: {fileID: 7339057828607594881} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -26.1, y: -1.9699999, z: 0} - m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 0.60059303} + m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6911127574010514126} m_RootOrder: 1 @@ -4922,6 +5417,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4950,7 +5446,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 35 + m_SortingOrder: 2400 m_Sprite: {fileID: 3618119950039578974, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 0.9607843, g: 0.13725491, b: 0.9254902, a: 1} m_FlipX: 0 @@ -4988,6 +5484,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -1.44, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5747733145301393674} - {fileID: 6643986184524449490} @@ -4996,6 +5493,41 @@ Transform: m_Father: {fileID: 2554173831134354060} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7505866129588524750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6845626153017959875} + m_Layer: 0 + m_Name: Clouds + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6845626153017959875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7505866129588524750} + 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: + - {fileID: 7553112033648447065} + - {fileID: 8086412976432979886} + - {fileID: 2529755070024774003} + - {fileID: 2033653106037340311} + m_Father: {fileID: 2169629160349170190} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7525778089917288208 GameObject: m_ObjectHideFlags: 0 @@ -5022,7 +5554,8 @@ Transform: m_GameObject: {fileID: 7525778089917288208} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.25, y: -0.54, z: 0} - m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 0.60059303} + m_LocalScale: {x: 0.60059303, y: 0.60059303, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4775588767381400061} m_RootOrder: 1 @@ -5038,6 +5571,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5066,7 +5600,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 45 + m_SortingOrder: 7200 m_Sprite: {fileID: 3618119950039578974, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 0.8980392, g: 0.8980392, b: 0.8980392, a: 1} m_FlipX: 0 @@ -5104,7 +5638,8 @@ Transform: m_GameObject: {fileID: 7774895304434243763} m_LocalRotation: {x: -0, y: -0, z: -0.7093236, w: 0.7048831} m_LocalPosition: {x: -22.379786, y: -1.0653191, z: 0} - m_LocalScale: {x: 0.6005851, y: 0.6005851, z: 0.6005851} + m_LocalScale: {x: 0.6005851, y: 0.6005851, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2029306107555335210} m_RootOrder: 3 @@ -5120,6 +5655,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5148,7 +5684,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 70 + m_SortingOrder: 3000 m_Sprite: {fileID: 5745174989593773125, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5160,7 +5696,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &7867429024149035442 +--- !u!1 &7813176331810529580 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5168,31 +5704,132 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6927789378567616062} + - component: {fileID: 1156341757066198576} m_Layer: 0 - m_Name: TwoDumplingStuff + m_Name: ArmsHolder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6927789378567616062 +--- !u!4 &1156341757066198576 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7867429024149035442} + m_GameObject: {fileID: 7813176331810529580} 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: - - {fileID: 5249558317707287682} - - {fileID: 2340444065591003763} - - {fileID: 950625167985768828} - m_Father: {fileID: 6163636881912119569} - m_RootOrder: 6 + - {fileID: 1415265751269166897} + m_Father: {fileID: 831714461830505250} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7953296634477943949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7314583057274366728} + - component: {fileID: 6371201262229313598} + - component: {fileID: 5383331078145009890} + m_Layer: 0 + m_Name: ShortHills (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7314583057274366728 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7953296634477943949} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.45, y: -2.895, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2169629160349170190} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6371201262229313598 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7953296634477943949} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -92 + m_Sprite: {fileID: 1838270889910269822, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.03, y: 2.95} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &5383331078145009890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7953296634477943949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.42 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} --- !u!1 &8219492712356600011 GameObject: m_ObjectHideFlags: 0 @@ -5203,8 +5840,9 @@ GameObject: m_Component: - component: {fileID: 7069306874276245283} - component: {fileID: 5157026256237712183} + - component: {fileID: 6748657384860450837} m_Layer: 0 - m_Name: DesertHill + m_Name: DesertHillSprite1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5218,11 +5856,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8219492712356600011} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -9.91279, y: -3, z: 0} - m_LocalScale: {x: 1.1537356, y: 1.1537356, z: 1.1537355} + m_LocalPosition: {x: -9.226, y: -2.9735, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2169629160349170190} - m_RootOrder: 7 + m_Father: {fileID: 4664790396195204968} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5157026256237712183 SpriteRenderer: @@ -5235,6 +5874,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5269,12 +5909,29 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 8.25, y: 2.68} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &6748657384860450837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8219492712356600011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.5 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} --- !u!1 &8528382047392833006 GameObject: m_ObjectHideFlags: 0 @@ -5301,7 +5958,8 @@ Transform: m_GameObject: {fileID: 8528382047392833006} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.31, y: -1.68, z: 0} - m_LocalScale: {x: 0.94, y: 0.94, z: 0.94} + m_LocalScale: {x: 0.94, y: 0.94, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4775588767381400061} m_Father: {fileID: 6163636881912119569} @@ -5309,7 +5967,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &6495224626437450886 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5322,10 +5980,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &8633692544295949288 GameObject: m_ObjectHideFlags: 0 @@ -5336,6 +5996,7 @@ GameObject: m_Component: - component: {fileID: 590582792504222320} - component: {fileID: 5354675969053820510} + - component: {fileID: 8364003212475266873} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -5351,8 +6012,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8633692544295949288} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.11, y: -4.6578, z: 0} - m_LocalScale: {x: 0.852906, y: 0.852906, z: 0.8529059} + m_LocalPosition: {x: 11.04, y: -4.46, z: 0} + m_LocalScale: {x: 0.807, y: 0.807, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2169629160349170190} m_RootOrder: 1 @@ -5368,6 +6030,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5396,18 +6059,137 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -90 + m_SortingOrder: -50 m_Sprite: {fileID: -6618383132387539161, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_DrawMode: 2 + m_Size: {x: 65.51, y: 1.24} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &8364003212475266873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8633692544295949288} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.5 + YSpeed: 0 + NegativeBounds: {x: -15.54, y: 0} + PositiveBounds: {x: 11.04, y: 0} +--- !u!1 &8671634408962839517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4044215000492705279} + - component: {fileID: 7318876833036451559} + - component: {fileID: 6514881826695601649} + m_Layer: 0 + m_Name: DesertHillSprite3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4044215000492705279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8671634408962839517} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.765, y: -2.9735, z: 0} + m_LocalScale: {x: -1.0917747, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4664790396195204968} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7318876833036451559 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8671634408962839517} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -91 + m_Sprite: {fileID: 3324821254823052925, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 8.25, y: 2.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &6514881826695601649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8671634408962839517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.5 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} --- !u!1 &8700103179855839601 GameObject: m_ObjectHideFlags: 0 @@ -5434,7 +6216,8 @@ Transform: m_GameObject: {fileID: 8700103179855839601} m_LocalRotation: {x: -0, y: -0, z: 0.05823126, w: 0.9983032} m_LocalPosition: {x: -4.62, y: -5.5, z: 0} - m_LocalScale: {x: 0.594, y: 0.594, z: 0.594} + m_LocalScale: {x: 0.594, y: 0.594, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1415265751269166897} m_RootOrder: 2 @@ -5450,6 +6233,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5478,7 +6262,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 300 m_Sprite: {fileID: -5412363002043104757, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5517,6 +6301,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.05, y: 2.27, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2671407606567406260} m_RootOrder: 5 @@ -5532,6 +6317,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5560,7 +6346,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 150 m_Sprite: {fileID: -5862641300611582602, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5598,7 +6384,8 @@ Transform: m_GameObject: {fileID: 8939138063054549425} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.31, y: -1.68, z: 0} - m_LocalScale: {x: 0.94, y: 0.94, z: 0.94} + m_LocalScale: {x: 0.94, y: 0.94, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6289292209976872202} m_Father: {fileID: 6163636881912119569} @@ -5606,7 +6393,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &6809288357990963551 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5619,10 +6406,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &9030838172503822172 GameObject: m_ObjectHideFlags: 0 @@ -5650,6 +6439,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.3220973, y: 2.566763, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8670665359059031396} m_Father: {fileID: 2799632831073484558} @@ -5666,6 +6456,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5694,7 +6485,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 100 m_Sprite: {fileID: 1030990730640347943, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5716,8 +6507,9 @@ GameObject: m_Component: - component: {fileID: 1871091660103544811} - component: {fileID: 4025118480975162234} + - component: {fileID: 3790367838227915195} m_Layer: 0 - m_Name: LongMountain (1) + m_Name: TallHills m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5731,11 +6523,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9041142239183310377} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.0772097, y: 0.51298815, z: 0} - m_LocalScale: {x: 1.1537356, y: 1.1537356, z: 1.1537355} + m_LocalPosition: {x: 3.0661, y: -0.48484, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2169629160349170190} - m_RootOrder: 9 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4025118480975162234 SpriteRenderer: @@ -5748,6 +6541,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5776,18 +6570,35 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -95 + m_SortingOrder: -97 m_Sprite: {fileID: -9215271416018340848, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 4.8, y: 9.48} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &3790367838227915195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9041142239183310377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoScroll: 1 + XSpeed: -0.1 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} --- !u!1 &9169262905377000879 GameObject: m_ObjectHideFlags: 0 @@ -5798,8 +6609,9 @@ GameObject: m_Component: - component: {fileID: 6332278233260095964} - component: {fileID: 6447317779789304617} + - component: {fileID: 1752348584238631895} m_Layer: 0 - m_Name: DesertMountain + m_Name: ShortHills m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5813,11 +6625,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9169262905377000879} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.84279, y: -2.8670118, z: 0} - m_LocalScale: {x: 1.1537356, y: 1.1537356, z: 1.1537355} + m_LocalPosition: {x: -10.082, y: -2.895, z: 0} + m_LocalScale: {x: 1.0917743, y: 1.0917743, z: 0.94629496} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2169629160349170190} - m_RootOrder: 8 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6447317779789304617 SpriteRenderer: @@ -5830,6 +6643,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5864,121 +6678,26 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 7.15, y: 4.03} + m_Size: {x: 6.03, y: 2.95} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &9222616237316710355 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7761527580584799260} - - component: {fileID: 5065317453108342271} - - component: {fileID: 3716713679857362564} - - component: {fileID: 8637114029497553133} - - component: {fileID: 2143278764804182814} - m_Layer: 0 - m_Name: test water - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7761527580584799260 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9222616237316710355} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.1212, y: -4.6606, z: 0} - m_LocalScale: {x: 27.942701, y: 1.0500456, z: 0.8529059} - m_Children: [] - m_Father: {fileID: 2169629160349170190} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5065317453108342271 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9222616237316710355} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &3716713679857362564 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9222616237316710355} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - 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: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8637114029497553133 +--- !u!114 &1752348584238631895 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9222616237316710355} + m_GameObject: {fileID: 9169262905377000879} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0479575deb5a235418550268de76edaa, type: 3} + m_Script: {fileID: 11500000, guid: 86babf8846fa7a4498e3fa3648f95cc9, type: 3} m_Name: m_EditorClassIdentifier: - _renderer: {fileID: 3716713679857362564} - _sprite: {fileID: -6618383132387539161, guid: 96a89d9ac91b4a0499e22d325fc1bb9c, type: 3} - NormalizedX: 10 - NormalizedY: 0 - TileX: 1 - TileY: 1 ---- !u!210 &2143278764804182814 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9222616237316710355} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + AutoScroll: 1 + XSpeed: -0.42 + YSpeed: 0 + NegativeBounds: {x: -20, y: 0} + PositiveBounds: {x: 20, y: 0} diff --git a/Assets/Resources/Games/munchyMonk.prefab.meta b/Assets/Resources/Games/munchyMonk.prefab.meta index e64fa04c..00a2add5 100644 --- a/Assets/Resources/Games/munchyMonk.prefab.meta +++ b/Assets/Resources/Games/munchyMonk.prefab.meta @@ -3,5 +3,5 @@ guid: 632fa3e028083a3419c6ceec58434fc6 PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: ntrshugyo + assetBundleVariant: en diff --git a/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk_mask.png.meta new file mode 100644 index 00000000..692470d4 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/munchyMonk_mask.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: d04644619571cb640bef4f8b2e4ca397 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 1 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/OneDumpling/DumplingsAnim.controller b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/DumplingsAnim.controller similarity index 71% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/OneDumpling/DumplingsAnim.controller rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/DumplingsAnim.controller index 25af5771..b781b842 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/OneDumpling/DumplingsAnim.controller +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/DumplingsAnim.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5472488506830438833 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleOnTop + 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: b9694bfc1724d9f41ba14506e0f061a4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -94,7 +120,13 @@ AnimatorStateMachine: m_Position: {x: 270, y: 130, z: 0} - serializedVersion: 1 m_State: {fileID: 7449569374710932826} - m_Position: {x: 50, y: 180, z: 0} + m_Position: {x: 30, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5301262728624689923} + m_Position: {x: 280, y: 190, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5472488506830438833} + m_Position: {x: 280, y: 240, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -105,6 +137,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 7449569374710932826} +--- !u!1102 &5301262728624689923 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Squish + 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: dcf88489d2949f44e8a31406e3f76210, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &5539309987236105817 AnimatorState: serializedVersion: 6 @@ -151,7 +209,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 0} + m_Motion: {fileID: 7400000, guid: eeb495d1bb2bac347873446480d7bb20, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/OneDumpling/DumplingsAnim.controller.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/DumplingsAnim.controller.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/OneDumpling/DumplingsAnim.controller.meta rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/DumplingsAnim.controller.meta diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/FollowHand.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/FollowHand.anim index 157fbb8b..9ac1b5bc 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/FollowHand.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/FollowHand.anim @@ -155,7 +155,32 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: - m_ScaleCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.878, y: 0.515, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.15 + value: {x: 0.878, y: 0.515, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -179,6 +204,13 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -639,6 +671,90 @@ AnimationClip: path: classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.878 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.878 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.515 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.515 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/HitHead.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/HitHead.anim index 8fe7ffac..85c434b4 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/HitHead.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/HitHead.anim @@ -76,7 +76,32 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: - m_ScaleCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.605, y: 0.605, z: 0.605} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0.605, y: 0.605, z: 0.605} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -93,6 +118,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -307,6 +339,90 @@ AnimationClip: path: classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.605 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.605 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.605 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.605 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.605 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.605 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Idle.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Idle.anim index 9aae90a3..45f2c9eb 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Idle.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Idle.anim @@ -68,7 +68,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/IdleOnTop.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/IdleOnTop.anim new file mode 100644 index 00000000..19f7c67c --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/IdleOnTop.anim @@ -0,0 +1,178 @@ +%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: IdleOnTop + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -2.46, y: -2.55, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 28 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + 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: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.46 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.55 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 28 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim1.controller.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/IdleOnTop.anim.meta similarity index 64% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim1.controller.meta rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/IdleOnTop.anim.meta index 27d9c714..dd0c7e1f 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim1.controller.meta +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/IdleOnTop.anim.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 814e109394736e842bbddcb48917ab9a +guid: b9694bfc1724d9f41ba14506e0f061a4 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 9100000 + mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Squish.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Squish.anim new file mode 100644 index 00000000..3e0ae4aa --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Squish.anim @@ -0,0 +1,213 @@ +%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: Squish + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -2.46, y: -3.42, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.878, y: 0.515, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + 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: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.878 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.515 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.46 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.42 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Squish.anim.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Squish.anim.meta new file mode 100644 index 00000000..98eb4804 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/Squish.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dcf88489d2949f44e8a31406e3f76210 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/SquishIdle.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/SquishIdle.anim new file mode 100644 index 00000000..67bef567 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/SquishIdle.anim @@ -0,0 +1,53 @@ +%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: SquishIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/SquishIdle.anim.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/SquishIdle.anim.meta new file mode 100644 index 00000000..84d34f29 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/SquishIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c51af42c46c05134cacc1e4fcc983daa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim1.controller b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim1.controller deleted file mode 100644 index cce18c21..00000000 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim1.controller +++ /dev/null @@ -1,159 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-3597405474641593046 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FollowHand - 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: 52c5d67df45ebce43a4be6760eb4791b, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-2060226846018297129 -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: 962796669179411144} - m_Position: {x: 300, y: -40, z: 0} - - serializedVersion: 1 - m_State: {fileID: -3597405474641593046} - m_Position: {x: 300, y: 100, z: 0} - - serializedVersion: 1 - m_State: {fileID: -1705263543142183420} - m_Position: {x: 378.30893, y: 34.20819, z: 0} - - serializedVersion: 1 - m_State: {fileID: 4962386846891930683} - m_Position: {x: 70, y: 170, 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: 4962386846891930683} ---- !u!1102 &-1705263543142183420 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: HitHead - 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: 41cdd05618fde134f8618f2caf975664, 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: TwoDumplingAnim1 - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -2060226846018297129} - 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!1102 &962796669179411144 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FallOff - 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: 9b689231e3814b54996ed105ac4fb830, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &4962386846891930683 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Givers/TwoGiver/TwoGiveIn.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Givers/TwoGiver/TwoGiveIn.anim index 014bc979..9b56601f 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Givers/TwoGiver/TwoGiveIn.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Givers/TwoGiver/TwoGiveIn.anim @@ -314,25 +314,6 @@ AnimationClip: path: Arm/Smear classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 90 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_SortingOrder - path: Arm/Smear - classID: 212 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -361,25 +342,6 @@ AnimationClip: path: LeftArm/Smear (1) classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 91 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_SortingOrder - path: LeftArm/Smear (1) - classID: 212 - script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -459,13 +421,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3875591737 - attribute: 3762991556 - script: {fileID: 0} - typeID: 212 - customType: 26 - isPPtrCurve: 0 - serializedVersion: 2 path: 3612620434 attribute: 2086281974 @@ -473,13 +428,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3612620434 - attribute: 3762991556 - script: {fileID: 0} - typeID: 212 - customType: 26 - isPPtrCurve: 0 - serializedVersion: 2 path: 4121138059 attribute: 0 @@ -1181,25 +1129,6 @@ AnimationClip: path: Arm/Smear classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 90 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_SortingOrder - path: Arm/Smear - classID: 212 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1342,25 +1271,6 @@ AnimationClip: path: LeftArm/Smear (1) classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 91 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_SortingOrder - path: LeftArm/Smear (1) - classID: 212 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Arm/WristSlap.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Arm/WristSlap.anim index ad10fe4b..09b158d7 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Arm/WristSlap.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Arm/WristSlap.anim @@ -1078,6 +1078,128 @@ AnimationClip: path: Smear1 classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 250 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: HandBack + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 200 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 250 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Orb + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 200 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Hand + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 400 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.033333335 + value: 200 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Arm + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 200 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.033333335 + value: 50 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmUpper + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -1250,6 +1372,41 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 7294930 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 976357615 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2270227889 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2685614196 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 640993049 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 - serializedVersion: 2 path: 640993049 attribute: 0 @@ -4528,6 +4685,128 @@ AnimationClip: path: Smear1 classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 250 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: HandBack + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 200 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 250 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Orb + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 200 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Hand + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 400 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.033333335 + value: 200 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Arm + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 200 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.033333335 + value: 50 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmUpper + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/BrowAnim.controller b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowAnim.controller similarity index 81% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/BrowAnim.controller rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowAnim.controller index 052592a3..abae3d5b 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/BrowAnim.controller +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowAnim.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BrowBop + m_Name: Bop m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -26,28 +26,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-7290459438556734662 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -9057866588557527313} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1107 &-240490249742821653 AnimatorStateMachine: serializedVersion: 6 @@ -102,11 +80,10 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BrowIdle + m_Name: Idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -7290459438556734662} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/BrowAnim.controller.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowAnim.controller.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/BrowAnim.controller.meta rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowAnim.controller.meta diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowBop.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowBop.anim index 008d06f1..af0799a7 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowBop.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/BrowBop.anim @@ -136,7 +136,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Eat.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Eat.anim index ce377f61..2f341e47 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Eat.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Eat.anim @@ -241,6 +241,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.85 + value: {x: -2.02, y: 1.49, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -356,6 +365,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.85 + value: {x: -2.22, y: -4.14, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -442,6 +460,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.85 + value: {x: 0.19, y: -1.08, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -476,10 +503,51 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.85 + value: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 path: Head/BrowHolder + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: {x: -2.05, y: 2.27, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Head/Brow + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: {x: -4.301448, y: -0.2649563, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Head/Nose m_ScaleCurves: [] m_FloatCurves: - curve: @@ -487,7 +555,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 170 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -496,7 +564,7 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 0.05 - value: 4 + value: 300 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -504,80 +572,8 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.06666667 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.15 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.16666667 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.23333333 - value: 2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.26666668 - value: 2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.7 - value: 2 + time: 0.85 + value: 200 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -591,6 +587,91 @@ AnimationClip: path: Head/Mouth classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Head/Brow + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Head/Nose + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Head/Nose + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Head/Nose + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -617,6 +698,8 @@ AnimationClip: value: {fileID: 1942295068727866544, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - time: 0.7 value: {fileID: 1942295068727866544, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - time: 0.85 + value: {fileID: 7784944344224955730, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} attribute: m_Sprite path: Head/Eye classID: 212 @@ -646,6 +729,8 @@ AnimationClip: value: {fileID: -6038894927061569683, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - time: 0.7 value: {fileID: -6038894927061569683, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - time: 0.85 + value: {fileID: -6038894927061569683, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} attribute: m_Sprite path: Head/Mouth classID: 212 @@ -692,6 +777,20 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2886801113 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3891770711 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1953960055 attribute: 4 @@ -706,6 +805,34 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2886801113 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3891770711 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3891770711 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3891770711 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2766917418 attribute: 0 @@ -733,6 +860,7 @@ AnimationClip: - {fileID: 1942295068727866544, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - {fileID: 1942295068727866544, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - {fileID: 1942295068727866544, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - {fileID: 7784944344224955730, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - {fileID: -6264046929643617538, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - {fileID: -6264046929643617538, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - {fileID: -1421327939087735319, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} @@ -745,12 +873,13 @@ AnimationClip: - {fileID: -6038894927061569683, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - {fileID: -6038894927061569683, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} - {fileID: -6038894927061569683, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} + - {fileID: -6038894927061569683, guid: de37f25efaa713347b9cfe924e2e3680, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.8333333 + m_StopTime: 0.8666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -877,6 +1006,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: -2.02 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -995,6 +1133,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 1.49 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1113,6 +1260,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1231,6 +1387,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: -2.22 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1349,6 +1514,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: -4.14 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1467,6 +1641,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1833,7 +2016,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 170 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1842,7 +2025,7 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 0.05 - value: 4 + value: 300 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1850,80 +2033,8 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.06666667 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.15 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.16666667 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.23333333 - value: 2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.26666668 - value: 2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.7 - value: 2 + time: 0.85 + value: 200 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2114,6 +2225,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0.19 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2160,6 +2280,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: -1.08 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2206,6 +2335,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2243,6 +2381,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2280,6 +2427,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2317,6 +2473,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2324,6 +2489,205 @@ AnimationClip: path: Head/BrowHolder classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: -2.05 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Head/Brow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 2.27 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Head/Brow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Head/Brow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Head/Brow + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: -4.301448 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Head/Nose + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: -0.2649563 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Head/Nose + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Head/Nose + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Head/Nose + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Head/Nose + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.85 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Head/Nose + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/OneDumpling.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder.meta similarity index 77% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/OneDumpling.meta rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder.meta index 9a8c213d..1535d145 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/OneDumpling.meta +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7aa8e6602f8310a4f8069a63adbdbfc4 +guid: 47b53459ad0b149408bc4327331d12ec folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim new file mode 100644 index 00000000..e82605e8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim @@ -0,0 +1,645 @@ +%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: GoLeft + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 5.64, y: 0.38, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 5.64, y: 0.38, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: -16.169998, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0.25, y: 0.38, z: 0} + inSlope: {x: -16.169998, y: -0, z: -0} + outSlope: {x: -16.169998, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 8.27, y: 0, z: 0} + inSlope: {x: -24.810001, y: 0, z: 0} + outSlope: {x: -24.810001, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -24.810001, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: ArmsHolder + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: ArmsHolder + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 7 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.15 + value: 7 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38333333 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/ArmUpper + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 8 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.15 + value: 8 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38333333 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/Hand + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.15 + value: 9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/Orb + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + 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: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3121568847 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3121568847 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 837560049 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1591772605 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1543559174 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666667 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 5.64 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 5.64 + inSlope: -0 + outSlope: -16.169998 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.25 + inSlope: -16.169998 + outSlope: -16.169998 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.38 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.38 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.38 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: ArmsHolder + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 8.27 + inSlope: -24.810001 + outSlope: -24.810001 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: -24.810001 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: ArmsHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: ArmsHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: ArmsHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 7 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.15 + value: 7 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38333333 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/ArmUpper + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 8 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.15 + value: 8 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38333333 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/Hand + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.15 + value: 9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/Orb + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim.meta new file mode 100644 index 00000000..9b3f0ffb --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoLeft.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55631d36c3bdc8643bb0fa750801912d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoRight.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoRight.anim new file mode 100644 index 00000000..cf6d5382 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoRight.anim @@ -0,0 +1,663 @@ +%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: GoRight + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.25, y: 0.38, z: 0} + inSlope: {x: -53.899998, y: -0, z: -0} + outSlope: {x: 16.169998, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 5.64, y: 0.38, z: 0} + inSlope: {x: 16.169998, y: -0, z: -0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 5.64, y: 0.38, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: -53.899998, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -82.700005, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -0, y: 0, z: 0} + outSlope: {x: 24.810001, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 8.27, y: 0, z: 0} + inSlope: {x: 24.810001, y: 0, z: 0} + outSlope: {x: -82.700005, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: ArmsHolder + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: -1.5 + outSlope: Infinity + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: ArmsHolder + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38333333 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.51666665 + value: 7 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/ArmUpper + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38333333 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.51666665 + value: 8 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/Hand + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.51666665 + value: 9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/Orb + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + 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: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3121568847 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3121568847 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 837560049 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1591772605 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1543559174 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666667 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: -53.899998 + outSlope: 16.169998 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 5.64 + inSlope: 16.169998 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 5.64 + inSlope: -0 + outSlope: -53.899998 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.38 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.38 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.38 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -82.700005 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: -0 + outSlope: 24.810001 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 8.27 + inSlope: 24.810001 + outSlope: -82.700005 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: ArmsHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: ArmsHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: ArmsHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: -1.5 + outSlope: Infinity + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: ArmsHolder + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38333333 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.51666665 + value: 7 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/ArmUpper + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38333333 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.51666665 + value: 8 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/Hand + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.51666665 + value: 9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: ArmsHolder/Arms/Orb + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoRight.anim.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoRight.anim.meta new file mode 100644 index 00000000..a277fe6e --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/GoRight.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c545e93ae9bfc446b4b09eced098ebe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim2.controller b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/HolderAnim.controller similarity index 58% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim2.controller rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/HolderAnim.controller index 0e5d11db..26fb8169 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim2.controller +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/HolderAnim.controller @@ -1,13 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-7829759506090051194 +--- !u!1102 &-7353337356241041381 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HitHead + m_Name: IdleLeft m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -20,7 +20,55 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 41cdd05618fde134f8618f2caf975664, type: 2} + m_Motion: {fileID: 7400000, guid: e7af0d6f57fcd8d43bc7af06a995fdff, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-4634774137408158128 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4321690644250964074} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-4321690644250964074 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleRight + 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: e6741a02e8aacec4e86816e333c8a837, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -32,13 +80,13 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: TwoDumplingAnim2 + m_Name: HolderAnim serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: 8009125445288574937} + m_StateMachine: {fileID: 9187243698983918112} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -48,17 +96,18 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &2756429330252731537 +--- !u!1102 &5012773176774724902 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FallOff + m_Name: GoRight m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -4634774137408158128} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -68,13 +117,62 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 9b689231e3814b54996ed105ac4fb830, type: 2} + m_Motion: {fileID: 7400000, guid: 3c545e93ae9bfc446b4b09eced098ebe, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &8009125445288574937 +--- !u!1102 &5555244363057993881 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GoLeft + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7141358835304235707} + 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: 55631d36c3bdc8643bb0fa750801912d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &7141358835304235707 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7353337356241041381} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &9187243698983918112 AnimatorStateMachine: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -84,76 +182,24 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 8072312523751096322} - m_Position: {x: 30, y: 180, z: 0} + m_State: {fileID: 5555244363057993881} + m_Position: {x: 290, y: -70, z: 0} - serializedVersion: 1 - m_State: {fileID: -7829759506090051194} - m_Position: {x: 320, y: 60, z: 0} + m_State: {fileID: 5012773176774724902} + m_Position: {x: 510, y: -70, z: 0} - serializedVersion: 1 - m_State: {fileID: 2756429330252731537} - m_Position: {x: 340, y: 180, z: 0} + m_State: {fileID: -7353337356241041381} + m_Position: {x: 290, y: -20, z: 0} - serializedVersion: 1 - m_State: {fileID: 8812723468117528593} - m_Position: {x: 400.59628, y: 119.17886, z: 0} + m_State: {fileID: -4321690644250964074} + m_Position: {x: 510, y: -20, 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_AnyStatePosition: {x: 100, y: -60, z: 0} + m_EntryPosition: {x: 100, y: -20, z: 0} + m_ExitPosition: {x: 740, y: -40, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 8072312523751096322} ---- !u!1102 &8072312523751096322 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle - 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: eeb495d1bb2bac347873446480d7bb20, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &8812723468117528593 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FollowHand - 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: 52c5d67df45ebce43a4be6760eb4791b, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: + m_DefaultState: {fileID: -7353337356241041381} diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim2.controller.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/HolderAnim.controller.meta similarity index 79% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim2.controller.meta rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/HolderAnim.controller.meta index cdabafc1..357630d5 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Dumplings/TwoDumplingAnim2.controller.meta +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/HolderAnim.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 514d460a64c303f47ad4585ff6d7f04b +guid: b6ba77b89884b6c429ea5ec6358f7af5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleLeft.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleLeft.anim new file mode 100644 index 00000000..dcfd4db8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleLeft.anim @@ -0,0 +1,53 @@ +%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: IdleLeft + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleLeft.anim.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleLeft.anim.meta new file mode 100644 index 00000000..d1150504 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleLeft.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7af0d6f57fcd8d43bc7af06a995fdff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim new file mode 100644 index 00000000..75fc2d06 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim @@ -0,0 +1,232 @@ +%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: IdleRight + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 5.64, y: 0.38, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 5.64, y: 0.38, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: ArmsHolder + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + 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: 3121568847 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 5.64 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 5.64 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.38 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.38 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: ArmsHolder + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim.meta new file mode 100644 index 00000000..bc0556ea --- /dev/null +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Holder/IdleRight.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6741a02e8aacec4e86816e333c8a837 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheBop.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Bop.anim similarity index 99% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheBop.anim rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Bop.anim index 99ccdda8..074ad997 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheBop.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Bop.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: StacheBop + m_Name: Stache1Bop serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -136,7 +136,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheBop.anim.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Bop.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheBop.anim.meta rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Bop.anim.meta diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheIdle.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Idle.anim similarity index 99% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheIdle.anim rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Idle.anim index 0c92a959..42e368e0 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheIdle.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Idle.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: StacheIdle + m_Name: Stache1Idle serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -100,7 +100,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheIdle.anim.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Idle.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheIdle.anim.meta rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache1Idle.anim.meta diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache2Idle.anim b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache2Idle.anim index 716066b9..9c5225bd 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache2Idle.anim +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/Stache2Idle.anim @@ -185,7 +185,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/StacheAnim.controller b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheAnim.controller similarity index 75% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/StacheAnim.controller rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheAnim.controller index 8dad59ae..f32e2329 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/StacheAnim.controller +++ b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheAnim.controller @@ -26,50 +26,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-4827620414986869291 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3906689342476762955} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-3734111273202796030 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6485121751303543246} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-1364688292467076909 AnimatorState: serializedVersion: 6 @@ -128,8 +84,7 @@ AnimatorState: m_Name: Bop4 m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 1503970535676841181} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -155,8 +110,7 @@ AnimatorState: m_Name: Bop3 m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 5418743036670214129} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -172,28 +126,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &1503970535676841181 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -1364688292467076909} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1107 &1674389361225034656 AnimatorStateMachine: serializedVersion: 6 @@ -236,7 +168,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 290, y: 240, z: 0} m_ExitPosition: {x: 620, y: 240, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 3906689342476762955} + m_DefaultState: {fileID: 4672073311667995112} --- !u!1102 &3613256941988255169 AnimatorState: serializedVersion: 6 @@ -247,8 +179,7 @@ AnimatorState: m_Name: Bop2 m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -3734111273202796030} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -271,7 +202,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle1 + m_Name: Idle m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -297,11 +228,10 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Bop1 + m_Name: Bop m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -4827620414986869291} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -317,28 +247,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &5418743036670214129 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 6266326612391989314} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &6266326612391989314 AnimatorState: serializedVersion: 6 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/StacheAnim.controller.meta b/Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheAnim.controller.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Brow/StacheAnim.controller.meta rename to Assets/Resources/Sprites/Games/MunchyMonk/Animations/Monk/Stache/StacheAnim.controller.meta diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/munchymonk.png.meta b/Assets/Resources/Sprites/Games/MunchyMonk/munchymonk.png.meta index 67caaca3..07794aea 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/munchymonk.png.meta +++ b/Assets/Resources/Sprites/Games/MunchyMonk/munchymonk.png.meta @@ -236,7 +236,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -1601,27 +1601,6 @@ TextureImporter: indices: edges: [] weights: [] - - serializedVersion: 2 - name: munchymonk_65 - rect: - serializedVersion: 2 - x: 3109 - y: 5795 - width: 387 - height: 391 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 8330ad200b469a890800000000000000 - internalID: -7446309801755540680 - vertices: [] - indices: - edges: [] - weights: [] - serializedVersion: 2 name: munchymonk_66 rect: @@ -1778,7 +1757,7 @@ TextureImporter: width: 605 height: 524 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1790,6 +1769,27 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: MMdumpling + rect: + serializedVersion: 2 + x: 3180 + y: 5854 + width: 263 + height: 263 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 38ac47cfc1473754b9ce73c3786dcb23 + internalID: 386239251 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -1801,6 +1801,7 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: + MMdumpling: 386239251 munchymonk_0: 4729902717272003802 munchymonk_1: -8560562273732883090 munchymonk_10: -1441660721830477300 diff --git a/Assets/Resources/Sprites/Games/MunchyMonk/munchymonkbg.png.meta b/Assets/Resources/Sprites/Games/MunchyMonk/munchymonkbg.png.meta index 9d138ccc..1fbf8ff6 100644 --- a/Assets/Resources/Sprites/Games/MunchyMonk/munchymonkbg.png.meta +++ b/Assets/Resources/Sprites/Games/MunchyMonk/munchymonkbg.png.meta @@ -81,15 +81,15 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -165,10 +165,10 @@ TextureImporter: name: munchymonkbg_0 rect: serializedVersion: 2 - x: 6 - y: 1030 - width: 414 - height: 946 + x: 42 + y: 1049 + width: 347 + height: 896 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -186,10 +186,10 @@ TextureImporter: name: munchymonkbg_1 rect: serializedVersion: 2 - x: 437 - y: 1029 - width: 480 - height: 948 + x: 481 + y: 1049 + width: 398 + height: 807 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -207,10 +207,10 @@ TextureImporter: name: munchymonkbg_2 rect: serializedVersion: 2 - x: 931 - y: 1708 - width: 825 - height: 268 + x: 980 + y: 1731 + width: 728 + height: 203 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -270,10 +270,10 @@ TextureImporter: name: munchymonkbg_5 rect: serializedVersion: 2 - x: 932 - y: 1401 - width: 603 - height: 295 + x: 987 + y: 1422 + width: 500 + height: 234 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -312,10 +312,10 @@ TextureImporter: name: munchymonkbg_7 rect: serializedVersion: 2 - x: 933 - y: 1030 - width: 665 - height: 357 + x: 967 + y: 1062 + width: 595 + height: 293 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -354,9 +354,9 @@ TextureImporter: name: munchymonkbg_9 rect: serializedVersion: 2 - x: 214 + x: 215 y: 27 - width: 3276 + width: 3274 height: 124 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -461,7 +461,7 @@ TextureImporter: serializedVersion: 2 x: 3868 y: 1116 - width: 88 + width: 84 height: 864 alignment: 0 pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Common/ScrollObject.cs b/Assets/Scripts/Common/ScrollObject.cs new file mode 100644 index 00000000..8314aa2f --- /dev/null +++ b/Assets/Scripts/Common/ScrollObject.cs @@ -0,0 +1,44 @@ +using UnityEngine; +using System; + +namespace HeavenStudio.Common +{ + public class ScrollObject : MonoBehaviour + { + public bool AutoScroll; + public float XSpeed = 1.0f; + public float YSpeed = 1.0f; + public Vector2 NegativeBounds; + public Vector2 PositiveBounds; + [System.NonSerialized] public float SpeedMod = 5; + + public void LateUpdate() + { + var pos = gameObject.transform.position; + float _x = Time.deltaTime*SpeedMod*XSpeed; + float _y = Time.deltaTime*SpeedMod*YSpeed; + if (AutoScroll && Conductor.instance.isPlaying) { + gameObject.transform.position += new Vector3(_x, _y); + + if (XSpeed > 0 && pos.x >= PositiveBounds.x) { + SetPos(NegativeBounds.x, pos.y); + } + if (XSpeed < 0 && pos.x <= NegativeBounds.x) { + SetPos(PositiveBounds.x, pos.y); + } + + if (YSpeed > 0 && pos.y >= PositiveBounds.y) { + SetPos(pos.x, NegativeBounds.y); + } + if (YSpeed < 0 && pos.y <= NegativeBounds.y) { + SetPos(pos.x, PositiveBounds.y); + } + } + } + + public void SetPos(float x, float y) + { + gameObject.transform.position = new Vector3(x, y); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Common/ScrollObject.cs.meta b/Assets/Scripts/Common/ScrollObject.cs.meta new file mode 100644 index 00000000..fc1a027b --- /dev/null +++ b/Assets/Scripts/Common/ScrollObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 86babf8846fa7a4498e3fa3648f95cc9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Common/SuperScroll.cs b/Assets/Scripts/Common/SuperScroll.cs index 48e9fce9..574817e4 100644 --- a/Assets/Scripts/Common/SuperScroll.cs +++ b/Assets/Scripts/Common/SuperScroll.cs @@ -21,6 +21,9 @@ namespace HeavenStudio.Common public float NormalizedX = 0.0f; public float NormalizedY = 0.0f; public Vector2 Normalized { get { return new Vector2(NormalizedX, NormalizedY); } set { NormalizedX = value.x; NormalizedY = value.y; } } + public bool AutoScroll; + public float AutoScrollX; + public float AutoScrollY; public float TileX = 1.0f; public float TileY = 1.0f; @@ -37,7 +40,7 @@ namespace HeavenStudio.Common _renderer.material = _shader; var spriteRect = _sprite.rect; - var tex = CropTexture(_sprite.texture, new Rect(spriteRect.x, spriteRect.y, spriteRect.width, spriteRect .height)); + var tex = CropTexture(_sprite.texture, new Rect(spriteRect.x, spriteRect.y, spriteRect.width, spriteRect.height)); tex.wrapMode = TextureWrapMode.Repeat; Material.mainTexture = tex; } @@ -46,6 +49,12 @@ namespace HeavenStudio.Common { _renderer.material.mainTextureScale = Tile; _renderer.material.mainTextureOffset = new Vector2(NormalizedX, -NormalizedY) * Tile; + + if (AutoScroll) { + float songPos = Conductor.instance.songPositionInBeats/100; + NormalizedX = songPos*AutoScrollX; + NormalizedY = songPos*AutoScrollY; + } } #endregion diff --git a/Assets/Scripts/Games/MunchyMonk/Dumpling.cs b/Assets/Scripts/Games/MunchyMonk/Dumpling.cs index 19c4891d..a54a5d30 100644 --- a/Assets/Scripts/Games/MunchyMonk/Dumpling.cs +++ b/Assets/Scripts/Games/MunchyMonk/Dumpling.cs @@ -9,70 +9,72 @@ namespace HeavenStudio.Games.Scripts_MunchyMonk { public class Dumpling : MonoBehaviour { - public Animator otherAnim; + public Color dumplingColor; public float startBeat; - public float type; + const string sfxName = "munchyMonk/"; - private bool canDestroy; + public bool canDestroy; [Header("References")] [SerializeField] Animator smearAnim; [SerializeField] Animator anim; + [SerializeField] SpriteRenderer smearSr; + public SpriteRenderer sr; private MunchyMonk game; private void Awake() { game = MunchyMonk.instance; - game.firstTwoMissed = false; + sr = GetComponent(); } private void Start() { - if (type == 1f || type == 3f) { - game.ScheduleInput(startBeat, 1f, InputType.STANDARD_DOWN, Hit, Miss, Early); - } else if (type >= 3.5f) { - game.ScheduleInput(startBeat, 0.75f, InputType.STANDARD_DOWN, Hit, Miss, Early); - } else { - game.ScheduleInput(startBeat, type == 2f ? 1.5f : 2f, InputType.STANDARD_DOWN, Hit, Miss, Early); + sr.color = dumplingColor; + if (game.dumplings.Count > 1) { + anim.Play("IdleOnTop", 0, 0); + game.dumplings[0].anim.DoScaledAnimationAsync("Squish", 0.5f); } } private void Update() { - if ((!Conductor.instance.isPlaying && !Conductor.instance.isPaused) || GameManager.instance.currentGame != "munchyMonk") { - GameObject.Destroy(gameObject); - } - if (canDestroy && anim.IsAnimationNotPlaying()) GameObject.Destroy(gameObject); } - private void Hit(PlayerActionEvent caller, float state) + public void HitFunction(float state) { - if (!canDestroy) { - game.MonkArmsAnim.DoScaledAnimationAsync("WristSlap", 0.5f); - Jukebox.PlayOneShotGame(sfxName+"slap"); - game.isStaring = false; - - if (state >= 1f || state <= -1f) + smearSr.color = dumplingColor; + game.MonkArmsAnim.DoScaledAnimationAsync("WristSlap", 0.5f); + Jukebox.PlayOneShotGame(sfxName+"slap"); + game.isStaring = false; + + if (state >= 1f || state <= -1f) + { + game.MonkAnim.DoScaledAnimationAsync("Barely", 0.5f); + anim.DoScaledAnimationAsync("HitHead", 0.5f); + Jukebox.PlayOneShotGame(sfxName+"barely"); + canDestroy = true; + game.needBlush = false; + } else { + game.MonkAnim.DoScaledAnimationAsync("Eat", 0.4f); + game.dumplings[0].anim.DoScaledAnimationAsync("FollowHand", 0.5f); + smearAnim.Play("SmearAppear", 0, 0); + game.needBlush = true; + Jukebox.PlayOneShotGame(sfxName+"gulp"); + MunchyMonk.howManyGulps++; + for (int i = 1; i <= 4; i++) { - game.MonkAnim.DoScaledAnimationAsync("Barely", 0.5f); - anim.DoScaledAnimationAsync("HitHead", 0.5f); - Jukebox.PlayOneShotGame(sfxName+"barely"); - canDestroy = true; - } else { - game.MonkAnim.DoScaledAnimationAsync("Eat", 0.4f); - if (type == 2) otherAnim.DoScaledAnimationAsync("FollowHand", 0.5f); - smearAnim.Play("SmearAppear", 0, 0); - game.needBlush = true; - Jukebox.PlayOneShotGame(sfxName+"gulp"); - if (game.forceGrow) game.growLevel += 1; - GameObject.Destroy(gameObject); + if (MunchyMonk.howManyGulps == MunchyMonk.inputsTilGrow*i) { + MunchyMonk.growLevel = i; + } } + GameObject.Destroy(gameObject); } } - private void Miss(PlayerActionEvent caller) + public void MissFunction() { if (!canDestroy) { anim.DoScaledAnimationAsync("FallOff", 0.5f); @@ -80,21 +82,18 @@ namespace HeavenStudio.Games.Scripts_MunchyMonk } } - private void Early(PlayerActionEvent caller) - { - if (!(type == 2.5f) || game.firstTwoMissed) { - game.MonkArmsAnim.DoScaledAnimationAsync("WristSlap", 0.5f); - game.MonkAnim.DoScaledAnimationAsync("Miss", 0.5f); - smearAnim.Play("SmearAppear", 0, 0); - anim.DoScaledAnimationAsync("HitHead", 0.5f); - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound(sfxName+"slap", game.lastReportedBeat), - new MultiSound.Sound(sfxName+"miss", game.lastReportedBeat), - }); - canDestroy = true; - game.needBlush = false; - game.firstTwoMissed = true; - } + public void EarlyFunction() + { + game.MonkArmsAnim.DoScaledAnimationAsync("WristSlap", 0.5f); + game.MonkAnim.DoScaledAnimationAsync("Miss", 0.5f); + smearAnim.Play("SmearAppear", 0, 0); + anim.DoScaledAnimationAsync("HitHead", 0.5f); + MultiSound.Play(new MultiSound.Sound[] { + new MultiSound.Sound(sfxName+"slap", Conductor.instance.songPositionInBeats), + new MultiSound.Sound(sfxName+"miss", Conductor.instance.songPositionInBeats), + }); + canDestroy = true; + game.needBlush = false; } } } diff --git a/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs b/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs index 539a2968..a0698e06 100644 --- a/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs +++ b/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs @@ -1,6 +1,8 @@ using HeavenStudio.Util; +using HeavenStudio.Common; using System; using System.Collections.Generic; +using System.Linq; using UnityEngine; namespace HeavenStudio.Games.Loaders @@ -15,11 +17,12 @@ namespace HeavenStudio.Games.Loaders { function = delegate { var e = eventCaller.currentEntity; - MunchyMonk.instance.Bop(e.beat, e["monkBop"]); + MunchyMonk.instance.Bop(e.beat, e["bop"], e["autoBop"]); }, parameters = new List() { - new Param("monkBop", false, "Bop", "Does the Monk bop?"), + new Param("bop", true, "Monk Bops?", "Does the monk bop?"), + new Param("autoBop", false, "Monk Bops? (Auto)", "Does the monk auto bop?"), }, defaultLength = 0.5f, }, @@ -27,13 +30,14 @@ namespace HeavenStudio.Games.Loaders { function = delegate { var e = eventCaller.currentEntity; - MunchyMonk.instance.MonkMove(e.beat, e.length, e["instant"], e["whichSide"]); + MunchyMonk.instance.MonkMove(e.beat, e.length, e["goToSide"], e["ease"]); }, resizable = true, parameters = new List() { - new Param("instant", false, "", "Instantly move to the middle or to the right"), - } + new Param("goToSide", MunchyMonk.WhichSide.Right, "Go to Which Side?", "Which side the Monk will move to"), + new Param("ease", EasingFunction.Ease.Linear, "Ease", "Which ease should the movement have?"), + }, }, new GameAction("One", "One") { @@ -41,81 +45,88 @@ namespace HeavenStudio.Games.Loaders var e = eventCaller.currentEntity; MunchyMonk.PreOneGoCue(e.beat, e["oneColor"]); }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + MunchyMonk.PreOneGoCue(e.beat, e["oneColor"]); + }, defaultLength = 2f, parameters = new List() { new Param("oneColor", new Color(1, 1, 1, 1), "Color", "Change the color of the dumpling") }, - inactiveFunction = delegate { - var e = eventCaller.currentEntity; - MunchyMonk.PreOneGoCue(e.beat, e["oneColor"]); - } }, new GameAction("TwoTwo", "Two Two") { defaultLength = 2f, parameters = new List() { - new Param("twoColor", new Color(1, 0.51f, 0.45f, 1), "Color", "Change the color of the dumplings") + new Param("twoColor1", new Color(1, 0.51f, 0.45f, 1), "1st Dumpling Color", "Change the color of the first dumpling"), + new Param("twoColor2", new Color(1, 0.51f, 0.45f, 1), "2nd Dumpling Color", "Change the color of the second dumpling"), }, preFunctionLength = 0.5f, preFunction = delegate { var e = eventCaller.currentEntity; - MunchyMonk.PreTwoTwoCue(e.beat, e["twoColor"]); + MunchyMonk.PreTwoTwoCue(e.beat, e["twoColor1"], e["twoColor2"]); }, }, new GameAction("Three", "Three") { function = delegate { var e = eventCaller.currentEntity; - MunchyMonk.PreThreeGoCue(e.beat, e["threeColor"]); + MunchyMonk.PreThreeGoCue(e.beat, e["threeColor1"], e["threeColor2"], e["threeColor3"]); + }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + MunchyMonk.PreThreeGoCue(e.beat, e["threeColor1"], e["threeColor2"], e["threeColor3"]); }, defaultLength = 4f, parameters = new List() { - new Param("threeColor", new Color(0.34f, 0.77f, 0.36f, 1), "Color", "Change the color of the dumplings") + new Param("threeColor1", new Color(0.34f, 0.77f, 0.36f, 1), "1st Dumpling Color", "Change the color of the first dumpling"), + new Param("threeColor2", new Color(0.34f, 0.77f, 0.36f, 1), "2nd Dumpling Color", "Change the color of the second dumpling"), + new Param("threeColor3", new Color(0.34f, 0.77f, 0.36f, 1), "3rd Dumpling Color", "Change the color of the third dumpling"), }, - inactiveFunction = delegate { - var e = eventCaller.currentEntity; - MunchyMonk.PreThreeGoCue(e.beat, e["threeColor"]); - } }, new GameAction("Modifiers", "Modifiers") { function = delegate { var e = eventCaller.currentEntity; - MunchyMonk.instance.Modifiers(e.beat, e["inputsTil"], e["forceGrow"], e["disableBaby"]); + MunchyMonk.Modifiers(e.beat, e["inputsTil"], e["resetLevel"], e["setLevel"], e["disableBaby"], e["shouldBlush"]); }, defaultLength = 0.5f, parameters = new List() { new Param("inputsTil", new EntityTypes.Integer(0, 50, 10), "How Many 'til Growth?", "How many dumplings are needed to grow the stache?"), - new Param("forceGrow", false, "Next Will Grow?", "Will the next input increment stache growth?"), + new Param("resetLevel", false, "Remove Hair", "Instantly remove all hair"), + new Param("setLevel", new EntityTypes.Integer(0, 4, 0), "Set Growth Level", "Instantly grow hair"), new Param("disableBaby", false, "Disable Baby?", "Make baby active or not"), + new Param("shouldBlush", true, "Should Monk Blush?", "Makes the Monk blush or not after eating"), }, }, new GameAction("MonkAnimation", "Monk Animations") { function = delegate { var e = eventCaller.currentEntity; - MunchyMonk.instance.PlayMonkAnim(e.beat, e["whichAnim"]); + MunchyMonk.instance.PlayMonkAnim(e.beat, e["whichAnim"], e["vineBoom"]); }, parameters = new List() { new Param("whichAnim", MunchyMonk.WhichMonkAnim.Stare, "Which Animation", "Which animation will the Monk play?"), + new Param("vineBoom", false, "Vine Boom", "Just guess with this one."), } }, - // note: make the bg not scroll by default new GameAction("ScrollBackground", "Scroll Background") { function = delegate { var e = eventCaller.currentEntity; - MunchyMonk.instance.ScrollBG(e.beat, e["instant"]); + MunchyMonk.instance.ScrollBG(e.beat, e.length, e["scrollSpeed"], e["ease"]); }, - defaultLength = 0.5f, + defaultLength = 1f, + resizable = true, parameters = new List() { - new Param("instant", false, "Instant?", "Will the scrolling happen immediately?"), + new Param("scrollSpeed", new EntityTypes.Float(0, 20, 5), "Scroll Speed", "What should the scroll speed be?"), + new Param("ease", EasingFunction.Ease.Linear, "Ease", "Which ease should the scroll ramp up have?"), } }, }); @@ -128,32 +139,28 @@ namespace HeavenStudio.Games using Scripts_MunchyMonk; public class MunchyMonk : Minigame { - static List queuedOnes = new List(); - struct QueuedOne + public List dumplings = new List(); + static List queuedOnes = new List(); + static List queuedTwoTwos = new List(); + static List queuedThrees = new List(); + struct QueuedDumpling { public float beat; - public Color color; - } - - static List queuedTwoTwos = new List(); - struct QueuedTwoTwo - { - public float beat; - public Color color; - } - - static List queuedThrees = new List(); - struct QueuedThree - { - public float beat; - public Color color; + public Color color1; + public Color color2; + public Color color3; } public enum WhichMonkAnim { Stare, Blush, - Bop, + } + + public enum WhichSide + { + Right, + Left, } [Header("Objects")] @@ -161,15 +168,6 @@ namespace HeavenStudio.Games [SerializeField] GameObject BrowHolder; [SerializeField] GameObject StacheHolder; [SerializeField] GameObject DumplingObj; - [SerializeField] GameObject TwoDumplingObj1; - [SerializeField] GameObject TwoDumplingObj2; - [SerializeField] SpriteRenderer DumplingSprite; - [SerializeField] SpriteRenderer TwoDumplingSprite1; - [SerializeField] SpriteRenderer TwoDumplingSprite2; - [SerializeField] SpriteRenderer DumplingSmear; - [SerializeField] SpriteRenderer TwoDumplingSmear1; - [SerializeField] SpriteRenderer TwoDumplingSmear2; - [SerializeField] Transform MMParent; [Header("Animators")] [SerializeField] Animator OneGiverAnim; @@ -177,24 +175,41 @@ namespace HeavenStudio.Games [SerializeField] Animator ThreeGiverAnim; [SerializeField] Animator BrowAnim; [SerializeField] Animator StacheAnim; + [SerializeField] Animator MonkHolderAnim; public Animator MonkAnim; public Animator MonkArmsAnim; - public Animator DumplingAnim; - public Animator TwoDumpling1Anim; - public Animator TwoDumpling2Anim; - public Animator SmearAnim; [Header("Variables")] + [SerializeField] Sprite[] dumplingSprites; public float lastReportedBeat = 0f; - public bool monkBop = true; public bool needBlush; public bool isStaring; - public bool firstTwoMissed; - public bool forceGrow; - public int growLevel = 0; - private bool disableBaby; - private int inputsTilGrow; - float scrollModifier = 0f; + bool monkBop = true; + + // these variables are static so that they can be set outside of the game/stay the same between game switches + static public int howManyGulps; + static public int growLevel = 0; + static public int inputsTilGrow = 10; + static bool noBlush; + static bool disableBaby; + + // the variables for scroll + bool scrollRampUp; + float scrollBeat; + float scrollLength; + float scrollMod; + static float scrollModCurrent = 0; + EasingFunction.Ease scrollEase; + + // the variables for the monk moving + bool isMoving; + float movingStartBeat; + float movingLength; + string moveAnim; + EasingFunction.Ease lastEase; + + private Dumpling currentDumpling; + ScrollObject[] scrollObjects; const string sfxName = "munchyMonk/"; public static MunchyMonk instance; @@ -202,7 +217,29 @@ namespace HeavenStudio.Games private void Awake() { instance = this; - if (disableBaby) Baby.SetActive(false); + Baby.SetActive(!disableBaby); + } + + private void Start() + { + scrollObjects = FindObjectsByType(FindObjectsSortMode.None); + foreach (var obj in scrollObjects) { + obj.SpeedMod = scrollModCurrent; + } + } + + private void OnDestroy() + { + // reset static variables + if (queuedOnes.Count > 0) queuedOnes.Clear(); + if (queuedTwoTwos.Count > 0) queuedThrees.Clear(); + if (queuedThrees.Count > 0) queuedThrees.Clear(); + + howManyGulps = 0; + growLevel = 0; + inputsTilGrow = 10; + noBlush = false; + disableBaby = false; } private void Update() @@ -213,6 +250,10 @@ namespace HeavenStudio.Games MonkArmsAnim.DoScaledAnimationAsync("WristSlap", 0.5f); Jukebox.PlayOneShotGame(sfxName+"slap"); isStaring = false; + // early input stuff + if (dumplings.Count != 0) { + InputFunctions(3); + } } // blushes when done eating but not when staring @@ -221,40 +262,61 @@ namespace HeavenStudio.Games && !MonkAnim.IsPlayingAnimationName("Stare") && !MonkAnim.IsPlayingAnimationName("Barely") && !MonkAnim.IsPlayingAnimationName("Miss") - && !isStaring) + && !isStaring + && !noBlush) { MonkAnim.DoScaledAnimationAsync("Blush", 0.5f); needBlush = false; } // sets hair stuff active when it needs to be - if (growLevel == 4) BrowHolder.SetActive(true); - if (growLevel > 0) StacheHolder.SetActive(true); + if (growLevel > 0) { + StacheHolder.SetActive(true); + if (growLevel == 4) BrowHolder.SetActive(true); + } - // resets the monk when game is paused - if (!Conductor.instance.isPlaying && !Conductor.instance.isPaused) { + // resets the monk when game is stopped + if (!Conductor.instance.NotStopped()) { MonkAnim.DoScaledAnimationAsync("Idle", 0.5f); } - // scrolling stuff - //if (needScroll) { - // Tile += new Vector2(2 * Time.deltaTime, 0); - // NormalizedX += 0.5f * Time.deltaTime; - //} + if (isMoving) { + float normalizedBeat = Conductor.instance.GetPositionFromBeat(movingStartBeat, movingLength); + EasingFunction.Function func = EasingFunction.GetEasingFunction(lastEase); + float newPos = func(0f, 1f, normalizedBeat); + MonkHolderAnim.DoNormalizedAnimation(moveAnim, newPos); + if (normalizedBeat >= 1f) { + isMoving = false; + } + } + + if (scrollRampUp) { + float normalizedBeat = Conductor.instance.GetPositionFromBeat(scrollBeat, scrollLength); + EasingFunction.Function func = EasingFunction.GetEasingFunction(scrollEase); + float newPos = func(scrollModCurrent, scrollMod, normalizedBeat); + if (normalizedBeat >= 1f) { + scrollRampUp = false; + scrollModCurrent = scrollMod; + } + + foreach (var obj in scrollObjects) { + obj.SpeedMod = newPos; + } + } // cue queuing stuff if (queuedOnes.Count > 0) { - foreach (var dumpling in queuedOnes) { OneGoCue(dumpling.beat, dumpling.color); } + foreach (var dumpling in queuedOnes) { OneGoCue(dumpling.beat, dumpling.color1); } queuedOnes.Clear(); } if (queuedTwoTwos.Count > 0) { - foreach (var dumpling in queuedTwoTwos) { TwoTwoCue(dumpling.beat, dumpling.color); } + foreach (var dumpling in queuedTwoTwos) { TwoTwoCue(dumpling.beat, dumpling.color1, dumpling.color2); } queuedTwoTwos.Clear(); } if (queuedThrees.Count > 0) { - foreach (var dumpling in queuedThrees) { ThreeGoCue(dumpling.beat, dumpling.color); } + foreach (var dumpling in queuedThrees) { ThreeGoCue(dumpling.beat, dumpling.color1, dumpling.color2, dumpling.color3); } queuedThrees.Clear(); } } @@ -263,47 +325,91 @@ namespace HeavenStudio.Games { if (Conductor.instance.ReportBeat(ref lastReportedBeat)) { if ((MonkAnim.IsAnimationNotPlaying() || MonkAnim.IsPlayingAnimationName("Bop") || MonkAnim.IsPlayingAnimationName("Idle")) - && monkBop - && !isStaring){ + && monkBop + && !isStaring) + { MonkAnim.DoScaledAnimationAsync("Bop", 0.5f); } - // commented this out cuz it makes a warning every beat but im not fixing it cuz i need to fix it on my munchy monk branch - //if (BrowAnim.IsPlayingAnimationName("Bop") && growLevel == 4) BrowAnim.DoScaledAnimationAsync("Bop", 0.5f); - //if (StacheAnim.IsPlayingAnimationName("Bop"+growLevel)) StacheAnim.DoScaledAnimationAsync("Bop"+growLevel, 0.5f); + + if (!MonkAnim.IsPlayingAnimationName("Blush") || !MonkAnim.IsPlayingAnimationName("Stare")) { + if (growLevel == 4) BrowAnim.DoScaledAnimationAsync("Bop", 0.5f); + if (growLevel > 0) StacheAnim.DoScaledAnimationAsync($"Bop{growLevel}", 0.5f); + } } } - public void Bop(float beat, bool doesBop) + public void Bop(float beat, bool bop, bool autoBop) { - monkBop = doesBop; + monkBop = autoBop; + if (bop) { + needBlush = false; + MonkAnim.DoScaledAnimationAsync("Bop", 0.5f); + if (growLevel == 4) BrowAnim.DoScaledAnimationAsync("Bop", 0.5f); + if (growLevel > 0) StacheAnim.DoScaledAnimationAsync($"Bop{growLevel}", 0.5f); + } } - public static void PreOneGoCue(float beat, Color oneColor) + public void InputFunctions(int whichVar, float state = 0) + { + currentDumpling = dumplings[dumplings.Count-1]; + switch (whichVar) + { + case 1: + currentDumpling.HitFunction(state); + break; + case 2: + currentDumpling.MissFunction(); + break; + case 3: + currentDumpling.EarlyFunction(); + break; + } + dumplings.RemoveAt(dumplings.Count-1); + } + + public void Hit(PlayerActionEvent caller, float state) + { + if (dumplings.Count > 0) InputFunctions(1, state); + } + + public void Miss(PlayerActionEvent caller) + { + if (dumplings.Count > 0) InputFunctions(2); + } + + public void Early(PlayerActionEvent caller) { } + + public static void PreOneGoCue(float beat, Color firstColor) { MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound(sfxName+"one_1", beat), - new MultiSound.Sound(sfxName+"one_2", beat + 1f), + new MultiSound.Sound(sfxName+"one_1", beat), + new MultiSound.Sound(sfxName+"one_2", beat + 1f), }, forcePlay: true); - queuedOnes.Add(new QueuedOne() - { beat = beat, color = oneColor, }); + queuedOnes.Add(new QueuedDumpling() + { beat = beat, color1 = firstColor, }); } - public void OneGoCue(float beat, Color oneColor) + public void OneGoCue(float beat, Color firstColor) { - DumplingSprite.color = - DumplingSmear.color = oneColor; - BeatAction.New(gameObject, new List() { - new BeatAction.Action(beat , delegate { OneGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); }), - new BeatAction.Action(beat+0.5f, delegate { OneGiverAnim.DoScaledAnimationAsync("GiveOut", 0.5f); }), + new BeatAction.Action(beat, delegate { + OneGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); + // dumpling + Dumpling DumplingClone = Instantiate(DumplingObj, gameObject.transform).GetComponent(); + DumplingClone.dumplingColor = firstColor; + DumplingClone.startBeat = beat; + DumplingClone.sr.sprite = dumplingSprites[0]; + dumplings.Add(DumplingClone); + ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, Hit, Miss, Early); + }), + new BeatAction.Action(beat+0.5f, delegate { + OneGiverAnim.DoScaledAnimationAsync("GiveOut", 0.5f); + }), }); - - Dumpling DumplingClone = Instantiate(DumplingObj, MMParent).GetComponent(); - DumplingClone.startBeat = beat; } - public static void PreTwoTwoCue(float beat, Color twoColor) + public static void PreTwoTwoCue(float beat, Color firstColor, Color secondColor) { MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound(sfxName+"two_1", beat - 0.5f), @@ -312,37 +418,41 @@ namespace HeavenStudio.Games new MultiSound.Sound(sfxName+"two_4", beat + 1.5f), }, forcePlay: true); - queuedTwoTwos.Add(new QueuedTwoTwo() - { beat = beat, color = twoColor, }); - } - - public void TwoTwoCue(float beat, Color twoColor) - { - BeatAction.New(gameObject, new List() { - new BeatAction.Action(beat-0.5f, delegate { - // lol - TwoDumplingSmear1.color = - TwoDumplingSmear2.color = - TwoDumplingSprite1.color = - TwoDumplingSprite2.color = twoColor; - - // first dumpling - Dumpling DumplingClone1 = Instantiate(TwoDumplingObj1, MMParent).GetComponent(); - DumplingClone1.startBeat = beat-0.5f; - DumplingClone1.type = 2f; - // second dumpling - Dumpling DumplingClone2 = Instantiate(TwoDumplingObj2, MMParent).GetComponent(); - DumplingClone2.startBeat = beat-0.5f; - DumplingClone2.type = 2.5f; - DumplingClone1.otherAnim = DumplingClone2.gameObject.GetComponent(); - - TwoGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); }), - new BeatAction.Action(beat, delegate { - TwoGiverAnim.DoScaledAnimationAsync("GiveOut", 0.5f); }), + queuedTwoTwos.Add(new QueuedDumpling() { + beat = beat, + color1 = firstColor, + color2 = secondColor, }); } - public static void PreThreeGoCue(float beat, Color threeColor) + public void TwoTwoCue(float beat, Color firstColor, Color secondColor) + { + BeatAction.New(gameObject, new List() { + new BeatAction.Action(beat-0.5f, delegate { + TwoGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); + // first dumpling + Dumpling DumplingClone1 = Instantiate(DumplingObj, gameObject.transform).GetComponent(); + DumplingClone1.dumplingColor = firstColor; + DumplingClone1.startBeat = beat-0.5f; + DumplingClone1.sr.sprite = dumplingSprites[1]; + dumplings.Add(DumplingClone1); + ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, Hit, Miss, Early); + //DumplingClone1.otherAnim = DumplingClone2.gameObject.GetComponent(); + }), + new BeatAction.Action(beat, delegate { + TwoGiverAnim.DoScaledAnimationAsync("GiveOut", 0.5f); + // second dumpling + Dumpling DumplingClone2 = Instantiate(DumplingObj, gameObject.transform).GetComponent(); + DumplingClone2.dumplingColor = secondColor; + DumplingClone2.startBeat = beat-0.5f; + DumplingClone2.sr.sprite = dumplingSprites[2]; + dumplings.Add(DumplingClone2); + ScheduleInput(beat, 1.5f, InputType.STANDARD_DOWN, Hit, Miss, Early); + }), + }); + } + + public static void PreThreeGoCue(float beat, Color firstColor, Color secondColor, Color thirdColor) { MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound(sfxName+"three_1", beat), @@ -351,89 +461,116 @@ namespace HeavenStudio.Games new MultiSound.Sound(sfxName+"three_4", beat + 3f), }, forcePlay: true); - queuedThrees.Add(new QueuedThree() - { beat = beat, color = threeColor, }); + queuedThrees.Add(new QueuedDumpling() { + beat = beat, + color1 = firstColor, + color2 = secondColor, + color3 = thirdColor, + }); } - public void ThreeGoCue(float beat, Color threeColor) + public void ThreeGoCue(float beat, Color firstColor, Color secondColor, Color thirdColor) { - DumplingSprite.color = - DumplingSmear.color = threeColor; - BeatAction.New(instance.gameObject, new List() { - // first dumpling new BeatAction.Action(beat, delegate { - Dumpling DumplingClone1 = Instantiate(DumplingObj, MMParent).GetComponent(); + // first in + ThreeGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); + // first dumpling + Dumpling DumplingClone1 = Instantiate(DumplingObj, gameObject.transform).GetComponent(); + DumplingClone1.dumplingColor = firstColor; DumplingClone1.startBeat = beat; - DumplingClone1.type = 3f; + DumplingClone1.sr.sprite = dumplingSprites[3]; + dumplings.Add(DumplingClone1); + ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, Hit, Miss, Early); }), - ThreeGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); }), new BeatAction.Action(beat+0.5f, delegate { + // first out ThreeGiverAnim.DoScaledAnimationAsync("GiveOut", 0.5f); }), - // second dumpling - new BeatAction.Action(beat+1.25f, delegate { - Dumpling DumplingClone2 = Instantiate(DumplingObj, MMParent).GetComponent(); - DumplingClone2.startBeat = beat+1.25f; - DumplingClone2.type = 3.5f; - - ThreeGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); }), - new BeatAction.Action(beat+1.75f, delegate { - ThreeGiverAnim.DoScaledAnimationAsync("GiveOut", 0.5f); }), - // third dumpling - new BeatAction.Action(beat+2.25f, delegate { - Dumpling DumplingClone3 = Instantiate(DumplingObj, MMParent).GetComponent(); - DumplingClone3.startBeat = beat+2.25f; - DumplingClone3.type = 4f; - ThreeGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); }), - new BeatAction.Action(beat+2.75f, delegate { + new BeatAction.Action(beat+1.3f, delegate { + // second in + ThreeGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); + // second dumpling + Dumpling DumplingClone2 = Instantiate(DumplingObj, gameObject.transform).GetComponent(); + DumplingClone2.dumplingColor = secondColor; + DumplingClone2.startBeat = beat+1.3f; + DumplingClone2.sr.sprite = dumplingSprites[4]; + dumplings.Add(DumplingClone2); + ScheduleInput(beat, 2f, InputType.STANDARD_DOWN, Hit, Miss, Early); }), + + new BeatAction.Action(beat+1.75f, delegate { + // second out + ThreeGiverAnim.DoScaledAnimationAsync("GiveOut", 0.5f); }), + + new BeatAction.Action(beat+2.3f, delegate { + // third in + ThreeGiverAnim.DoScaledAnimationAsync("GiveIn", 0.5f); + // third dumpling + Dumpling DumplingClone3 = Instantiate(DumplingObj, gameObject.transform).GetComponent(); + DumplingClone3.dumplingColor = thirdColor; + DumplingClone3.startBeat = beat+2.3f; + DumplingClone3.sr.sprite = dumplingSprites[5]; + dumplings.Add(DumplingClone3); + ScheduleInput(beat, 3f, InputType.STANDARD_DOWN, Hit, Miss, Early); }), + + new BeatAction.Action(beat+2.75f, delegate { + // third out ThreeGiverAnim.DoScaledAnimationAsync("GiveOut", 0.5f); }), }); } - public void PlayMonkAnim(float beat, int whichAnim) + public void PlayMonkAnim(float beat, int whichAnim, bool vineBoom) { switch (whichAnim) { - case 0: - MonkAnim.DoScaledAnimationAsync("Stare", 0.5f); - isStaring = true; - break; case 1: MonkAnim.DoScaledAnimationAsync("Blush", 0.5f); needBlush = false; break; - case 2: - MonkAnim.DoScaledAnimationAsync("Bop", 0.5f); + default: + MonkAnim.DoScaledAnimationAsync("Stare", 0.5f); + isStaring = true; break; } + + // it's in zeo's video; no reason not to include it :) + if (vineBoom) Jukebox.PlayOneShotGame("fanClub/arisa_dab", forcePlay: true); } - public void MonkMove(float beat, float length, bool isInstant, int whichSide) + public void MonkMove(float beat, float length, int goToSide, int ease) { - if (isInstant) { - - } else { - if (whichSide == 0) { - - } else { + movingStartBeat = beat; + movingLength = length; + moveAnim = (goToSide == 0 ? "GoRight" : "GoLeft"); + isMoving = true; + lastEase = (EasingFunction.Ease)ease; + } - } + public static void Modifiers(float beat, int inputsTilGrow, bool resetLevel, int setLevel, bool disableBaby, bool shouldBlush) + { + if (MunchyMonk.inputsTilGrow != inputsTilGrow) MunchyMonk.howManyGulps = inputsTilGrow * MunchyMonk.growLevel; + if (setLevel != 0) MunchyMonk.growLevel = setLevel; + if (resetLevel) { + MunchyMonk.growLevel = 0; + MunchyMonk.howManyGulps = 0; } + + + MunchyMonk.noBlush = !shouldBlush; + MunchyMonk.inputsTilGrow = inputsTilGrow; + MunchyMonk.disableBaby = disableBaby; + + if (GameManager.instance.currentGame == "munchyMonk") + MunchyMonk.instance.Baby.SetActive(!disableBaby); } - public void Modifiers(float beat, int inputsTilGrow, bool forceGrow, bool disableBaby) + public void ScrollBG(float beat, float length, float scrollSpeed, int ease) { - instance.inputsTilGrow = inputsTilGrow; - instance.forceGrow = forceGrow; - instance.disableBaby = disableBaby; - - if (disableBaby) Baby.SetActive(false); - } - - public void ScrollBG(float beat, bool isInstant) - { - + scrollBeat = beat; + scrollLength = length; + scrollMod = scrollSpeed; + scrollRampUp = true; + scrollEase = (EasingFunction.Ease)ease; } } } \ No newline at end of file