diff --git a/Assets/Resources/Games/cropStomp.prefab b/Assets/Resources/Games/cropStomp.prefab index 750b32ef0..82a630939 100644 --- a/Assets/Resources/Games/cropStomp.prefab +++ b/Assets/Resources/Games/cropStomp.prefab @@ -167,6 +167,100 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1724630562508082575 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9013836040703323965} + - component: {fileID: 5390509786553021236} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9013836040703323965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724630562508082575} + 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: [] + m_Father: {fileID: 5722211921049515452} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5390509786553021236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724630562508082575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4216796832095366999} + handleType: 0 + leftHandleLocalPosition: {x: 0, y: -3, z: 0} + rightHandleLocalPosition: {x: -0, y: 3, z: -0} +--- !u!1 &1912046815530632528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3556255116223739725} + - component: {fileID: 7518811250107335392} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3556255116223739725 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1912046815530632528} + 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: [] + m_Father: {fileID: 3207137220522778508} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7518811250107335392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1912046815530632528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 7648030253694337683} + handleType: 0 + leftHandleLocalPosition: {x: 0, y: -1, z: 0} + rightHandleLocalPosition: {x: -0, y: 1, z: -0} --- !u!1 &2339041431090773305 GameObject: m_ObjectHideFlags: 0 @@ -331,6 +425,53 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: -0, y: 0, z: 0} rightHandleLocalPosition: {x: 0, y: -0, z: -0} +--- !u!1 &3160896539912705443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7588339279902079887} + - component: {fileID: 628762754964992989} + m_Layer: 0 + m_Name: Point 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7588339279902079887 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160896539912705443} + 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: [] + m_Father: {fileID: 3207137220522778508} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &628762754964992989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160896539912705443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 7648030253694337683} + handleType: 0 + leftHandleLocalPosition: {x: -0, y: 1, z: -0} + rightHandleLocalPosition: {x: 0, y: -1, z: 0} --- !u!1 &3306990414045802303 GameObject: m_ObjectHideFlags: 0 @@ -362,6 +503,158 @@ Transform: m_Father: {fileID: 3400679188163948944} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3377373105055045263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 417816444571395395} + - component: {fileID: 8020774681123229851} + m_Layer: 0 + m_Name: Mole + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &417816444571395395 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377373105055045263} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4.5, y: 4.5, z: 1} + m_Children: + - {fileID: 3207137220522778508} + - {fileID: 5592378564678122777} + m_Father: {fileID: 7947161716638790645} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8020774681123229851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377373105055045263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21658c0e285c7f54e8c320332291b270, type: 3} + m_Name: + m_EditorClassIdentifier: + inList: 0 + lastState: 0 + state: + gameObject: {fileID: 0} + early: 0 + perfect: 0 + late: 0 + createBeat: 0 + eligibleHitsList: [] + aceTimes: 0 + isEligible: 0 + triggersAutoplay: 1 + isMole: 1 + veggieSprites: + - {fileID: -4174758508601275437, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} + - {fileID: -2961287720435529803, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} + - {fileID: 5598513160068558425, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} + moleSprites: + - {fileID: -7342873356196823606, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} + - {fileID: -4112523241890619114, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} + - {fileID: 3862573926363885855, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} + veggieSprite: {fileID: 7928308337446182332} + veggieTrans: {fileID: 5592378564678122777} + curve: {fileID: 7648030253694337683} + targetBeat: 0 +--- !u!1 &3829333311673839566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1524379417701275016} + - component: {fileID: 7928308337446182332} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1524379417701275016 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3829333311673839566} + 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: [] + m_Father: {fileID: 5592378564678122777} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7928308337446182332 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3829333311673839566} + 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: 2 + m_Sprite: {fileID: -7342873356196823606, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3948884045839928685 GameObject: m_ObjectHideFlags: 0 @@ -526,6 +819,61 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4054995023368593208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5722211921049515452} + - component: {fileID: 4216796832095366999} + m_Layer: 0 + m_Name: MoleCurve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5722211921049515452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4054995023368593208} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6925, y: -0.0879997, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 9013836040703323965} + - {fileID: 91958044408621973} + - {fileID: 2182143009000168317} + m_Father: {fileID: 5813499711186931250} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4216796832095366999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4054995023368593208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 5390509786553021236} + - {fileID: 8549282191410311990} + - {fileID: 8020774569150893270} + normalizedTime: 0.5 --- !u!1 &4359899702068686394 GameObject: m_ObjectHideFlags: 0 @@ -559,6 +907,53 @@ Transform: m_Father: {fileID: 5813499711186931250} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4376224606821414354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6048083266540539888} + - component: {fileID: 3870464971272127331} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6048083266540539888 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4376224606821414354} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.5040001, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3207137220522778508} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3870464971272127331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4376224606821414354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 7648030253694337683} + handleType: 0 + leftHandleLocalPosition: {x: -0, y: 0, z: 0} + rightHandleLocalPosition: {x: 0, y: -0, z: -0} --- !u!1 &4478042505738261112 GameObject: m_ObjectHideFlags: 0 @@ -587,6 +982,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7001187974207596949} + - {fileID: 417816444571395395} m_Father: {fileID: 3229117913716202416} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -666,7 +1062,7 @@ Transform: m_LocalScale: {x: 4.5, y: 4.5, z: 5} m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6072388044625575886 SpriteRenderer: @@ -831,6 +1227,7 @@ Transform: m_Children: - {fileID: 3229117913716202416} - {fileID: 6378453749366738950} + - {fileID: 5722211921049515452} - {fileID: 9053856824134827426} - {fileID: 5813499711658895220} m_Father: {fileID: 0} @@ -851,6 +1248,7 @@ MonoBehaviour: EligibleHits: [] firstEnable: 0 baseVeggie: {fileID: 2592768001999288343} + baseMole: {fileID: 3377373105055045263} legsAnim: {fileID: 5381231469059857945} bodyAnim: {fileID: 5071188212098719590} farmerTrans: {fileID: 2890674062888421961} @@ -860,6 +1258,7 @@ MonoBehaviour: veggieHolder: {fileID: 6205523899711794644} farmer: {fileID: 2943047049103139379} pickCurve: {fileID: 1367185960650937854} + moleCurve: {fileID: 4216796832095366999} --- !u!1 &5813499711658895222 GameObject: m_ObjectHideFlags: 0 @@ -889,7 +1288,7 @@ Transform: m_LocalScale: {x: 18.9426, y: 11.7704, z: 1} m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5813499711658895221 SpriteRenderer: @@ -942,6 +1341,53 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6051994564129256084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2182143009000168317} + - component: {fileID: 8020774569150893270} + m_Layer: 0 + m_Name: Point 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2182143009000168317 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6051994564129256084} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -15, y: -3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5722211921049515452} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8020774569150893270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6051994564129256084} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4216796832095366999} + handleType: 0 + leftHandleLocalPosition: {x: 0, y: 3, z: 0} + rightHandleLocalPosition: {x: -0, y: -3, z: -0} --- !u!1 &6481603154299829066 GameObject: m_ObjectHideFlags: 0 @@ -1180,6 +1626,37 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: -0, y: 1, z: -0} rightHandleLocalPosition: {x: 0, y: -1, z: 0} +--- !u!1 &7017226645532624212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5592378564678122777} + m_Layer: 0 + m_Name: Pivot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5592378564678122777 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7017226645532624212} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1524379417701275016} + m_Father: {fileID: 417816444571395395} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7395503987791811721 GameObject: m_ObjectHideFlags: 0 @@ -1435,6 +1912,53 @@ MonoBehaviour: isEligible: 0 triggersAutoplay: 0 nextStompBeat: 0 +--- !u!1 &8661740946493645443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 91958044408621973} + - component: {fileID: 8549282191410311990} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &91958044408621973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661740946493645443} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8, y: 5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5722211921049515452} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8549282191410311990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661740946493645443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4216796832095366999} + handleType: 0 + leftHandleLocalPosition: {x: 2, y: -0, z: 0} + rightHandleLocalPosition: {x: -2, y: 0, z: -0} --- !u!1 &8897652086585911321 GameObject: m_ObjectHideFlags: 0 @@ -1517,6 +2041,61 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9036500057431371455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3207137220522778508} + - component: {fileID: 7648030253694337683} + m_Layer: 0 + m_Name: Curve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3207137220522778508 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9036500057431371455} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.75, z: 0} + m_LocalScale: {x: 1, y: 0.5, z: 1} + m_Children: + - {fileID: 3556255116223739725} + - {fileID: 6048083266540539888} + - {fileID: 7588339279902079887} + m_Father: {fileID: 417816444571395395} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7648030253694337683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9036500057431371455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 7518811250107335392} + - {fileID: 3870464971272127331} + - {fileID: 628762754964992989} + normalizedTime: 0.5 --- !u!1 &9068570991608772132 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sfx/games/cropStomp/GEUH.ogg b/Assets/Resources/Sfx/games/cropStomp/GEUH.ogg new file mode 100644 index 000000000..f46773e16 Binary files /dev/null and b/Assets/Resources/Sfx/games/cropStomp/GEUH.ogg differ diff --git a/Assets/Resources/Sfx/games/cropStomp/GEUH.ogg.meta b/Assets/Resources/Sfx/games/cropStomp/GEUH.ogg.meta new file mode 100644 index 000000000..edcb5192c --- /dev/null +++ b/Assets/Resources/Sfx/games/cropStomp/GEUH.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6e7ae9a1edcafd244af7ff8f7c0e618b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/cropStomp/moleHeh1.ogg b/Assets/Resources/Sfx/games/cropStomp/moleHeh1.ogg new file mode 100644 index 000000000..edfa88de9 Binary files /dev/null and b/Assets/Resources/Sfx/games/cropStomp/moleHeh1.ogg differ diff --git a/Assets/Resources/Sfx/games/cropStomp/moleHeh1.ogg.meta b/Assets/Resources/Sfx/games/cropStomp/moleHeh1.ogg.meta new file mode 100644 index 000000000..a9c08411a --- /dev/null +++ b/Assets/Resources/Sfx/games/cropStomp/moleHeh1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f4e53e4a874bc7a419204a11e9f1b69c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/cropStomp/moleHeh2.ogg b/Assets/Resources/Sfx/games/cropStomp/moleHeh2.ogg new file mode 100644 index 000000000..ba34f1bce Binary files /dev/null and b/Assets/Resources/Sfx/games/cropStomp/moleHeh2.ogg differ diff --git a/Assets/Resources/Sfx/games/cropStomp/moleHeh2.ogg.meta b/Assets/Resources/Sfx/games/cropStomp/moleHeh2.ogg.meta new file mode 100644 index 000000000..eaa194433 --- /dev/null +++ b/Assets/Resources/Sfx/games/cropStomp/moleHeh2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1bfdd30a4327d934e9cb5e02f3164c64 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/cropStomp/moleNyeh.ogg b/Assets/Resources/Sfx/games/cropStomp/moleNyeh.ogg new file mode 100644 index 000000000..398758145 Binary files /dev/null and b/Assets/Resources/Sfx/games/cropStomp/moleNyeh.ogg differ diff --git a/Assets/Resources/Sfx/games/cropStomp/moleNyeh.ogg.meta b/Assets/Resources/Sfx/games/cropStomp/moleNyeh.ogg.meta new file mode 100644 index 000000000..8edbf907c --- /dev/null +++ b/Assets/Resources/Sfx/games/cropStomp/moleNyeh.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 75cbf3c9fdfbaab4db2fbe0f15df5ab0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/CropStomp/CropStomp.cs b/Assets/Scripts/Games/CropStomp/CropStomp.cs index c09a018f6..e76132937 100644 --- a/Assets/Scripts/Games/CropStomp/CropStomp.cs +++ b/Assets/Scripts/Games/CropStomp/CropStomp.cs @@ -28,6 +28,7 @@ namespace RhythmHeavenMania.Games.CropStomp [NonSerialized] public bool isFlicking; public GameObject baseVeggie; + public GameObject baseMole; public Animator legsAnim; public Animator bodyAnim; public Transform farmerTrans; @@ -37,6 +38,7 @@ namespace RhythmHeavenMania.Games.CropStomp public Transform veggieHolder; public Farmer farmer; public BezierCurve3D pickCurve; + public BezierCurve3D moleCurve; private Tween shakeTween; @@ -47,7 +49,7 @@ namespace RhythmHeavenMania.Games.CropStomp instance = this; } - private void Start() + private async void Start() { // Finding grass sprite width for grass scrolling. var grassSprite = grass.sprite; @@ -75,9 +77,11 @@ namespace RhythmHeavenMania.Games.CropStomp } } - // Spawn veggies. + // Veggie and mole events. var vegEvents = entities.FindAll(v => v.datamodel == "cropStomp/veggies"); + var moleEvents = entities.FindAll(m => m.datamodel == "cropStomp/mole"); + // Spawn veggies. for (int i = 0; i < vegEvents.Count; i++) { var vegBeat = vegEvents[i].beat; @@ -93,11 +97,22 @@ namespace RhythmHeavenMania.Games.CropStomp var targetVeggieBeat = vegBeat + 2f * b; if (startBeat < targetVeggieBeat) { - SpawnVeggie(targetVeggieBeat, startBeat); + SpawnVeggie(targetVeggieBeat, startBeat, false); } } } } + + // Spawn moles. + for (int i = 0; i < moleEvents.Count; i++) + { + var moleBeat = moleEvents[i].beat; + + if (startBeat < moleBeat) + { + SpawnVeggie(moleBeat, startBeat, true); + } + } } private void Update() @@ -201,9 +216,9 @@ namespace RhythmHeavenMania.Games.CropStomp isStepping = true; } - private void SpawnVeggie(float beat, float startBeat) + private void SpawnVeggie(float beat, float startBeat, bool isMole) { - var newVeggie = GameObject.Instantiate(baseVeggie, veggieHolder).GetComponent(); + var newVeggie = GameObject.Instantiate(isMole ? baseMole : baseVeggie, veggieHolder).GetComponent(); newVeggie.targetBeat = beat; diff --git a/Assets/Scripts/Games/CropStomp/Veggie.cs b/Assets/Scripts/Games/CropStomp/Veggie.cs index 6ca189f8c..9cf720f99 100644 --- a/Assets/Scripts/Games/CropStomp/Veggie.cs +++ b/Assets/Scripts/Games/CropStomp/Veggie.cs @@ -18,10 +18,12 @@ namespace RhythmHeavenMania.Games.CropStomp public SpriteRenderer veggieSprite; public Transform veggieTrans; public BezierCurve3D curve; + private BezierCurve3D hitCurve; public float targetBeat; private float stompedBeat; private float pickedBeat; + private float pickTime = 1f; private int veggieState = 0; private bool boinked; // Player got barely when trying to pick. @@ -39,6 +41,11 @@ namespace RhythmHeavenMania.Games.CropStomp { veggieSprite.sprite = veggieSprites[UnityEngine.Random.Range(0, veggieSprites.Length)]; } + else + { + veggieSprite.sprite = moleSprites[0]; + pickTime = 1.5f; + } } private bool gotStomped; // Safeguard in case nested Update() call breaks. @@ -97,7 +104,8 @@ namespace RhythmHeavenMania.Games.CropStomp { veggieState = -1; - Jukebox.PlayOneShotGame("cropStomp/veggieMiss"); + if (!isMole) + Jukebox.PlayOneShotGame("cropStomp/veggieMiss"); return; } @@ -138,14 +146,18 @@ namespace RhythmHeavenMania.Games.CropStomp private void PickedUpdate() { - float pickPosition = Conductor.instance.GetPositionFromBeat(pickedBeat, 1f); + float pickPosition = Conductor.instance.GetPositionFromBeat(pickedBeat, pickTime); pickPosition = Mathf.Clamp(pickPosition, 0, 1); - veggieTrans.position = game.pickCurve.GetPoint(pickPosition); + veggieTrans.position = hitCurve.GetPoint(pickPosition); - veggieTrans.rotation = Quaternion.Euler(0, 0, veggieTrans.rotation.eulerAngles.z + (pickedRotationSpeed * Time.deltaTime)); + var rotSpeed = isMole ? -pickedRotationSpeed : pickedRotationSpeed; + veggieTrans.rotation = Quaternion.Euler(0, 0, veggieTrans.rotation.eulerAngles.z + (rotSpeed * Time.deltaTime)); - var veggieScale = Mathf.Min(1.5f - pickPosition, 1f); - veggieTrans.localScale = Vector2.one * veggieScale; + if (!isMole) + { + var veggieScale = Mathf.Min(1.5f - pickPosition, 1f); + veggieTrans.localScale = Vector2.one * veggieScale; + } } private void StompVeggie(bool autoTriggered) @@ -211,10 +223,23 @@ namespace RhythmHeavenMania.Games.CropStomp BeatAction.New(gameObject, new List() { new BeatAction.Action(pickedBeat + 0.5f, delegate { veggieSprite.sortingOrder = -1; }), - new BeatAction.Action(pickedBeat + 1f, delegate { GameObject.Destroy(gameObject); }) + new BeatAction.Action(pickedBeat + pickTime, delegate { GameObject.Destroy(gameObject); }) }); Jukebox.PlayOneShotGame("cropStomp/veggieKay"); + + hitCurve = game.pickCurve; + } + else + { + BeatAction.New(gameObject, new List() + { + new BeatAction.Action(pickedBeat + pickTime, delegate { GameObject.Destroy(gameObject); }) + }); + + Jukebox.PlayOneShotGame("cropStomp/GEUH"); + + hitCurve = game.moleCurve; } if (squashTween != null) diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 311452246..85dc0b4a9 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -362,6 +362,7 @@ namespace RhythmHeavenMania { new GameAction("start marching", delegate { CropStomp.instance.StartMarching(eventCaller.currentEntity.beat); }, 2f, false), new GameAction("veggies", delegate { }, 4f, true), + new GameAction("mole", delegate { }, 2f, false), }), /*new Minigame("spaceDance", "Space Dance", "B888F8", new List() {