catchy tune: gameplay implemented, animation adjustments

This commit is contained in:
kkuhn317 2022-12-29 20:41:22 -05:00
parent 74fac11b99
commit 6924728577
23 changed files with 1548 additions and 2732 deletions

File diff suppressed because one or more lines are too long

View file

@ -254,7 +254,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7009696120969573463}
- component: {fileID: 8306434661293035236}
m_Layer: 0
m_Name: shoulder
m_TagString: Untagged
@ -272,61 +271,12 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.1199999, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 2598385184184571312}
- {fileID: 2343923251983769356}
m_Father: {fileID: 7997575977314638224}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8306434661293035236
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 786446246965887726}
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: 22
m_Sprite: {fileID: 6813553822765877458, guid: 5a65df7bb864c0248aac9cb3c640784b, 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.58, y: 2.54}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &801887564292033294
GameObject:
m_ObjectHideFlags: 0
@ -525,7 +475,7 @@ Transform:
- {fileID: 3752477502864886478}
- {fileID: 8242410538167019657}
m_Father: {fileID: 5813499711186931250}
m_RootOrder: 7
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &1484131320285530606
Animator:
@ -537,7 +487,7 @@ Animator:
m_GameObject: {fileID: 992341452064354670}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 22100000, guid: 0e2a776387afe75428ffd42f972456d7, type: 2}
m_Controller: {fileID: 9100000, guid: dbec2f996c097204fbabd409d1582516, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
@ -749,7 +699,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
m_SortingOrder: 1
m_Sprite: {fileID: -1384196080759313857, guid: 0abb2a0b4ce32484088bd67150cc20ef, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -1380,6 +1330,88 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2811116221280878316
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6392985126056854645}
- component: {fileID: 8898913622620173527}
m_Layer: 0
m_Name: grabbing
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &6392985126056854645
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2811116221280878316}
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: 4797431964762108354}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8898913622620173527
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2811116221280878316}
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: 22
m_Sprite: {fileID: 6155212226941906339, guid: 5a65df7bb864c0248aac9cb3c640784b, 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.58, y: 2.54}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2946216797412216352
GameObject:
m_ObjectHideFlags: 0
@ -1491,6 +1523,7 @@ MonoBehaviour:
startBeat: 0
anim: {fileID: 3687550532664276802}
side: 0
eligable: 1
--- !u!95 &3687550532664276802
Animator:
serializedVersion: 3
@ -1620,7 +1653,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5813499711186931250}
m_RootOrder: 8
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3126892981753011118
GameObject:
@ -2692,7 +2725,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4797431964762108354}
- component: {fileID: 3359485560925212884}
m_Layer: 0
m_Name: shoulder
m_TagString: Untagged
@ -2710,61 +2742,12 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.1199999, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 2697895304291564350}
- {fileID: 6392985126056854645}
m_Father: {fileID: 5255010178246812078}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3359485560925212884
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4686654208295237911}
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: 22
m_Sprite: {fileID: -2950032572879587788, guid: 5a65df7bb864c0248aac9cb3c640784b, 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.58, y: 2.54}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &5335445266941032824
GameObject:
m_ObjectHideFlags: 0
@ -3313,8 +3296,6 @@ Transform:
- {fileID: 8746993661413993986}
- {fileID: 5813499711658895220}
- {fileID: 2926650863297674356}
- {fileID: 4519834680602206643}
- {fileID: 4025721451813666757}
- {fileID: 7997575977314638224}
- {fileID: 5255010178246812078}
- {fileID: 7132931890004463583}
@ -3341,8 +3322,6 @@ MonoBehaviour:
orangeBase: {fileID: 2946216797412216352}
pineappleBase: {fileID: 8913925594972200924}
fruitHolder: {fileID: 7132931890004463583}
leftCurve: {fileID: 2518424467918884650}
rightCurve: {fileID: 5989372879564921552}
--- !u!1 &5813499711658895222
GameObject:
m_ObjectHideFlags: 0
@ -3589,6 +3568,88 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6030172325110703757
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2598385184184571312}
- component: {fileID: 1993172189274862486}
m_Layer: 0
m_Name: normal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2598385184184571312
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6030172325110703757}
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: 7009696120969573463}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1993172189274862486
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6030172325110703757}
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: 22
m_Sprite: {fileID: 6813553822765877458, guid: 5a65df7bb864c0248aac9cb3c640784b, 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.58, y: 2.54}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6231672151385264451
GameObject:
m_ObjectHideFlags: 0
@ -3671,36 +3732,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6372883010668871030
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4025721451813666757}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4025721451813666757
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6372883010668871030}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -13.771696, y: -1.5344136, z: -63.312584}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5813499711186931250}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6618754934861920270
GameObject:
m_ObjectHideFlags: 0
@ -3900,7 +3931,7 @@ Transform:
- {fileID: 752060619203519241}
- {fileID: 3733534293348500293}
m_Father: {fileID: 5813499711186931250}
m_RootOrder: 6
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &2714918693410431372
Animator:
@ -4425,6 +4456,88 @@ MonoBehaviour:
handleType: 0
leftHandleLocalPosition: {x: 0.015293598, y: -1.0521564, z: -0}
rightHandleLocalPosition: {x: -0.015293598, y: 1.0521564, z: 0}
--- !u!1 &8059748310852804670
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2697895304291564350}
- component: {fileID: 9204118004869799616}
m_Layer: 0
m_Name: normal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2697895304291564350
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8059748310852804670}
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: 4797431964762108354}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &9204118004869799616
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8059748310852804670}
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: 22
m_Sprite: {fileID: -2950032572879587788, guid: 5a65df7bb864c0248aac9cb3c640784b, 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.58, y: 2.54}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &8062451851649843751
GameObject:
m_ObjectHideFlags: 0
@ -4652,7 +4765,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2782166267725029782
Transform:
m_ObjectHideFlags: 0
@ -4703,7 +4816,7 @@ MonoBehaviour:
- {fileID: 2561598410281455641}
- {fileID: 4820020064892944221}
normalizedTime: 0.5
--- !u!1 &8826023680323221297
--- !u!1 &8853261142435602627
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -4711,36 +4824,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4519834680602206643}
- component: {fileID: 8936138408121109063}
- component: {fileID: 2343923251983769356}
- component: {fileID: 9068724854033191156}
m_Layer: 0
m_Name: sprites_0
m_Name: grabbing
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4519834680602206643
m_IsActive: 0
--- !u!4 &2343923251983769356
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8826023680323221297}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -28.332092, y: 2.5658875, z: 0}
m_GameObject: {fileID: 8853261142435602627}
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: 5813499711186931250}
m_RootOrder: 4
m_Father: {fileID: 7009696120969573463}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8936138408121109063
--- !u!212 &9068724854033191156
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8826023680323221297}
m_GameObject: {fileID: 8853261142435602627}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@ -4773,13 +4886,13 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 6128299156075563123, guid: 5a65df7bb864c0248aac9cb3c640784b, type: 3}
m_SortingOrder: 22
m_Sprite: {fileID: 6708733205153277002, guid: 5a65df7bb864c0248aac9cb3c640784b, 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.78, y: 2.83}
m_Size: {x: 1.58, y: 2.54}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
@ -4896,6 +5009,7 @@ MonoBehaviour:
startBeat: 0
anim: {fileID: 2043772623599362328}
side: 0
eligable: 1
--- !u!95 &2043772623599362328
Animator:
serializedVersion: 3

View file

@ -110,7 +110,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Alalin
m_Name: Alalin and plalin
serializedVersion: 5
m_AnimatorParameters:
- m_Name: bop
@ -119,7 +119,7 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: stopcatch
- m_Name: stopCatch
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
@ -199,7 +199,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: stopcatch
m_ConditionEvent: stopCatch
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -257888764932827859}

View file

@ -1,15 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!221 &22100000
AnimatorOverrideController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Plalin
m_Controller: {fileID: 9100000, guid: dbec2f996c097204fbabd409d1582516, type: 2}
m_Clips:
- m_OriginalClip: {fileID: 7400000, guid: 77817aa47d3201b41b291437166856c1, type: 2}
m_OverrideClip: {fileID: 7400000, guid: 87c01d930a9e29143a600f82bf76e676, type: 2}
- m_OriginalClip: {fileID: 7400000, guid: a0f682c59cbf7e942a1b06a8e7c32129, type: 2}
m_OverrideClip: {fileID: 7400000, guid: 00d2e21725c6043449e63809e66d053a, type: 2}

View file

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 0e2a776387afe75428ffd42f972456d7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 22100000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 00d2e21725c6043449e63809e66d053a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -347,14 +347,45 @@ AnimationClip:
path: orange
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 6708733205153277002, guid: 5a65df7bb864c0248aac9cb3c640784b, type: 3}
attribute: m_Sprite
path: shoulder
classID: 212
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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: shoulder/normal
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: shoulder/grabbing
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
@ -447,12 +478,19 @@ AnimationClip:
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2946186525
attribute: 0
path: 971876707
attribute: 2086281974
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2189547052
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 976167654
attribute: 1
@ -474,8 +512,7 @@ AnimationClip:
typeID: 4
customType: 4
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 6708733205153277002, guid: 5a65df7bb864c0248aac9cb3c640784b, type: 3}
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
@ -1427,6 +1464,44 @@ AnimationClip:
path: armleft/hand
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: shoulder/normal
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: shoulder/grabbing
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

View file

@ -21,15 +21,15 @@ AnimationClip:
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: -480}
outSlope: {x: 0, y: 0, z: 480}
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.75
value: {x: 0, y: 0, z: -360}
inSlope: {x: 0, y: 0, z: -480}
value: {x: 0, y: 0, z: 360}
inSlope: {x: 0, y: 0, z: 480}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -64,53 +64,53 @@ AnimationClip:
- serializedVersion: 3
time: 0.16666667
value: {x: 1.38, y: 1.95, z: 0}
inSlope: {x: 0, y: -46.319996, z: 0}
outSlope: {x: 0, y: 15.240001, z: 0}
inSlope: {x: 0, y: -160.31366, z: 0}
outSlope: {x: 0, y: 25.05948, 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}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.14055133, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.29823396, z: 0.33333334}
- serializedVersion: 3
time: 0.25
value: {x: 1.58, y: 3.22, z: 0}
inSlope: {x: 2.5799997, y: 0, z: 0}
outSlope: {x: 2.5799997, y: 0, z: 0}
inSlope: {x: 2.5799997, y: -4.828325, z: 0}
outSlope: {x: 2.5799997, y: 4.524621, 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}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.3616065, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.3402196, z: 0.33333334}
- serializedVersion: 3
time: 0.33333334
value: {x: 1.81, y: 0.52, z: 0}
inSlope: {x: 2.46, y: -32.399998, z: 0}
outSlope: {x: 2.46, y: 28.080006, z: 0}
inSlope: {x: 2.46, y: -79.53856, z: 0}
outSlope: {x: 2.46, y: 72.20629, 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}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.1956242, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.2581541, z: 0.33333334}
- serializedVersion: 3
time: 0.41666666
value: {x: 1.99, y: 2.86, z: 0}
inSlope: {x: 4.320002, y: 0, z: 0}
outSlope: {x: 4.320002, y: 0, z: 0}
inSlope: {x: 3.332182, y: 0, z: 0}
outSlope: {x: 3.332182, 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}
weightedMode: 3
inWeight: {x: 0.32821593, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.24847981, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 2.63, y: -1.32, z: 0}
inSlope: {x: 6.840001, y: -50.159992, z: 0}
outSlope: {x: 6.840001, y: 36.480007, z: 0}
value: {x: 2.5145469, y: -1.32, z: 0}
inSlope: {x: 7.80242, y: -195.68529, z: 0}
outSlope: {x: 7.80242, y: 149.16298, 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}
weightedMode: 3
inWeight: {x: 0.2606313, y: 0.14489864, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.13903359, z: 0.33333334}
- serializedVersion: 3
time: 0.5833333
value: {x: 3.13, y: 1.72, z: 0}
inSlope: {x: 6.5399985, y: 0, z: 0}
outSlope: {x: 6.5399985, y: 0, z: 0}
inSlope: {x: 7.232718, y: 0, z: 0}
outSlope: {x: 7.232718, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -118,20 +118,20 @@ AnimationClip:
- serializedVersion: 3
time: 0.6666667
value: {x: 3.72, y: -0.02, z: 0}
inSlope: {x: 5.4599986, y: -41.759995, z: 0}
outSlope: {x: 5.4599986, y: -41.759995, z: 0}
inSlope: {x: 5.4599986, y: -117.671585, z: 0}
outSlope: {x: 5.4599986, y: -117.671585, 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}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.1531984, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.4188417, z: 0.33333334}
- serializedVersion: 3
time: 0.75
value: {x: 4.04, y: -6.61, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 28.212006, z: 0}
outSlope: {x: 0, y: 28.212006, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.6280562, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
@ -328,26 +328,26 @@ AnimationClip:
- serializedVersion: 3
time: 0.41666666
value: 1.99
inSlope: 4.320002
outSlope: 4.320002
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: 3.332182
outSlope: 3.332182
tangentMode: 0
weightedMode: 3
inWeight: 0.32821593
outWeight: 0.24847981
- serializedVersion: 3
time: 0.5
value: 2.63
inSlope: 6.840001
outSlope: 6.840001
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
value: 2.5145469
inSlope: 7.80242
outSlope: 7.80242
tangentMode: 0
weightedMode: 3
inWeight: 0.2606313
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
value: 3.13
inSlope: 6.5399985
outSlope: 6.5399985
inSlope: 7.232718
outSlope: 7.232718
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
@ -401,30 +401,30 @@ AnimationClip:
- serializedVersion: 3
time: 0.16666667
value: 1.95
inSlope: -46.319996
outSlope: 15.240001
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -160.31366
outSlope: 25.05948
tangentMode: 1
weightedMode: 3
inWeight: 0.14055133
outWeight: 0.29823396
- serializedVersion: 3
time: 0.25
value: 3.22
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -4.828325
outSlope: 4.524621
tangentMode: 1
weightedMode: 3
inWeight: 0.3616065
outWeight: 0.3402196
- serializedVersion: 3
time: 0.33333334
value: 0.52
inSlope: -32.399998
outSlope: 28.080006
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -79.53856
outSlope: 72.20629
tangentMode: 1
weightedMode: 3
inWeight: 0.1956242
outWeight: 0.2581541
- serializedVersion: 3
time: 0.41666666
value: 2.86
@ -437,12 +437,12 @@ AnimationClip:
- serializedVersion: 3
time: 0.5
value: -1.32
inSlope: -50.159992
outSlope: 36.480007
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -195.68529
outSlope: 149.16298
tangentMode: 1
weightedMode: 3
inWeight: 0.14489864
outWeight: 0.13903359
- serializedVersion: 3
time: 0.5833333
value: 1.72
@ -455,20 +455,20 @@ AnimationClip:
- serializedVersion: 3
time: 0.6666667
value: -0.02
inSlope: -41.759995
outSlope: -41.759995
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -117.671585
outSlope: -117.671585
tangentMode: 0
weightedMode: 3
inWeight: 0.1531984
outWeight: 0.4188417
- serializedVersion: 3
time: 0.75
value: -6.61
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
inSlope: 28.212006
outSlope: 28.212006
tangentMode: 0
weightedMode: 3
inWeight: 0.6280562
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
@ -779,15 +779,15 @@ AnimationClip:
time: 0
value: 0
inSlope: 0
outSlope: -480
outSlope: 480
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: -360
inSlope: -480
value: 360
inSlope: 480
outSlope: 0
tangentMode: 69
weightedMode: 0

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b83faa32ea89be34caa219e4e6ea9088
guid: e1563df2eeaea5e469c9a6e971ba06eb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000

View file

@ -64,53 +64,53 @@ AnimationClip:
- serializedVersion: 3
time: 0.16666667
value: {x: -1.38, y: 1.95, z: 0}
inSlope: {x: 0, y: -46.319996, z: 0}
outSlope: {x: 0, y: 15.240001, z: 0}
inSlope: {x: 0, y: -160.31366, z: 0}
outSlope: {x: 0, y: 25.05948, 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}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.14055133, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.29823396, z: 0.33333334}
- serializedVersion: 3
time: 0.25
value: {x: -1.58, y: 3.22, z: 0}
inSlope: {x: -2.5799997, y: 0, z: 0}
outSlope: {x: -2.5799997, y: 0, z: 0}
inSlope: {x: -2.5799997, y: -4.828325, z: 0}
outSlope: {x: -2.5799997, y: 4.524621, 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}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.3616065, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.3402196, z: 0.33333334}
- serializedVersion: 3
time: 0.33333334
value: {x: -1.81, y: 0.52, z: 0}
inSlope: {x: -2.46, y: -32.399998, z: 0}
outSlope: {x: -2.46, y: 28.080006, z: 0}
inSlope: {x: -2.46, y: -79.53856, z: 0}
outSlope: {x: -2.46, y: 72.20629, 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}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.1956242, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.2581541, z: 0.33333334}
- serializedVersion: 3
time: 0.41666666
value: {x: -1.99, y: 2.86, z: 0}
inSlope: {x: -4.320002, y: 0, z: 0}
outSlope: {x: -4.320002, y: 0, z: 0}
inSlope: {x: -3.4681566, y: 0, z: 0}
outSlope: {x: -3.4681566, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
weightedMode: 3
inWeight: {x: 0.56479895, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: -2.63, y: -1.32, z: 0}
inSlope: {x: -6.840001, y: -50.159992, z: 0}
outSlope: {x: -6.840001, y: 36.480007, z: 0}
value: {x: -2.4947433, y: -1.32, z: 0}
inSlope: {x: -8.378592, y: -195.68529, z: 0}
outSlope: {x: -8.378592, y: 149.16298, 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}
weightedMode: 3
inWeight: {x: 0.2414088, y: 0.14489864, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.13903359, z: 0.33333334}
- serializedVersion: 3
time: 0.5833333
value: {x: -3.13, y: 1.72, z: 0}
inSlope: {x: -6.5399985, y: 0, z: 0}
outSlope: {x: -6.5399985, y: 0, z: 0}
inSlope: {x: -7.351539, y: 0, z: 0}
outSlope: {x: -7.351539, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -118,20 +118,20 @@ AnimationClip:
- serializedVersion: 3
time: 0.6666667
value: {x: -3.72, y: -0.02, z: 0}
inSlope: {x: -5.4599986, y: -41.759995, z: 0}
outSlope: {x: -5.4599986, y: -41.759995, z: 0}
inSlope: {x: -5.4599986, y: -117.671585, z: 0}
outSlope: {x: -5.4599986, y: -117.671585, 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}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.1531984, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.4188417, z: 0.33333334}
- serializedVersion: 3
time: 0.75
value: {x: -4.04, y: -6.61, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 28.212006, z: 0}
outSlope: {x: 0, y: 28.212006, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.6280562, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
@ -328,26 +328,26 @@ AnimationClip:
- serializedVersion: 3
time: 0.41666666
value: -1.99
inSlope: -4.320002
outSlope: -4.320002
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
inSlope: -3.4681566
outSlope: -3.4681566
tangentMode: 0
weightedMode: 3
inWeight: 0.56479895
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: -2.63
inSlope: -6.840001
outSlope: -6.840001
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
value: -2.4947433
inSlope: -8.378592
outSlope: -8.378592
tangentMode: 0
weightedMode: 3
inWeight: 0.2414088
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
value: -3.13
inSlope: -6.5399985
outSlope: -6.5399985
inSlope: -7.351539
outSlope: -7.351539
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
@ -401,30 +401,30 @@ AnimationClip:
- serializedVersion: 3
time: 0.16666667
value: 1.95
inSlope: -46.319996
outSlope: 15.240001
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -160.31366
outSlope: 25.05948
tangentMode: 1
weightedMode: 3
inWeight: 0.14055133
outWeight: 0.29823396
- serializedVersion: 3
time: 0.25
value: 3.22
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -4.828325
outSlope: 4.524621
tangentMode: 1
weightedMode: 3
inWeight: 0.3616065
outWeight: 0.3402196
- serializedVersion: 3
time: 0.33333334
value: 0.52
inSlope: -32.399998
outSlope: 28.080006
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -79.53856
outSlope: 72.20629
tangentMode: 1
weightedMode: 3
inWeight: 0.1956242
outWeight: 0.2581541
- serializedVersion: 3
time: 0.41666666
value: 2.86
@ -437,12 +437,12 @@ AnimationClip:
- serializedVersion: 3
time: 0.5
value: -1.32
inSlope: -50.159992
outSlope: 36.480007
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -195.68529
outSlope: 149.16298
tangentMode: 1
weightedMode: 3
inWeight: 0.14489864
outWeight: 0.13903359
- serializedVersion: 3
time: 0.5833333
value: 1.72
@ -455,20 +455,20 @@ AnimationClip:
- serializedVersion: 3
time: 0.6666667
value: -0.02
inSlope: -41.759995
outSlope: -41.759995
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inSlope: -117.671585
outSlope: -117.671585
tangentMode: 0
weightedMode: 3
inWeight: 0.1531984
outWeight: 0.4188417
- serializedVersion: 3
time: 0.75
value: -6.61
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
inSlope: 28.212006
outSlope: 28.212006
tangentMode: 0
weightedMode: 3
inWeight: 0.6280562
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2

View file

@ -1,713 +0,0 @@
%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: idle red
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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: shoulder
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.13360786, y: 4, 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: head
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.1199999, y: 1, 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: shoulder
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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, 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: torso
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -3.285367, y: -3.2983599, 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: armright
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -14.345367, y: 10.03164, 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: orange
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: armleft
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: orange
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: armright
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -2950032572879587788, guid: 5a65df7bb864c0248aac9cb3c640784b, type: 3}
attribute: m_Sprite
path: shoulder
classID: 212
script: {fileID: 0}
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: 3435577197
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 499495288
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3289784515
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2946186525
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 2817783452
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2946186525
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 660585605
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3289784515
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 499495288
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2946186525
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: -2950032572879587788, guid: 5a65df7bb864c0248aac9cb3c640784b, type: 3}
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: 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: -0.13360786
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: head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 4
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: head
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: head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1.1199999
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: shoulder
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_LocalPosition.y
path: shoulder
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: shoulder
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.x
path: torso
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.y
path: torso
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: torso
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: armleft
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.285367
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: armright
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.2983599
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: armright
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: armright
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: orange
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -14.345367
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: orange
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 10.03164
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: orange
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: orange
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: armright
classID: 1
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: localEulerAnglesRaw.x
path: shoulder
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: localEulerAnglesRaw.y
path: shoulder
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: localEulerAnglesRaw.z
path: shoulder
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: shoulder
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: shoulder
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: shoulder
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 87c01d930a9e29143a600f82bf76e676
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -170,14 +170,45 @@ AnimationClip:
path: armright
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 6813553822765877458, guid: 5a65df7bb864c0248aac9cb3c640784b, type: 3}
attribute: m_Sprite
path: shoulder
classID: 212
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
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: shoulder/normal
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: shoulder/grabbing
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
@ -207,12 +238,19 @@ AnimationClip:
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2946186525
attribute: 0
path: 971876707
attribute: 2086281974
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2189547052
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2817783452
attribute: 1
@ -255,14 +293,13 @@ AnimationClip:
typeID: 4
customType: 4
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 6813553822765877458, guid: 5a65df7bb864c0248aac9cb3c640784b, type: 3}
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -677,6 +714,44 @@ AnimationClip:
path: shoulder
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: shoulder/normal
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: shoulder/grabbing
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

View file

@ -117,7 +117,7 @@ AnimatorController:
m_DefaultFloat: 1
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -152,7 +152,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: b83faa32ea89be34caa219e4e6ea9088, type: 2}
m_Motion: {fileID: 7400000, guid: e1563df2eeaea5e469c9a6e971ba06eb, type: 2}
m_Tag:
m_SpeedParameter: speed
m_MirrorParameter:

View file

@ -80,7 +80,7 @@ Material:
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- _BodyColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- _BodyColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1}
- _BtnColor: {r: 1, g: 1, b: 1, a: 1}
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _Color: {r: 1, g: 1, b: 1, a: 1}

View file

@ -10,13 +10,14 @@ namespace HeavenStudio.Games.Loaders
using static Minigames;
public static class CtrCatchLoader
{
// minigame menu items
public static Minigame AddGame(EventCaller eventCaller) {
return new Minigame("catchyTune", "Catchy Tune", "B4E6F6", false, false, new List<GameAction>()
return new Minigame("catchyTune", "Catchy Tune \n<color=#eb5454>[WIP]</color>", "B4E6F6", false, false, new List<GameAction>()
{
new GameAction("orange", "Orange")
{
function = delegate {var e = eventCaller.currentEntity; CatchyTune.instance.DropFruit(e.beat, e["side"], false); },
defaultLength = 4f,
defaultLength = 5f,
parameters = new List<Param>()
{
new Param("side", CatchyTune.Side.Left, "Side", "The side the orange falls down")
@ -26,12 +27,23 @@ namespace HeavenStudio.Games.Loaders
new GameAction("pineapple", "Pineapple")
{
function = delegate {var e = eventCaller.currentEntity; CatchyTune.instance.DropFruit(e.beat, e["side"], true); },
defaultLength = 8f,
defaultLength = 9f,
parameters = new List<Param>()
{
new Param("side", CatchyTune.Side.Left, "Side", "The side the pineapple falls down")
},
},
new GameAction("bop", "Bop")
{
function = delegate {var e = eventCaller.currentEntity; CatchyTune.instance.Bop(e.beat, e["left"], e["right"]); },
defaultLength = 1f,
parameters = new List<Param>()
{
new Param("left" , true, "Left", "Plalin bops head"),
new Param("right", true, "Right", "Alalin bops head")
},
}
});
}
}
@ -60,11 +72,9 @@ namespace HeavenStudio.Games
public GameObject pineappleBase;
public Transform fruitHolder;
[Header("Curves")]
public BezierCurve3D leftCurve;
public BezierCurve3D rightCurve;
// when to stop playing the catch animation
private float stopCatchLeft = 0f;
private float stopCatchRight = 0f;
public static CatchyTune instance;
@ -73,22 +83,6 @@ namespace HeavenStudio.Games
instance = this;
}
// private void Update()
// {
// headAndBodyAnim.SetBool("ShouldOpenMouth", foodHolder.childCount != 0);
// if (PlayerInput.GetAnyDirectionDown())
// {
// headAndBodyAnim.Play("BiteL", 0, 0);
// }
// else if (PlayerInput.Pressed())
// {
// headAndBodyAnim.Play("BiteR", 0, 0);
// }
// }
List<DynamicBeatmap.DynamicEntity> spawnedOrangeEvents = new List<DynamicBeatmap.DynamicEntity>();
const float orangeoffset = 0.5f;
const float pineappleoffset = 0.5f;
@ -117,8 +111,6 @@ namespace HeavenStudio.Games
// }
// }
// if (PlayerInput.GetAnyDirectionDown())
// {
// plalinAnim.Play("catchOrange", 0, 0);
@ -127,49 +119,35 @@ namespace HeavenStudio.Games
// {
// alalinAnim.Play("catchOrange", 0, 0);
// }
Conductor conductor = Conductor.instance;
if (conductor.isPlaying && !conductor.isPaused)
{
// print(stopCatchLeft + " " + stopCatchRight);
// print("current beat: " + conductor.songPositionInBeats);
if (stopCatchLeft > 0 && stopCatchLeft <= conductor.songPositionInBeats)
{
plalinAnim.SetTrigger("stopCatch");
stopCatchLeft = 0;
}
if (stopCatchRight > 0 && stopCatchRight <= conductor.songPositionInBeats)
{
alalinAnim.SetTrigger("stopCatch");
stopCatchRight = 0;
}
}
}
// private void LateUpdate()
// {
// if (squashing)
// {
// var dState = donutBagAnim.GetCurrentAnimatorStateInfo(0);
// var cState = cakeBagAnim.GetCurrentAnimatorStateInfo(0);
// bool noDonutSquash = dState.IsName("DonutIdle");
// bool noCakeSquash = cState.IsName("CakeIdle");
// if (noDonutSquash && noCakeSquash)
// {
// squashing = false;
// bagsAnim.Play("Idle", 0, 0);
// }
// }
// }
// public void SpawnTreat(float beat, bool isCake)
// {
// var objectToSpawn = isCake ? cakeBase : donutBase;
// var newTreat = GameObject.Instantiate(objectToSpawn, foodHolder);
// var treatComp = newTreat.GetComponent<Treat>();
// treatComp.startBeat = beat;
// treatComp.curve = isCake ? cakeCurve : donutCurve;
// newTreat.SetActive(true);
// Jukebox.PlayOneShotGame(isCake ? "blueBear/cake" : "blueBear/donut");
// SquashBag(isCake);
// }
public void DropFruit(float beat, int side, bool isPineapple)
{
var objectToSpawn = isPineapple ? pineappleBase : orangeBase;
print("side = " + side);
if (side == (int)Side.Left || side == (int)Side.Both)
{
DropFruitSingle(beat, false, objectToSpawn);
@ -181,17 +159,6 @@ namespace HeavenStudio.Games
}
//float fruittimer = isPineapple ? 10f : 6f;
//if (side == Side.Left || side == Side.Both) {
// PlayerActionEvent fruitcatch = ScheduleInput(beat, fruittimer, InputType.DIRECTION_DOWN, catchOrangeSuccess, isPineapple ? catchPineappleMiss : catchOrangeMiss, isPineapple ? catchPineappleMiss : catchOrangeMiss);
//}
//if (side == Side.Right || side == Side.Both) {
// PlayerActionEvent fruitcatch = ScheduleInput(beat, fruittimer, InputType.STANDARD_DOWN, isPineapple ? catchPineappleSuccess : catchOrangeSuccess, isPineapple ? catchPineappleMiss : catchOrangeMiss, isPineapple ? catchPineappleMiss : catchOrangeMiss);
//}
}
public void DropFruitSingle(float beat, bool side, GameObject objectToSpawn)
@ -202,40 +169,41 @@ namespace HeavenStudio.Games
fruitComp.startBeat = beat;
fruitComp.side = side;
newFruit.SetActive(true);
print("dropped fruit");
}
public void catchOrangeSuccess(PlayerActionEvent caller)
public void Bop(float beat, bool left, bool right)
{
plalinAnim.Play("catchOrange", 0, 0);
Jukebox.PlayOneShotGame("catchyTune/catchSuccess");
if (left && stopCatchLeft == 0)
{
plalinAnim.Play("bop", 0, 0);
}
if (right && stopCatchRight == 0)
{
alalinAnim.Play("bop", 0, 0);
}
}
public void catchOrangeMiss(PlayerActionEvent caller)
public void catchSuccess(bool side, bool isPineapple, float beat)
{
if (side) {
alalinAnim.Play("catchOrange", 0, 0);
stopCatchRight = beat + 0.9f;
}
else
{
plalinAnim.Play("catchOrange", 0, 0);
stopCatchLeft = beat + 0.9f;
}
}
public void catchMiss(bool side, bool isPineapple)
{
return;
}
public void catchPineappleSuccess(PlayerActionEvent caller)
{
//alalinAnim.Play("catchPineapple", 0, 0);
Jukebox.PlayOneShotGame("catchyTune/catchSuccess");
}
public void catchPineappleMiss(PlayerActionEvent caller)
{
return;
}
// void CatchOrangePlalin()
// {
// plalinAnim.Play("catchOrange", 0, 0);
// }
// void CatchOrangeAlalin()
// {
// alalinAnim.Play("catchOrange", 0, 0);
// }
}

View file

@ -10,30 +10,37 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
{
public class Fruit : PlayerActionObject
{
const float rotSpeed = 360f;
const float sizeSpeed = 2f;
public bool isPineapple;
public float startBeat;
bool flying = true;
float flyBeats;
public Animator anim;
public bool side;
public bool eligable = true;
private string soundText;
private Minigame.Eligible e = new Minigame.Eligible();
private CatchyTune game;
private float beatLength = 4f;
private void Awake()
{
game = CatchyTune.instance;
e.gameObject = this.gameObject;
var cond = Conductor.instance;
var tempo = cond.songBpm;
var playbackSpeed = cond.musicSource.pitch;
float speedmult = isPineapple ? 0.5f : 1f;
anim.SetFloat("speed", (speedmult * tempo / 60f) * 0.2f);
if (isPineapple) beatLength = 8f;
anim.SetFloat("speed", GetAnimSpeed(isPineapple, tempo, playbackSpeed));
if (side)
{
@ -43,8 +50,126 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
anim.Play("fruit bounce", 0, 0f);
}
soundText = "catchyTune/";
if (side)
{
soundText += "right";
}
else {
soundText += "left";
}
if (isPineapple)
{
soundText += "Pineapple";
}
else {
soundText += "Orange";
}
MultiSound.Sound[] sound;
if (isPineapple) {
sound = new MultiSound.Sound[]
{
new MultiSound.Sound(soundText, startBeat + 2f),
new MultiSound.Sound(soundText, startBeat + 4f),
new MultiSound.Sound(soundText, startBeat + 6f)
};
}
else
{
sound = new MultiSound.Sound[]
{
new MultiSound.Sound(soundText, startBeat + 1f),
new MultiSound.Sound(soundText, startBeat + 2f),
new MultiSound.Sound(soundText, startBeat + 3f)
};
}
MultiSound.Play(sound);
}
private void Update()
{
Conductor cond = Conductor.instance;
float tempo = cond.songBpm;
float playbackSpeed = cond.musicSource.pitch;
if (cond.isPaused)
{
anim.SetFloat("speed", 0f);
}
else {
anim.SetFloat("speed", GetAnimSpeed(isPineapple, tempo, playbackSpeed));
}
float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, beatLength);
if (eligable)
{
// check input timing
StateCheck(normalizedBeat);
bool pressed = (PlayerInput.Pressed() && side) || (PlayerInput.GetAnyDirectionDown() && !side);
if (pressed)
{
if (state.perfect)
{
CatchFruit();
}
else if (state.notPerfect())
{
Miss();
}
else {
WayOff();
}
}
}
// fell off screen
if (normalizedBeat > 1.5f) {
Destroy(this.gameObject);
}
}
private float GetAnimSpeed(bool pineapple, float tempo, float playbackSpeed)
{
float speedmult = pineapple ? 0.5f : 1f;
return (speedmult * tempo / 60f) * 0.17f * playbackSpeed;
}
public override void OnAce()
{
CatchFruit();
}
private void CatchFruit()
{
//print("catch fruit");
Jukebox.PlayOneShotGame(soundText + "Catch");
game.catchSuccess(side, isPineapple, startBeat+beatLength);
Destroy(this.gameObject);
}
private void Miss()
{
//print("miss fruit");
eligable = false;
game.catchMiss(side, isPineapple);
Jukebox.PlayOneShotGame("catchyTune/missTest");
}
private void WayOff()
{
//print("way off");
//eligable = false;
Jukebox.PlayOneShotGame("catchyTune/whiff");
}
}
}