diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index f9794b376..32372c8cc 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -133,6 +133,88 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1706873953206308461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4986952394065486216} + - component: {fileID: 6912971380721679022} + m_Layer: 0 + m_Name: Mark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4986952394065486216 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1706873953206308461} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.887, y: 3.766, z: 0} + m_LocalScale: {x: 0.55448896, y: 0.55448896, z: 0.55448896} + m_Children: [] + m_Father: {fileID: 8285689916985503547} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6912971380721679022 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1706873953206308461} + 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: 0 + m_Sprite: {fileID: -7562411584499721466, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, 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 &1878496493894552565 GameObject: m_ObjectHideFlags: 0 @@ -588,6 +670,88 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4026680394803664292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 570661951155970246} + - component: {fileID: 6882391183622255728} + m_Layer: 0 + m_Name: 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &570661951155970246 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026680394803664292} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.046, y: 3.705, z: 0} + m_LocalScale: {x: 0.55448896, y: 0.55448896, z: 0.55448896} + m_Children: [] + m_Father: {fileID: 8285689916985503547} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6882391183622255728 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026680394803664292} + 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: 0 + m_Sprite: {fileID: 8853733407125453983, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, 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 &4166122059546700708 GameObject: m_ObjectHideFlags: 0 @@ -633,6 +797,88 @@ WindZone: m_WindTurbulence: 1 m_WindPulseMagnitude: 0.5 m_WindPulseFrequency: 0.01 +--- !u!1 &4346565458863165845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6334762466188099420} + - component: {fileID: 5310555110843074598} + m_Layer: 0 + m_Name: HIT + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6334762466188099420 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346565458863165845} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.006, y: 3.724, z: 0} + m_LocalScale: {x: 0.55448896, y: 0.55448896, z: 0.55448896} + m_Children: [] + m_Father: {fileID: 8285689916985503547} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5310555110843074598 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346565458863165845} + 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: 0 + m_Sprite: {fileID: 3741207959606632285, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, 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 &4977179752022768034 GameObject: m_ObjectHideFlags: 0 @@ -5437,6 +5683,70 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &6398113137460299953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7581330309301576633} + m_Layer: 0 + m_Name: Hit3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7581330309301576633 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6398113137460299953} + 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: 8285689916985503547} + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6693302166145137461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8285689916985503547} + m_Layer: 0 + m_Name: Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8285689916985503547 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6693302166145137461} + 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: 6334762466188099420} + - {fileID: 570661951155970246} + - {fileID: 4986952394065486216} + m_Father: {fileID: 7581330309301576633} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7248900331656947029 GameObject: m_ObjectHideFlags: 0 @@ -6108,7 +6418,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -500 - m_Sprite: {fileID: 21300000, guid: 2e1219e20b44d7b4b9b79c341cc5099a, type: 3} + m_Sprite: {fileID: 21300000, guid: b888cc3ff5664c647a0e08e95f9778d1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -17327,6 +17637,7 @@ Transform: - {fileID: 2035530467837460450} - {fileID: 634606877704519381} - {fileID: 6013960276080899241} + - {fileID: 7581330309301576633} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17368,6 +17679,12 @@ MonoBehaviour: - {fileID: 21300000, guid: f05694d1ff974fe4387e487d025edede, type: 3} BGSprite: {fileID: 7248900333330862853} comboRef: {fileID: 1174851578296134715} + HIT3Ref: {fileID: 6398113137460299953} + Numbers: + - {fileID: -6652173421999817615, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 1726704843289908573, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 8853733407125453983, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -715771857855404744, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} --- !u!61 &5840347371021274451 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboCrouch.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboCrouch.anim index 9bd25bd37..02f35ef8b 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboCrouch.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboCrouch.anim @@ -70,7 +70,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.927, y: -1.116, z: 0} + value: {x: 1.037, y: -1.129, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -79,7 +79,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0.34, y: -1.116, z: 0} + value: {x: 0.491, y: -1.123, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -95,7 +95,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -3.662, y: -3.069, z: 0.012} + value: {x: -3.662, y: -3.814, z: 0.012} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -104,7 +104,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: -3.546, y: -3.069, z: 0.012} + value: {x: -3.55, y: -3.809, z: 0.012} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -120,7 +120,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -2.076, y: -2.796, z: 0} + value: {x: -2.103, y: -3.524, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -477,7 +477,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.927 + value: 1.037 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -486,7 +486,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.34 + value: 0.491 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -505,7 +505,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.116 + value: -1.129 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -514,7 +514,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -1.116 + value: -1.123 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -570,7 +570,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -3.546 + value: -3.55 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -589,7 +589,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -3.069 + value: -3.814 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -598,7 +598,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -3.069 + value: -3.809 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -645,7 +645,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.076 + value: -2.103 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -664,7 +664,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.796 + value: -3.524 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboCrouchPunch.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboCrouchPunch.anim index cb4f87252..8a24eb144 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboCrouchPunch.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboCrouchPunch.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.736, y: -1.207, z: 0} + value: {x: 1.997, y: -1.218, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: 1.894, y: -1.23, z: 0} + value: {x: 1.98, y: -1.236, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -45,7 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.186, y: -2.01, z: 0} + value: {x: 0.15, y: -2.112, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -54,7 +54,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: 0.292, y: -1.953, z: 0} + value: {x: 0.433, y: -2.072, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -611,7 +611,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.736 + value: 1.997 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -620,7 +620,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: 1.894 + value: 1.98 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -639,7 +639,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.207 + value: -1.218 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -648,7 +648,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: -1.23 + value: -1.236 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -695,7 +695,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.186 + value: 0.15 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -704,7 +704,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: 0.292 + value: 0.433 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -723,7 +723,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.01 + value: -2.112 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -732,7 +732,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: -1.953 + value: -2.072 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboKick.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboKick.anim index 8935cb787..ac3ec41ee 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboKick.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboKick.anim @@ -36,7 +36,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.85, y: -1.81, z: 0} + value: {x: 2.158, y: -1.892, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -431,7 +431,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.85 + value: 2.158 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -450,7 +450,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.81 + value: -1.892 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboMiss.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboMiss.anim index d84447bdc..ac780529f 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboMiss.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/ComboMiss.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.004, y: -1.608, z: 0} + value: {x: 0.167, y: -1.734, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: -0.695, y: -1.705, z: 0} + value: {x: -0.564, y: -1.814, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: -0.655, y: -1.663, z: 0} + value: {x: -0.677, y: -1.754, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -47,7 +47,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: -0.05, y: -1.681, z: 0} + value: {x: -0.011, y: -1.759, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -56,7 +56,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: -0.11, y: -1.698, z: 0} + value: {x: -0.241, y: -1.782, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -65,7 +65,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: -0.787, y: -1.604, z: 0} + value: {x: -0.967, y: -1.728, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -74,7 +74,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: -0.684, y: -1.604, z: 0} + value: {x: -0.492, y: -1.748, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -83,7 +83,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.36666667 - value: {x: -1.309, y: -1.717, z: 0} + value: {x: -1.185, y: -1.805, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -92,7 +92,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.43333334 - value: {x: -1.204, y: -1.666, z: 0} + value: {x: -1.24, y: -1.75, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -101,7 +101,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.53333336 - value: {x: -0.514, y: -1.659, z: 0} + value: {x: -0.495, y: -1.765, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -110,7 +110,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.78333336 - value: {x: -0.653, y: -1.887, z: 0} + value: {x: -0.509, y: -2.036, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -363,7 +363,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.78333336 - value: {x: 0.476, y: -1.819, z: 0} + value: {x: 0.14, y: -1.618, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -388,7 +388,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.78333336 - value: {x: 0.296, y: -2.646, z: 0} + value: {x: 0.112, y: -2.447, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -1063,7 +1063,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.004 + value: 0.167 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1072,7 +1072,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: -0.695 + value: -0.564 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1081,7 +1081,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: -0.655 + value: -0.677 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1090,7 +1090,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: -0.05 + value: -0.011 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1099,7 +1099,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: -0.11 + value: -0.241 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1108,7 +1108,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: -0.787 + value: -0.967 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1117,7 +1117,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: -0.684 + value: -0.492 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1126,7 +1126,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.36666667 - value: -1.309 + value: -1.185 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1135,7 +1135,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.43333334 - value: -1.204 + value: -1.24 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1144,7 +1144,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.53333336 - value: -0.514 + value: -0.495 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1153,7 +1153,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.78333336 - value: -0.653 + value: -0.509 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1172,7 +1172,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.608 + value: -1.734 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1181,7 +1181,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: -1.705 + value: -1.814 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1190,7 +1190,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: -1.663 + value: -1.754 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1199,7 +1199,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: -1.681 + value: -1.759 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1208,7 +1208,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: -1.698 + value: -1.782 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1217,7 +1217,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: -1.604 + value: -1.728 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1226,7 +1226,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: -1.604 + value: -1.748 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1235,7 +1235,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.36666667 - value: -1.717 + value: -1.805 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1244,7 +1244,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.43333334 - value: -1.666 + value: -1.75 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1253,7 +1253,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.53333336 - value: -1.659 + value: -1.765 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1262,7 +1262,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.78333336 - value: -1.887 + value: -2.036 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2165,7 +2165,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.78333336 - value: 0.476 + value: 0.14 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2193,7 +2193,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.78333336 - value: -1.819 + value: -1.618 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2277,7 +2277,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.78333336 - value: 0.296 + value: 0.112 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2305,7 +2305,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.78333336 - value: -2.646 + value: -2.447 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Joe.controller b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Joe.controller index 0c5c0c4cd..1125ee1ad 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Joe.controller +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Joe.controller @@ -76,6 +76,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-5715640135744765184 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Prepare + 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: a15fd4208e20ae64fbbb1a546ec29b47, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-5591596368051940793 AnimatorState: serializedVersion: 6 @@ -128,6 +154,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-3992726405563629270 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Prepare + m_Speed: 0 + 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: a15fd4208e20ae64fbbb1a546ec29b47, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-3436905812145754027 AnimatorState: serializedVersion: 6 @@ -384,6 +436,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -6482717725205857642} m_Position: {x: 270, y: -120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3992726405563629270} + m_Position: {x: 30, y: 250, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Pow.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Pow.anim index 045baa738..e7a68bb0b 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Pow.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Pow.anim @@ -70,7 +70,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.138, y: 0.0278, z: 0} + value: {x: 1.052, y: -0.119, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -79,7 +79,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 1.138, y: -0.0671, z: 0} + value: {x: 1.052, y: -0.205, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -246,7 +246,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 0.6066134, y: 0.6023737, z: 0.6066134} + value: {x: 0.6066134, y: 0.60366595, z: 0.6066134} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -517,21 +517,6 @@ AnimationClip: path: ArmsandTorso/karateman_fastfx_0 classID: 212 script: {fileID: 0} - - curve: - - time: 0.5 - value: {fileID: 21300000, guid: 6d5eaac230c616a46b980e6f4ef8fd24, type: 3} - - time: 0.51666665 - value: {fileID: 21300000, guid: 3749038d3748aa44ba316228d9230e76, type: 3} - - time: 0.53333336 - value: {fileID: 21300000, guid: 2364dfca10364004580d7f46cfdcfd39, type: 3} - - time: 0.55 - value: {fileID: 21300000, guid: 8dd2d7bf859153a41aea49936d56f5bf, type: 3} - - time: 0.56666666 - value: {fileID: 21300000, guid: 1dd4cd4a679627d4db4fe19ed3cdf7bf, type: 3} - attribute: m_Sprite - path: GameObject (1) - classID: 212 - script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -707,30 +692,18 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 2766423756 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 pptrCurveMapping: - {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: -2636709571086610862, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: 8132349032079424561, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: 2873506237420579991, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: 1035685740351643046, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 21300000, guid: 6d5eaac230c616a46b980e6f4ef8fd24, type: 3} - - {fileID: 21300000, guid: 3749038d3748aa44ba316228d9230e76, type: 3} - - {fileID: 21300000, guid: 2364dfca10364004580d7f46cfdcfd39, type: 3} - - {fileID: 21300000, guid: 8dd2d7bf859153a41aea49936d56f5bf, type: 3} - - {fileID: 21300000, guid: 1dd4cd4a679627d4db4fe19ed3cdf7bf, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5833333 + m_StopTime: 0.55 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -881,7 +854,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.138 + value: 1.052 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -890,7 +863,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 1.138 + value: 1.052 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -927,7 +900,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.0278 + value: -0.119 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -936,7 +909,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: -0.0671 + value: -0.205 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1525,7 +1498,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.6023737 + value: 0.60366595 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Prepare.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Prepare.anim new file mode 100644 index 000000000..28b350533 --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Prepare.anim @@ -0,0 +1,948 @@ +%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: Prepare + 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.026, y: -0.12, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: ArmsandTorso/LeftArm + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.933, y: -0.767, 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: ArmsandTorso/Torso + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -3.008, y: 1.039, 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 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -2.3971, y: -2.21, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: LeftLeg + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -3.5786, y: -2.595, z: 0.0096} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: RightLeg + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -3.6715, y: -2.891, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: Shadow/Shadow + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -2.561, y: -2.653, 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: Shadow/Shadow2 + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.61910963, y: 0.6066134, z: 0.5466813} + 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: LeftLeg + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.6243446, y: 0.6066134, z: 0.6066134} + 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: RightLeg + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.6066134, y: 0.6066134, z: 0.6066134} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: Shadow/Shadow + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.6066134, y: 0.6066134, z: 0.6066134} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: Shadow/Shadow2 + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 6fab5d5db68d7bd42918ea021881e4de, type: 3} + attribute: m_Sprite + path: GameObject (1) + 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: 550364408 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3561792701 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 101577729 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2252147196 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 60707592 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 336439404 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 101577729 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2252147196 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 60707592 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 336439404 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2766423756 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 6fab5d5db68d7bd42918ea021881e4de, 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.026 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: ArmsandTorso/LeftArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.12 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: ArmsandTorso/LeftArm + 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_LocalPosition.z + path: ArmsandTorso/LeftArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.933 + 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: ArmsandTorso/Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.767 + 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: ArmsandTorso/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.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: ArmsandTorso/Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.008 + 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 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.039 + 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 + 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.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: -2.3971 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: LeftLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.21 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: LeftLeg + 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_LocalPosition.z + path: LeftLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.61910963 + 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_LocalScale.x + path: LeftLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + 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_LocalScale.y + path: LeftLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5466813 + 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_LocalScale.z + path: LeftLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.5786 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: RightLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.595 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: RightLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.0096 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: RightLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6243446 + 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_LocalScale.x + path: RightLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + 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_LocalScale.y + path: RightLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + 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_LocalScale.z + path: RightLeg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.6715 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Shadow/Shadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.891 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Shadow/Shadow + 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_LocalPosition.z + path: Shadow/Shadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: Shadow/Shadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: Shadow/Shadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: Shadow/Shadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.561 + 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: Shadow/Shadow2 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.653 + 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: Shadow/Shadow2 + 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.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Shadow/Shadow2 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: Shadow/Shadow2 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: Shadow/Shadow2 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6066134 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: Shadow/Shadow2 + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Prepare.anim.meta b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Prepare.anim.meta new file mode 100644 index 000000000..9a89e958c --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/Joe/Prepare.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a15fd4208e20ae64fbbb1a546ec29b47 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png b/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png index 9f8bf2f12..d342031df 100644 Binary files a/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png and b/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png differ diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png.meta index 70cb75970..62d37ec37 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png.meta @@ -191,6 +191,27 @@ TextureImporter: - first: 213: 8740903891819718386 second: karateman_hand + - first: + 213: -6652173421999817615 + second: karateman_num_1 + - first: + 213: 1726704843289908573 + second: karateman_num_2 + - first: + 213: 8853733407125453983 + second: karateman_num_3 + - first: + 213: -715771857855404744 + second: karateman_num_4 + - first: + 213: -7562411584499721466 + second: karateman_num_mark + - first: + 213: 3741207959606632285 + second: karateman_hit + - first: + 213: 7115452968192417703 + second: karateman_num_grr externalObjects: {} serializedVersion: 11 mipmaps: @@ -276,6 +297,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -955,10 +988,10 @@ TextureImporter: name: karateman_barrel rect: serializedVersion: 2 - x: 864 - y: 865 + x: 868 + y: 804 width: 280 - height: 251 + height: 376 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1272,7 +1305,7 @@ TextureImporter: serializedVersion: 2 x: 1858 y: 3524 - width: 442 + width: 474 height: 280 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -1291,10 +1324,10 @@ TextureImporter: name: karateman_rightleg_crouch rect: serializedVersion: 2 - x: 641 - y: 3220 - width: 320 - height: 296 + x: 644 + y: 3044 + width: 312 + height: 472 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1312,10 +1345,10 @@ TextureImporter: name: karateman_leftleg_crouch rect: serializedVersion: 2 - x: 968 - y: 3220 - width: 371 - height: 296 + x: 964 + y: 3044 + width: 376 + height: 472 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1334,9 +1367,9 @@ TextureImporter: rect: serializedVersion: 2 x: 4 - y: 1976 - width: 664 - height: 517 + y: 1956 + width: 696 + height: 537 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1354,10 +1387,10 @@ TextureImporter: name: karateman_combo_kick_1 rect: serializedVersion: 2 - x: 676 - y: 1976 - width: 750 - height: 517 + x: 708 + y: 1956 + width: 760 + height: 537 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1417,10 +1450,10 @@ TextureImporter: name: karateman_combo_crouchpunch_0 rect: serializedVersion: 2 - x: 505 - y: 1420 - width: 522 - height: 552 + x: 548 + y: 1412 + width: 472 + height: 536 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1438,10 +1471,10 @@ TextureImporter: name: karateman_combo_crouchpunch_1 rect: serializedVersion: 2 - x: 1038 - y: 1417 - width: 522 - height: 555 + x: 1028 + y: 1412 + width: 536 + height: 536 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1459,9 +1492,9 @@ TextureImporter: name: karateman_arm_7 rect: serializedVersion: 2 - x: 2308 + x: 2340 y: 3524 - width: 442 + width: 440 height: 280 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -1480,9 +1513,9 @@ TextureImporter: name: karateman_arm_8 rect: serializedVersion: 2 - x: 2761 + x: 2788 y: 3524 - width: 442 + width: 408 height: 280 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -1501,10 +1534,10 @@ TextureImporter: name: karateman_torso_2 rect: serializedVersion: 2 - x: 2947 - y: 2564 - width: 394 - height: 952 + x: 2916 + y: 2532 + width: 440 + height: 984 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1522,10 +1555,10 @@ TextureImporter: name: karateman_fastfx_3 rect: serializedVersion: 2 - x: 2464 + x: 2468 y: 2564 - width: 478 - height: 621 + width: 440 + height: 664 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1543,10 +1576,10 @@ TextureImporter: name: karateman_combo_miss_0 rect: serializedVersion: 2 - x: 1436 - y: 1976 - width: 713 - height: 517 + x: 1476 + y: 1956 + width: 664 + height: 536 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1564,10 +1597,10 @@ TextureImporter: name: karateman_combo_miss_1 rect: serializedVersion: 2 - x: 2163 - y: 1976 - width: 515 - height: 517 + x: 2148 + y: 1956 + width: 536 + height: 536 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1586,9 +1619,9 @@ TextureImporter: rect: serializedVersion: 2 x: 4 - y: 1420 - width: 491 - height: 552 + y: 1412 + width: 536 + height: 536 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1606,12 +1639,12 @@ TextureImporter: name: karateman_arm_9 rect: serializedVersion: 2 - x: 2736 - y: 3191 - width: 205 - height: 325 + x: 2692 + y: 3236 + width: 216 + height: 281 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: [] @@ -1627,12 +1660,12 @@ TextureImporter: name: karateman_hand rect: serializedVersion: 2 - x: 2464 - y: 3191 - width: 268 - height: 325 + x: 2468 + y: 3236 + width: 216 + height: 280 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: [] @@ -1644,6 +1677,153 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: karateman_num_1 + rect: + serializedVersion: 2 + x: 2052 + y: 1348 + width: 216 + height: 280 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 17cf765748bbea3a0800000000000000 + internalID: -6652173421999817615 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: karateman_num_2 + rect: + serializedVersion: 2 + x: 2276 + y: 1348 + width: 280 + height: 280 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d55dd3018ec76f710800000000000000 + internalID: 1726704843289908573 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: karateman_num_3 + rect: + serializedVersion: 2 + x: 2372 + y: 1636 + width: 248 + height: 312 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f9cb8bbef97ceda70800000000000000 + internalID: 8853733407125453983 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: karateman_num_4 + rect: + serializedVersion: 2 + x: 2628 + y: 1637 + width: 280 + height: 311 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 835ae40a9411116f0800000000000000 + internalID: -715771857855404744 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: karateman_num_mark + rect: + serializedVersion: 2 + x: 2916 + y: 1636 + width: 184 + height: 312 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 60b58943bbaec0790800000000000000 + internalID: -7562411584499721466 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: karateman_hit + rect: + serializedVersion: 2 + x: 2176 + y: 994 + width: 312 + height: 282 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d5f973741d07be330800000000000000 + internalID: 3741207959606632285 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: karateman_num_grr + rect: + serializedVersion: 2 + x: 2494 + y: 1120 + width: 446 + height: 224 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7af9b1976ca2fb260800000000000000 + internalID: 7115452968192417703 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index ff00ed022..046c0aec9 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -244,6 +244,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9435780} m_CullTransparentMesh: 1 +--- !u!1 &19519744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 19519745} + - component: {fileID: 19519747} + - component: {fileID: 19519748} + - component: {fileID: 19519746} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &19519745 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 19519744} + 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: 1852819573} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 30.541} + m_Pivot: {x: 0, y: 0} +--- !u!114 &19519746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 19519744} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &19519747 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 19519744} + m_CullTransparentMesh: 1 +--- !u!114 &19519748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 19519744} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29c850cbdd078e94aa96bb4fb67cdc8e, type: 3} + m_Name: + m_EditorClassIdentifier: + audio: {fileID: 0} + image: {fileID: 19519746} + width: 10332 + col: {r: 0.6509804, g: 0.3882353, b: 0.8, a: 1} --- !u!1 &93132552 GameObject: m_ObjectHideFlags: 0 @@ -9132,6 +9221,7 @@ RectTransform: - {fileID: 580861938} - {fileID: 1838356727} - {fileID: 411779174} + - {fileID: 19519745} m_Father: {fileID: 547319783} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/EventCaller.cs b/Assets/Scripts/EventCaller.cs index 99d41183e..14899b3d3 100644 --- a/Assets/Scripts/EventCaller.cs +++ b/Assets/Scripts/EventCaller.cs @@ -52,22 +52,6 @@ namespace RhythmHeavenMania { minigames[minigames.FindIndex(c => c.name == minigamesInBeatmap[i].name)].holder = Resources.Load($"Games/{minigamesInBeatmap[i].name}"); } - - for (int i = 0; i < GameManager.instance.Beatmap.entities.Count; i++) - { - string[] e = GameManager.instance.Beatmap.entities[i].datamodel.Split('/'); - try - { - if (minigames.Find(c => c.name == e[0]).actions.Find(c => c.actionName == e[1]).playerAction == true && e[0] != "gameManager") - { - GameManager.instance.playerEntities.Add(GameManager.instance.Beatmap.entities[i]); - } - } - catch (Exception ex) - { - Debug.LogWarning(GameManager.instance.Beatmap.entities[i].datamodel + " " + ex); - } - } } private void Update() @@ -92,9 +76,6 @@ namespace RhythmHeavenMania Minigames.GameAction action = game.actions.Find(c => c.actionName == details[1]); action.function.Invoke(); - if (action.playerAction == true) - GameManager.instance.currentPlayerEvent++; - } catch (Exception ex) { diff --git a/Assets/Scripts/GameEvent.cs b/Assets/Scripts/GameEvent.cs new file mode 100644 index 000000000..c90a2734b --- /dev/null +++ b/Assets/Scripts/GameEvent.cs @@ -0,0 +1,9 @@ +namespace RhythmHeavenMania +{ + public class GameEvent + { + public float length; + public float startBeat; + public float lastReportedBeat; + } +} \ No newline at end of file diff --git a/Assets/Scripts/GameEvent.cs.meta b/Assets/Scripts/GameEvent.cs.meta new file mode 100644 index 000000000..3a613a5d9 --- /dev/null +++ b/Assets/Scripts/GameEvent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a2b5bd1181291e346b57ddd994b54e8f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/KarateMan/KarateJoe.cs b/Assets/Scripts/Games/KarateMan/KarateJoe.cs index 472370688..256ec76a6 100644 --- a/Assets/Scripts/Games/KarateMan/KarateJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateJoe.cs @@ -70,7 +70,7 @@ namespace RhythmHeavenMania.Games.KarateMan Jukebox.PlayOneShotGame("karateman/swingNoHit"); } comboIndex++; - anim.Play("PunchLeft", 0, 0); + AnimPlay("PunchLeft"); } else if (normalizedBeat >= 1.25f && comboIndex < 2) { @@ -86,7 +86,7 @@ namespace RhythmHeavenMania.Games.KarateMan Jukebox.PlayOneShotGame("karateman/swingNoHit_Alt"); } comboIndex++; - anim.Play("PunchRight", 0, 0); + AnimPlay("PunchRight"); } else if (normalizedBeat >= 1.5f && comboIndex < 3) { @@ -98,7 +98,7 @@ namespace RhythmHeavenMania.Games.KarateMan Jukebox.PlayOneShotGame("karateman/comboHit2"); } comboIndex++; - anim.Play("ComboCrouch", 0, 0); + AnimPlay("ComboCrouch"); } else if (normalizedBeat >= 1.75f && comboIndex < 4) { @@ -114,7 +114,7 @@ namespace RhythmHeavenMania.Games.KarateMan Jukebox.PlayOneShotGame("karateman/comboMiss"); } comboIndex++; - anim.Play("ComboKick", 0, 0); + AnimPlay("ComboKick"); } else if (normalizedBeat >= 2f && comboIndex < 5) { @@ -126,7 +126,7 @@ namespace RhythmHeavenMania.Games.KarateMan Jukebox.PlayOneShotGame("karateman/comboHit3"); } comboIndex++; - anim.Play("ComboCrouchPunch", 0, 0); + AnimPlay("ComboCrouchPunch"); } else if (normalizedBeat >= 2.05f) { @@ -140,7 +140,7 @@ namespace RhythmHeavenMania.Games.KarateMan else { // fail anim - anim.Play("ComboMiss"); + AnimPlay("ComboMiss"); ResetCombo(); } } @@ -159,7 +159,7 @@ namespace RhythmHeavenMania.Games.KarateMan { if (kickC != null) StopCoroutine(kickC); hitBarrel = false; - anim.Play("Kick", 0, 0); + AnimPlay("Kick"); } if (Conductor.instance.songPositionInBeats > barrelBeat + 3) @@ -167,7 +167,7 @@ namespace RhythmHeavenMania.Games.KarateMan if (kickC != null) StopCoroutine(kickC); hitBarrel = false; // should be inebetween for this - anim.Play("Idle", 0, 0); + AnimPlay("Idle"); } } else @@ -244,7 +244,7 @@ namespace RhythmHeavenMania.Games.KarateMan barrelBeat = Conductor.instance.songPositionInBeats; hitBarrel = true; yield return new WaitForSeconds(0.17f); - anim.Play("KickPrepare", 0, 0); + AnimPlay("KickPrepare"); } private void Swing() @@ -313,9 +313,9 @@ namespace RhythmHeavenMania.Games.KarateMan Jukebox.PlayOneShotGame("karateman/swingNoHit"); if (punchLeft) - anim.Play("PunchLeft", 0, 0); + AnimPlay("PunchLeft"); else - anim.Play("PunchRight", 0, 0); + AnimPlay("PunchRight"); } public void HitEffectF(Vector3 pos) @@ -327,6 +327,12 @@ namespace RhythmHeavenMania.Games.KarateMan Destroy(hit, 0.06f); } + public void AnimPlay(string name) + { + anim.Play(name, 0, 0); + anim.speed = 1; + } + private void BarrelDestroy(Pot p, bool combo) { for (int i = 0; i < 8; i++) diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 724372670..25073cc55 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -22,15 +22,20 @@ namespace RhythmHeavenMania.Games.KarateMan public SpriteRenderer BGSprite; private bool bgEnabled; - private float newBeat, newBeatBop; + private float newBeat; - private float bopLength; - private float bopBeat; + public GameEvent bop = new GameEvent(); + public GameEvent prepare = new GameEvent(); private float bgBeat; public GameObject comboRef; + public GameObject HIT3Ref; + + public Sprite[] Numbers; + + [System.Serializable] public class BGSpriteC { @@ -122,10 +127,10 @@ namespace RhythmHeavenMania.Games.KarateMan MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("karateman/punchKick1", beat + 1f), - new MultiSound.Sound("karateman/punchKick2", beat + 1.5f), - new MultiSound.Sound("karateman/punchKick3", beat + 1.75f), - new MultiSound.Sound("karateman/punchKick4", beat + 2.25f) + new MultiSound.Sound("karateman/punchKick1", beat + 1f), + new MultiSound.Sound("karateman/punchKick2", beat + 1.5f), + new MultiSound.Sound("karateman/punchKick3", beat + 1.75f), + new MultiSound.Sound("karateman/punchKick4", beat + 2.25f) }); break; } @@ -154,15 +159,28 @@ namespace RhythmHeavenMania.Games.KarateMan } } - if (Conductor.instance.ReportBeat(ref newBeatBop, bopBeat % 1)) + if (Conductor.instance.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1)) { - if (Conductor.instance.songPositionInBeats >= bopBeat && Conductor.instance.songPositionInBeats < bopBeat + bopLength) + if (Conductor.instance.songPositionInBeats >= bop.startBeat && Conductor.instance.songPositionInBeats < bop.startBeat + bop.length) { - float compare = KarateJoe.anim.GetCurrentAnimatorStateInfo(0).speed; - if (KarateJoe.anim.GetCurrentAnimatorStateInfo(0).normalizedTime >= compare && !KarateJoe.anim.IsInTransition(0)) + if (KarateJoe.anim.IsAnimationNotPlaying()) KarateJoe.anim.Play("Bop", 0, 0); } } + + if (prepare.length > 0) + { + if (Conductor.instance.songPositionInBeats >= prepare.startBeat && Conductor.instance.songPositionInBeats < prepare.startBeat + prepare.length) + { + if (KarateJoe.anim.IsAnimationNotPlaying()) + KarateJoe.AnimPlay("Prepare"); + } + else + { + KarateJoe.AnimPlay("Idle"); + prepare.length = 0; + } + } } public void BGFXOn() @@ -178,13 +196,38 @@ namespace RhythmHeavenMania.Games.KarateMan public void Bop(float beat, float length) { - bopLength = length; - bopBeat = beat; + bop.length = length; + bop.startBeat = beat; } public void Hit3(float beat) { MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("karateman/hit", beat), new MultiSound.Sound("karateman/three", beat + 0.5f) }); + GameObject hit3 = Instantiate(HIT3Ref, this.transform); + hit3.transform.GetChild(0).GetChild(1).GetComponent().sprite = Numbers[2]; + BeatAction.New(hit3, new List() + { + new BeatAction.Action(beat + 0.5f, delegate { hit3.transform.GetChild(0).gameObject.SetActive(true); }), + new BeatAction.Action(beat + 4.5f, delegate { Destroy(hit3); }) + }); + } + + public void Hit4(float beat) + { + MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("karateman/hit", beat), new MultiSound.Sound("karateman/four", beat + 0.5f) }); + GameObject hit4 = Instantiate(HIT3Ref, this.transform); + hit4.transform.GetChild(0).GetChild(1).GetComponent().sprite = Numbers[3]; + BeatAction.New(hit4, new List() + { + new BeatAction.Action(beat + 0.5f, delegate { hit4.transform.GetChild(0).gameObject.SetActive(true); }), + new BeatAction.Action(beat + 4.5f, delegate { Destroy(hit4); }) + }); + } + + public void Prepare(float beat, float length) + { + prepare.startBeat = beat; + prepare.length = length; } public void CreateBomb(Transform parent, Vector2 scale, ref GameObject shadow) diff --git a/Assets/Scripts/LevelEditor/Timeline.cs b/Assets/Scripts/LevelEditor/Timeline.cs index cb1b8aa08..50103904b 100644 --- a/Assets/Scripts/LevelEditor/Timeline.cs +++ b/Assets/Scripts/LevelEditor/Timeline.cs @@ -51,7 +51,7 @@ namespace RhythmHeavenMania.Editor var entity = GameManager.instance.Beatmap.entities[i]; var e = GameManager.instance.Beatmap.entities[i]; - AddEventObject(e.datamodel, false, new Vector3(e.beat, Mathp.Round2Nearest(Random.Range(0, -LayersRect.rect.height), LayerHeight())), i); + AddEventObject(e.datamodel, false, new Vector3(e.beat, -e.track * LayerHeight()), i); } TimelineSlider.GetChild(0).GetComponent().color = EditorTheme.theme.properties.BeatMarkerCol.Hex2RGB(); @@ -322,7 +322,7 @@ namespace RhythmHeavenMania.Editor else { eventObj.resizable = true; - if (gameAction.defaultLength != GameManager.instance.Beatmap.entities[entityId].length) + if (gameAction.defaultLength != GameManager.instance.Beatmap.entities[entityId].length && dragNDrop == false) { g.GetComponent().sizeDelta = new Vector2(GameManager.instance.Beatmap.entities[entityId].length, LayerHeight()); } diff --git a/Assets/Scripts/LevelEditor/TimelineEventObj.cs b/Assets/Scripts/LevelEditor/TimelineEventObj.cs index 712a717ae..0bae0697b 100644 --- a/Assets/Scripts/LevelEditor/TimelineEventObj.cs +++ b/Assets/Scripts/LevelEditor/TimelineEventObj.cs @@ -64,7 +64,7 @@ namespace RhythmHeavenMania.Editor { for (int i = 0; i < this.transform.childCount; i++) { - this.transform.GetChild(i).gameObject.SetActive(visible); + // this.transform.GetChild(i).gameObject.SetActive(visible); } } @@ -155,6 +155,8 @@ namespace RhythmHeavenMania.Editor startPosY = mousePos.y - this.transform.position.y; moving = true; + + OnComplete(); } public void OnUp() @@ -210,13 +212,14 @@ namespace RhythmHeavenMania.Editor sizeDelta = new Vector2(Mathf.Clamp(sizeDelta.x, 0.25f, rectTransform.localPosition.x), sizeDelta.y); rectTransform.sizeDelta = new Vector2(Mathp.Round2Nearest(sizeDelta.x, 0.25f), sizeDelta.y); + + OnComplete(); } public void OnLeftUp() { SetPivot(new Vector2(0, rectTransform.pivot.y)); resizing = false; - OnComplete(); } public void OnRightDown() @@ -238,13 +241,13 @@ namespace RhythmHeavenMania.Editor sizeDelta = new Vector2(Mathf.Clamp(sizeDelta.x, 0.25f, Mathf.Infinity), sizeDelta.y); rectTransform.sizeDelta = new Vector2(Mathp.Round2Nearest(sizeDelta.x, 0.25f), sizeDelta.y); + + OnComplete(); } public void OnRightUp() { resizing = false; - - OnComplete(); } private void SetPivot(Vector2 pivot) @@ -272,6 +275,8 @@ namespace RhythmHeavenMania.Editor { eligibleToMove = true; } + + OnComplete(); } private void OnComplete() diff --git a/Assets/Scripts/LevelEditor/WaveformVisual.cs b/Assets/Scripts/LevelEditor/WaveformVisual.cs new file mode 100644 index 000000000..26a4dbc56 --- /dev/null +++ b/Assets/Scripts/LevelEditor/WaveformVisual.cs @@ -0,0 +1,124 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace RhythmHeavenMania.Editor +{ + public class WaveformVisual : MonoBehaviour + { + public new AudioSource audio; + + public RawImage image; + + public int width; + + public Color col; + + int resolution = 60; + + float[] waveForm; + float[] samples; + + Texture2D texture; + + private void Start() + { + audio = Conductor.instance.musicSource; + GetComponent().sizeDelta = new Vector2(Conductor.instance.SongLengthInBeats(), GetComponent().sizeDelta.y); + texture = new Texture2D(width, 100, TextureFormat.RGBA32, false); + CreateWaveForm(); + } + + // This two are from unity answer (I mixed up) + public void CreateWaveForm() + { + resolution = audio.clip.frequency / resolution; + + samples = new float[audio.clip.samples * audio.clip.channels]; + audio.clip.GetData(samples, 0); + + int s = 0; + while (s < samples.Length) + { + samples[s] = samples[s] * 0.5F; + ++s; + } + audio.clip.SetData(samples, 0); + + waveForm = new float[(samples.Length / resolution)]; + + for (int i = 0; i < waveForm.Length; i++) + { + waveForm[i] = 0; + + for (int ii = 0; ii < resolution; ii++) + { + waveForm[i] += Mathf.Abs(samples[(i * resolution) + ii]); + } + + waveForm[i] /= resolution; + } + + MakeTexture(width, 100, waveForm, col); + } + + public void MakeTexture(int width, int height, float[] waveform, Color col) + { + texture = new Texture2D(width, height, TextureFormat.RGBA32, false); + + for (int x = 0; x < width; x++) + { + for (int y = 0; y < height; y++) + { + texture.SetPixel(x, y, Color.black); + } + } + + for (int x = 0; x < waveform.Length; x++) + { + for (int y = 0; y <= waveform[x] * ((float)height * .75f); y++) + { + texture.SetPixel(x, (height / 2) + y, col); + texture.SetPixel(x, (height / 2) - y, col); + } + } + + texture.Apply(); + + image.texture = texture; + } + + void Update() + { + //script from unity doc. + float[] spectrum = new float[1024]; + + AudioListener.GetSpectrumData(spectrum, 0, FFTWindow.Rectangular); + + /*for (int i = 1; i < spectrum.Length - 1; i++) + { + Debug.DrawLine(new Vector3(i - 1, spectrum[i] + 10, 0), new Vector3(i, spectrum[i + 1] + 10, 0), Color.red); + Debug.DrawLine(new Vector3(i - 1, Mathf.Log(spectrum[i - 1]) + 10, 2), new Vector3(i, Mathf.Log(spectrum[i]) + 10, 2), Color.cyan); + Debug.DrawLine(new Vector3(Mathf.Log(i - 1), spectrum[i - 1] - 10, 1), new Vector3(Mathf.Log(i), spectrum[i] - 10, 1), Color.green); + Debug.DrawLine(new Vector3(Mathf.Log(i - 1), Mathf.Log(spectrum[i - 1]), 3), new Vector3(Mathf.Log(i), Mathf.Log(spectrum[i]), 3), Color.blue); + } + + //script from unity answer + for (int i = 0; i < waveForm.Length - 1; i++) + { + Vector3 sv = new Vector3(i * .01f, waveForm[i] * 10, 0); + Vector3 ev = new Vector3(i * .01f, -waveForm[i] * 10, 0); + + Debug.DrawLine(sv, ev, Color.yellow); + }*/ + + int current = audio.timeSamples / resolution; + current *= 2; + + Vector3 c = new Vector3(current * .01f, 0, 0); + + Debug.DrawLine(c, c + Vector3.up * 10, Color.white); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/LevelEditor/WaveformVisual.cs.meta b/Assets/Scripts/LevelEditor/WaveformVisual.cs.meta new file mode 100644 index 000000000..a68c0198c --- /dev/null +++ b/Assets/Scripts/LevelEditor/WaveformVisual.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 29c850cbdd078e94aa96bb4fb67cdc8e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 2752c178b..e919b60c0 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -34,15 +34,13 @@ namespace RhythmHeavenMania { public string actionName; public EventCallback function; - public bool playerAction = false; public float defaultLength; public bool resizable; - public GameAction(string actionName, EventCallback function, float defaultLength = 1, bool playerAction = false, bool resizable = false) + public GameAction(string actionName, EventCallback function, float defaultLength = 1, bool resizable = false) { this.actionName = actionName; this.function = function; - this.playerAction = playerAction; this.defaultLength = defaultLength; this.resizable = resizable; } @@ -61,11 +59,11 @@ namespace RhythmHeavenMania }), new Minigame("forkLifter", "Fork Lifter", "FFFFFF", new List() { - new GameAction("pea", delegate { ForkLifter.instance.Flick(eventCaller.currentBeat, 0); }, 3, true), - new GameAction("topbun", delegate { ForkLifter.instance.Flick(eventCaller.currentBeat, 1); }, 3, true), - new GameAction("burger", delegate { ForkLifter.instance.Flick(eventCaller.currentBeat, 2); }, 3, true), - new GameAction("bottombun", delegate { ForkLifter.instance.Flick(eventCaller.currentBeat, 3); }, 3, true), - new GameAction("prepare", delegate { ForkLifter.instance.ForkLifterHand.Prepare(); }, 0.5f, true), + new GameAction("pea", delegate { ForkLifter.instance.Flick(eventCaller.currentBeat, 0); }, 3), + new GameAction("topbun", delegate { ForkLifter.instance.Flick(eventCaller.currentBeat, 1); }, 3), + new GameAction("burger", delegate { ForkLifter.instance.Flick(eventCaller.currentBeat, 2); }, 3), + new GameAction("bottombun", delegate { ForkLifter.instance.Flick(eventCaller.currentBeat, 3); }, 3), + new GameAction("prepare", delegate { ForkLifter.instance.ForkLifterHand.Prepare(); }, 0.5f), new GameAction("gulp", delegate { ForkLifterPlayer.instance.Eat(); }), new GameAction("sigh", delegate { Jukebox.PlayOneShot("sigh"); }) }), @@ -78,24 +76,26 @@ namespace RhythmHeavenMania }), new Minigame("spaceball", "Spaceball", "00A518", new List() { - new GameAction("shoot", delegate { Spaceball.instance.Shoot(eventCaller.currentBeat, false, eventCaller.currentType); }, 2, true), - new GameAction("shootHigh", delegate { Spaceball.instance.Shoot(eventCaller.currentBeat, true, eventCaller.currentType); }, 3, true), + new GameAction("shoot", delegate { Spaceball.instance.Shoot(eventCaller.currentBeat, false, eventCaller.currentType); }, 2), + new GameAction("shootHigh", delegate { Spaceball.instance.Shoot(eventCaller.currentBeat, true, eventCaller.currentType); }, 3), new GameAction("costume", delegate { Spaceball.instance.Costume(eventCaller.currentType); } ), new GameAction("alien", delegate { Spaceball.instance.alien.Show(eventCaller.currentBeat); } ), - new GameAction("cameraZoom", delegate { }, 4, false, true ), + new GameAction("cameraZoom", delegate { }, 4, true ), }), new Minigame("karateman", "Karate Man", "70A8D8", new List() { - new GameAction("bop", delegate { KarateMan.instance.Bop(eventCaller.currentBeat, eventCaller.currentLength); }, 0.5f, true, true), - new GameAction("pot", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 0); }, 2, true), - new GameAction("bulb", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 1); }, 2, true), - new GameAction("rock", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 2); }, 2, true), - new GameAction("ball", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 3); }, 2, true), - new GameAction("kick", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 4); }, 4.5f, true), - new GameAction("combo", delegate { KarateMan.instance.Combo(eventCaller.currentBeat); }, 4f, true), + new GameAction("bop", delegate { KarateMan.instance.Bop(eventCaller.currentBeat, eventCaller.currentLength); }, 0.5f, true), + new GameAction("pot", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 0); }, 2), + new GameAction("bulb", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 1); }, 2), + new GameAction("rock", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 2); }, 2), + new GameAction("ball", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 3); }, 2), + new GameAction("kick", delegate { KarateMan.instance.Shoot(eventCaller.currentBeat, 4); }, 4.5f), + new GameAction("combo", delegate { KarateMan.instance.Combo(eventCaller.currentBeat); }, 4f), + new GameAction("hit3", delegate { KarateMan.instance.Hit3(eventCaller.currentBeat); }), + new GameAction("hit4", delegate { KarateMan.instance.Hit4(eventCaller.currentBeat); }), + new GameAction("prepare", delegate { KarateMan.instance.Prepare(eventCaller.currentBeat, eventCaller.currentLength); }, 1f, true), new GameAction("bgfxon", delegate { KarateMan.instance.BGFXOn(); } ), new GameAction("bgfxoff", delegate { KarateMan.instance.BGFXOff(); }), - new GameAction("hit3", delegate { KarateMan.instance.Hit3(eventCaller.currentBeat); }), }) }; } diff --git a/Assets/Scripts/Util/AnimationHelpers.cs b/Assets/Scripts/Util/AnimationHelpers.cs new file mode 100644 index 000000000..46d0c44ee --- /dev/null +++ b/Assets/Scripts/Util/AnimationHelpers.cs @@ -0,0 +1,13 @@ +using UnityEngine; + +namespace RhythmHeavenMania.Util +{ + public static class AnimationHelpers + { + public static bool IsAnimationNotPlaying(this Animator anim) + { + float compare = anim.GetCurrentAnimatorStateInfo(0).speed; + return anim.GetCurrentAnimatorStateInfo(0).normalizedTime >= compare && !anim.IsInTransition(0); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Util/AnimationHelpers.cs.meta b/Assets/Scripts/Util/AnimationHelpers.cs.meta new file mode 100644 index 000000000..6557a322a --- /dev/null +++ b/Assets/Scripts/Util/AnimationHelpers.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 790eba0f95f13f34992936566436eab1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Util/BeatAction.cs b/Assets/Scripts/Util/BeatAction.cs new file mode 100644 index 000000000..a36bbf11b --- /dev/null +++ b/Assets/Scripts/Util/BeatAction.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace RhythmHeavenMania.Util +{ + public class BeatAction : MonoBehaviour + { + private int index; + private List actions = new List(); + + public delegate void EventCallback(); + + public class Action + { + public float beat { get; set; } + public EventCallback function { get; set; } + + public Action(float beat, EventCallback function) + { + this.beat = beat; + this.function = function; + } + } + + public static void New(GameObject prefab, List actions) + { + BeatAction beatAction = prefab.AddComponent(); + beatAction.actions = actions; + } + + private void Update() + { + float songPositionInBeats = Conductor.instance.songPositionInBeats; + + for (int i = 0; i < actions.Count; i++) + { + if (songPositionInBeats >= actions[i].beat && index == i) + { + actions[i].function.Invoke(); + index++; + } + } + } + } + +} \ No newline at end of file diff --git a/Assets/Scripts/Util/BeatAction.cs.meta b/Assets/Scripts/Util/BeatAction.cs.meta new file mode 100644 index 000000000..01327a023 --- /dev/null +++ b/Assets/Scripts/Util/BeatAction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a46fad3208ea5224aa38fdf3de0a9dec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/karatekacombos.json b/Assets/karatekacombos.json index 731328b0c..527a42af8 100644 --- a/Assets/karatekacombos.json +++ b/Assets/karatekacombos.json @@ -1 +1 @@ -{"bpm":180.0,"entities":[{"beat":8.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":16.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":24.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":28.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":28.5,"track":0,"length":1.0,"datamodel":"karateman/hit3"},{"beat":30.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":31.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":32.0,"track":3,"length":2.0,"datamodel":"karateman/rock"},{"beat":34.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":34.0,"track":1,"length":64.0,"datamodel":"karateman/bop"},{"beat":36.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":38.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":40.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":42.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":44.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":44.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":46.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":47.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":48.0,"track":3,"length":2.0,"datamodel":"karateman/rock"},{"beat":50.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":52.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":54.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":56.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":58.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":60.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":62.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":64.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":66.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":68.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":70.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":72.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":74.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":76.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":78.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":80.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":82.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":84.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":86.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":88.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":90.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":92.0,"track":3,"length":2.0,"datamodel":"karateman/bulb"},{"beat":94.0,"track":0,"length":4.0,"datamodel":"karateman/combo"},{"beat":98.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":99.5,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":102.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":103.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":106.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":108.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":110.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":111.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":114.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":115.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":118.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":119.5,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":122.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":124.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":126.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":127.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":130.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":132.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":134.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":136.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":138.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":140.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":140.5,"track":2,"length":1.0,"datamodel":"karateman/hit3"},{"beat":142.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":143.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":144.0,"track":3,"length":2.0,"datamodel":"karateman/rock"},{"beat":146.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":148.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":150.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":152.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":154.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":156.0,"track":3,"length":2.0,"datamodel":"karateman/bulb"},{"beat":158.0,"track":2,"length":4.0,"datamodel":"karateman/combo"},{"beat":162.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":164.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":166.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":168.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":170.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":172.0,"track":2,"length":2.0,"datamodel":"karateman/bulb"},{"beat":174.0,"track":1,"length":4.0,"datamodel":"karateman/combo"},{"beat":178.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":180.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":182.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":184.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":186.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":188.0,"track":3,"length":2.0,"datamodel":"karateman/bulb"},{"beat":190.0,"track":2,"length":4.0,"datamodel":"karateman/combo"},{"beat":194.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":196.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":198.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":200.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":202.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":204.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":206.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":208.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":210.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":212.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":214.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":216.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":219.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":219.5,"track":0,"length":1.0,"datamodel":"karateman/hit3"},{"beat":221.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":222.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":223.0,"track":1,"length":2.0,"datamodel":"karateman/rock"},{"beat":226.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":228.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":230.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":232.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":234.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":236.0,"track":3,"length":2.0,"datamodel":"karateman/bulb"},{"beat":238.0,"track":0,"length":4.0,"datamodel":"karateman/combo"},{"beat":242.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":244.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":246.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":248.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":248.5,"track":2,"length":1.0,"datamodel":"karateman/hit3"},{"beat":250.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":251.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":252.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":252.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":254.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":255.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":256.0,"track":2,"length":2.0,"datamodel":"karateman/ball"},{"beat":258.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":259.5,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":262.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":263.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":266.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":268.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":270.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":271.5,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":274.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":275.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":278.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":279.5,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":282.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":284.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":286.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":287.5,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":290.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":292.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":294.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":296.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":298.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":300.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":302.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":304.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":306.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":308.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":310.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":312.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":312.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":314.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":315.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":316.0,"track":1,"length":2.0,"datamodel":"karateman/rock"},{"beat":316.5,"track":0,"length":1.0,"datamodel":"karateman/hit3"},{"beat":318.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":319.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":320.0,"track":3,"length":2.0,"datamodel":"karateman/rock"},{"beat":323.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":327.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":331.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":335.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":339.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":343.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":347.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":351.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":354.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":356.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":358.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":360.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":362.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":364.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":364.5,"track":2,"length":1.0,"datamodel":"karateman/hit3"},{"beat":366.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":367.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":368.0,"track":0,"length":2.0,"datamodel":"karateman/rock"},{"beat":370.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":372.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":372.5,"track":0,"length":1.0,"datamodel":"karateman/hit3"},{"beat":374.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":375.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":376.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":378.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":380.0,"track":0,"length":2.0,"datamodel":"karateman/bulb"},{"beat":382.0,"track":2,"length":4.0,"datamodel":"karateman/combo"}]} \ No newline at end of file +{"bpm":180.0,"entities":[{"beat":2.0,"track":2,"length":26.0,"datamodel":"karateman/bop"},{"beat":8.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":8.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":16.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":16.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":24.0,"track":3,"length":1.0,"datamodel":"karateman/prepare"},{"beat":24.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":28.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":28.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":28.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":30.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":30.0,"track":1,"length":1.0,"datamodel":"karateman/prepare"},{"beat":31.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":32.0,"track":0,"length":2.0,"datamodel":"karateman/rock"},{"beat":34.0,"track":2,"length":12.0,"datamodel":"karateman/bop"},{"beat":34.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":36.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":38.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":40.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":42.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":44.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":44.5,"track":0,"length":1.0,"datamodel":"karateman/hit3"},{"beat":46.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":46.0,"track":1,"length":1.0,"datamodel":"karateman/prepare"},{"beat":47.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":48.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":50.0,"track":2,"length":48.0,"datamodel":"karateman/bop"},{"beat":50.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":52.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":54.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":56.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":58.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":60.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":62.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":64.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":66.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":68.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":70.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":72.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":74.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":76.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":78.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":80.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":82.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":84.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":86.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":88.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":90.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":92.0,"track":3,"length":2.0,"datamodel":"karateman/bulb"},{"beat":94.0,"track":2,"length":4.0,"datamodel":"karateman/combo"},{"beat":98.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":98.0,"track":2,"length":0.5,"datamodel":"karateman/bop"},{"beat":99.5,"track":1,"length":0.5,"datamodel":"karateman/bop"},{"beat":99.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":102.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":102.0,"track":1,"length":0.5,"datamodel":"karateman/bop"},{"beat":103.5,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":103.5,"track":1,"length":0.5,"datamodel":"karateman/bop"},{"beat":106.0,"track":3,"length":5.0,"datamodel":"karateman/bop"},{"beat":106.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":108.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":110.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":111.5,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":114.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":114.0,"track":3,"length":0.5,"datamodel":"karateman/bop"},{"beat":115.5,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":115.5,"track":1,"length":0.5,"datamodel":"karateman/bop"},{"beat":118.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":118.5,"track":2,"length":0.5,"datamodel":"karateman/bop"},{"beat":119.5,"track":0,"length":0.5,"datamodel":"karateman/bop"},{"beat":119.5,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":122.0,"track":0,"length":5.5,"datamodel":"karateman/bop"},{"beat":122.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":124.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":126.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":127.5,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":130.0,"track":2,"length":88.0,"datamodel":"karateman/bop"},{"beat":130.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":132.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":134.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":136.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":138.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":140.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":140.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":142.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":143.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":144.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":146.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":148.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":150.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":152.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":154.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":156.0,"track":2,"length":2.0,"datamodel":"karateman/bulb"},{"beat":158.0,"track":0,"length":4.0,"datamodel":"karateman/combo"},{"beat":162.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":164.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":166.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":168.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":170.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":172.0,"track":2,"length":2.0,"datamodel":"karateman/bulb"},{"beat":174.0,"track":2,"length":4.0,"datamodel":"karateman/combo"},{"beat":178.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":180.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":182.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":184.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":186.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":188.0,"track":1,"length":2.0,"datamodel":"karateman/bulb"},{"beat":190.0,"track":0,"length":4.0,"datamodel":"karateman/combo"},{"beat":194.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":196.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":198.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":200.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":202.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":204.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":206.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":208.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":210.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":212.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":214.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":216.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":218.0,"track":2,"length":2.0,"datamodel":"karateman/prepare"},{"beat":219.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":219.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":221.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":222.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":223.0,"track":0,"length":2.0,"datamodel":"karateman/rock"},{"beat":225.0,"track":1,"length":34.5,"datamodel":"karateman/bop"},{"beat":226.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":228.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":230.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":232.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":234.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":236.0,"track":0,"length":2.0,"datamodel":"karateman/bulb"},{"beat":238.0,"track":3,"length":4.0,"datamodel":"karateman/combo"},{"beat":242.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":244.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":246.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":248.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":248.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":250.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":251.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":252.0,"track":0,"length":2.0,"datamodel":"karateman/rock"},{"beat":252.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":254.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":255.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":256.0,"track":2,"length":2.0,"datamodel":"karateman/ball"},{"beat":258.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":259.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":262.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":262.0,"track":1,"length":0.5,"datamodel":"karateman/bop"},{"beat":263.5,"track":1,"length":0.5,"datamodel":"karateman/bop"},{"beat":263.5,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":266.0,"track":2,"length":5.5,"datamodel":"karateman/bop"},{"beat":266.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":268.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":270.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":271.5,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":274.0,"track":1,"length":0.5,"datamodel":"karateman/bop"},{"beat":274.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":275.5,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":278.0,"track":1,"length":0.5,"datamodel":"karateman/bop"},{"beat":278.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":279.5,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":282.0,"track":2,"length":5.0,"datamodel":"karateman/bop"},{"beat":282.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":284.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":286.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":287.5,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":290.0,"track":3,"length":33.0,"datamodel":"karateman/bop"},{"beat":290.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":292.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":294.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":296.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":298.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":300.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":302.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":304.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":306.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":308.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":310.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":312.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":312.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":314.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":315.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":316.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":316.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":318.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":319.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":320.0,"track":0,"length":2.0,"datamodel":"karateman/rock"},{"beat":322.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":323.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":326.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":327.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":330.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":331.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":334.0,"track":3,"length":1.0,"datamodel":"karateman/prepare"},{"beat":335.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":338.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":339.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":342.0,"track":0,"length":1.0,"datamodel":"karateman/prepare"},{"beat":343.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":346.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":347.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":350.0,"track":2,"length":1.0,"datamodel":"karateman/prepare"},{"beat":351.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":353.0,"track":3,"length":30.0,"datamodel":"karateman/bop"},{"beat":354.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":356.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":358.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":360.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":362.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":364.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":364.5,"track":1,"length":1.0,"datamodel":"karateman/hit3"},{"beat":366.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":367.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":368.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":370.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":372.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":372.5,"track":2,"length":1.0,"datamodel":"karateman/hit3"},{"beat":374.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":375.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":376.0,"track":0,"length":2.0,"datamodel":"karateman/rock"},{"beat":378.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":380.0,"track":2,"length":2.0,"datamodel":"karateman/bulb"},{"beat":382.0,"track":2,"length":4.0,"datamodel":"karateman/combo"}]} \ No newline at end of file