Multisound + Combo miss animation

This commit is contained in:
Braedon 2022-01-20 20:24:30 -05:00
parent b8f694eedf
commit e7353723ab
28 changed files with 3624 additions and 197 deletions

View file

@ -604,7 +604,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &2035530467837460450
Transform:
m_ObjectHideFlags: 0
@ -629,8 +629,8 @@ WindZone:
m_Enabled: 1
m_Mode: 0
m_Radius: 20
m_WindMain: 1
m_WindTurbulence: 0.98
m_WindMain: 1.4
m_WindTurbulence: 1
m_WindPulseMagnitude: 0.5
m_WindPulseFrequency: 0.01
--- !u!1 &4977179752022768034
@ -650,7 +650,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &634606877704519381
Transform:
m_ObjectHideFlags: 0
@ -659,7 +659,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4977179752022768034}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10.54, y: 7.32, z: 0}
m_LocalPosition: {x: 44.5, y: 7.32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7248900333300803150}
@ -917,7 +917,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 0.25
scalar: 0.4
minScalar: 0.1
maxCurve:
serializedVersion: 2
@ -1300,7 +1300,7 @@ ParticleSystem:
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
m_Scale: {x: 48.8, y: 1, z: 1}
m_Scale: {x: 110.22, y: 1, z: 1}
placementMode: 0
m_MeshMaterialIndex: 0
m_MeshNormalOffset: 0
@ -2983,7 +2983,7 @@ ParticleSystem:
multiplierCurve:
serializedVersion: 2
minMaxState: 0
scalar: 0.65
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2

Binary file not shown.

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 64abc3d63d0b45e4fbf97673314b4fd7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 35a9069319e63c445af451c4b06f349d
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:

File diff suppressed because it is too large Load diff

View file

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

View file

@ -22,6 +22,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-6482717725205857642
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ComboMiss
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8691734983307489608}
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: f3c28ccedf871ea41b0ef24c347b4d54, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-5861875158490190595
AnimatorState:
serializedVersion: 6
@ -279,7 +306,7 @@ AnimatorStateTransition:
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 2
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
@ -353,7 +380,10 @@ AnimatorStateMachine:
m_Position: {x: 110, y: -270, z: 0}
- serializedVersion: 1
m_State: {fileID: 6768413994762201734}
m_Position: {x: 180, y: -120, z: 0}
m_Position: {x: 40, y: -120, z: 0}
- serializedVersion: 1
m_State: {fileID: -6482717725205857642}
m_Position: {x: 270, y: -120, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -440,6 +470,28 @@ AnimatorState:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8620679625281884147
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1384082412439939393}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8691734983307489608
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}

View file

@ -86,6 +86,24 @@ AnimationClip:
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.5
value: {x: -0.18, y: 0.129, 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.53333336
value: {x: -0.39, y: 0.257, 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
@ -96,12 +114,21 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: -1.12, y: -2.6, z: 0}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
inWeight: {x: 0, y: 0, z: 0}
outWeight: {x: 0, y: 0, z: 0}
- serializedVersion: 3
time: 0.5
value: {x: -3.6715, y: -2.891, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0, z: 0}
outWeight: {x: 0, y: 0, z: 0}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -112,12 +139,30 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: -1.63, y: -2.46, z: 0}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
inWeight: {x: 0, y: 0, z: 0}
outWeight: {x: 0, y: 0, z: 0}
- serializedVersion: 3
time: 0.5
value: {x: -2.561, y: -2.653, 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.53333336
value: {x: -2.631, y: -2.649, 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
@ -138,6 +183,38 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: ArmsandTorso/karateman_fastfx_0
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: {x: -2.4092, y: -2.21, z: 0}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: LeftLeg
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: {x: -3.5809, y: -2.595, z: 0.0097}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: RightLeg
m_ScaleCurves:
- curve:
serializedVersion: 2
@ -180,6 +257,70 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: ArmsandTorso/Torso
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: {x: 0.61407477, y: 0.6066134, z: 0.5466813}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: LeftLeg
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: {x: 0.6231133, y: 0.6066134, z: 0.6066134}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: RightLeg
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.5
value: {x: 0.6066134, y: 0.6066134, z: 0.6066134}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Shadow/Shadow
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.5
value: {x: 0.6066134, y: 0.6066134, z: 0.6066134}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Shadow/Shadow2
m_FloatCurves:
- curve:
serializedVersion: 2
@ -212,6 +353,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -231,6 +381,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -304,6 +463,34 @@ AnimationClip:
path: ArmsandTorso/LeftArm
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Head
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@ -315,6 +502,10 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: -2636709571086610862, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- time: 0.5
value: {fileID: 8132349032079424561, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- time: 0.53333336
value: {fileID: 2873506237420579991, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
attribute: m_Sprite
path: ArmsandTorso/Torso
classID: 212
@ -326,6 +517,21 @@ AnimationClip:
path: ArmsandTorso/karateman_fastfx_0
classID: 212
script: {fileID: 0}
- curve:
- time: 0.5
value: {fileID: 21300000, guid: 6d5eaac230c616a46b980e6f4ef8fd24, type: 3}
- time: 0.51666665
value: {fileID: 21300000, guid: 3749038d3748aa44ba316228d9230e76, type: 3}
- time: 0.53333336
value: {fileID: 21300000, guid: 2364dfca10364004580d7f46cfdcfd39, type: 3}
- time: 0.55
value: {fileID: 21300000, guid: 8dd2d7bf859153a41aea49936d56f5bf, type: 3}
- time: 0.56666666
value: {fileID: 21300000, guid: 1dd4cd4a679627d4db4fe19ed3cdf7bf, type: 3}
attribute: m_Sprite
path: GameObject (1)
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
@ -368,6 +574,20 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 101577729
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2252147196
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2894697483
attribute: 4
@ -389,6 +609,34 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 101577729
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2252147196
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 60707592
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 336439404
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 130111906
attribute: 555744692
@ -431,6 +679,13 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 130111906
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 130111906
attribute: 0
@ -452,16 +707,30 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 2766423756
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- {fileID: -2636709571086610862, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- {fileID: 8132349032079424561, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- {fileID: 2873506237420579991, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- {fileID: 1035685740351643046, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- {fileID: 21300000, guid: 6d5eaac230c616a46b980e6f4ef8fd24, type: 3}
- {fileID: 21300000, guid: 3749038d3748aa44ba316228d9230e76, type: 3}
- {fileID: 21300000, guid: 2364dfca10364004580d7f46cfdcfd39, type: 3}
- {fileID: 21300000, guid: 8dd2d7bf859153a41aea49936d56f5bf, type: 3}
- {fileID: 21300000, guid: 1dd4cd4a679627d4db4fe19ed3cdf7bf, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.21666667
m_StopTime: 0.5833333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -628,6 +897,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: -0.18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: -0.39
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -656,6 +943,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0.129
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: 0.257
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -684,6 +989,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
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
@ -703,6 +1026,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -722,6 +1054,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -741,6 +1082,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: -3.6715
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -760,6 +1110,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: -2.891
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -779,6 +1138,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -798,6 +1166,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: -2.561
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: -2.631
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -817,6 +1203,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: -2.653
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: -2.649
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -836,6 +1240,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
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
@ -1164,6 +1586,376 @@ AnimationClip:
path: ArmsandTorso/LeftArm
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: -2.4092
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: LeftLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: -2.21
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: LeftLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
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: LeftLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: 0.61407477
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: LeftLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: LeftLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: 0.5466813
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: LeftLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: -3.5809
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: RightLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: -2.595
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: RightLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: 0.0097
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: RightLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: 0.6231133
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: RightLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: RightLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.53333336
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: RightLeg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Head
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.5
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: Shadow/Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.5
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: Shadow/Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.5
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Shadow/Shadow
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.5
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: Shadow/Shadow2
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.5
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: Shadow/Shadow2
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.5
value: 0.6066134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Shadow/Shadow2
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

View file

@ -176,6 +176,21 @@ TextureImporter:
- first:
213: 1035685740351643046
second: karateman_fastfx_3
- first:
213: 6306676755524619996
second: karateman_combo_miss_0
- first:
213: -4526798831361396534
second: karateman_combo_miss_1
- first:
213: 1589152150856737785
second: karateman_combo_miss_2
- first:
213: -3126141815255192416
second: karateman_arm_9
- first:
213: 8740903891819718386
second: karateman_hand
externalObjects: {}
serializedVersion: 11
mipmaps:
@ -1512,7 +1527,7 @@ TextureImporter:
width: 478
height: 621
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1524,6 +1539,111 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_combo_miss_0
rect:
serializedVersion: 2
x: 1436
y: 1976
width: 713
height: 517
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: cde024e4811d58750800000000000000
internalID: 6306676755524619996
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_combo_miss_1
rect:
serializedVersion: 2
x: 2163
y: 1976
width: 515
height: 517
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: ac0fc0762749d21c0800000000000000
internalID: -4526798831361396534
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_combo_miss_2
rect:
serializedVersion: 2
x: 4
y: 1420
width: 491
height: 552
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9f32dd5267dcd0610800000000000000
internalID: 1589152150856737785
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_arm_9
rect:
serializedVersion: 2
x: 2736
y: 3191
width: 205
height: 325
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0ac28300596bd94d0800000000000000
internalID: -3126141815255192416
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: karateman_hand
rect:
serializedVersion: 2
x: 2464
y: 3191
width: 268
height: 325
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 2f66ebf37cded4970800000000000000
internalID: 8740903891819718386
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []

View file

@ -7244,8 +7244,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f86858990a87c764892672104bdaef1f, type: 3}
m_Name:
m_EditorClassIdentifier:
level: {fileID: 4900000, guid: 244c565c8088cfa4597e0ebda9c7de98, type: 3}
music: {fileID: 8300000, guid: e5cf71158cc9bff4a8fbfbca1e73e500, type: 3}
level: {fileID: 4900000, guid: 5e794baa94fb06d4f939aaf032fab5ea, type: 3}
music: {fileID: 8300000, guid: f3b9f9179bad8394a98f617bda265a62, type: 3}
debugUI: 0
playOnStart: 0
editor: 1

View file

@ -166,8 +166,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f86858990a87c764892672104bdaef1f, type: 3}
m_Name:
m_EditorClassIdentifier:
level: {fileID: 4900000, guid: 244c565c8088cfa4597e0ebda9c7de98, type: 3}
music: {fileID: 8300000, guid: e5cf71158cc9bff4a8fbfbca1e73e500, type: 3}
level: {fileID: 4900000, guid: 5e794baa94fb06d4f939aaf032fab5ea, type: 3}
music: {fileID: 8300000, guid: f3b9f9179bad8394a98f617bda265a62, type: 3}
debugUI: 1
playOnStart: 1
editor: 0

View file

@ -12,34 +12,34 @@ namespace RhythmHeavenMania
{
public class GameManager : MonoBehaviour
{
public static GameManager instance;
private EventCaller eventCaller;
[Header("Lists")]
public Beatmap Beatmap = new Beatmap();
[HideInInspector] public List<Beatmap.Entity> playerEntities = new List<Beatmap.Entity>();
private List<GameObject> preloadedGames = new List<GameObject>();
public List<GameObject> SoundObjects = new List<GameObject>();
public int currentEvent, currentPlayerEvent;
[Header("Components")]
public TextAsset txt;
public float startOffset;
public Camera GameCamera, CursorCam;
public CircleCursor CircleCursor;
[Header("Games")]
Coroutine currentGameSwitchIE;
public string currentGame;
public float startBeat;
private GameObject currentGameO;
private List<GameObject> preloadedGames = new List<GameObject>();
[HideInInspector] public GameObject GamesHolder;
[Header("Games")]
public string currentGame;
Coroutine currentGameSwitchIE;
[Header("Properties")]
public int currentEvent, currentPlayerEvent;
public float startOffset;
public bool playOnStart;
public float startBeat;
private GameObject currentGameO;
public static GameManager instance { get; private set; }
private EventCaller eventCaller;
private void Awake()
{
@ -137,6 +137,8 @@ namespace RhythmHeavenMania
{
SetCurrentEventToClosest(beat);
}
for (int i = 0; i < SoundObjects.Count; i++) Destroy(SoundObjects[i].gameObject);
}
public void Pause()

View file

@ -254,7 +254,7 @@ namespace RhythmHeavenMania.Games.ForkLifter
}
if (!canHit)
Jukebox.PlayOneShotGame("forkLifter/stabnohit", false);
Jukebox.PlayOneShotGame("forkLifter/stabnohit");
anim.Play("Player_Stab", 0, 0);
}

View file

@ -31,6 +31,7 @@ namespace RhythmHeavenMania.Games.KarateMan
// rb2d.interpolation = RigidbodyInterpolation2D.Interpolate;
float yRange = 0;
float xRange = Random.Range(500, 800);
switch (index)
{
@ -59,10 +60,14 @@ namespace RhythmHeavenMania.Games.KarateMan
yRange = Random.Range(500, 1600);
break;
}
if (combo) yRange = Random.Range(800, 1600);
if (combo)
{
yRange = Random.Range(800, 1600);
xRange = Random.Range(200, 500);
}
rb2d.AddForce(Vector3.up * yRange);
rb2d.AddForce(Vector3.right * Random.Range(500, 800));
rb2d.AddForce(Vector3.right * xRange);
// this.gameObject.AddComponent<Rotate>().rotateSpeed = Random.Range(60, 450);
col = this.gameObject.AddComponent<BoxCollider2D>();

View file

@ -1,54 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using RhythmHeavenMania.Util;
namespace RhythmHeavenMania.Games.KarateMan
{
public class ComboSound : 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/punchy1");
index++;
}
else if (normalizedBeat >= 1.25f && index < 2)
{
Jukebox.PlayOneShotGame("karateman/punchy2");
index++;
}
else if (normalizedBeat >= 1.5f && index < 3)
{
Jukebox.PlayOneShotGame("karateman/punchy3");
index++;
}
else if (normalizedBeat >= 1.75f && index < 4)
{
Jukebox.PlayOneShotGame("karateman/punchy4");
index++;
}
else if (normalizedBeat >= 2f && index < 5)
{
Jukebox.PlayOneShotGame("karateman/ko");
index++;
}
else if (normalizedBeat >= 2.5f && index < 6)
{
Jukebox.PlayOneShotGame("karateman/pow");
index++;
}
else if (normalizedBeat >= 3)
{
Destroy(this.gameObject);
}
}
}
}

View file

@ -65,6 +65,10 @@ namespace RhythmHeavenMania.Games.KarateMan
comboPotIndex++;
Jukebox.PlayOneShotGame("karateman/comboHit1");
}
else
{
Jukebox.PlayOneShotGame("karateman/swingNoHit");
}
comboIndex++;
anim.Play("PunchLeft", 0, 0);
}
@ -77,6 +81,10 @@ namespace RhythmHeavenMania.Games.KarateMan
comboPotIndex++;
Jukebox.PlayOneShotGame("karateman/comboHit1");
}
else
{
Jukebox.PlayOneShotGame("karateman/swingNoHit_Alt");
}
comboIndex++;
anim.Play("PunchRight", 0, 0);
}
@ -101,6 +109,10 @@ namespace RhythmHeavenMania.Games.KarateMan
comboPotIndex++;
Jukebox.PlayOneShotGame("karateman/comboHit3");
}
else
{
Jukebox.PlayOneShotGame("karateman/comboMiss");
}
comboIndex++;
anim.Play("ComboKick", 0, 0);
}
@ -128,7 +140,7 @@ namespace RhythmHeavenMania.Games.KarateMan
else
{
// fail anim
anim.Play("Idle");
anim.Play("ComboMiss");
ResetCombo();
}
}

View file

@ -55,8 +55,15 @@ namespace RhythmHeavenMania.Games.KarateMan
Shoot(beat + 1f, 0, true, "PotCombo5", 4, new Vector2(0.124f, -3.123f));
Shoot(beat + 1.5f, 4, true, "PotCombo6", 5, new Vector2(-1.333f, -2.995f));
GameObject cs = new GameObject(); cs.AddComponent<ComboSound>().startBeat = beat;
cs.transform.parent = this.transform.parent;
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("karateman/punchy1", beat + 1f),
new MultiSound.Sound("karateman/punchy2", beat + 1.25f),
new MultiSound.Sound("karateman/punchy3", beat + 1.5f),
new MultiSound.Sound("karateman/punchy4", beat + 1.75f),
new MultiSound.Sound("karateman/ko", beat + 2f),
new MultiSound.Sound("karateman/pow", beat + 2.5f)
});
}
public void Shoot(float beat, int type, bool combo = false, string throwAnim = "", int comboIndex = 0, Vector2 endShadowPos = new Vector2())
@ -113,8 +120,13 @@ namespace RhythmHeavenMania.Games.KarateMan
outSnd = "karateman/barrelOutKicks";
p.hitSnd = "karateman/barrelBreak";
GameObject pks = new GameObject(); pks.AddComponent<PunchKickSound>().startBeat = beat;
pks.transform.parent = this.transform.parent;
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("karateman/punchKick1", beat + 1f),
new MultiSound.Sound("karateman/punchKick2", beat + 1.5f),
new MultiSound.Sound("karateman/punchKick3", beat + 1.75f),
new MultiSound.Sound("karateman/punchKick4", beat + 2.25f)
});
break;
}
@ -170,6 +182,11 @@ namespace RhythmHeavenMania.Games.KarateMan
bopBeat = beat;
}
public void Hit3(float beat)
{
MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("karateman/hit", beat), new MultiSound.Sound("karateman/three", beat + 0.5f) });
}
public void CreateBomb(Transform parent, Vector2 scale, ref GameObject shadow)
{
GameObject bomb = Instantiate(Bomb, parent);

View file

@ -116,6 +116,12 @@ namespace RhythmHeavenMania.Games.KarateMan
lastRot = Holder.transform.GetChild(0).eulerAngles.z;
StateCheck(normalizedBeat);
if (normalizedBeat > 1)
{
Sprite.GetComponent<SpriteRenderer>().sortingOrder = -20;
Shadow.GetComponent<SpriteRenderer>().sortingOrder = -30;
}
}
if (!isHit && !isThrown)

View file

@ -1,44 +0,0 @@
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++;
}
else if (normalizedBeat >= 3)
{
Destroy(this.gameObject);
}
}
}
}

View file

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

View file

@ -100,7 +100,7 @@ namespace RhythmHeavenMania.Games.Spaceball
}
if (!canHit)
Jukebox.PlayOneShotGame("spaceball/swing", false);
Jukebox.PlayOneShotGame("spaceball/swing");
anim.Play("Swing", 0, 0);
}

View file

@ -95,6 +95,7 @@ namespace RhythmHeavenMania
new GameAction("combo", delegate { KarateMan.instance.Combo(eventCaller.currentBeat); }, 4f, true),
new GameAction("bgfxon", delegate { KarateMan.instance.BGFXOn(); } ),
new GameAction("bgfxoff", delegate { KarateMan.instance.BGFXOff(); }),
new GameAction("hit3", delegate { KarateMan.instance.Hit3(eventCaller.currentBeat); }),
})
};
}

View file

@ -40,22 +40,28 @@ namespace RhythmHeavenMania.Util
FindJukebox().GetComponent<AudioSource>().volume = volume;
}
public static void PlayOneShot(string name, bool relyOnBeat = true)
public static void PlayOneShot(string name, float beat = -1)
{
GameObject oneShot = new GameObject("oneShot");
AudioSource aus = oneShot.AddComponent<AudioSource>();
aus.playOnAwake = false;
AudioSource audioSource = oneShot.AddComponent<AudioSource>();
audioSource.playOnAwake = false;
Sound snd = oneShot.AddComponent<Sound>();
snd.relyOnBeat = relyOnBeat;
AudioClip clip = Resources.Load<AudioClip>($"Sfx/{name}");
snd.clip = clip;
snd.beat = beat;
// snd.pitch = (clip.length / Conductor.instance.secPerBeat);
GameManager.instance.SoundObjects.Add(oneShot);
}
public static void PlayOneShotGame(string name, bool relyOnBeat = true)
public static void PlayOneShotGame(string name, float beat = -1)
{
if (GameManager.instance.currentGame == name.Split('/')[0])
PlayOneShot($"games/{name}", relyOnBeat);
{
PlayOneShot($"games/{name}", beat);
}
}
}

View file

@ -0,0 +1,58 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace RhythmHeavenMania.Util
{
public class MultiSound : MonoBehaviour
{
private float startBeat;
private int index;
public List<Sound> sounds = new List<Sound>();
public class Sound
{
public string name { get; set; }
public float beat { get; set; }
public Sound(string name, float beat)
{
this.name = name;
this.beat = beat;
}
}
public static void Play(Sound[] snds)
{
List<Sound> sounds = snds.ToList();
GameObject gameObj = new GameObject();
MultiSound ms = gameObj.AddComponent<MultiSound>();
ms.sounds = sounds;
ms.startBeat = sounds[0].beat;
gameObj.name = "MultiSound";
GameManager.instance.SoundObjects.Add(gameObj);
}
private void Update()
{
float songPositionInBeats = Conductor.instance.songPositionInBeats;
for (int i = 0; i < sounds.Count; i++)
{
if (songPositionInBeats >= sounds[i].beat && index == i)
{
Jukebox.PlayOneShotGame(sounds[i].name);
index++;
}
}
if (songPositionInBeats >= (sounds[sounds.Count - 1].beat))
{
Destroy(this.gameObject);
}
}
}
}

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 59918d58846257448a659991cf2d031b
guid: d4b7cd2685734204f971219d97b4f9d3
MonoImporter:
externalObjects: {}
serializedVersion: 2

View file

@ -15,50 +15,41 @@ namespace RhythmHeavenMania.Util
private float startTime;
public bool relyOnBeat = true;
public float beat;
bool playInstant = false;
int playIndex = 0;
private void Start()
{
audioSource = GetComponent<AudioSource>();
audioSource.clip = clip;
audioSource.pitch = pitch;
audioSource.PlayScheduled(Time.time);
if (beat == -1)
{
audioSource.PlayScheduled(Time.time);
playInstant = true;
playIndex++;
}
else
{
playInstant = false;
}
startTime = Conductor.instance.songPosition;
if (!relyOnBeat)
{
StartCoroutine(NotRelyOnBeatSound());
}
StartCoroutine(NotRelyOnBeatSound());
}
private void Update()
{
if (relyOnBeat)
if (!playInstant)
{
if (Conductor.instance.isPaused && !Conductor.instance.isPlaying && pauseTimes == 0)
if (Conductor.instance.songPositionInBeats > beat && playIndex < 1)
{
audioSource.Pause();
pauseTimes = 1;
}
else if (Conductor.instance.isPlaying && !Conductor.instance.isPaused && pauseTimes == 1)
{
audioSource.Play();
pauseTimes = 0;
}
else if (!Conductor.instance.isPlaying && !Conductor.instance.isPaused)
{
Destroy(this.gameObject);
}
if (Conductor.instance.songPosition > startTime + clip.length)
{
Destroy(this.gameObject);
}
if (Conductor.instance.songPosition < startTime)
{
Destroy(this.gameObject);
audioSource.PlayScheduled(Time.time);
playIndex++;
}
}
}

File diff suppressed because one or more lines are too long