From 996354946a6af93a75909a95e4548fd4371e5deb Mon Sep 17 00:00:00 2001 From: minenice55 Date: Fri, 29 Jul 2022 22:25:48 -0400 Subject: [PATCH] hit effect start, kick charge --- Assets/Resources/Games/karateman.prefab | 1535 ++++++++++++++++- .../Games/KarateMan/anime/item/HitMark.anim | 96 ++ .../KarateMan/anime/item/HitMark.anim.meta | 8 + .../KarateMan/anime/item/HitMark.controller | 72 + .../anime/item/HitMark.controller.meta | 8 + .../KarateMan/reference/HitMark.000.png.meta | 96 ++ .../Games/KarateMan/KarateManHitMark.cs | 12 + .../Games/KarateMan/KarateManHitMark.cs.meta | 11 + .../Scripts/Games/KarateMan/KarateManJoe.cs | 66 +- .../Scripts/Games/KarateMan/KarateManPot.cs | 118 +- 10 files changed, 1997 insertions(+), 25 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim create mode 100644 Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim.meta create mode 100644 Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller create mode 100644 Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller.meta create mode 100644 Assets/Resources/Sprites/Games/KarateMan/reference/HitMark.000.png.meta create mode 100644 Assets/Scripts/Games/KarateMan/KarateManHitMark.cs create mode 100644 Assets/Scripts/Games/KarateMan/KarateManHitMark.cs.meta diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index b9cc6959..7481db6e 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -30,6 +30,53 @@ Transform: m_Father: {fileID: 3325930061220206449} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &378719132702221104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7276856425239073995} + - component: {fileID: 5616945994458044850} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7276856425239073995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378719132702221104} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.834, y: -3.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7516792099538371658} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5616945994458044850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378719132702221104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 1012406578222914806} + handleType: 0 + leftHandleLocalPosition: {x: 0, y: 3, z: 0} + rightHandleLocalPosition: {x: -0, y: -3, z: -0} --- !u!1 &527958706599872367 GameObject: m_ObjectHideFlags: 0 @@ -199,6 +246,8 @@ MonoBehaviour: anim: {fileID: 3234329793564267697} inCombo: 0 lockedInCombo: 0 + wantKick: 0 + inKick: 0 --- !u!1 &676219503303960657 GameObject: m_ObjectHideFlags: 0 @@ -589,6 +638,100 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1254968169744446728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2010174462455352108} + - component: {fileID: 3913085013490914210} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2010174462455352108 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254968169744446728} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 21, y: 0, z: 50} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4982149263030314109} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3913085013490914210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254968169744446728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 5225581163868431287} + handleType: 0 + leftHandleLocalPosition: {x: -0.22212219, y: 2.2398815, z: -0.66477203} + rightHandleLocalPosition: {x: 0.22212219, y: -2.2398815, z: 0.66477203} +--- !u!1 &1255971316623522150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8169270648613731847} + - component: {fileID: 3310366568088466315} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8169270648613731847 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255971316623522150} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.8, y: -1.485, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5563384789630518309} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3310366568088466315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255971316623522150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 6630505047486178256} + handleType: 0 + leftHandleLocalPosition: {x: -4, y: -1.5, z: -0} + rightHandleLocalPosition: {x: 4, y: 1.5, z: 0} --- !u!1 &1361561967555302870 GameObject: m_ObjectHideFlags: 0 @@ -918,6 +1061,100 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1795663421957276498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5522135299373641616} + - component: {fileID: 6608222514180747498} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5522135299373641616 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795663421957276498} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 22, y: -3.5, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4689631526136439814} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6608222514180747498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795663421957276498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 7440330371911974480} + handleType: 0 + leftHandleLocalPosition: {x: -4.7850113, y: 3.0681098, z: 0} + rightHandleLocalPosition: {x: 4.7850113, y: -3.0681098, z: -0} +--- !u!1 &2014910199073494154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7193050631968789796} + - component: {fileID: 5839351672492996551} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7193050631968789796 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014910199073494154} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.038, y: -0.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4689631526136439814} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5839351672492996551 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014910199073494154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 7440330371911974480} + handleType: 0 + leftHandleLocalPosition: {x: -9.069726, y: -1.6479057, z: -0} + rightHandleLocalPosition: {x: 9.069726, y: 1.6479057, z: 0} --- !u!1 &2133099716162141502 GameObject: m_ObjectHideFlags: 0 @@ -1071,7 +1308,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1 + m_SortingOrder: -2 m_Sprite: {fileID: -270761472599659251, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1330,6 +1567,59 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2434683575904635774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9050889269876678613} + - component: {fileID: 3818844878142428538} + m_Layer: 0 + m_Name: NGCurve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9050889269876678613 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2434683575904635774} + 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: 7290949952937468431} + - {fileID: 3575285284218698538} + m_Father: {fileID: 4312528015478943137} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3818844878142428538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2434683575904635774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 6377202002461921099} + - {fileID: 4702312763169610534} + normalizedTime: 0.5 --- !u!1 &2508216721951572257 GameObject: m_ObjectHideFlags: 0 @@ -1658,6 +1948,88 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2707606657656961620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8437085058865309782} + - component: {fileID: 7966717703427789461} + m_Layer: 0 + m_Name: ref_item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8437085058865309782 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2707606657656961620} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 1} + m_Children: [] + m_Father: {fileID: 3609080353678146599} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7966717703427789461 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2707606657656961620} + 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: -5000 + m_Sprite: {fileID: 21300000, guid: 223bb24c40a67fa4aa0a9c1d23dcc149, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.6117647} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2977027034337794333 GameObject: m_ObjectHideFlags: 0 @@ -1723,6 +2095,53 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2984170029978105125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7935047667012083206} + - component: {fileID: 6500119322541787499} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7935047667012083206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2984170029978105125} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.5, y: -3.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5054440503976402883} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6500119322541787499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2984170029978105125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4654694281393269592} + handleType: 0 + leftHandleLocalPosition: {x: -1.5, y: 2.5, z: 0} + rightHandleLocalPosition: {x: 1.5, y: -2.5, z: -0} --- !u!1 &3040834920837458945 GameObject: m_ObjectHideFlags: 0 @@ -1738,7 +2157,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5764267227668832721 Transform: m_ObjectHideFlags: 0 @@ -2005,6 +2424,141 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3424199812263106991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8567066984769460187} + - component: {fileID: 5527751328197121811} + m_Layer: 0 + m_Name: Bottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8567066984769460187 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3424199812263106991} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.081, y: -0.691, z: 0} + m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_Children: [] + m_Father: {fileID: 6153427326708225474} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5527751328197121811 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3424199812263106991} + 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: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 1 + m_DrawMode: 0 + m_Size: {x: 5.2222223, y: 3.8888888} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &3590327776417586289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5563384789630518309} + - component: {fileID: 6630505047486178256} + m_Layer: 0 + m_Name: Pos4Curve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5563384789630518309 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3590327776417586289} + 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: 8169270648613731847} + - {fileID: 208937695667241414} + m_Father: {fileID: 4312528015478943137} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6630505047486178256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3590327776417586289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 3310366568088466315} + - {fileID: 3166550980124671271} + normalizedTime: 0.5 --- !u!1 &3628647816790808034 GameObject: m_ObjectHideFlags: 0 @@ -2159,7 +2713,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: -5001 m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 1, g: 0, b: 1, a: 1} + m_Color: {r: 1, g: 0, b: 0.365098, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -2199,6 +2753,7 @@ Transform: - {fileID: 8380209919518305174} - {fileID: 4468064543835661468} - {fileID: 4580764379744752145} + - {fileID: 6153427326708225474} m_Father: {fileID: 1483789816297415762} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2713,6 +3268,7 @@ MonoBehaviour: path: 1 Shadow: {fileID: 2136808730019920255} ShadowInstance: {fileID: 0} + HitMark: {fileID: 5218911297968347512} awakeAnim: comboId: -1 HitPosition: @@ -2733,7 +3289,7 @@ MonoBehaviour: - {x: 1.5, y: 0, z: -9} - {x: 1.5, y: 0, z: -8} - {x: 1, y: 0, z: -8.75} - - {x: -2.5, y: 4, z: -9.5} + - {x: -2.25, y: 4, z: -9.5} - {x: 0.25, y: 0, z: -8.5} - {x: 2.25, y: 0, z: -9.5} ItemSlipRt: @@ -2743,6 +3299,17 @@ MonoBehaviour: - 0.35 - 0.3 - 0.1 + ItemCurves: + - {fileID: 692487349845718181} + - {fileID: 7440330371911974480} + - {fileID: 4654694281393269592} + - {fileID: 210535419838892513} + - {fileID: 6630505047486178256} + - {fileID: 1012406578222914806} + - {fileID: 3818844878142428538} + - {fileID: 5225581163868431287} + CurrentCurve: {fileID: 0} + curveTargetBeat: 0 BulbLight: {fileID: 6100859660585592015} --- !u!1 &4199646893499933531 GameObject: @@ -2826,6 +3393,53 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4443733665875631485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5291316370690989749} + - component: {fileID: 4211824095764449397} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5291316370690989749 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4443733665875631485} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.962, y: -0.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4982149263030314109} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4211824095764449397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4443733665875631485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 5225581163868431287} + handleType: 0 + leftHandleLocalPosition: {x: -9.345507, y: -13.731841, z: -25.860306} + rightHandleLocalPosition: {x: 9.345507, y: 13.731841, z: 25.860306} --- !u!1 &4461166469202109451 GameObject: m_ObjectHideFlags: 0 @@ -2857,6 +3471,7 @@ Transform: - {fileID: 3848867281373793675} - {fileID: 5558339493236770269} - {fileID: 3795370127036445573} + - {fileID: 8437085058865309782} m_Father: {fileID: 1483789816297415762} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2993,6 +3608,136 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4970885292489675407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7654967304496385897} + - component: {fileID: 210535419838892513} + m_Layer: 0 + m_Name: Pos3Curve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7654967304496385897 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4970885292489675407} + 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: 8906330806401648573} + - {fileID: 3344200712112006560} + m_Father: {fileID: 4312528015478943137} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &210535419838892513 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4970885292489675407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 3988457175511447223} + - {fileID: 5447234073443252464} + normalizedTime: 0.5 +--- !u!1 &5218911297968347512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6153427326708225474} + - component: {fileID: 7224055226350217353} + - component: {fileID: 351631121493088109} + - component: {fileID: 4439328010565654444} + m_Layer: 0 + m_Name: HitMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6153427326708225474 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5218911297968347512} + 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: 7019368942529031031} + - {fileID: 8567066984769460187} + m_Father: {fileID: 3325930061220206449} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &7224055226350217353 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5218911297968347512} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e4ec861ddbb579445854754649520ef1, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &351631121493088109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5218911297968347512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d73c427be556896499214ab4666ff3b3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!210 &4439328010565654444 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5218911297968347512} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -1 --- !u!1 &5617176006396949645 GameObject: m_ObjectHideFlags: 0 @@ -3029,6 +3774,241 @@ Transform: m_Father: {fileID: 1483789816297415762} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5641315844638892119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 208937695667241414} + - component: {fileID: 3166550980124671271} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &208937695667241414 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5641315844638892119} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.75, y: -3.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5563384789630518309} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3166550980124671271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5641315844638892119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 6630505047486178256} + handleType: 0 + leftHandleLocalPosition: {x: -1, y: 1.5, z: 0} + rightHandleLocalPosition: {x: 1, y: -1.5, z: -0} +--- !u!1 &5905694198237952078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4982149263030314109} + - component: {fileID: 5225581163868431287} + m_Layer: 0 + m_Name: KickBombCurve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4982149263030314109 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5905694198237952078} + 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: 5291316370690989749} + - {fileID: 2010174462455352108} + m_Father: {fileID: 4312528015478943137} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5225581163868431287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5905694198237952078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 4211824095764449397} + - {fileID: 3913085013490914210} + normalizedTime: 0.5 +--- !u!1 &6133880555762376977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7019368942529031031} + - component: {fileID: 4949865498492430620} + m_Layer: 0 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7019368942529031031 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6133880555762376977} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.104, y: 0.717, z: 0} + m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_Children: [] + m_Father: {fileID: 6153427326708225474} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4949865498492430620 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6133880555762376977} + 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: -348202296468608855, 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: 5.2222223, y: 3.8888888} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6441149207388293964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1675496839687250270} + - component: {fileID: 692487349845718181} + m_Layer: 0 + m_Name: Pos1Curve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1675496839687250270 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6441149207388293964} + 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: 1507714514432023537} + - {fileID: 7766585513545450152} + m_Father: {fileID: 4312528015478943137} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &692487349845718181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6441149207388293964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 6172967404685770295} + - {fileID: 5875892704702222816} + normalizedTime: 0.5 --- !u!1 &6561823287543825666 GameObject: m_ObjectHideFlags: 0 @@ -3113,6 +4093,59 @@ MonoBehaviour: Item: {fileID: 4158625219071088136} Joe: {fileID: 5897754239051819249} Word: {fileID: 8471847813194768760} +--- !u!1 &6574514768376321096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7516792099538371658} + - component: {fileID: 1012406578222914806} + m_Layer: 0 + m_Name: Pos5NGCurve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7516792099538371658 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6574514768376321096} + 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: 2042206774723335725} + - {fileID: 7276856425239073995} + m_Father: {fileID: 4312528015478943137} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1012406578222914806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6574514768376321096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 6033471325294600680} + - {fileID: 5616945994458044850} + normalizedTime: 0.5 --- !u!1 &6607790457825461986 GameObject: m_ObjectHideFlags: 0 @@ -3195,6 +4228,59 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6703760478237622290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5054440503976402883} + - component: {fileID: 4654694281393269592} + m_Layer: 0 + m_Name: Pos2Curve + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5054440503976402883 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6703760478237622290} + 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: 5959473432926702246} + - {fileID: 7935047667012083206} + m_Father: {fileID: 4312528015478943137} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4654694281393269592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6703760478237622290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 3302029053321637930} + - {fileID: 6500119322541787499} + normalizedTime: 0.5 --- !u!1 &6804201553746816326 GameObject: m_ObjectHideFlags: 0 @@ -3277,6 +4363,53 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6853119866071720776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2042206774723335725} + - component: {fileID: 6033471325294600680} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2042206774723335725 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6853119866071720776} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.584, y: 1.612, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7516792099538371658} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6033471325294600680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6853119866071720776} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 1012406578222914806} + handleType: 0 + leftHandleLocalPosition: {x: -1.2, y: -1.2, z: -0} + rightHandleLocalPosition: {x: 1.2, y: 1.2, z: 0} --- !u!1 &6866427257646180062 GameObject: m_ObjectHideFlags: 0 @@ -3523,6 +4656,147 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6979528226812344444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1507714514432023537} + - component: {fileID: 6172967404685770295} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1507714514432023537 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6979528226812344444} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.038, y: -0.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1675496839687250270} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6172967404685770295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6979528226812344444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 692487349845718181} + handleType: 0 + leftHandleLocalPosition: {x: -3.4252949, y: -2.2673411, z: -0} + rightHandleLocalPosition: {x: 3.4252949, y: 2.2673411, z: 0} +--- !u!1 &7015206745496403491 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3575285284218698538} + - component: {fileID: 4702312763169610534} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3575285284218698538 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7015206745496403491} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: -3.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9050889269876678613} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4702312763169610534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7015206745496403491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 3818844878142428538} + handleType: 0 + leftHandleLocalPosition: {x: 0, y: 3, z: 0} + rightHandleLocalPosition: {x: -0, y: -3, z: -0} +--- !u!1 &7031693769840288682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7766585513545450152} + - component: {fileID: 5875892704702222816} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7766585513545450152 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7031693769840288682} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 19, y: -3.5, z: 0.15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1675496839687250270} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5875892704702222816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7031693769840288682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 692487349845718181} + handleType: 0 + leftHandleLocalPosition: {x: -4.8983917, y: 3.7972484, z: 0} + rightHandleLocalPosition: {x: 4.8983917, y: -3.7972484, z: -0} --- !u!1 &7117799636702328791 GameObject: m_ObjectHideFlags: 0 @@ -3606,6 +4880,100 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7222647528853194096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7290949952937468431} + - component: {fileID: 6377202002461921099} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7290949952937468431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7222647528853194096} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.038, y: -0.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9050889269876678613} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6377202002461921099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7222647528853194096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 3818844878142428538} + handleType: 0 + leftHandleLocalPosition: {x: -1.2, y: -1.2, z: -0} + rightHandleLocalPosition: {x: 1.2, y: 1.2, z: 0} +--- !u!1 &7308693041633148314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8906330806401648573} + - component: {fileID: 3988457175511447223} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8906330806401648573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7308693041633148314} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.494, y: -3.739, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7654967304496385897} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3988457175511447223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7308693041633148314} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 210535419838892513} + handleType: 0 + leftHandleLocalPosition: {x: -2, y: -2.5, z: -0} + rightHandleLocalPosition: {x: 2, y: 2.5, z: 0} --- !u!1 &7395954162971010416 GameObject: m_ObjectHideFlags: 0 @@ -3770,6 +5138,53 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7655509461159504414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3344200712112006560} + - component: {fileID: 5447234073443252464} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3344200712112006560 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7655509461159504414} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 10, y: -3.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7654967304496385897} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5447234073443252464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7655509461159504414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 210535419838892513} + handleType: 0 + leftHandleLocalPosition: {x: -1.5, y: 1.5, z: 0} + rightHandleLocalPosition: {x: 1.5, y: -1.5, z: -0} --- !u!1 &7660798116759458000 GameObject: m_ObjectHideFlags: 0 @@ -3867,7 +5282,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4312528015478943137 Transform: m_ObjectHideFlags: 0 @@ -3878,10 +5293,65 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1675496839687250270} + - {fileID: 4689631526136439814} + - {fileID: 5054440503976402883} + - {fileID: 7654967304496385897} + - {fileID: 5563384789630518309} + - {fileID: 7516792099538371658} + - {fileID: 9050889269876678613} + - {fileID: 4982149263030314109} m_Father: {fileID: 1483789816297415762} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7885567851022778951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5959473432926702246} + - component: {fileID: 3302029053321637930} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5959473432926702246 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7885567851022778951} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.769, y: -2.05, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5054440503976402883} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3302029053321637930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7885567851022778951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4654694281393269592} + handleType: 0 + leftHandleLocalPosition: {x: -2, y: -2.5, z: -0} + rightHandleLocalPosition: {x: 2, y: 2.5, z: 0} --- !u!1 &7919762816917508181 GameObject: m_ObjectHideFlags: 0 @@ -4322,3 +5792,56 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9220090776867258397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4689631526136439814} + - component: {fileID: 7440330371911974480} + m_Layer: 0 + m_Name: Pos1CurveStraight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4689631526136439814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9220090776867258397} + 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: 7193050631968789796} + - {fileID: 5522135299373641616} + m_Father: {fileID: 4312528015478943137} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7440330371911974480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9220090776867258397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 5839351672492996551} + - {fileID: 6608222514180747498} + normalizedTime: 0.5 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim new file mode 100644 index 00000000..d6724124 --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim @@ -0,0 +1,96 @@ +%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: HitMark + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - time: 0.033333335 + value: {fileID: 0} + attribute: m_Sprite + path: Bottom + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - time: 0.033333335 + value: {fileID: 0} + attribute: m_Sprite + path: Top + 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: 2398320530 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 647256362 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 0} + - {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.050000004 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0.033333335 + functionName: KillHitMark + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim.meta b/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim.meta new file mode 100644 index 00000000..5e997b65 --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 614e5734fc0dc9e4cb8ebaf207e465f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller b/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller new file mode 100644 index 00000000..fa3784e8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7178668093368379828 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HitMark + 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: 614e5734fc0dc9e4cb8ebaf207e465f8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-5074555497065744670 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7178668093368379828} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7178668093368379828} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HitMark + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5074555497065744670} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller.meta b/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller.meta new file mode 100644 index 00000000..b72be311 --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4ec861ddbb579445854754649520ef1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/KarateMan/reference/HitMark.000.png.meta b/Assets/Resources/Sprites/Games/KarateMan/reference/HitMark.000.png.meta new file mode 100644 index 00000000..0d2e6fea --- /dev/null +++ b/Assets/Resources/Sprites/Games/KarateMan/reference/HitMark.000.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 223bb24c40a67fa4aa0a9c1d23dcc149 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/KarateMan/KarateManHitMark.cs b/Assets/Scripts/Games/KarateMan/KarateManHitMark.cs new file mode 100644 index 00000000..250164d5 --- /dev/null +++ b/Assets/Scripts/Games/KarateMan/KarateManHitMark.cs @@ -0,0 +1,12 @@ +using UnityEngine; + +namespace HeavenStudio.Games.Scripts_KarateMan +{ + public class KarateManHitMark : MonoBehaviour + { + void KillHitMark() + { + Destroy(gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/KarateMan/KarateManHitMark.cs.meta b/Assets/Scripts/Games/KarateMan/KarateManHitMark.cs.meta new file mode 100644 index 00000000..99bfd401 --- /dev/null +++ b/Assets/Scripts/Games/KarateMan/KarateManHitMark.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d73c427be556896499214ab4666ff3b3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs index 7f5344e2..1e61ffee 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs @@ -25,6 +25,12 @@ namespace HeavenStudio.Games.Scripts_KarateMan public int GetComboId() { return inComboId; } public int GetShouldComboId() { return shouldComboId; } + public bool wantKick = false; + public bool inKick = false; + float lastChargeTime = Single.MinValue; + + bool inSpecial { get { return inCombo || inKick; } } + private void Awake() { @@ -44,6 +50,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (missProg >= 0f && missProg < 1f) { anim.DoScaledAnimation("LowKickMiss", lastComboMissTime, 3f); + bop.startBeat = lastComboMissTime + 3f; } else if (missProg >= 1f) { @@ -56,7 +63,24 @@ namespace HeavenStudio.Games.Scripts_KarateMan } } - if (PlayerInput.Pressed(true) && !inCombo) + if (inKick) + { + float chargeProg = cond.GetPositionFromBeat(lastChargeTime, 2.75f); + if (chargeProg >= 0f && chargeProg < 1f) + { + anim.DoScaledAnimation("ManCharge", lastChargeTime, 2.75f); + bop.startBeat = lastChargeTime + 2.75f; + } + else if (chargeProg >= 1f) + { + anim.speed = 1f; + bop.startBeat = lastChargeTime + 2.75f; + lastChargeTime = Single.MinValue; + inKick = false; + } + } + + if (PlayerInput.Pressed(true) && !inSpecial) { if (!KarateMan.instance.IsExpectingInputNow()) { @@ -64,7 +88,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan Jukebox.PlayOneShotGame("karateman/swingNoHit", forcePlay: true); } } - else if (PlayerInput.AltPressed() && !inCombo) + else if (PlayerInput.AltPressed() && !inSpecial) { if (!KarateMan.instance.IsExpectingInputNow()) { @@ -82,6 +106,12 @@ namespace HeavenStudio.Games.Scripts_KarateMan } } } + + if ((!GameManager.instance.autoplay) && (PlayerInput.PressedUp(true) && wantKick && !PlayerInput.Pressing(true))) + { + //stopped holding, don't charge + wantKick = false; + } } public bool Punch(int forceHand = 0) @@ -95,20 +125,20 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (cond.songPositionInBeats - lastPunchTime < 0.25f + (Minigame.LateTime() - 1f)) { lastPunchTime = Single.MinValue; - anim.Play("Straight", -1, 0); + anim.DoScaledAnimationAsync("Straight", 0.5f); straight = true; } else { lastPunchTime = cond.songPositionInBeats; - anim.Play("Jab", -1, 0); + anim.DoScaledAnimationAsync("Jab", 0.5f); } break; case 1: - anim.Play("Jab", -1, 0); + anim.DoScaledAnimationAsync("Jab", 0.5f); break; case 2: - anim.Play("Straight", -1, 0); + anim.DoScaledAnimationAsync("Straight", 0.5f); straight = true; break; } @@ -172,5 +202,29 @@ namespace HeavenStudio.Games.Scripts_KarateMan new MultiSound.Sound("karateman/comboMiss", beat + 0.75f), }, forcePlay: true); } + + public void StartKickCharge(float beat) + { + wantKick = true; + BeatAction.New(gameObject, new List() + { + new BeatAction.Action(beat, delegate { + if (wantKick) + { + wantKick = false; + inKick = true; + lastChargeTime = beat; + bop.startBeat = beat + 2.75f; + } + }) + }); + } + + public void Kick(float beat) + { + if (!inKick) return; + inKick = false; + bop.startBeat = beat + 2f; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/KarateMan/KarateManPot.cs b/Assets/Scripts/Games/KarateMan/KarateManPot.cs index 4e202b62..74c4a235 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManPot.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManPot.cs @@ -2,6 +2,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using NaughtyBezierCurves; + using HeavenStudio.Util; namespace HeavenStudio.Games.Scripts_KarateMan @@ -15,6 +17,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan public GameObject Shadow; public GameObject ShadowInstance; + public GameObject HitMark; + public string awakeAnim; FlyStatus status = FlyStatus.Fly; Color effectTint = Color.white; @@ -57,6 +61,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan public float[] HitPositionOffset; public Vector3[] StartPositionOffset; public float[] ItemSlipRt; + public BezierCurve3D[] ItemCurves; + public BezierCurve3D CurrentCurve; + public float curveTargetBeat; public SpriteRenderer BulbLight; @@ -131,8 +138,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan path = 5; break; case ItemType.KickBarrel: - //todo: needs own action for spawning the bomb - KarateMan.instance.ScheduleInput(startBeat, 1f, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, ItemJustOrNg, ItemThrough, ItemOut); + KarateMan.instance.ScheduleInput(startBeat, 1f, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, KickChargeJustOrNg, ItemThrough, ItemOut); KarateMan.instance.ScheduleUserInput(startBeat, 1f, InputType.STANDARD_ALT_DOWN, ItemWrongAction, ItemOut, ItemOut); path = 1; comboId = -1; @@ -161,7 +167,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan { var cond = Conductor.instance; float floorHeight = HitPosition[0].position.y; - ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z); switch (status) { case FlyStatus.Fly: @@ -177,10 +182,24 @@ namespace HeavenStudio.Games.Scripts_KarateMan } break; case FlyStatus.Hit: - //TEMPORARY - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); - return; + prog = cond.GetPositionFromBeat(startBeat, curveTargetBeat); + if (cond.songPositionInBeats >= startBeat + 2f || CurrentCurve == null) { + GameObject.Destroy(ShadowInstance.gameObject); + GameObject.Destroy(gameObject); + return; + } + else { + if (prog <= 1f) + { + transform.position = CurrentCurve.GetPoint(prog); + transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (-180f * Time.deltaTime * (1/cond.pitchedSecPerBeat))); + } + else + { + transform.position = CurrentCurve.GetPoint(1f); + } + } + break; case FlyStatus.NG: //TEMPORARY GameObject.Destroy(ShadowInstance.gameObject); @@ -189,45 +208,82 @@ namespace HeavenStudio.Games.Scripts_KarateMan case FlyStatus.HitWeak: break; } + ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z); + } + + void CreateHitMark(bool useLocalPos = false) + { + GameObject hitMark = GameObject.Instantiate(HitMark, KarateMan.instance.ItemHolder); + if (useLocalPos) + hitMark.transform.localPosition = transform.position; + else + hitMark.transform.position = HitPosition[path].position; + + hitMark.SetActive(true); } //handles hitsound and particles - void ItemHitEffect() + void ItemHitEffect(bool straight = false) { + startBeat = Conductor.instance.songPositionInBeats; + CreateHitMark(type == ItemType.KickBomb); switch (type) { case ItemType.Bulb: + CurrentCurve = ItemCurves[straight ? 1 : 0]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/lightbulbHit", forcePlay: true); break; case ItemType.Rock: + CurrentCurve = ItemCurves[1]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/rockHit", forcePlay: true); break; case ItemType.Ball: + CurrentCurve = ItemCurves[1]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/soccerHit", forcePlay: true); break; case ItemType.Cooking: + CurrentCurve = ItemCurves[1]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/cookingPot", forcePlay: true); + //todo: pot lid break; case ItemType.Alien: + CurrentCurve = ItemCurves[1]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/alienHit", forcePlay: true); break; case ItemType.TacoBell: + CurrentCurve = ItemCurves[1]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/rockHit", forcePlay: true); Jukebox.PlayOneShotGame("karateman/tacobell", forcePlay: true); break; case ItemType.ComboPot1: + CurrentCurve = ItemCurves[straight ? 1 : 0]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/comboHit1", forcePlay: true); break; case ItemType.ComboPot2: + CurrentCurve = ItemCurves[0]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/comboHit1", forcePlay: true); break; case ItemType.ComboPot3: + CurrentCurve = ItemCurves[2]; + curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/comboHit2", forcePlay: true); break; case ItemType.ComboPot4: + CurrentCurve = ItemCurves[3]; + curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/comboHit3", forcePlay: true); break; case ItemType.ComboPot5: + CurrentCurve = ItemCurves[4]; + curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/comboHit3", forcePlay: true); break; case ItemType.ComboBarrel: @@ -237,6 +293,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan Jukebox.PlayOneShotGame("karateman/barrelBreak", forcePlay: true); break; default: + CurrentCurve = ItemCurves[straight ? 1 : 0]; + curveTargetBeat = 2f; Jukebox.PlayOneShotGame("karateman/potHit", forcePlay: true); break; } @@ -316,13 +374,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (GameManager.instance.currentGame != "karateman") return; var joe = KarateMan.instance.Joe; if (status == FlyStatus.Fly && !joe.inCombo) { - joe.Punch(ItemPunchHand()); + bool straight = joe.Punch(ItemPunchHand()); if (state <= -1f || state >= 1f) { Jukebox.PlayOneShot("miss"); status = FlyStatus.NG; } else { - ItemHitEffect(); + ItemHitEffect(straight); status = FlyStatus.Hit; } } @@ -365,7 +423,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan { if (GameManager.instance.currentGame != "karateman") return; var joe = KarateMan.instance.Joe; - if (status == FlyStatus.Fly && !joe.inCombo) { + if (status == FlyStatus.Fly && !(joe.inKick || joe.wantKick || joe.inCombo)) { joe.inCombo = true; joe.Punch(1); joe.SetComboId(comboId); @@ -393,13 +451,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan //WHEN SCORING THIS IS A MISS var joe = KarateMan.instance.Joe; if (status == FlyStatus.Fly && !joe.inCombo) { - joe.Punch(ItemPunchHand()); + bool straight = joe.Punch(ItemPunchHand()); if (state <= -1f || state >= 1f) { Jukebox.PlayOneShot("miss"); status = FlyStatus.NG; } else { - ItemHitEffect(); + ItemHitEffect(straight); } } } @@ -452,5 +510,39 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (GameManager.instance.currentGame != "karateman") return; KarateMan.instance.Joe.ForceFailCombo(Conductor.instance.songPositionInBeats); } + + public void KickChargeJustOrNg(PlayerActionEvent caller, float state) + { + if (GameManager.instance.currentGame != "karateman") return; + var joe = KarateMan.instance.Joe; + if (status == FlyStatus.Fly && !(joe.inKick || joe.wantKick || joe.inCombo)) { + joe.Punch(ItemPunchHand()); + if (state <= -1f || state >= 1f) { + Jukebox.PlayOneShot("miss"); + status = FlyStatus.NG; + } + else { + //spawn the bomb + joe.StartKickCharge(startBeat + 1.25f); + ItemHitEffect(); + status = FlyStatus.Hit; + } + } + } + + public void KickChargeOut(PlayerActionEvent caller) {} + + public void KickChargeThrough(PlayerActionEvent caller) + { + if (GameManager.instance.currentGame != "karateman") return; + if (status != FlyStatus.Fly || gameObject == null) return; + BeatAction.New(gameObject, new List() + { + new BeatAction.Action(startBeat + 2f, delegate { + //TODO: play miss sound + //deduct flow if applicable + }) + }); + } } } \ No newline at end of file