Catchy Tune miss animations, fix bugs

This commit is contained in:
kkuhn317 2023-01-15 19:08:52 -05:00
parent 6da9974ede
commit 594d80492e
31 changed files with 9279 additions and 1250 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff

View file

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

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

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

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

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

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

@ -1,30 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-9032489315230670701
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: stopSmile
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7420415389510580220}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-8881534166334005264
AnimatorStateMachine:
serializedVersion: 6
@ -39,7 +14,7 @@ AnimatorStateMachine:
m_Position: {x: 390, y: 140, z: 0}
- serializedVersion: 1
m_State: {fileID: -3613986019669567760}
m_Position: {x: 390, y: 50, z: 0}
m_Position: {x: 390, y: 60, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -76,6 +51,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-7176537707024101983
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: miss
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: 7c6214ca1c53d714cabcab41255e13f4, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-7150627345461972805
AnimatorStateMachine:
serializedVersion: 6
@ -93,10 +94,16 @@ AnimatorStateMachine:
m_Position: {x: 550, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: -1734007541150468808}
m_Position: {x: 360, y: 210, z: 0}
m_Position: {x: 550, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: 7064411899962845865}
m_Position: {x: 140, y: 210, z: 0}
m_Position: {x: 550, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: 5917782446888337801}
m_Position: {x: 240, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -7176537707024101983}
m_Position: {x: 240, y: 250, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -104,7 +111,7 @@ AnimatorStateMachine:
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ExitPosition: {x: 50, y: 60, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -257888764932827859}
--- !u!1102 &-3613986019669567760
@ -117,8 +124,7 @@ AnimatorState:
m_Name: smile
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -9032489315230670701}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -166,8 +172,7 @@ AnimatorState:
m_Name: catchOrange
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8993844910001889603}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -224,19 +229,7 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: stopCatch
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: stopSmile
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -314,31 +307,32 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &6445843323331112035
AnimatorStateTransition:
--- !u!1102 &5917782446888337801
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: stopCatch
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -257888764932827859}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
m_Name: whiff
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: f88256fa832734c428282c6a6d9bfe00, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7064411899962845865
AnimatorState:
serializedVersion: 6
@ -349,8 +343,7 @@ AnimatorState:
m_Name: catchPineapple
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 6445843323331112035}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -366,28 +359,3 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8993844910001889603
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: stopCatch
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -257888764932827859}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

View file

@ -320,6 +320,22 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: head/normal
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.89, y: 8.85, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: effect
m_ScaleCurves:
- curve:
serializedVersion: 2
@ -371,6 +387,22 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: armright/hand
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 2, y: 2, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: effect
m_FloatCurves:
- curve:
serializedVersion: 2
@ -486,6 +518,34 @@ AnimationClip:
path: pineapple
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.033333335
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: effect
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -613,6 +673,13 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3059782130
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 976167654
attribute: 1
@ -620,6 +687,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3059782130
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3435577197
attribute: 4
@ -648,6 +722,13 @@ AnimationClip:
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 3059782130
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -1975,6 +2056,148 @@ AnimationClip:
path: armright
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.033333335
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: effect
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1.89
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 8.85
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: effect
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

View file

@ -352,6 +352,22 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: head/normal
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.76, y: 9.46, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: effect
m_ScaleCurves:
- curve:
serializedVersion: 2
@ -527,6 +543,34 @@ AnimationClip:
path: pineapple
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.033333335
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: effect
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -654,6 +698,13 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3059782130
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 976167654
attribute: 1
@ -668,6 +719,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3059782130
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3435577197
attribute: 4
@ -2171,6 +2229,91 @@ AnimationClip:
path: head/normal
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.033333335
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: effect
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1.76
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 9.46
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: effect
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

View file

@ -227,6 +227,139 @@ AnimationClip:
path: pineapple
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: other shoulder
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 22
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: shoulder/grabbing
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: armleft
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 19
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: armleft/hand
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: armright
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 29
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: armright/hand
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: sparks
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -277,6 +410,55 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3298181620
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2189547052
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 3435577197
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 1430998491
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 3289784515
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 976167654
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 1582071985
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2817783452
attribute: 1
@ -797,6 +979,139 @@ AnimationClip:
path: pineapple
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: other shoulder
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 22
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: shoulder/grabbing
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: armleft
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 19
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: armleft/hand
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: armright
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 29
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: armright/hand
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: sparks
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

File diff suppressed because it is too large Load diff

View file

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

View file

@ -21,15 +21,15 @@ AnimationClip:
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 480}
outSlope: {x: 0, y: 0, z: 485.7143}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.75
value: {x: 0, y: 0, z: 360}
inSlope: {x: 0, y: 0, z: 480}
time: 0.7
value: {x: 0, y: 0, z: 340}
inSlope: {x: 0, y: 0, z: 485.7143}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -132,31 +132,76 @@ AnimationClip:
inWeight: {x: 0.2414088, y: 0.14489864, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.13903359, z: 0.33333334}
- serializedVersion: 3
time: 0.5833333
time: 0.6
value: {x: -3.13, y: 1.72, z: 0}
inSlope: {x: -7.351539, y: 0, z: 0}
outSlope: {x: -7.351539, y: 0, z: 0}
inSlope: {x: -5.9115396, y: 0, z: 0}
outSlope: {x: -5.9115396, y: 0.4912238, z: 0}
tangentMode: 0
weightedMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.40858358, z: 0.33333334}
- serializedVersion: 3
time: 0.6666667
value: {x: -3.72, y: -0.02, z: 0}
inSlope: {x: -5.4599986, y: -117.671585, z: 0}
outSlope: {x: -5.4599986, y: -117.671585, z: 0}
value: {x: -3.48, y: 0.87280375, z: 0}
inSlope: {x: -5.6000013, y: -29.368988, z: 0}
outSlope: {x: -5.6000013, y: -29.368988, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.1531984, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.4188417, z: 0.33333334}
inWeight: {x: 0.33333334, y: 0.25332236, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.52903634, z: 0.33333334}
- serializedVersion: 3
time: 0.75
value: {x: -4.04, y: -6.61, z: 0}
inSlope: {x: 0, y: 28.212006, z: 0}
outSlope: {x: 0, y: 28.212006, z: 0}
time: 0.7
value: {x: -3.69, y: -0.83, z: 0}
inSlope: {x: -6.3000016, y: -123.91813, z: 0}
outSlope: {x: -6.3000016, y: 45.159035, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.6280562, z: 0.33333334}
inWeight: {x: 0.33333334, y: 0.12678917, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.35629305, z: 0.33333334}
- serializedVersion: 3
time: 0.76666665
value: {x: -4.100405, y: 0.37673494, z: 0}
inSlope: {x: -7.6333313, y: 1.3328836, z: 0}
outSlope: {x: -7.6333313, y: 1.3328836, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.05440593, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.025350586, z: 0.33333334}
- serializedVersion: 3
time: 0.8
value: {x: -4.42, y: 0.015632883, z: 0}
inSlope: {x: -11.947641, y: -21.284918, z: 0}
outSlope: {x: -11.947641, y: -21.284918, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.55332977, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.3340477, z: 0.33333334}
- serializedVersion: 3
time: 0.8833333
value: {x: -5.609913, y: -6.2066717, z: 0}
inSlope: {x: -17.895725, y: -231.00607, z: 0}
outSlope: {x: -17.895725, y: 0, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.21162382, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.9166667
value: {x: -6.278656, y: -6.256734, z: 0}
inSlope: {x: -22.434496, y: -2.6503289, z: 0}
outSlope: {x: 0.34387216, y: -2.6503289, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.33333337, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: -6.25, y: -6.4591894, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 1
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
@ -219,7 +264,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.75
time: 0.8
value: {x: 0.7, y: 0.7, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -323,6 +368,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.68333334
value: 850
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -526,7 +580,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.75
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -609,26 +663,53 @@ AnimationClip:
inWeight: 0.2414088
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
time: 0.6
value: -3.13
inSlope: -7.351539
outSlope: -7.351539
inSlope: -5.9115396
outSlope: -5.9115396
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -3.72
inSlope: -5.4599986
outSlope: -5.4599986
value: -3.48
inSlope: -5.6000013
outSlope: -5.6000013
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: -4.04
time: 0.7
value: -3.69
inSlope: -6.3000016
outSlope: -6.3000016
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.8
value: -4.42
inSlope: -11.947641
outSlope: -11.947641
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.9166667
value: -6.278656
inSlope: -22.434496
outSlope: 0.34387216
tangentMode: 65
weightedMode: 0
inWeight: 0.21511212
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -6.25
inSlope: 0
outSlope: 0
tangentMode: 136
@ -709,31 +790,49 @@ AnimationClip:
inWeight: 0.14489864
outWeight: 0.13903359
- serializedVersion: 3
time: 0.5833333
time: 0.6
value: 1.72
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
outSlope: 0.4912238
tangentMode: 1
weightedMode: 3
inWeight: 0.33333334
outWeight: 0.55681735
- serializedVersion: 3
time: 0.7
value: -0.83
inSlope: -123.91813
outSlope: 45.159035
tangentMode: 1
weightedMode: 3
inWeight: 0.08273729
outWeight: 0.35629305
- serializedVersion: 3
time: 0.76666665
value: 0.37673494
inSlope: 1.3328836
outSlope: 1.3328836
tangentMode: 0
weightedMode: 3
inWeight: 0.05440593
outWeight: 0.018174646
- serializedVersion: 3
time: 0.8833333
value: -6.2066717
inSlope: -231.00607
outSlope: 0
tangentMode: 1
weightedMode: 3
inWeight: 0.2513148
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -0.02
inSlope: -117.671585
outSlope: -117.671585
time: 1
value: -6.4591894
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 3
inWeight: 0.1531984
outWeight: 0.4188417
- serializedVersion: 3
time: 0.75
value: -6.61
inSlope: 28.212006
outSlope: 28.212006
tangentMode: 0
weightedMode: 3
inWeight: 0.6280562
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
@ -809,7 +908,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5833333
time: 0.6
value: 0
inSlope: 0
outSlope: 0
@ -827,7 +926,34 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.7
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.8
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.9166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -855,7 +981,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.8
value: 0.7
inSlope: 0
outSlope: 0
@ -883,7 +1009,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.8
value: 0.7
inSlope: 0
outSlope: 0
@ -911,7 +1037,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.8
value: 1
inSlope: 0
outSlope: 0
@ -974,6 +1100,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.68333334
value: 850
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -994,7 +1129,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.7
value: 0
inSlope: 0
outSlope: 0
@ -1022,7 +1157,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.7
value: 0
inSlope: 0
outSlope: 0
@ -1044,15 +1179,15 @@ AnimationClip:
time: 0
value: 0
inSlope: 0
outSlope: 480
outSlope: 485.7143
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 360
inSlope: 480
time: 0.7
value: 340
inSlope: 485.7143
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -1545,6 +1680,36 @@ AnimationClip:
classID: 212
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
@ -1575,36 +1740,6 @@ AnimationClip:
path: sprite
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: effect
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: effect
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -21,15 +21,15 @@ AnimationClip:
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 1000}
outSlope: {x: 0, y: 0, z: 497.56097}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.75
value: {x: 0, y: 0, z: 750}
inSlope: {x: 0, y: 0, z: 1000}
time: 0.68333334
value: {x: 0, y: 0, z: 340}
inSlope: {x: 0, y: 0, z: 497.56097}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -130,34 +130,88 @@ AnimationClip:
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.2414088, y: 0.14489864, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.13903359, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.14100447, z: 0.33333334}
- serializedVersion: 3
time: 0.5833333
value: {x: -3.01, y: 3.64, z: 0}
inSlope: {x: -7.0799994, y: 0, z: 0}
outSlope: {x: -7.0799994, y: 0, z: 0}
value: {x: -3.01, y: 3.4501753, z: 0}
inSlope: {x: -6.051858, y: 16.383991, z: 0}
outSlope: {x: -6.051858, y: 16.383991, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.3849122, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.35262993, z: 0.33333334}
- serializedVersion: 3
time: 0.6
value: {x: -3.115494, y: 3.591041, z: 0}
inSlope: {x: -6.5585628, y: -1.0673969, z: 0}
outSlope: {x: -6.5585628, y: -1.0673969, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.30970716, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.32927436, z: 0.33333334}
- serializedVersion: 3
time: 0.6666667
value: {x: -3.548643, y: 1.0412797, z: 0}
inSlope: {x: -5.654277, y: -91.28552, z: 0}
outSlope: {x: -5.654277, y: -91.28552, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.32209942, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.3419506, z: 0.33333334}
- serializedVersion: 3
time: 0.68333334
value: {x: -3.69, y: -0.83, z: 0}
inSlope: {x: -4.8465233, y: -135.84102, z: 0}
outSlope: {x: -4.8465233, y: 45.159035, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.32357207, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.35629305, z: 0.33333334}
- serializedVersion: 3
time: 0.75
value: {x: -4.0896387, y: 0.37673494, z: 0}
inSlope: {x: -8.117822, y: 1.3328836, z: 0}
outSlope: {x: -8.117822, y: 1.3328836, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.05440593, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.025350586, z: 0.33333334}
- serializedVersion: 3
time: 0.78333336
value: {x: -4.42, y: 0.015632883, z: 0}
inSlope: {x: -11.947644, y: -21.284918, z: 0}
outSlope: {x: -11.947644, y: -21.284918, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.55332977, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.3340477, z: 0.33333334}
- serializedVersion: 3
time: 0.8666667
value: {x: -5.609914, y: -6.2066717, z: 0}
inSlope: {x: -17.895735, y: -231.00607, z: 0}
outSlope: {x: -17.895735, y: -313.84293, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.21162382, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.32101902, z: 0.33333334}
- serializedVersion: 3
time: 0.9
value: {x: -6.278656, y: -13.621937, z: 0}
inSlope: {x: -22.434496, y: 0, z: 0}
outSlope: {x: 0.28656, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.21511212, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: -6.25, y: -13.621937, 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}
- serializedVersion: 3
time: 0.6666667
value: {x: -3.72, y: -0.02, z: 0}
inSlope: {x: 0, y: -117.671585, z: 0}
outSlope: {x: 0, y: -117.671585, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.1531984, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.4188417, z: 0.33333334}
- serializedVersion: 3
time: 0.75
value: {x: -3.48, y: -8.5, z: 0}
inSlope: {x: 0, y: 28.212006, z: 0}
outSlope: {x: 0, y: 28.212006, z: 0}
tangentMode: 0
weightedMode: 3
inWeight: {x: 0.33333334, y: 0.6280562, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -219,7 +273,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.75
time: 0.78333336
value: {x: 0.7, y: 0.7, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -323,6 +377,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.6666667
value: 850
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -526,7 +589,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.75
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -611,24 +674,51 @@ AnimationClip:
- serializedVersion: 3
time: 0.5833333
value: -3.01
inSlope: -7.0799994
outSlope: -7.0799994
inSlope: -6.051858
outSlope: -6.051858
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -3.72
inSlope: 0
outSlope: 0
value: -3.548643
inSlope: -5.654277
outSlope: -5.654277
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: -3.48
time: 0.68333334
value: -3.69
inSlope: -4.8465233
outSlope: -4.8465233
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.78333336
value: -4.42
inSlope: -11.947644
outSlope: -11.947644
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.9
value: -6.278656
inSlope: -22.434496
outSlope: 0.28656
tangentMode: 65
weightedMode: 0
inWeight: 0.21511212
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -6.25
inSlope: 0
outSlope: 0
tangentMode: 136
@ -709,31 +799,49 @@ AnimationClip:
inWeight: 0.14489864
outWeight: 0.13903359
- serializedVersion: 3
time: 0.5833333
value: 3.64
inSlope: 0
outSlope: 0
tangentMode: 136
time: 0.6
value: 3.591041
inSlope: -1.0673969
outSlope: -1.0673969
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
outWeight: 0.2261544
- serializedVersion: 3
time: 0.6666667
value: -0.02
inSlope: -117.671585
outSlope: -117.671585
tangentMode: 0
time: 0.68333334
value: -0.83
inSlope: -135.84102
outSlope: 45.159035
tangentMode: 1
weightedMode: 3
inWeight: 0.1531984
outWeight: 0.4188417
inWeight: 0.3085435
outWeight: 0.35629305
- serializedVersion: 3
time: 0.75
value: -8.5
inSlope: 28.212006
outSlope: 28.212006
value: 0.37673494
inSlope: 1.3328836
outSlope: 1.3328836
tangentMode: 0
weightedMode: 3
inWeight: 0.6280562
inWeight: 0.05440593
outWeight: 0.018174646
- serializedVersion: 3
time: 0.8666667
value: -6.2066717
inSlope: -231.00607
outSlope: -313.84293
tangentMode: 1
weightedMode: 3
inWeight: 0.2513148
outWeight: 0.32101902
- serializedVersion: 3
time: 0.9
value: -13.621937
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
@ -827,7 +935,34 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.68333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.78333336
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.9
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -855,7 +990,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.78333336
value: 0.7
inSlope: 0
outSlope: 0
@ -883,7 +1018,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.78333336
value: 0.7
inSlope: 0
outSlope: 0
@ -911,7 +1046,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.78333336
value: 1
inSlope: 0
outSlope: 0
@ -974,6 +1109,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.6666667
value: 850
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -994,7 +1138,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.68333334
value: 0
inSlope: 0
outSlope: 0
@ -1022,7 +1166,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
time: 0.68333334
value: 0
inSlope: 0
outSlope: 0
@ -1044,15 +1188,15 @@ AnimationClip:
time: 0
value: 0
inSlope: 0
outSlope: 1000
outSlope: 497.56097
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 750
inSlope: 1000
time: 0.68333334
value: 340
inSlope: 497.56097
outSlope: 0
tangentMode: 69
weightedMode: 0

File diff suppressed because it is too large Load diff

View file

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

View file

@ -165,7 +165,7 @@ TextureImporter:
width: 184
height: 286
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: []
@ -186,7 +186,7 @@ TextureImporter:
width: 292
height: 496
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: []
@ -207,7 +207,7 @@ TextureImporter:
width: 506
height: 506
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: []
@ -228,7 +228,7 @@ TextureImporter:
width: 346
height: 558
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: []
@ -249,7 +249,7 @@ TextureImporter:
width: 182
height: 178
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: []
@ -270,7 +270,7 @@ TextureImporter:
width: 172
height: 254
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: []
@ -291,7 +291,7 @@ TextureImporter:
width: 184
height: 286
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: []
@ -312,7 +312,7 @@ TextureImporter:
width: 504
height: 506
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: []
@ -333,7 +333,7 @@ TextureImporter:
width: 349
height: 560
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: []
@ -354,7 +354,7 @@ TextureImporter:
width: 182
height: 178
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: []
@ -375,7 +375,7 @@ TextureImporter:
width: 173
height: 252
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: []
@ -396,7 +396,7 @@ TextureImporter:
width: 216
height: 125
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: []
@ -417,7 +417,7 @@ TextureImporter:
width: 292
height: 494
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: []
@ -438,7 +438,7 @@ TextureImporter:
width: 256
height: 240
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: []
@ -459,7 +459,7 @@ TextureImporter:
width: 196
height: 196
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: []
@ -480,7 +480,7 @@ TextureImporter:
width: 522
height: 506
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: []
@ -501,7 +501,7 @@ TextureImporter:
width: 446
height: 464
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: []
@ -522,7 +522,7 @@ TextureImporter:
width: 976
height: 652
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: []
@ -542,8 +542,8 @@ TextureImporter:
y: 1035
width: 300
height: 570
alignment: 0
pivot: {x: 0, y: 0}
alignment: 9
pivot: {x: 0.5255749, y: 0.28528753}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -564,7 +564,7 @@ TextureImporter:
width: 520
height: 506
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: []
@ -585,7 +585,7 @@ TextureImporter:
width: 230
height: 230
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: []
@ -606,7 +606,7 @@ TextureImporter:
width: 264
height: 258
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: []

View file

@ -2,8 +2,8 @@ using System;
public static class AppInfo {
//--- AutoGenerated.begin
public const string Version = "0.0.963";
public static readonly DateTime Date = new DateTime(2023, 01, 12, 00, 27, 14, 138, DateTimeKind.Utc);
public const string Version = "0.0.964";
public static readonly DateTime Date = new DateTime(2023, 01, 15, 23, 58, 17, 115, DateTimeKind.Utc);
//--- AutoGenerated.end
}

View file

@ -125,13 +125,13 @@ namespace HeavenStudio.Games
// print("current beat: " + conductor.songPositionInBeats);
if (stopCatchLeft > 0 && stopCatchLeft <= cond.songPositionInBeats)
{
plalinAnim.SetTrigger("stopCatch");
plalinAnim.Play("idle", 0, 0);
stopCatchLeft = 0;
}
if (stopCatchRight > 0 && stopCatchRight <= cond.songPositionInBeats)
{
alalinAnim.SetTrigger("stopCatch");
alalinAnim.Play("idle", 0, 0);
stopCatchRight = 0;
}
@ -147,8 +147,8 @@ namespace HeavenStudio.Games
if (stopSmile > 0 && stopSmile <= cond.songPositionInBeats)
{
//print("smile stop");
plalinAnim.SetTrigger("stopSmile");
alalinAnim.SetTrigger("stopSmile");
plalinAnim.Play("stopsmile", 1, 0);
alalinAnim.Play("stopsmile", 1, 0);
stopSmile = 0;
heartMessage.SetActive(false);
}
@ -157,7 +157,7 @@ namespace HeavenStudio.Games
{
if (bopLeft && stopCatchLeft == 0)
{
plalinAnim.Play("bop", 0, 0);
plalinAnim.SetTrigger("bop");
}
if (bopRight && stopCatchRight == 0)
@ -265,6 +265,7 @@ namespace HeavenStudio.Games
startSmile = beat + 1f;
stopSmile = beat + 2f;
}
}
public void catchMiss(bool side, bool isPineapple)
@ -272,14 +273,35 @@ namespace HeavenStudio.Games
// not the right sound at all but need an accurate rip
Jukebox.PlayOneShotGame("catchyTune/fruitThrough");
// hurt animation here
float beat = Conductor.instance.songPositionInBeats;
if (side)
{
alalinAnim.Play("miss", 0, 0);
stopCatchRight = beat + 0.7f;
}
else
{
plalinAnim.Play("miss", 0, 0);
stopCatchLeft = beat + 0.7f;
}
}
public void catchWhiff(bool side)
{
Jukebox.PlayOneShotGame("catchyTune/whiff");
float beat = Conductor.instance.songPositionInBeats;
// whiff animation here
if (side)
{
alalinAnim.Play("whiff", 0, 0);
stopCatchRight = beat + 0.5f;
}
else
{
plalinAnim.Play("whiff", 0, 0);
stopCatchLeft = beat + 0.5f;
}
}
}
}

View file

@ -2,7 +2,6 @@ using System.Collections;
using System.Collections.Generic;
using System;
using UnityEngine;
using NaughtyBezierCurves;
using HeavenStudio.Util;
@ -74,12 +73,7 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
// minenice: note - needs PlayerActionEvent implementation
private void Update()
{
Conductor cond = Conductor.instance;
float tempo = cond.songBpm;
float playbackSpeed = cond.musicSource.pitch;
anim.DoScaledAnimation("fruit bounce", startBeat, beatLength + (isPineapple ? 1f : 0.5f));
anim.DoScaledAnimation("fruit bounce", startBeat, beatLength + (isPineapple ? 4f : 2f));
float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, beatLength);
}
@ -134,6 +128,7 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
private void CatchFruit(PlayerActionEvent caller, float state)
{
//minenice: TODO - near misses (-1 > state > 1)
Jukebox.PlayOneShotGame(soundText + "Catch");
game.catchSuccess(side, isPineapple, smile, startBeat + beatLength);
Destroy(this.gameObject);
@ -145,7 +140,7 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(startBeat + beatLength + (isPineapple ? 1f : 0.5f), delegate { Destroy(this.gameObject); }),
new BeatAction.Action(startBeat + beatLength + (isPineapple ? 3f : 1.5f), delegate { Destroy(this.gameObject); }),
});
}

File diff suppressed because one or more lines are too long

View file

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.0.963
bundleVersion: 0.0.964
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@ -155,11 +155,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.Megaminerzero.HeavenStudio
buildNumber:
Standalone: 963
Standalone: 964
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 963
AndroidBundleVersionCode: 964
AndroidMinSdkVersion: 19
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1