camera stuff!
This commit is contained in:
parent
b8ee222575
commit
39c38b8aa1
File diff suppressed because it is too large
Load diff
|
|
@ -14,7 +14,7 @@ AnimatorState:
|
||||||
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
|
||||||
m_WriteDefaultValues: 1
|
m_WriteDefaultValues: 0
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
|
|
@ -26,58 +26,6 @@ AnimatorState:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
m_CycleOffsetParameter:
|
m_CycleOffsetParameter:
|
||||||
m_TimeParameter:
|
m_TimeParameter:
|
||||||
--- !u!1102 &-7530952339586054454
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: break
|
|
||||||
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: 097e4120edbde8a49af1ee5d43c739a6, type: 2}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
||||||
--- !u!1102 &-7228348868439060554
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: shake
|
|
||||||
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: 1102bcbac87470b48b0615389d924561, type: 2}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
||||||
--- !u!1102 &-1891003415174242613
|
--- !u!1102 &-1891003415174242613
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
|
|
@ -92,7 +40,7 @@ AnimatorState:
|
||||||
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
|
||||||
m_WriteDefaultValues: 1
|
m_WriteDefaultValues: 0
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
|
|
@ -119,12 +67,6 @@ AnimatorStateMachine:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -8672832660157761820}
|
m_State: {fileID: -8672832660157761820}
|
||||||
m_Position: {x: 260, y: 0, z: 0}
|
m_Position: {x: 260, y: 0, z: 0}
|
||||||
- serializedVersion: 1
|
|
||||||
m_State: {fileID: -7530952339586054454}
|
|
||||||
m_Position: {x: 260, y: 120, z: 0}
|
|
||||||
- serializedVersion: 1
|
|
||||||
m_State: {fileID: -7228348868439060554}
|
|
||||||
m_Position: {x: 260, y: 180, z: 0}
|
|
||||||
m_ChildStateMachines: []
|
m_ChildStateMachines: []
|
||||||
m_AnyStateTransitions: []
|
m_AnyStateTransitions: []
|
||||||
m_EntryTransitions: []
|
m_EntryTransitions: []
|
||||||
|
|
@ -183,7 +125,7 @@ AnimatorState:
|
||||||
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
|
||||||
m_WriteDefaultValues: 1
|
m_WriteDefaultValues: 0
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
|
|
@ -206,7 +148,7 @@ AnimatorStateMachine:
|
||||||
m_ChildStates:
|
m_ChildStates:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 5773130082680349530}
|
m_State: {fileID: 5773130082680349530}
|
||||||
m_Position: {x: 282.9432, y: 34.36415, z: 0}
|
m_Position: {x: 280, y: 30, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 6285518713359575881}
|
m_State: {fileID: 6285518713359575881}
|
||||||
m_Position: {x: 282.93604, y: 215.39151, z: 0}
|
m_Position: {x: 282.93604, y: 215.39151, z: 0}
|
||||||
|
|
@ -237,7 +179,7 @@ AnimatorState:
|
||||||
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
|
||||||
m_WriteDefaultValues: 1
|
m_WriteDefaultValues: 0
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
|
|
@ -263,7 +205,7 @@ AnimatorState:
|
||||||
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
|
||||||
m_WriteDefaultValues: 1
|
m_WriteDefaultValues: 0
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ AnimationClip:
|
||||||
m_Level: 0
|
m_Level: 0
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_HasAdditiveReferencePose: 0
|
m_HasAdditiveReferencePose: 0
|
||||||
m_LoopTime: 0
|
m_LoopTime: 1
|
||||||
m_LoopBlend: 0
|
m_LoopBlend: 0
|
||||||
m_LoopBlendOrientation: 0
|
m_LoopBlendOrientation: 0
|
||||||
m_LoopBlendPositionY: 0
|
m_LoopBlendPositionY: 0
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,44 @@ AnimationClip:
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
path:
|
path:
|
||||||
m_ScaleCurves: []
|
m_ScaleCurves: []
|
||||||
m_FloatCurves: []
|
m_FloatCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.016666668
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.68333334
|
||||||
|
value: 1
|
||||||
|
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: wall_high_model
|
||||||
|
classID: 1
|
||||||
|
script: {fileID: 0}
|
||||||
m_PPtrCurves: []
|
m_PPtrCurves: []
|
||||||
m_SampleRate: 60
|
m_SampleRate: 60
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
|
|
@ -57,6 +94,13 @@ AnimationClip:
|
||||||
typeID: 4
|
typeID: 4
|
||||||
customType: 0
|
customType: 0
|
||||||
isPPtrCurve: 0
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 3051566205
|
||||||
|
attribute: 2086281974
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 1
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
pptrCurveMapping: []
|
pptrCurveMapping: []
|
||||||
m_AnimationClipSettings:
|
m_AnimationClipSettings:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
|
@ -163,6 +207,43 @@ AnimationClip:
|
||||||
path:
|
path:
|
||||||
classID: 4
|
classID: 4
|
||||||
script: {fileID: 0}
|
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
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.016666668
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.68333334
|
||||||
|
value: 1
|
||||||
|
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: wall_high_model
|
||||||
|
classID: 1
|
||||||
|
script: {fileID: 0}
|
||||||
m_EulerEditorCurves: []
|
m_EulerEditorCurves: []
|
||||||
m_HasGenericRootTransform: 1
|
m_HasGenericRootTransform: 1
|
||||||
m_HasMotionFloatCurves: 0
|
m_HasMotionFloatCurves: 0
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ AnimatorController:
|
||||||
m_Behaviours: []
|
m_Behaviours: []
|
||||||
m_BlendingMode: 0
|
m_BlendingMode: 0
|
||||||
m_SyncedLayerIndex: -1
|
m_SyncedLayerIndex: -1
|
||||||
m_DefaultWeight: 1
|
m_DefaultWeight: 0
|
||||||
m_IKPass: 0
|
m_IKPass: 0
|
||||||
m_SyncedLayerAffectsTiming: 0
|
m_SyncedLayerAffectsTiming: 0
|
||||||
m_Controller: {fileID: 9100000}
|
m_Controller: {fileID: 9100000}
|
||||||
|
|
@ -164,7 +164,7 @@ AnimatorStateMachine:
|
||||||
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}
|
||||||
m_DefaultState: {fileID: -3339993895938749424}
|
m_DefaultState: {fileID: -7867947768620779705}
|
||||||
--- !u!1102 &5573168244071546499
|
--- !u!1102 &5573168244071546499
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,62 @@ AnimationClip:
|
||||||
m_RotationCurves: []
|
m_RotationCurves: []
|
||||||
m_CompressedRotationCurves: []
|
m_CompressedRotationCurves: []
|
||||||
m_EulerCurves: []
|
m_EulerCurves: []
|
||||||
m_PositionCurves: []
|
m_PositionCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: {x: -140.99988, y: -1, z: 0.7999998}
|
||||||
|
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: 1
|
||||||
|
value: {x: -140.99988, y: -1, z: 0.7999998}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
path:
|
||||||
m_ScaleCurves: []
|
m_ScaleCurves: []
|
||||||
m_FloatCurves: []
|
m_FloatCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
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: wall_low_model
|
||||||
|
classID: 1
|
||||||
|
script: {fileID: 0}
|
||||||
m_PPtrCurves: []
|
m_PPtrCurves: []
|
||||||
m_SampleRate: 60
|
m_SampleRate: 60
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
|
|
@ -24,7 +77,21 @@ AnimationClip:
|
||||||
m_Center: {x: 0, y: 0, z: 0}
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
m_Extent: {x: 0, y: 0, z: 0}
|
m_Extent: {x: 0, y: 0, z: 0}
|
||||||
m_ClipBindingConstant:
|
m_ClipBindingConstant:
|
||||||
genericBindings: []
|
genericBindings:
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 3301542606
|
||||||
|
attribute: 2086281974
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 1
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 0
|
||||||
|
attribute: 1
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 4
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
pptrCurveMapping: []
|
pptrCurveMapping: []
|
||||||
m_AnimationClipSettings:
|
m_AnimationClipSettings:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
|
@ -46,8 +113,120 @@ AnimationClip:
|
||||||
m_KeepOriginalPositionXZ: 0
|
m_KeepOriginalPositionXZ: 0
|
||||||
m_HeightFromFeet: 0
|
m_HeightFromFeet: 0
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_EditorCurves: []
|
m_EditorCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: -140.99988
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: -140.99988
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalPosition.x
|
||||||
|
path:
|
||||||
|
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.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: -1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalPosition.y
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0.7999998
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0.7999998
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalPosition.z
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
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: wall_low_model
|
||||||
|
classID: 1
|
||||||
|
script: {fileID: 0}
|
||||||
m_EulerEditorCurves: []
|
m_EulerEditorCurves: []
|
||||||
m_HasGenericRootTransform: 0
|
m_HasGenericRootTransform: 1
|
||||||
m_HasMotionFloatCurves: 0
|
m_HasMotionFloatCurves: 0
|
||||||
m_Events: []
|
m_Events: []
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,44 @@ AnimationClip:
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
path:
|
path:
|
||||||
m_ScaleCurves: []
|
m_ScaleCurves: []
|
||||||
m_FloatCurves: []
|
m_FloatCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.016666668
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.6666667
|
||||||
|
value: 1
|
||||||
|
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: wall_low_model
|
||||||
|
classID: 1
|
||||||
|
script: {fileID: 0}
|
||||||
m_PPtrCurves: []
|
m_PPtrCurves: []
|
||||||
m_SampleRate: 60
|
m_SampleRate: 60
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
|
|
@ -57,6 +94,13 @@ AnimationClip:
|
||||||
typeID: 4
|
typeID: 4
|
||||||
customType: 0
|
customType: 0
|
||||||
isPPtrCurve: 0
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 3301542606
|
||||||
|
attribute: 2086281974
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 1
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
pptrCurveMapping: []
|
pptrCurveMapping: []
|
||||||
m_AnimationClipSettings:
|
m_AnimationClipSettings:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
|
@ -163,6 +207,43 @@ AnimationClip:
|
||||||
path:
|
path:
|
||||||
classID: 4
|
classID: 4
|
||||||
script: {fileID: 0}
|
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
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.016666668
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.6666667
|
||||||
|
value: 1
|
||||||
|
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: wall_low_model
|
||||||
|
classID: 1
|
||||||
|
script: {fileID: 0}
|
||||||
m_EulerEditorCurves: []
|
m_EulerEditorCurves: []
|
||||||
m_HasGenericRootTransform: 1
|
m_HasGenericRootTransform: 1
|
||||||
m_HasMotionFloatCurves: 0
|
m_HasMotionFloatCurves: 0
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ ModelImporter:
|
||||||
type: UnityEngine:Material
|
type: UnityEngine:Material
|
||||||
assembly: UnityEngine.CoreModule
|
assembly: UnityEngine.CoreModule
|
||||||
name: airboy_board
|
name: airboy_board
|
||||||
second: {fileID: 2100000, guid: 21a244208ca5883499c02785947c32eb, type: 2}
|
second: {fileID: 2100000, guid: 18236ab917d571548b689dbcdf081b2e, type: 2}
|
||||||
- first:
|
- first:
|
||||||
type: UnityEngine:Material
|
type: UnityEngine:Material
|
||||||
assembly: UnityEngine.CoreModule
|
assembly: UnityEngine.CoreModule
|
||||||
|
|
@ -39,7 +39,7 @@ ModelImporter:
|
||||||
animationDoRetargetingWarnings: 0
|
animationDoRetargetingWarnings: 0
|
||||||
importAnimatedCustomProperties: 0
|
importAnimatedCustomProperties: 0
|
||||||
importConstraints: 0
|
importConstraints: 0
|
||||||
animationCompression: 1
|
animationCompression: 3
|
||||||
animationRotationError: 0.5
|
animationRotationError: 0.5
|
||||||
animationPositionError: 0.5
|
animationPositionError: 0.5
|
||||||
animationScaleError: 0.5
|
animationScaleError: 0.5
|
||||||
|
|
@ -95,7 +95,157 @@ ModelImporter:
|
||||||
humanDescription:
|
humanDescription:
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
human: []
|
human: []
|
||||||
skeleton: []
|
skeleton:
|
||||||
|
- name: neo_airboy(Clone)
|
||||||
|
parentName:
|
||||||
|
position: {x: 0, y: 0, z: 0}
|
||||||
|
rotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: airboy_model
|
||||||
|
parentName: neo_airboy(Clone)
|
||||||
|
position: {x: -0, y: 0, z: 0}
|
||||||
|
rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
|
||||||
|
scale: {x: 100, y: 100, z: 100}
|
||||||
|
- name: airboy_model_skeleton
|
||||||
|
parentName: neo_airboy(Clone)
|
||||||
|
position: {x: -0, y: 0, z: 0}
|
||||||
|
rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
|
||||||
|
scale: {x: 100, y: 100, z: 100}
|
||||||
|
- name: airboy
|
||||||
|
parentName: airboy_model_skeleton
|
||||||
|
position: {x: 0, y: -5.9604643e-10, z: 0.0047615133}
|
||||||
|
rotation: {x: 0.6252786, y: -0.18935074, z: -0.056728657, w: 0.7549536}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Skl_Root
|
||||||
|
parentName: airboy
|
||||||
|
position: {x: -0.0000143014295, y: 0.0017634439, z: -0.00065276027}
|
||||||
|
rotation: {x: 0, y: 0, z: -0.7071081, w: 0.7071055}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Leg_1_L
|
||||||
|
parentName: Skl_Root
|
||||||
|
position: {x: 0.00023749859, y: -0.0012651699, z: 0.00024293795}
|
||||||
|
rotation: {x: -0.0701334, y: 0.021923741, z: 0.5820632, w: 0.8098168}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Leg_2_L
|
||||||
|
parentName: Leg_1_L
|
||||||
|
position: {x: 0.000021828784, y: -0.00299883, z: -0.000053091644}
|
||||||
|
rotation: {x: 0.3738204, y: -0.15457922, z: -0.0067697144, w: 0.9145042}
|
||||||
|
scale: {x: 0.9999999, y: 0.99999994, z: 0.99999994}
|
||||||
|
- name: Ankle_L
|
||||||
|
parentName: Leg_2_L
|
||||||
|
position: {x: -0.000019310237, y: -0.0025961706, z: 0.00038391133}
|
||||||
|
rotation: {x: 0.44290522, y: 0.695263, z: 0.38431135, w: 0.4156309}
|
||||||
|
scale: {x: 1, y: 0.9999999, z: 1.0000001}
|
||||||
|
- name: Ankle_L_end
|
||||||
|
parentName: Ankle_L
|
||||||
|
position: {x: -0, y: 0.00006831873, z: 0}
|
||||||
|
rotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Leg_1_R
|
||||||
|
parentName: Skl_Root
|
||||||
|
position: {x: 0.0004820577, y: 0.0012244481, z: -0.00016237333}
|
||||||
|
rotation: {x: 0.018891929, y: 0.9935955, z: -0.11084521, w: -0.011162682}
|
||||||
|
scale: {x: 1, y: 0.99999994, z: 0.99999994}
|
||||||
|
- name: Leg_2_R
|
||||||
|
parentName: Leg_1_R
|
||||||
|
position: {x: -0.0029990696, y: -0.00000016089528, z: 0.000054637192}
|
||||||
|
rotation: {x: 0.84910434, y: -0.022140535, z: 0.5240824, w: -0.062203437}
|
||||||
|
scale: {x: 0.9999999, y: 0.9999999, z: 0.99999994}
|
||||||
|
- name: Ankle_R
|
||||||
|
parentName: Leg_2_R
|
||||||
|
position: {x: 0.00035560734, y: 0.00003682382, z: -0.0025999998}
|
||||||
|
rotation: {x: -0.41944757, y: 0.53825307, z: 0.66963845, w: 0.2931412}
|
||||||
|
scale: {x: 1, y: 0.99999994, z: 1}
|
||||||
|
- name: Ankle_R_end
|
||||||
|
parentName: Ankle_R
|
||||||
|
position: {x: -0, y: 0.0000683188, z: 0}
|
||||||
|
rotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Waist
|
||||||
|
parentName: Skl_Root
|
||||||
|
position: {x: -0.000011850246, y: -1.0635972e-10, z: -0.00006796107}
|
||||||
|
rotation: {x: -0.081661806, y: -0.025835225, z: -0.046427183, w: 0.9952429}
|
||||||
|
scale: {x: 1, y: 0.99999994, z: 1}
|
||||||
|
- name: Spine
|
||||||
|
parentName: Waist
|
||||||
|
position: {x: -0.00285833, y: 4.6566126e-11, z: -0.00014242729}
|
||||||
|
rotation: {x: -0.19188948, y: 0.3852869, z: -0.053714685, w: 0.90102565}
|
||||||
|
scale: {x: 1, y: 0.99999994, z: 1}
|
||||||
|
- name: Arm_1_L
|
||||||
|
parentName: Spine
|
||||||
|
position: {x: -0.0014556204, y: -0.0014599604, z: -0.00012458261}
|
||||||
|
rotation: {x: -0.28129122, y: -0.44526345, z: 0.59765553, w: 0.6045028}
|
||||||
|
scale: {x: 1.0000001, y: 1, z: 1}
|
||||||
|
- name: Arm_2_L
|
||||||
|
parentName: Arm_1_L
|
||||||
|
position: {x: -0.0027749697, y: 0.00000016977778, z: -0.000005434118}
|
||||||
|
rotation: {x: -0.009569032, y: 0.04283372, z: -0.008593103, w: 0.9989995}
|
||||||
|
scale: {x: 1, y: 1.0000001, z: 0.99999994}
|
||||||
|
- name: Wrist_L
|
||||||
|
parentName: Arm_2_L
|
||||||
|
position: {x: -0.0020982707, y: -0.00000016995705, z: 0.000005434453}
|
||||||
|
rotation: {x: 0.0015187274, y: -0.34756982, z: 0.57559866, w: 0.7401886}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Wrist_L_end
|
||||||
|
parentName: Wrist_L
|
||||||
|
position: {x: -0, y: 0.00006831884, z: 0}
|
||||||
|
rotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Arm_1_R
|
||||||
|
parentName: Spine
|
||||||
|
position: {x: -0.0014555797, y: 0.0014553501, z: -0.00012458238}
|
||||||
|
rotation: {x: -0.091404326, y: -0.2838889, z: 0.65810406, w: 0.6913403}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Arm_2_R
|
||||||
|
parentName: Arm_1_R
|
||||||
|
position: {x: 0.00279524, y: 7.4505804e-11, z: 7.4505804e-11}
|
||||||
|
rotation: {x: -0.021586465, y: 0.0049736337, z: 0.035006884, w: 0.9991416}
|
||||||
|
scale: {x: 1, y: 1, z: 0.99999994}
|
||||||
|
- name: Wrist_R
|
||||||
|
parentName: Arm_2_R
|
||||||
|
position: {x: 0.00200266, y: -2.4214386e-10, z: 3.9115547e-10}
|
||||||
|
rotation: {x: 0.0020077813, y: 0.03459511, z: -0.6778131, w: 0.73441714}
|
||||||
|
scale: {x: 0.99999994, y: 0.9999999, z: 1}
|
||||||
|
- name: Wrist_R_end
|
||||||
|
parentName: Wrist_R
|
||||||
|
position: {x: -0, y: 0.00006831884, z: 0}
|
||||||
|
rotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: Head
|
||||||
|
parentName: Spine
|
||||||
|
position: {x: -0.00273719, y: -2.4214386e-10, z: -0.00019367904}
|
||||||
|
rotation: {x: -0.22803612, y: -0.3707989, z: -0.1509692, w: 0.88753366}
|
||||||
|
scale: {x: 1, y: 0.99999994, z: 1}
|
||||||
|
- name: Head_end
|
||||||
|
parentName: Head
|
||||||
|
position: {x: -0, y: 0.0000683188, z: 0}
|
||||||
|
rotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: board_model
|
||||||
|
parentName: airboy
|
||||||
|
position: {x: -0, y: -0.001552491, z: 0}
|
||||||
|
rotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: eft_fire_L
|
||||||
|
parentName: board_model
|
||||||
|
position: {x: -0.013613599, y: -0.0010463799, z: 0.0040700096}
|
||||||
|
rotation: {x: 0, y: -0, z: -0.0000000074505797, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: eft_fire_L_end
|
||||||
|
parentName: eft_fire_L
|
||||||
|
position: {x: -0, y: 0.00006831877, z: 0}
|
||||||
|
rotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: eft_fire_R
|
||||||
|
parentName: board_model
|
||||||
|
position: {x: -0.013613599, y: -0.0010463799, z: -0.0040804893}
|
||||||
|
rotation: {x: 0, y: -0, z: -0.0000000074505797, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
|
- name: eft_fire_R_end
|
||||||
|
parentName: eft_fire_R
|
||||||
|
position: {x: -0, y: 0.00006831877, z: 0}
|
||||||
|
rotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
scale: {x: 1, y: 1, z: 1}
|
||||||
armTwist: 0.5
|
armTwist: 0.5
|
||||||
foreArmTwist: 0.5
|
foreArmTwist: 0.5
|
||||||
upperLegTwist: 0.5
|
upperLegTwist: 0.5
|
||||||
|
|
@ -106,7 +256,7 @@ ModelImporter:
|
||||||
globalScale: 1
|
globalScale: 1
|
||||||
rootMotionBoneName:
|
rootMotionBoneName:
|
||||||
hasTranslationDoF: 0
|
hasTranslationDoF: 0
|
||||||
hasExtraRoot: 0
|
hasExtraRoot: 1
|
||||||
skeletonHasParents: 1
|
skeletonHasParents: 1
|
||||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
autoGenerateAvatarMappingIfUnspecified: 1
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
|
|
||||||
|
|
@ -551,9 +551,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 574002313}
|
m_Father: {fileID: 574002313}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &9435782
|
--- !u!114 &9435782
|
||||||
|
|
@ -4172,9 +4172,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 539838476}
|
m_Father: {fileID: 539838476}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 32, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!114 &121871281
|
--- !u!114 &121871281
|
||||||
|
|
@ -4396,9 +4396,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 539838476}
|
m_Father: {fileID: 539838476}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 72, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!114 &129013734
|
--- !u!114 &129013734
|
||||||
|
|
@ -4532,9 +4532,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 539838476}
|
m_Father: {fileID: 539838476}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 112, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!114 &151246938
|
--- !u!114 &151246938
|
||||||
|
|
@ -7278,7 +7278,7 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 24.3
|
m_fontSize: 8
|
||||||
m_fontSizeBase: 24.3
|
m_fontSizeBase: 24.3
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 1
|
m_enableAutoSizing: 1
|
||||||
|
|
@ -8906,7 +8906,7 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 2.9
|
m_fontSize: 0
|
||||||
m_fontSizeBase: 14.3
|
m_fontSizeBase: 14.3
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 1
|
m_enableAutoSizing: 1
|
||||||
|
|
@ -17806,8 +17806,8 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 704039021}
|
m_TargetGraphic: {fileID: 704039021}
|
||||||
m_HandleRect: {fileID: 704039020}
|
m_HandleRect: {fileID: 704039020}
|
||||||
m_Direction: 0
|
m_Direction: 0
|
||||||
m_Value: 0
|
m_Value: -0.0000011559699
|
||||||
m_Size: 1
|
m_Size: 0.53800046
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -26850,8 +26850,8 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 1589389272}
|
m_TargetGraphic: {fileID: 1589389272}
|
||||||
m_HandleRect: {fileID: 1589389271}
|
m_HandleRect: {fileID: 1589389271}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 0
|
m_Value: 1
|
||||||
m_Size: 1
|
m_Size: 0.9994133
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -32707,7 +32707,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 64.28572}
|
m_AnchoredPosition: {x: 0, y: 119.22439}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &1154875945
|
--- !u!222 &1154875945
|
||||||
|
|
@ -34643,7 +34643,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: -8}
|
m_AnchoredPosition: {x: 0, y: -8.0000305}
|
||||||
m_SizeDelta: {x: 0, y: -63.99999}
|
m_SizeDelta: {x: 0, y: -63.99999}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1244621693
|
--- !u!114 &1244621693
|
||||||
|
|
@ -37250,9 +37250,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 574002313}
|
m_Father: {fileID: 574002313}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 40, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &1345846031
|
--- !u!114 &1345846031
|
||||||
|
|
@ -43455,8 +43455,8 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 1220118245}
|
m_TargetGraphic: {fileID: 1220118245}
|
||||||
m_HandleRect: {fileID: 1220118244}
|
m_HandleRect: {fileID: 1220118244}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 1.0000002
|
m_Value: 1.0000005
|
||||||
m_Size: 0.13436738
|
m_Size: 0.58957434
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -46876,9 +46876,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 574002313}
|
m_Father: {fileID: 574002313}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 80, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &1783491359
|
--- !u!114 &1783491359
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,24 @@ namespace HeavenStudio.Games.Loaders
|
||||||
{
|
{
|
||||||
new Param("sound", true, "Play Sound", "Toggle if the 'YEAAAAAH LET'S GO' voice clip plays."),
|
new Param("sound", true, "Play Sound", "Toggle if the 'YEAAAAAH LET'S GO' voice clip plays."),
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
|
||||||
|
new GameAction("camera", "Camera Controls")
|
||||||
|
{
|
||||||
|
function = delegate {
|
||||||
|
var e = eventCaller.currentEntity;
|
||||||
|
// var rotation = new Vector3(0, e["valA"], 0);
|
||||||
|
Airboarder.instance.ChangeCamera(eventCaller.currentEntity.beat, eventCaller.currentEntity["valA"], eventCaller.currentEntity["valB"], eventCaller.currentEntity.length, (Util.EasingFunction.Ease)eventCaller.currentEntity["type"], eventCaller.currentEntity["additive"]);
|
||||||
|
},
|
||||||
|
defaultLength = 4,
|
||||||
|
resizable = true,
|
||||||
|
parameters = new List<Param>() {
|
||||||
|
new Param("valA", new EntityTypes.Integer(-360, 360, 0), "Rotation", "Set the rotation of the camera around the pivot point."),
|
||||||
|
new Param("valB", new EntityTypes.Float(0.1f, 4f, 0.5f), "Zoom", "Set the camera's level of zoom."),
|
||||||
|
new Param("type", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action."),
|
||||||
|
new Param("additive", true, "Additive Rotation", "Toggle if the above rotation should be added to the current angle instead of setting the target angle to travel to.")
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
@ -128,6 +145,11 @@ namespace HeavenStudio.Games
|
||||||
public static Airboarder instance;
|
public static Airboarder instance;
|
||||||
|
|
||||||
public bool wantsCrouch;
|
public bool wantsCrouch;
|
||||||
|
|
||||||
|
[Header("Camera")]
|
||||||
|
[SerializeField] Transform cameraPivot;
|
||||||
|
[SerializeField] Transform cameraPos;
|
||||||
|
[SerializeField] float cameraFOV;
|
||||||
|
|
||||||
[Header("Objects")]
|
[Header("Objects")]
|
||||||
[SerializeField] Arch archBasic;
|
[SerializeField] Arch archBasic;
|
||||||
|
|
@ -150,6 +172,13 @@ namespace HeavenStudio.Games
|
||||||
public double switchBeat;
|
public double switchBeat;
|
||||||
|
|
||||||
|
|
||||||
|
double cameraRotateBeat = double.MaxValue;
|
||||||
|
double cameraRotateLength;
|
||||||
|
Util.EasingFunction.Ease cameraRotateEase;
|
||||||
|
float cameraRotateLast = 0, cameraScaleLast = 1;
|
||||||
|
float cameraRotateNext = 0, cameraScaleNext = 1;
|
||||||
|
|
||||||
|
|
||||||
public float startFloor;
|
public float startFloor;
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
|
|
@ -157,6 +186,9 @@ namespace HeavenStudio.Games
|
||||||
instance = this;
|
instance = this;
|
||||||
SetupBopRegion("airboarder", "bop", "auto");
|
SetupBopRegion("airboarder", "bop", "auto");
|
||||||
wantsCrouch = false;
|
wantsCrouch = false;
|
||||||
|
GameCamera.AdditionalPosition = cameraPos.position + (Quaternion.Euler(cameraPos.rotation.eulerAngles) * Vector3.forward * 10f);
|
||||||
|
GameCamera.AdditionalRotEuler = cameraPos.rotation.eulerAngles;
|
||||||
|
GameCamera.AdditionalFoV = cameraFOV;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnGameSwitch(double beat)
|
public override void OnGameSwitch(double beat)
|
||||||
|
|
@ -195,22 +227,62 @@ namespace HeavenStudio.Games
|
||||||
wallBasic.CueJump(e.beat);
|
wallBasic.CueJump(e.beat);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
EntityPreCheck(Conductor.instance.songPositionInBeatsAsDouble);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EntityPreCheck(double beat)
|
||||||
|
{
|
||||||
|
cameraRotateBeat = double.MaxValue;
|
||||||
|
cameraRotateLength = 0;
|
||||||
|
cameraRotateEase = Util.EasingFunction.Ease.Linear;
|
||||||
|
cameraRotateLast = 0; cameraScaleLast = 1;
|
||||||
|
cameraRotateNext = 0; cameraScaleNext = 1;
|
||||||
|
|
||||||
|
List<RiqEntity> prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.beat < beat && c.datamodel.Split(0) == "airboarder");
|
||||||
|
RiqEntity lastGameSwitch = GameManager.instance.Beatmap.Entities.FindLast(c => c.beat <= beat && c.datamodel == "gameManager/switchGame/airboarder");
|
||||||
|
|
||||||
|
if (lastGameSwitch == null) return;
|
||||||
|
List<RiqEntity> cameraEntities = prevEntities.FindAll(c => c.beat >= lastGameSwitch.beat && c.datamodel == "airboarder/camera");
|
||||||
|
|
||||||
|
foreach (var entity in cameraEntities)
|
||||||
|
{
|
||||||
|
ChangeCamera(entity.beat, entity["valA"], entity["valB"], entity.length, (Util.EasingFunction.Ease)entity["type"], entity["additive"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateCamera(beat);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public override void OnPlay(double beat)
|
public override void OnPlay(double beat)
|
||||||
{
|
{
|
||||||
|
EntityPreCheck(beat);
|
||||||
OnGameSwitch(beat);
|
OnGameSwitch(beat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UpdateCamera(double beat)
|
||||||
|
{
|
||||||
|
if (beat >= cameraRotateBeat)
|
||||||
|
{
|
||||||
|
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction(cameraRotateEase);
|
||||||
|
float rotProg = Conductor.instance.GetPositionFromBeat(cameraRotateBeat, cameraRotateLength, true);
|
||||||
|
rotProg = Mathf.Clamp01(rotProg);
|
||||||
|
float rot = func(cameraRotateLast, cameraRotateNext, rotProg);
|
||||||
|
cameraPivot.rotation = Quaternion.Euler(0, rot, 0);
|
||||||
|
cameraPivot.localScale = Vector3.one * func(cameraScaleLast, cameraScaleNext, rotProg);
|
||||||
|
}
|
||||||
|
|
||||||
|
GameCamera.AdditionalPosition = cameraPos.position + (Quaternion.Euler(cameraPos.rotation.eulerAngles) * Vector3.forward * 10f);
|
||||||
|
GameCamera.AdditionalRotEuler = cameraPos.rotation.eulerAngles;
|
||||||
|
GameCamera.AdditionalFoV = cameraFOV;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void Update()
|
public void Update()
|
||||||
{
|
{
|
||||||
|
|
@ -262,8 +334,12 @@ namespace HeavenStudio.Games
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UpdateCamera(currentBeat);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void ForceCharge()
|
public void ForceCharge()
|
||||||
{
|
{
|
||||||
CPU1.DoScaledAnimationAsync("charge", 1f, 0, 1);
|
CPU1.DoScaledAnimationAsync("charge", 1f, 0, 1);
|
||||||
|
|
@ -293,6 +369,24 @@ namespace HeavenStudio.Games
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ChangeCamera(double beat, float rotation, float camZoom, double length, Util.EasingFunction.Ease ease, bool additive = true)
|
||||||
|
{
|
||||||
|
cameraRotateBeat = beat;
|
||||||
|
cameraRotateLength = length;
|
||||||
|
cameraRotateEase = ease;
|
||||||
|
cameraRotateLast = cameraRotateNext % 360f;
|
||||||
|
cameraScaleLast = cameraScaleNext;
|
||||||
|
cameraScaleNext = camZoom;
|
||||||
|
if (additive)
|
||||||
|
{
|
||||||
|
cameraRotateNext = cameraRotateLast + rotation;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cameraRotateNext = rotation;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void BopToggle(double beat, float length, bool boarders, bool autoBop)
|
public void BopToggle(double beat, float length, bool boarders, bool autoBop)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
game = Airboarder.instance;
|
game = Airboarder.instance;
|
||||||
|
|
||||||
// archBasic.transform.position = new Vector3(-140, -1, 0.8f);
|
// archBasic.transform.position = new Vector3(-140, -1, 0.8f);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -143,7 +144,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
public void DuckMiss(PlayerActionEvent caller)
|
public void DuckMiss(PlayerActionEvent caller)
|
||||||
{
|
{
|
||||||
game.Player.DoScaledAnimationAsync("hit1",1.5f, 0, 1);
|
game.Player.DoScaledAnimationAsync("hit1",1.5f, 0, 1);
|
||||||
anim.DoScaledAnimationAsync("break", 1f, 0f, animLayer:1);
|
anim.DoScaledAnimationAsync("break", 1f, 0, animLayer:1);
|
||||||
double beat = caller.startBeat + caller.timer;
|
double beat = caller.startBeat + caller.timer;
|
||||||
game.MissSound(beat);
|
game.MissSound(beat);
|
||||||
BeatAction.New(this, new() {
|
BeatAction.New(this, new() {
|
||||||
|
|
@ -178,7 +179,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
|
|
||||||
public void CrouchMiss(PlayerActionEvent caller){
|
public void CrouchMiss(PlayerActionEvent caller){
|
||||||
game.Player.DoScaledAnimationAsync("hit1",1.5f, 0, 1);
|
game.Player.DoScaledAnimationAsync("hit1",1.5f, 0, 1);
|
||||||
anim.DoScaledAnimationAsync("break", 1f, 0f, animLayer:1);
|
anim.DoScaledAnimationAsync("break", 1f, 0, animLayer:1);
|
||||||
double beat = caller.startBeat + caller.timer;
|
double beat = caller.startBeat + caller.timer;
|
||||||
game.MissSound(beat);
|
game.MissSound(beat);
|
||||||
BeatAction.New(this, new() {
|
BeatAction.New(this, new() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue