everything but the boss call cancel fix
This commit is contained in:
parent
efcc9390e5
commit
6501b375aa
|
|
@ -2286,7 +2286,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!4 &2932735252070355021
|
--- !u!4 &2932735252070355021
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,8 @@ AnimatorState:
|
||||||
m_Name: BossCall
|
m_Name: BossCall
|
||||||
m_Speed: 1
|
m_Speed: 1
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_Transitions: []
|
m_Transitions:
|
||||||
|
- {fileID: 7611257612628289801}
|
||||||
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
|
||||||
|
|
@ -322,6 +323,28 @@ AnimatorState:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
m_CycleOffsetParameter:
|
m_CycleOffsetParameter:
|
||||||
m_TimeParameter:
|
m_TimeParameter:
|
||||||
|
--- !u!1101 &7611257612628289801
|
||||||
|
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: 7709906099263252174}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 1
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 1
|
||||||
|
m_HasExitTime: 1
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!1102 &7709906099263252174
|
--- !u!1102 &7709906099263252174
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: 0, 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.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -204,6 +213,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: 0, 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.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -301,6 +319,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: 0, 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.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -398,6 +425,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: 0, 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.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -495,6 +531,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: 0, 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.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -593,6 +638,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: -5.833, y: 1.142, 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_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -690,6 +744,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: -7.031, y: 0.127, 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_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -787,6 +850,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: -6.517, y: 0.964, 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_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -884,6 +956,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: -6.121, y: -0.12, 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_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -981,6 +1062,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: -5.646, y: -0.97, 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_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -1079,6 +1169,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
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.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: {x: 0.76, y: 0.76, z: 0.76}
|
||||||
|
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_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -1177,6 +1276,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0
|
inWeight: 0
|
||||||
outWeight: 0
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -1277,6 +1385,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0
|
inWeight: 0
|
||||||
outWeight: 0
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -1306,6 +1423,8 @@ AnimationClip:
|
||||||
value: {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- time: 0.23333333
|
- time: 0.23333333
|
||||||
value: {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- time: 0.28333333
|
||||||
|
value: {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
attribute: m_Sprite
|
attribute: m_Sprite
|
||||||
path: BossTorso
|
path: BossTorso
|
||||||
classID: 212
|
classID: 212
|
||||||
|
|
@ -1331,6 +1450,8 @@ AnimationClip:
|
||||||
value: {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- time: 0.23333333
|
- time: 0.23333333
|
||||||
value: {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- time: 0.28333333
|
||||||
|
value: {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
attribute: m_Sprite
|
attribute: m_Sprite
|
||||||
path: BossHead
|
path: BossHead
|
||||||
classID: 212
|
classID: 212
|
||||||
|
|
@ -1356,6 +1477,8 @@ AnimationClip:
|
||||||
value: {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- time: 0.23333333
|
- time: 0.23333333
|
||||||
value: {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- time: 0.28333333
|
||||||
|
value: {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
attribute: m_Sprite
|
attribute: m_Sprite
|
||||||
path: BossLeftLeg
|
path: BossLeftLeg
|
||||||
classID: 212
|
classID: 212
|
||||||
|
|
@ -1381,6 +1504,8 @@ AnimationClip:
|
||||||
value: {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- time: 0.23333333
|
- time: 0.23333333
|
||||||
value: {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- time: 0.28333333
|
||||||
|
value: {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
attribute: m_Sprite
|
attribute: m_Sprite
|
||||||
path: BossArmLeft
|
path: BossArmLeft
|
||||||
classID: 212
|
classID: 212
|
||||||
|
|
@ -1406,6 +1531,8 @@ AnimationClip:
|
||||||
value: {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- time: 0.23333333
|
- time: 0.23333333
|
||||||
value: {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
value: {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- time: 0.28333333
|
||||||
|
value: {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
attribute: m_Sprite
|
attribute: m_Sprite
|
||||||
path: BossArmRight
|
path: BossArmRight
|
||||||
classID: 212
|
classID: 212
|
||||||
|
|
@ -1554,6 +1681,8 @@ AnimationClip:
|
||||||
- {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- {fileID: 8969925656131713453, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3108801417681170918, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
|
@ -1574,6 +1703,7 @@ AnimationClip:
|
||||||
- {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- {fileID: -4011833703415356042, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
|
@ -1584,6 +1714,8 @@ AnimationClip:
|
||||||
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- {fileID: 3980019249115040852, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
- {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
- {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
- {fileID: -5596940865122316592, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
|
||||||
|
|
@ -1599,7 +1731,7 @@ AnimationClip:
|
||||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
m_AdditiveReferencePoseTime: 0
|
m_AdditiveReferencePoseTime: 0
|
||||||
m_StartTime: 0
|
m_StartTime: 0
|
||||||
m_StopTime: 0.25
|
m_StopTime: 0.3
|
||||||
m_OrientationOffsetY: 0
|
m_OrientationOffsetY: 0
|
||||||
m_Level: 0
|
m_Level: 0
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
|
|
@ -1708,6 +1840,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: -5.833
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -1808,6 +1949,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 1.142
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -1908,6 +2058,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2008,6 +2167,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: -7.031
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2108,6 +2276,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0.127
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2208,6 +2385,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2308,6 +2494,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: -6.517
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2408,6 +2603,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0.964
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2508,6 +2712,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2608,6 +2821,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: -6.121
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2708,6 +2930,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: -0.12
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2808,6 +3039,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -2908,6 +3148,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0
|
inWeight: 0
|
||||||
outWeight: 0
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3008,6 +3257,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0
|
inWeight: 0
|
||||||
outWeight: 0
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3108,6 +3366,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3208,6 +3475,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3308,6 +3584,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3408,6 +3693,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3508,6 +3802,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3608,6 +3911,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3708,6 +4020,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: -5.646
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3808,6 +4129,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: -0.97
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -3908,6 +4238,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4008,6 +4347,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4108,6 +4456,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4208,6 +4565,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4308,6 +4674,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4408,6 +4783,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4508,6 +4892,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4608,6 +5001,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4708,6 +5110,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4808,6 +5219,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -4908,6 +5328,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0.76
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -5008,6 +5437,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0.76
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
@ -5108,6 +5546,15 @@ AnimationClip:
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.28333333
|
||||||
|
value: 0.76
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
|
|
||||||
|
|
@ -11,22 +11,22 @@ AnimatorStateMachine:
|
||||||
m_ChildStates:
|
m_ChildStates:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -1965619301899192355}
|
m_State: {fileID: -1965619301899192355}
|
||||||
m_Position: {x: 200, y: 0, z: 0}
|
m_Position: {x: 210, y: 10, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 2982170771521702613}
|
m_State: {fileID: 2982170771521702613}
|
||||||
m_Position: {x: 235, y: 65, z: 0}
|
|
||||||
- serializedVersion: 1
|
|
||||||
m_State: {fileID: -1103792992353294211}
|
|
||||||
m_Position: {x: 270, y: 130, z: 0}
|
m_Position: {x: 270, y: 130, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -1103792992353294211}
|
||||||
|
m_Position: {x: 240, y: 70, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -1173706079913618943}
|
m_State: {fileID: -1173706079913618943}
|
||||||
m_Position: {x: 305, y: 195, z: 0}
|
m_Position: {x: 300, y: 190, z: 0}
|
||||||
m_ChildStateMachines: []
|
m_ChildStateMachines: []
|
||||||
m_AnyStateTransitions: []
|
m_AnyStateTransitions: []
|
||||||
m_EntryTransitions: []
|
m_EntryTransitions: []
|
||||||
m_StateMachineTransitions: {}
|
m_StateMachineTransitions: {}
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
m_AnyStatePosition: {x: 10, y: 20, z: 0}
|
||||||
m_EntryPosition: {x: 50, y: 120, z: 0}
|
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||||
m_ExitPosition: {x: 800, y: 120, z: 0}
|
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||||
|
|
@ -64,7 +64,7 @@ AnimatorState:
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: CartguyPhoneBop
|
m_Name: PhoneBop
|
||||||
m_Speed: 1
|
m_Speed: 1
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_Transitions: []
|
m_Transitions: []
|
||||||
|
|
|
||||||
|
|
@ -159,7 +159,7 @@ AnimationClip:
|
||||||
m_Level: 0
|
m_Level: 0
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_HasAdditiveReferencePose: 0
|
m_HasAdditiveReferencePose: 0
|
||||||
m_LoopTime: 1
|
m_LoopTime: 0
|
||||||
m_LoopBlend: 0
|
m_LoopBlend: 0
|
||||||
m_LoopBlendOrientation: 0
|
m_LoopBlendOrientation: 0
|
||||||
m_LoopBlendPositionY: 0
|
m_LoopBlendPositionY: 0
|
||||||
|
|
|
||||||
|
|
@ -448,7 +448,7 @@ AnimationClip:
|
||||||
m_Level: 0
|
m_Level: 0
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_HasAdditiveReferencePose: 0
|
m_HasAdditiveReferencePose: 0
|
||||||
m_LoopTime: 1
|
m_LoopTime: 0
|
||||||
m_LoopBlend: 0
|
m_LoopBlend: 0
|
||||||
m_LoopBlendOrientation: 0
|
m_LoopBlendOrientation: 0
|
||||||
m_LoopBlendPositionY: 0
|
m_LoopBlendPositionY: 0
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ namespace HeavenStudio.Games.Scripts_MeatGrinder
|
||||||
|
|
||||||
[NonSerialized] public double startBeat;
|
[NonSerialized] public double startBeat;
|
||||||
[NonSerialized] public MeatType meatType;
|
[NonSerialized] public MeatType meatType;
|
||||||
[NonSerialized] public double reactionBeats = -1;
|
[NonSerialized] public double reactionBeats;
|
||||||
[NonSerialized] public int reaction;
|
[NonSerialized] public int reaction;
|
||||||
|
|
||||||
private bool isHit = false;
|
private bool isHit = false;
|
||||||
|
|
@ -109,9 +109,9 @@ namespace HeavenStudio.Games.Scripts_MeatGrinder
|
||||||
SoundByte.PlayOneShotGame("meatGrinder/" + (isBarely ? "tink" : "meatHit"));
|
SoundByte.PlayOneShotGame("meatGrinder/" + (isBarely ? "tink" : "meatHit"));
|
||||||
game.TackAnim.DoScaledAnimationAsync("TackHit" + (isBarely ? "Barely" : "Success"), 0.5f);
|
game.TackAnim.DoScaledAnimationAsync("TackHit" + (isBarely ? "Barely" : "Success"), 0.5f);
|
||||||
|
|
||||||
if (reactionBeats > 0) {
|
if (reaction > 0) {
|
||||||
BeatAction.New(game, new List<BeatAction.Action>() {
|
BeatAction.New(game, new List<BeatAction.Action>() {
|
||||||
new(startBeat + reactionBeats + 1, delegate { game.TackExpression(reaction); })
|
new(startBeat + reactionBeats + 1, delegate { game.DoExpressions(reaction); })
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,11 @@ namespace HeavenStudio.Games.Loaders
|
||||||
{
|
{
|
||||||
function = delegate {
|
function = delegate {
|
||||||
var e = eventCaller.currentEntity;
|
var e = eventCaller.currentEntity;
|
||||||
|
SoundByte.PlayOneShotGame("meatGrinder/toss", forcePlay: true);
|
||||||
MeatGrinder.instance.MeatToss(e.beat, e["bacon"], e["reaction"], e["reactionBeats"]);
|
MeatGrinder.instance.MeatToss(e.beat, e["bacon"], e["reaction"], e["reactionBeats"]);
|
||||||
},
|
},
|
||||||
inactiveFunction = delegate {
|
inactiveFunction = delegate {
|
||||||
|
SoundByte.PlayOneShotGame("meatGrinder/toss", forcePlay: true);
|
||||||
MeatGrinder.QueueMeatToss(eventCaller.currentEntity);
|
MeatGrinder.QueueMeatToss(eventCaller.currentEntity);
|
||||||
},
|
},
|
||||||
defaultLength = 2f,
|
defaultLength = 2f,
|
||||||
|
|
@ -64,6 +66,7 @@ namespace HeavenStudio.Games.Loaders
|
||||||
},
|
},
|
||||||
new GameAction("MeatCall", "Meat Call")
|
new GameAction("MeatCall", "Meat Call")
|
||||||
{
|
{
|
||||||
|
inactiveFunction = delegate { SoundByte.PlayOneShotGame("meatGrinder/signal", forcePlay: true); },
|
||||||
defaultLength = 0.5f,
|
defaultLength = 0.5f,
|
||||||
priority = 2,
|
priority = 2,
|
||||||
preFunctionLength = 1f,
|
preFunctionLength = 1f,
|
||||||
|
|
@ -80,11 +83,15 @@ namespace HeavenStudio.Games.Loaders
|
||||||
preFunction = delegate { MeatGrinder.PrePassTurn(eventCaller.currentEntity.beat); },
|
preFunction = delegate { MeatGrinder.PrePassTurn(eventCaller.currentEntity.beat); },
|
||||||
preFunctionLength = 1
|
preFunctionLength = 1
|
||||||
},
|
},
|
||||||
new GameAction("tackExpressions", "Tack Expressions")
|
new GameAction("expressions", "Expressions")
|
||||||
{
|
{
|
||||||
function = delegate { MeatGrinder.instance.TackExpression(eventCaller.currentEntity["expression"]); },
|
function = delegate {
|
||||||
|
var e = eventCaller.currentEntity;
|
||||||
|
MeatGrinder.instance.DoExpressions(e["tackExpression"], e["bossExpression"]);
|
||||||
|
},
|
||||||
parameters = new List<Param>() {
|
parameters = new List<Param>() {
|
||||||
new Param("expression", MeatGrinder.TackExpressions.Content, "Expression", "The expression Tack will display"),
|
new Param("tackExpression", MeatGrinder.TackExpressions.Content, "Tack Expression", "The expression Tack will display"),
|
||||||
|
new Param("bossExpression", MeatGrinder.BossExpressions.None, "Boss Expression", "The expression Boss will display"),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
new GameAction("cartGuy", "Cart Guy")
|
new GameAction("cartGuy", "Cart Guy")
|
||||||
|
|
@ -144,7 +151,7 @@ namespace HeavenStudio.Games
|
||||||
public Util.EasingFunction.Ease cartEase = Util.EasingFunction.Ease.Linear;
|
public Util.EasingFunction.Ease cartEase = Util.EasingFunction.Ease.Linear;
|
||||||
public double cartBeat = double.MaxValue;
|
public double cartBeat = double.MaxValue;
|
||||||
public float cartLength = 0;
|
public float cartLength = 0;
|
||||||
public bool cartSpider = false;
|
public bool cartPhone = false;
|
||||||
public string cartDir = "Left";
|
public string cartDir = "Left";
|
||||||
private const string sfxName = "meatGrinder/";
|
private const string sfxName = "meatGrinder/";
|
||||||
|
|
||||||
|
|
@ -154,10 +161,17 @@ namespace HeavenStudio.Games
|
||||||
{
|
{
|
||||||
None,
|
None,
|
||||||
Content,
|
Content,
|
||||||
// Smug,
|
Smug,
|
||||||
Wonder,
|
Wonder,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum BossExpressions
|
||||||
|
{
|
||||||
|
None,
|
||||||
|
Eyebrow,
|
||||||
|
Scared,
|
||||||
|
}
|
||||||
|
|
||||||
public enum CartGuyDirection
|
public enum CartGuyDirection
|
||||||
{
|
{
|
||||||
Right,
|
Right,
|
||||||
|
|
@ -205,10 +219,12 @@ namespace HeavenStudio.Games
|
||||||
passedTurns.Clear();
|
passedTurns.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CartGuyParentAnim.gameObject.SetActive(cartLength != 0);
|
||||||
|
|
||||||
if (cartLength != 0)
|
if (cartLength != 0)
|
||||||
{
|
{
|
||||||
// CartGuyParentAnim.gameObject.SetActive(true);
|
// CartGuyParentAnim.gameObject.SetActive(true);
|
||||||
if (cartSpider) CartGuyAnim.Play("Phone", 0, 0);
|
if (cartPhone) CartGuyAnim.Play("Phone", 0, 0);
|
||||||
float normalizedBeat = Conductor.instance.GetPositionFromBeat(cartBeat, cartLength);
|
float normalizedBeat = Conductor.instance.GetPositionFromBeat(cartBeat, cartLength);
|
||||||
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction(cartEase);
|
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction(cartEase);
|
||||||
float newPos = func(0f, 1f, normalizedBeat);
|
float newPos = func(0f, 1f, normalizedBeat);
|
||||||
|
|
@ -223,9 +239,9 @@ namespace HeavenStudio.Games
|
||||||
{
|
{
|
||||||
BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f);
|
BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f);
|
||||||
}
|
}
|
||||||
if (!cartSpider && CartGuyParentAnim.gameObject.activeSelf)
|
if (CartGuyParentAnim.gameObject.activeSelf)
|
||||||
{
|
{
|
||||||
CartGuyAnim.DoScaledAnimationAsync("Bop", 0.5f);
|
CartGuyAnim.DoScaledAnimationAsync(cartPhone ? "PhoneBop" : "Bop", 0.5f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -266,7 +282,7 @@ namespace HeavenStudio.Games
|
||||||
var actions = new List<BeatAction.Action>();
|
var actions = new List<BeatAction.Action>();
|
||||||
for (int i = 0; i < length; i++)
|
for (int i = 0; i < length; i++)
|
||||||
{
|
{
|
||||||
actions.Add( new BeatAction.Action(beat + i, delegate {
|
actions.Add(new BeatAction.Action(beat + i, delegate {
|
||||||
if (!BossAnim.IsPlayingAnimationNames("BossCall", "BossSignal")) {
|
if (!BossAnim.IsPlayingAnimationNames("BossCall", "BossSignal")) {
|
||||||
BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f);
|
BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f);
|
||||||
}
|
}
|
||||||
|
|
@ -276,18 +292,23 @@ namespace HeavenStudio.Games
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void TackExpression(int expression)
|
public void DoExpressions(int tackExpression, int bossExpression = 0)
|
||||||
{
|
{
|
||||||
string anim = ((TackExpressions)expression).ToString();
|
if (tackExpression != (int)TackExpressions.None) {
|
||||||
TackAnim.DoScaledAnimationAsync("Tack" + anim, 0.5f);
|
string tackAnim = ((TackExpressions)tackExpression).ToString();
|
||||||
Debug.Log(anim);
|
TackAnim.DoScaledAnimationAsync("Tack" + tackAnim, 0.5f);
|
||||||
|
}
|
||||||
|
if (bossExpression != (int)BossExpressions.None) {
|
||||||
|
string bossAnim = ((BossExpressions)bossExpression).ToString();
|
||||||
|
BossAnim.DoScaledAnimationAsync("Boss" + bossAnim, 0.5f);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CartGuy(double beat, float length, bool spider, int direction, int ease)
|
public void CartGuy(double beat, float length, bool spider, int direction, int ease)
|
||||||
{
|
{
|
||||||
cartBeat = beat;
|
cartBeat = beat;
|
||||||
cartLength = length;
|
cartLength = length;
|
||||||
cartSpider = spider;
|
cartPhone = spider;
|
||||||
cartDir = direction == 0 ? "Right" : "Left";
|
cartDir = direction == 0 ? "Right" : "Left";
|
||||||
cartEase = (Util.EasingFunction.Ease)ease;
|
cartEase = (Util.EasingFunction.Ease)ease;
|
||||||
}
|
}
|
||||||
|
|
@ -348,8 +369,6 @@ namespace HeavenStudio.Games
|
||||||
|
|
||||||
public void MeatToss(double beat, bool bacon, int reaction, float reactionBeat)
|
public void MeatToss(double beat, bool bacon, int reaction, float reactionBeat)
|
||||||
{
|
{
|
||||||
SoundByte.PlayOneShotGame(sfxName + "toss");
|
|
||||||
|
|
||||||
Meat meat = Instantiate(MeatBase, transform).GetComponent<Meat>();
|
Meat meat = Instantiate(MeatBase, transform).GetComponent<Meat>();
|
||||||
meat.gameObject.SetActive(true);
|
meat.gameObject.SetActive(true);
|
||||||
meat.startBeat = beat;
|
meat.startBeat = beat;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue