Most kick animations and functionality complete

This commit is contained in:
Starpelly 2022-01-02 07:09:15 -05:00
parent 2c2d43ac17
commit 76ed0ee2e9
26 changed files with 5511 additions and 93 deletions

View file

@ -41,6 +41,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 4148631055418481416} - component: {fileID: 4148631055418481416}
- component: {fileID: 7521326649909447202} - component: {fileID: 7521326649909447202}
- component: {fileID: 8345966320992202177}
m_Layer: 0 m_Layer: 0
m_Name: Bomb m_Name: Bomb
m_TagString: Untagged m_TagString: Untagged
@ -61,6 +62,7 @@ Transform:
m_Children: m_Children:
- {fileID: 7652970415563750395} - {fileID: 7652970415563750395}
- {fileID: 8457699647532782750} - {fileID: 8457699647532782750}
- {fileID: 5813723510322526047}
m_Father: {fileID: 7248900333495205507} m_Father: {fileID: 7248900333495205507}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -83,6 +85,109 @@ Animator:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0 m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &8345966320992202177
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1878496493894552565}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bb2c19bd0f31d1040925d1fc2dff960c, type: 3}
m_Name:
m_EditorClassIdentifier:
inList: 0
lastState: 0
state:
gameObject: {fileID: 0}
early: 0
perfect: 0
late: 0
isEligible: 0
kicked: 0
--- !u!1 &2099248522849929875
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5795518356344492327}
- component: {fileID: 4233113091070337915}
m_Layer: 0
m_Name: Shadow2 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &5795518356344492327
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2099248522849929875}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.977, y: -3.312, z: 0}
m_LocalScale: {x: 0.8111427, y: 0.8111427, z: 0.5692476}
m_Children: []
m_Father: {fileID: 7248900333462687936}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4233113091070337915
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2099248522849929875}
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: -3151023100055821189, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 4.7777777, y: 6.5555553}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2786846297550947310 --- !u!1 &2786846297550947310
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -99,7 +204,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &7652970415563750395 --- !u!4 &7652970415563750395
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -165,6 +270,88 @@ SpriteRenderer:
m_WasSpriteAssigned: 0 m_WasSpriteAssigned: 0
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!1 &5263482473086880165
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5813723510322526047}
- component: {fileID: 8874500387669191284}
m_Layer: 0
m_Name: Shadow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5813723510322526047
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5263482473086880165}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.33, y: -3.7596, z: 0}
m_LocalScale: {x: 0.77939385, y: 0.77939385, z: 0.7793938}
m_Children: []
m_Father: {fileID: 4148631055418481416}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8874500387669191284
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5263482473086880165}
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: -5
m_Sprite: {fileID: -270761472599659251, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 3.8888888, y: 3}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &7248900331656947029 --- !u!1 &7248900331656947029
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1323,6 +1510,11 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
inList: 0 inList: 0
lastState: 0 lastState: 0
state:
gameObject: {fileID: 0}
early: 0
perfect: 0
late: 0
isEligible: 0 isEligible: 0
startBeat: 0 startBeat: 0
createBeat: 0 createBeat: 0
@ -12119,6 +12311,7 @@ Transform:
m_Children: m_Children:
- {fileID: 7248900332856218925} - {fileID: 7248900332856218925}
- {fileID: 7248900333476518157} - {fileID: 7248900333476518157}
- {fileID: 5795518356344492327}
m_Father: {fileID: 7248900332013002293} m_Father: {fileID: 7248900332013002293}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -12339,7 +12532,7 @@ SpriteRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: -6341196331951941137, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} m_Sprite: {fileID: -6341196331951941137, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.41960785} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0

Binary file not shown.

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: eaa3f9c9f0a03824e881968b365bf5ce
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 2107ebb148e4e27418be5788cd831ef6
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View file

@ -83,6 +83,31 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: BombHolder path: BombHolder
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1.03, y: -3.8, z: 0}
inSlope: {x: 3.8617775, y: 8.454684, z: 0}
outSlope: {x: 3.8617775, y: 8.454684, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.03782567, y: 0.044793554, z: 0.33333334}
- serializedVersion: 3
time: 1.5166667
value: {x: 3.549, y: 0.613, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Shadow
m_ScaleCurves: m_ScaleCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
@ -118,6 +143,31 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: BombHolder path: BombHolder
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.77939385, y: 0.77939385, z: 0.7793938}
inSlope: {x: -0.62300956, y: -0.61270195, z: 0}
outSlope: {x: -0.62300956, y: -0.61270195, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.036830254, y: 0.03882108, z: 0.33333334}
- serializedVersion: 3
time: 1.5166667
value: {x: 0.18761705, y: 0.18761705, z: 0.18761703}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Shadow
m_FloatCurves: [] m_FloatCurves: []
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
@ -321,6 +371,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 1926924059
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 4092152953 path: 4092152953
attribute: 4 attribute: 4
@ -335,6 +392,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 1926924059
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 1482111001 path: 1482111001
attribute: 0 attribute: 0
@ -788,6 +852,174 @@ AnimationClip:
path: BombHolder path: BombHolder
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.03
inSlope: 3.8617775
outSlope: 3.8617775
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.03782567
- serializedVersion: 3
time: 1.5166667
value: 3.549
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.8
inSlope: 8.454684
outSlope: 8.454684
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.044793554
- serializedVersion: 3
time: 1.5166667
value: 0.613
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.77939385
inSlope: -0.62300956
outSlope: -0.62300956
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.036830254
- serializedVersion: 3
time: 1.5166667
value: 0.18761705
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.77939385
inSlope: -0.61270195
outSlope: -0.61270195
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.03882108
- serializedVersion: 3
time: 1.5166667
value: 0.18761705
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.7793938
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5166667
value: 0.18761703
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Shadow
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: m_EulerEditorCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2

View file

@ -74,6 +74,31 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: BombHolder path: BombHolder
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.33, y: -3.7595997, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 2.6923077, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.65
value: {x: 1.42, y: -3.7595997, z: 0}
inSlope: {x: 2.6923077, y: -0, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Shadow
m_ScaleCurves: [] m_ScaleCurves: []
m_FloatCurves: [] m_FloatCurves: []
m_PPtrCurves: m_PPtrCurves:
@ -304,6 +329,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 1926924059
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 4092152953 path: 4092152953
attribute: 4 attribute: 4
@ -639,6 +671,90 @@ AnimationClip:
path: BombHolder/BombRotHolder path: BombHolder/BombRotHolder
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.33
inSlope: 0
outSlope: 2.6923077
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.65
value: 1.42
inSlope: 2.6923077
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.7595997
inSlope: 0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.65
value: -3.7595997
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.65
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Shadow
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: m_EulerEditorCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2

View file

@ -117,6 +117,38 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: ArmsandTorso/LeftArm path: ArmsandTorso/LeftArm
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -4.697, y: -3.393, 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
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -2.92, y: -3.05, 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/Shadow
m_ScaleCurves: [] m_ScaleCurves: []
m_FloatCurves: [] m_FloatCurves: []
m_PPtrCurves: m_PPtrCurves:
@ -391,6 +423,20 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 336439404
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 - serializedVersion: 2
path: 2766423756 path: 2766423756
attribute: 0 attribute: 0
@ -872,6 +918,120 @@ AnimationClip:
path: ArmsandTorso/LeftArm path: ArmsandTorso/LeftArm
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -4.697
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: -3.393
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: -2.92
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/Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.05
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.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.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Shadow/Shadow
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: [] m_EulerEditorCurves: []
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0

View file

@ -95,6 +95,38 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: LeftLeg path: LeftLeg
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -4.697, y: -3.393, 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
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -2.92, y: -3.05, 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/Shadow
m_ScaleCurves: [] m_ScaleCurves: []
m_FloatCurves: [] m_FloatCurves: []
m_PPtrCurves: m_PPtrCurves:
@ -112,6 +144,20 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant: m_ClipBindingConstant:
genericBindings: genericBindings:
- serializedVersion: 2
path: 336439404
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 - serializedVersion: 2
path: 550364408 path: 550364408
attribute: 0 attribute: 0
@ -462,6 +508,120 @@ AnimationClip:
path: LeftLeg path: LeftLeg
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -4.697
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: -3.393
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: -2.92
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/Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.05
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.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.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Shadow/Shadow
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: [] m_EulerEditorCurves: []
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0

View file

@ -32,8 +32,7 @@ AnimatorState:
m_Name: Bop m_Name: Bop
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions: []
- {fileID: 6729412516870947754}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
@ -49,6 +48,33 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &-3436905812145754027
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Kick
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8620679625281884147}
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: c3e6a93fdb6110948aa2cef75891a509, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-1914255544141906500 --- !u!1102 &-1914255544141906500
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -91,6 +117,12 @@ AnimatorController:
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 0}
- m_Name: holdingKick
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
@ -168,16 +200,22 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1384082412439939393} m_State: {fileID: 1384082412439939393}
m_Position: {x: 200, y: 0, z: 0} m_Position: {x: 210, y: 60, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -5861875158490190595} m_State: {fileID: -5861875158490190595}
m_Position: {x: 400, y: 110, z: 0} m_Position: {x: 240, y: 220, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -1914255544141906500} m_State: {fileID: -1914255544141906500}
m_Position: {x: 400, y: -110, z: 0} m_Position: {x: 400, y: -110, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 4383148785964449126} m_State: {fileID: 4383148785964449126}
m_Position: {x: 420, y: 10, z: 0} m_Position: {x: 420, y: 10, z: 0}
- serializedVersion: 1
m_State: {fileID: 8712441973720990189}
m_Position: {x: 490, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -3436905812145754027}
m_Position: {x: 390, y: 140, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -210,7 +248,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &6729412516870947754 --- !u!1101 &8620679625281884147
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -232,3 +270,29 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1102 &8712441973720990189
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: KickPrepare
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: 7f6412540eb493e41ad0a070bc2e35c0, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

File diff suppressed because it is too large Load diff

View file

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

File diff suppressed because it is too large Load diff

View file

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

View file

@ -237,18 +237,9 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: -2.721, y: -3.065, z: 0} value: {x: -4.697, y: -3.393, z: 0}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: 0, 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}
- serializedVersion: 3
time: 0.06666667
value: {x: -2.781, y: -3.065, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -257,6 +248,31 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: Shadow/Shadow2 path: Shadow/Shadow2
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -2.774, y: -3.055, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: -2.92, y: -3.05, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Shadow/Shadow
m_ScaleCurves: [] m_ScaleCurves: []
m_FloatCurves: [] m_FloatCurves: []
m_PPtrCurves: m_PPtrCurves:
@ -354,6 +370,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 60707592
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2766423756 path: 2766423756
attribute: 0 attribute: 0
@ -1103,19 +1126,10 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -2.721 value: -4.697
inSlope: 0 inSlope: Infinity
outSlope: 0 outSlope: Infinity
tangentMode: 136 tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -2.781
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1131,19 +1145,10 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -3.065 value: -3.393
inSlope: 0 inSlope: Infinity
outSlope: 0 outSlope: Infinity
tangentMode: 136 tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -3.065
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1160,18 +1165,9 @@ AnimationClip:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0 value: 0
inSlope: 0 inSlope: Infinity
outSlope: 0 outSlope: Infinity
tangentMode: 136 tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1182,6 +1178,90 @@ AnimationClip:
path: Shadow/Shadow2 path: Shadow/Shadow2
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -2.774
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -2.92
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/Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.055
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -3.05
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.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.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
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/Shadow
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: [] m_EulerEditorCurves: []
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0

View file

@ -149,7 +149,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: -4.766, y: -3.421, z: 0} value: {x: -2.92, y: -3.05, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
@ -158,7 +158,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.13333334 time: 0.13333334
value: {x: -4.818, y: -3.421, z: 0} value: {x: -2.92, y: -3.05, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
@ -174,7 +174,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: -2.685, y: -3.065, z: 0} value: {x: -4.697, y: -3.393, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
@ -183,7 +183,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.13333334 time: 0.13333334
value: {x: -2.749, y: -3.065, z: 0} value: {x: -4.697, y: -3.393, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
@ -192,7 +192,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.23333333 time: 0.23333333
value: {x: -2.781, y: -3.065, z: 0} value: {x: -4.697, y: -3.393, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
@ -1007,7 +1007,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -4.766 value: -2.92
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1016,7 +1016,7 @@ AnimationClip:
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.13333334 time: 0.13333334
value: -4.818 value: -2.92
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1035,7 +1035,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -3.421 value: -3.05
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1044,7 +1044,7 @@ AnimationClip:
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.13333334 time: 0.13333334
value: -3.421 value: -3.05
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1091,7 +1091,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -2.685 value: -4.697
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1100,7 +1100,7 @@ AnimationClip:
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.13333334 time: 0.13333334
value: -2.749 value: -4.697
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1109,7 +1109,7 @@ AnimationClip:
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.23333333 time: 0.23333333
value: -2.781 value: -4.697
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1128,7 +1128,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -3.065 value: -3.393
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1137,7 +1137,7 @@ AnimationClip:
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.13333334 time: 0.13333334
value: -3.065 value: -3.393
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1146,7 +1146,7 @@ AnimationClip:
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.23333333 time: 0.23333333
value: -3.065 value: -3.393
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 MiB

After

Width:  |  Height:  |  Size: 5.8 MiB

View file

@ -101,6 +101,33 @@ TextureImporter:
- first: - first:
213: 8671423413994339737 213: 8671423413994339737
second: karateman_barrel second: karateman_barrel
- first:
213: 4054907966118216257
second: karateman_kick_prepare_0
- first:
213: -2527936805555730590
second: karateman_kick_0
- first:
213: 6207558157275519107
second: karateman_kick_1
- first:
213: -8214882660725976715
second: karateman_kick_leg_0
- first:
213: 3928519723912928495
second: karateman_kick_2
- first:
213: 8471165906507836423
second: karateman_kick_3
- first:
213: 2524486813432512213
second: karateman_kick_leg_1
- first:
213: -3384082045092113307
second: karateman_kick_leg_2
- first:
213: -678416614439994711
second: karateman_fastfx_1
externalObjects: {} externalObjects: {}
serializedVersion: 11 serializedVersion: 11
mipmaps: mipmaps:
@ -882,6 +909,195 @@ TextureImporter:
indices: indices:
edges: [] edges: []
weights: [] weights: []
- serializedVersion: 2
name: karateman_kick_prepare_0
rect:
serializedVersion: 2
x: 3428
y: 2244
width: 664
height: 536
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 142c065bf4de54830800000000000000
internalID: 4054907966118216257
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_kick_0
rect:
serializedVersion: 2
x: 4
y: 4
width: 760
height: 792
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 26707327ed6faecd0800000000000000
internalID: -2527936805555730590
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_kick_1
rect:
serializedVersion: 2
x: 772
y: 4
width: 440
height: 760
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 3885cf6414da52650800000000000000
internalID: 6207558157275519107
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_kick_leg_0
rect:
serializedVersion: 2
x: 3332
y: 804
width: 472
height: 279
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 57199ef8ebfdefd80800000000000000
internalID: -8214882660725976715
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_kick_2
rect:
serializedVersion: 2
x: 1860
y: 164
width: 376
height: 440
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: fec12fcefd7e48630800000000000000
internalID: 3928519723912928495
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_kick_3
rect:
serializedVersion: 2
x: 2244
y: 164
width: 440
height: 440
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 70cacc28280af8570800000000000000
internalID: 8471165906507836423
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_kick_leg_1
rect:
serializedVersion: 2
x: 2948
y: 644
width: 376
height: 440
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5de7dcaa167c80320800000000000000
internalID: 2524486813432512213
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_kick_leg_2
rect:
serializedVersion: 2
x: 2692
y: 644
width: 248
height: 472
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 564d1834f435901d0800000000000000
internalID: -3384082045092113307
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_fastfx_1
rect:
serializedVersion: 2
x: 2692
y: 68
width: 856
height: 568
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9aab49efea7c596f0800000000000000
internalID: -678416614439994711
vertices: []
indices:
edges: []
weights: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []

View file

@ -103,8 +103,8 @@ namespace RhythmHeavenMania
new GameAction("rock", delegate { KarateMan.instance.Shoot(currentBeat, 2); }, true ), new GameAction("rock", delegate { KarateMan.instance.Shoot(currentBeat, 2); }, true ),
new GameAction("ball", delegate { KarateMan.instance.Shoot(currentBeat, 3); }, true ), new GameAction("ball", delegate { KarateMan.instance.Shoot(currentBeat, 3); }, true ),
new GameAction("kick", delegate { KarateMan.instance.Shoot(currentBeat, 4); }, true ), new GameAction("kick", delegate { KarateMan.instance.Shoot(currentBeat, 4); }, true ),
new GameAction("bgfxOn", delegate { KarateMan.instance.BGFXOn(); } ), new GameAction("bgfxon", delegate { KarateMan.instance.BGFXOn(); } ),
new GameAction("bgfxOff", delegate { KarateMan.instance.BGFXOff(); }), new GameAction("bgfxoff", delegate { KarateMan.instance.BGFXOff(); }),
}) })
}; };

View file

@ -2,45 +2,81 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.KarateMan namespace RhythmHeavenMania.Games.KarateMan
{ {
public class Bomb : MonoBehaviour public class Bomb : PlayerActionObject
{ {
private Animator anim; private Animator anim;
private float startBeat; private float startBeat;
private float hitBeat; private float hitBeat;
public bool hit; public bool kicked;
private bool eligible;
private void Start() private void Start()
{ {
anim = GetComponent<Animator>(); anim = GetComponent<Animator>();
startBeat = Conductor.instance.songPositionInBeats; startBeat = Conductor.instance.songPositionInBeats;
eligible = true;
} }
private void Update() private void Update()
{ {
if (!hit) if (!kicked)
{ {
float normalizedBeatAnim = Conductor.instance.GetLoopPositionFromBeat(startBeat, 1.25f); float normalizedBeatAnim = Conductor.instance.GetLoopPositionFromBeat(startBeat, 2.75f);
anim.Play("BombOut", 0, normalizedBeatAnim); anim.Play("BombOut", 0, normalizedBeatAnim);
anim.speed = 0; anim.speed = 0;
float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(startBeat, 0.75f);
StateCheckNoList(normalizedBeat);
if (normalizedBeat > 1.5f)
{
eligible = false;
// explode animation
Destroy(this.gameObject);
}
if (PlayerInput.PressedUp() && eligible)
{
eligible = false;
if (state.perfect)
{
Hit();
} }
else else
{ {
float normalizedBeatAnim = Conductor.instance.GetLoopPositionFromBeat(hitBeat, 1.5f); Jukebox.PlayOneShot("miss");
anim.Play("BombHit", 0, 0); // some miss animation here or somethin
}
}
}
else
{
float normalizedBeatAnim = Conductor.instance.GetLoopPositionFromBeat(hitBeat, 3f);
anim.Play("BombHit", 0, normalizedBeatAnim);
anim.speed = 0; anim.speed = 0;
if (normalizedBeatAnim > 1)
{
Destroy(this.gameObject);
}
} }
} }
public void Hit() public void Hit()
{ {
Jukebox.PlayOneShotGame("karateman/bombKick");
hitBeat = Conductor.instance.songPositionInBeats;
kicked = true;
} }
} }
} }

View file

@ -19,18 +19,54 @@ namespace RhythmHeavenMania.Games.KarateMan
public ParticleSystem RockParticle; public ParticleSystem RockParticle;
public GameObject BulbHit; public GameObject BulbHit;
public bool hitBarrel = false;
private Coroutine kickC;
private float barrelBeat;
public static KarateJoe instance { get; set; }
private void Start() private void Start()
{ {
instance = this;
anim = GetComponent<Animator>(); anim = GetComponent<Animator>();
} }
private void Update() private void Update()
{
if (hitBarrel)
{
if (PlayerInput.PressedUp())
{
if (kickC != null) StopCoroutine(kickC);
hitBarrel = false;
anim.Play("Kick", 0, 0);
}
if (Conductor.instance.songPositionInBeats > barrelBeat + 3)
{
if (kickC != null) StopCoroutine(kickC);
hitBarrel = false;
// should be inebetween for this
anim.Play("Idle", 0, 0);
}
}
else
{ {
if (PlayerInput.Pressed()) if (PlayerInput.Pressed())
{ {
Swing(); Swing();
} }
} }
}
private IEnumerator PrepareKick()
{
barrelBeat = Conductor.instance.songPositionInBeats;
hitBarrel = true;
yield return new WaitForSeconds(0.17f);
anim.Play("KickPrepare", 0, 0);
}
private void Swing() private void Swing()
{ {
@ -75,6 +111,10 @@ namespace RhythmHeavenMania.Games.KarateMan
case 2: case 2:
RockParticle.Play(); RockParticle.Play();
break; break;
case 4:
if (kickC != null) StopCoroutine(kickC);
kickC = StartCoroutine(PrepareKick());
break;
} }
Destroy(hit, 0.04f); Destroy(hit, 0.04f);

View file

@ -95,7 +95,10 @@ namespace RhythmHeavenMania.Games.KarateMan
case 4: case 4:
p.kick = true; p.kick = true;
Jukebox.PlayOneShotGame("karateman/barrelOutKicks"); Jukebox.PlayOneShotGame("karateman/barrelOutKicks");
p.hitSnd = "karateman/barrelOutKicks"; p.hitSnd = "karateman/barrelBreak";
GameObject pks = new GameObject(); pks.AddComponent<PunchKickSound>().startBeat = beat;
pks.transform.parent = this.transform.parent;
break; break;
} }
} }

View file

@ -0,0 +1,40 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.KarateMan
{
public class PunchKickSound : MonoBehaviour
{
public float startBeat;
private int index;
private void Update()
{
float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(startBeat, 1);
if (normalizedBeat >= 1 && index < 1)
{
Jukebox.PlayOneShotGame("karateman/punchKick1");
index++;
}
else if (normalizedBeat >= 1.5f && index < 2)
{
Jukebox.PlayOneShotGame("karateman/punchKick2");
index++;
}
else if (normalizedBeat >= 1.75f && index < 3)
{
Jukebox.PlayOneShotGame("karateman/punchKick3");
index++;
}
else if (normalizedBeat >= 2.25f && index < 4)
{
Jukebox.PlayOneShotGame("karateman/punchKick4");
index++;
}
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2036349e64d9e874b84fdab3cc5ff619
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -8,12 +8,12 @@ namespace RhythmHeavenMania.Games
{ {
public bool inList = false; public bool inList = false;
public int lastState; public int lastState;
private Minigame.Eligible e = new Minigame.Eligible(); public Minigame.Eligible state = new Minigame.Eligible();
public bool isEligible; public bool isEligible;
public void PlayerActionInit(GameObject g) public void PlayerActionInit(GameObject g)
{ {
e.gameObject = g; state.gameObject = g;
} }
// could possibly add support for custom early, perfect, and end times if needed. // could possibly add support for custom early, perfect, and end times if needed.
@ -47,16 +47,16 @@ namespace RhythmHeavenMania.Games
{ {
if (!inList) if (!inList)
{ {
e.early = early; state.early = early;
e.perfect = perfect; state.perfect = perfect;
e.late = late; state.late = late;
eligibleHitsList.Add(e); eligibleHitsList.Add(state);
inList = true; inList = true;
} }
else else
{ {
Minigame.Eligible es = eligibleHitsList[eligibleHitsList.IndexOf(e)]; Minigame.Eligible es = eligibleHitsList[eligibleHitsList.IndexOf(state)];
es.early = early; es.early = early;
es.perfect = perfect; es.perfect = perfect;
es.late = late; es.late = late;
@ -67,7 +67,7 @@ namespace RhythmHeavenMania.Games
{ {
if (!inList) return; if (!inList) return;
eligibleHitsList.Remove(e); eligibleHitsList.Remove(state);
inList = false; inList = false;
} }
@ -79,5 +79,38 @@ namespace RhythmHeavenMania.Games
currentHitInList++; currentHitInList++;
} }
} }
// No list
public void StateCheckNoList(float normalizedBeat)
{
if (normalizedBeat > Minigame.EarlyTime() && normalizedBeat < Minigame.PerfectTime() && lastState == 0)
{
ModifyState(true, false, false);
lastState++;
}
// Perfect State
else if (normalizedBeat > Minigame.PerfectTime() && normalizedBeat < Minigame.LateTime() && lastState == 1)
{
ModifyState(false, true, false);
lastState++;
}
// Late State
else if (normalizedBeat > Minigame.LateTime() && normalizedBeat < Minigame.EndTime() && lastState == 2)
{
ModifyState(false, false, true);
lastState++;
}
else if (normalizedBeat < Minigame.EarlyTime() || normalizedBeat > Minigame.EndTime())
{
// ineligible
}
}
private void ModifyState(bool early, bool perfect, bool late)
{
state.early = early;
state.perfect = perfect;
state.late = late;
}
} }
} }

View file

@ -1,6 +1,10 @@
{ {
"bpm": 119, "bpm": 119,
"entities": [ "entities": [
{
"beat": 0,
"datamodel": "karateman/bgfxon"
},
{ {
"beat": 1, "beat": 1,
"datamodel": "karateman/bop" "datamodel": "karateman/bop"
@ -10,7 +14,7 @@
"datamodel": "karateman/kick" "datamodel": "karateman/kick"
}, },
{ {
"beat": 16, "beat": 14,
"datamodel": "karateman/rock" "datamodel": "karateman/rock"
}, },
{ {