more testing

This commit is contained in:
wookywok 2024-02-28 12:57:42 -06:00
parent 2c83f87906
commit 8f2a99a365
7 changed files with 485 additions and 212 deletions

View file

@ -220,7 +220,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
SoundSequences: []
scheduledInputs: []
archBasic: {fileID: 8936501854466078156}
archBasic: {fileID: 8461780237997933545}
CPU1: {fileID: 1975474441940497211}
CPU2: {fileID: 1643307588540728724}
Player: {fileID: 4556547465341807253}
@ -489,7 +489,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7492287756769301100}
- {fileID: 29952083038891356}
m_Father: {fileID: 9145231469005479427}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -834,6 +834,130 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1001 &567682525194717879
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3936369134362627134}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalScale.x
value: 0.8999999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalScale.y
value: 0.8999999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalScale.z
value: 0.8999999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalPosition.x
value: -139.7999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalPosition.z
value: 0.7399999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Name
value: arch
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
--- !u!4 &29952083038891356 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
m_PrefabInstance: {fileID: 567682525194717879}
m_PrefabAsset: {fileID: 0}
--- !u!1 &802126642102188006 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
m_PrefabInstance: {fileID: 567682525194717879}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8461780237997933545
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 802126642102188006}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7418df1ca9a5218468aa02006816659f, type: 3}
m_Name:
m_EditorClassIdentifier:
game: {fileID: 9105702199878946262}
targetBeat: 0
appearBeat: 0
anim: {fileID: 8600933127264107586}
--- !u!95 &8600933127264107586
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 802126642102188006}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 4464fa6dd045f9345bcdb7f9d2d7d8f3, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1001 &1668676186462176245
PrefabInstance:
m_ObjectHideFlags: 0
@ -1465,162 +1589,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
m_PrefabInstance: {fileID: 6777388439690958800}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6949983834859599239
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3936369134362627134}
m_Modifications:
- target: {fileID: -8683758047975109530, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalScale.x
value: 0.8999999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalScale.y
value: 0.8999999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalScale.z
value: 0.8999999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalPosition.x
value: -139.79994
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalPosition.z
value: 0.73999995
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -2353223234459991575, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- target: {fileID: -173591966208411800, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: -9139256375293671822, guid: 9ac4366931460d2418ee132f0611c6d5, type: 3}
- target: {fileID: 919132149155446097, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Name
value: wall_high_model
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2403189322366553295, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- target: {fileID: 3077173719689288970, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- target: {fileID: 5395715898216199303, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- target: {fileID: 5521721997653780584, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- target: {fileID: 7774976483248423280, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
--- !u!4 &7492287756769301100 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
m_PrefabInstance: {fileID: 6949983834859599239}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7832363007057217750 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
m_PrefabInstance: {fileID: 6949983834859599239}
m_PrefabAsset: {fileID: 0}
--- !u!95 &1569284795458859455
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7832363007057217750}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 4464fa6dd045f9345bcdb7f9d2d7d8f3, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &8936501854466078156
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7832363007057217750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7418df1ca9a5218468aa02006816659f, type: 3}
m_Name:
m_EditorClassIdentifier:
game: {fileID: 0}
targetBeat: 0
appearBeat: 0
anim: {fileID: 1569284795458859455}
--- !u!1001 &8186997898690455698
PrefabInstance:
m_ObjectHideFlags: 0

View file

@ -15,6 +15,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -2970421746828851933}
m_Position: {x: 360, y: 90, z: 0}
- serializedVersion: 1
m_State: {fileID: -1823303173307067926}
m_Position: {x: 395, y: 155, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -51,6 +54,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-1823303173307067926
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: move2
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: 990f9df7e2796d247985259b56b6018b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-846839717617555184
AnimatorState:
serializedVersion: 6

View file

@ -20,9 +20,9 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -139.66, y: -1, z: 0.74}
value: {x: -139.66, y: -1, z: 0.7399999}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 300.04288, y: 0, z: 0}
outSlope: {x: 300.04288, y: 0, z: 0.00000025544847}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -30,7 +30,7 @@ AnimationClip:
- serializedVersion: 3
time: 0.46666667
value: {x: 0.36, y: -1, z: 0.74}
inSlope: {x: 300.04288, y: -0, z: -0}
inSlope: {x: 300.04288, y: -0, z: 0.00000025544847}
outSlope: {x: 299.64996, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -63,6 +63,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.46666667
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.6666667
value: 0
@ -202,9 +211,9 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.74
value: 0.7399999
inSlope: 0
outSlope: 0
outSlope: 0.00000025544847
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
@ -212,7 +221,7 @@ AnimationClip:
- serializedVersion: 3
time: 0.46666667
value: 0.74
inSlope: -0
inSlope: 0.00000025544847
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -246,6 +255,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.46666667
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.6666667
value: 0

View file

@ -0,0 +1,232 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: move2
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.36, y: -1, z: 0.74}
inSlope: {x: 300.04288, y: -0, z: 0.00000025544847}
outSlope: {x: 299.65, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: 60.29, y: -1, z: 0.74}
inSlope: {x: 299.65, 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_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
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_Enabled
path:
classID: 114
script: {fileID: 11500000, guid: 7418df1ca9a5218468aa02006816659f, type: 3}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3305885265
script: {fileID: 11500000, guid: 7418df1ca9a5218468aa02006816659f, type: 3}
typeID: 114
customType: 24
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.36
inSlope: 300.04288
outSlope: 299.65
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 60.29
inSlope: 299.65
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.74
inSlope: 0.00000025544847
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0.74
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
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_Enabled
path:
classID: 114
script: {fileID: 11500000, guid: 7418df1ca9a5218468aa02006816659f, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

View file

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

View file

@ -123,11 +123,11 @@ namespace HeavenStudio.Games
[SerializeField] Arch archBasic;
[Header("Animators")]
[SerializeField] Animator CPU1;
[SerializeField] Animator CPU2;
[SerializeField] public Animator CPU1;
[SerializeField] public Animator CPU2;
[SerializeField] public Animator Player;
[SerializeField] Animator Dog;
[SerializeField] Animator Floor;
[SerializeField] public Animator Dog;
[SerializeField] public Animator Floor;
bool goBop;
public bool cpu1CantBop = false;
@ -177,15 +177,16 @@ namespace HeavenStudio.Games
//spawns an arch for each arch event
foreach (var archReg in relevantArches)
{
if(archReg.beat - 28 >= switchBeat)
{
if(archReg.beat - 28f >= switchBeat)
{
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(archReg.beat-28f, delegate {RequestArch(archReg.beat);})
});
new BeatAction.Action(archReg.beat-28, delegate {RequestArch(archReg.beat);}),
new BeatAction.Action(archReg.beat, delegate {CueDuck(archReg.beat);})
});
}
}
}
}
@ -289,6 +290,7 @@ namespace HeavenStudio.Games
public void CueDuck(double beat)
{
ScheduleInput(beat, 3f, InputAction_BasicPress, DuckSuccess, DuckMiss, DuckEmpty);
BeatAction.New(instance, new List<BeatAction.Action>() {
new BeatAction.Action(beat, delegate {cpu1CantBop = true;} ),
@ -312,6 +314,8 @@ namespace HeavenStudio.Games
public void CueCrouch(double beat)
{
ScheduleInput(beat, 3f, InputAction_FlickRelease, CrouchSuccess, CrouchMiss, CrouchEmpty);
BeatAction.New(instance, new List<BeatAction.Action>() {
new BeatAction.Action(beat, delegate {cpu1CantBop = true;}),
new BeatAction.Action(beat, delegate {CPU1.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f);}),
@ -321,7 +325,6 @@ namespace HeavenStudio.Games
new BeatAction.Action(beat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}),
new BeatAction.Action(beat+1, delegate {CPU1.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f);}),
new BeatAction.Action(beat+1, delegate {CPU2.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f);}),
new BeatAction.Action(beat+2, delegate {CPU2.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f);}),
new BeatAction.Action(beat+2, delegate {Player.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f);}),
@ -340,6 +343,7 @@ namespace HeavenStudio.Games
BeatAction.New(instance, new List<BeatAction.Action>() {
new BeatAction.Action(beat+1, delegate {CPU1.GetComponent<Animator>().DoScaledAnimationAsync("jump", 1f);}),
new BeatAction.Action(beat+1, delegate {cpu1CantBop = false;} ),
new BeatAction.Action(beat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/jump");}),
@ -351,32 +355,32 @@ namespace HeavenStudio.Games
}
public void DuckSuccess(double beat)
public void DuckSuccess(PlayerActionEvent caller, float state)
{
Player.GetComponent<Animator>().DoScaledAnimationAsync("duck", 1f);
SoundByte.PlayOneShotGame("airboarder/crouch");
}
public void DuckMiss(double beat){
public void DuckMiss(PlayerActionEvent caller){
Player.GetComponent<Animator>().DoScaledAnimationAsync("hit1",1f);
}
public void DuckEmpty(double beat){
public void DuckEmpty(PlayerActionEvent caller){
Player.GetComponent<Animator>().DoScaledAnimationAsync("hit2", 1f);
}
public void CrouchSuccess(double beat)
public void CrouchSuccess(PlayerActionEvent caller, float state)
{
Player.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f);
SoundByte.PlayOneShotGame("airboarder/crouchCharge");
playerCantBop = true;
}
public void CrouchMiss(double beat){
public void CrouchMiss(PlayerActionEvent caller){
Player.GetComponent<Animator>().DoScaledAnimationAsync("hit1",1f);
}
public void CrouchEmpty(double beat){
public void CrouchEmpty(PlayerActionEvent caller){
Player.GetComponent<Animator>().DoScaledAnimationAsync("hit2", 1f);
}

View file

@ -28,53 +28,67 @@ namespace HeavenStudio.Games.Scripts_Airboarder
{
double calcBeat = appearBeat;
BeatAction.New(game, new List<BeatAction.Action>()
{
new BeatAction.Action(calcBeat+28f, delegate {game.CueDuck(calcBeat);}),
new BeatAction.Action(calcBeat+31f, delegate {game.ScheduleInput(calcBeat, 0f, Airboarder.InputAction_BasicPress, DuckSuccessArch, DuckMissArch, DuckEmptyArch);})
// BeatAction.New(game, new List<BeatAction.Action>()
// {
// new BeatAction.Action(calcBeat+31, delegate {game.ScheduleInput(calcBeat, 0f, Airboarder.InputAction_BasicPress, DuckSuccessArch, DuckMissArch, DuckEmptyArch);}),
// new BeatAction.Action(calcBeat+28, delegate {game.cpu1CantBop = true;} ),
// new BeatAction.Action(calcBeat+28, delegate {game.CPU1.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f);}),
// new BeatAction.Action(calcBeat+28, delegate {SoundByte.PlayOneShotGame("airboarder/ready");}),
// new BeatAction.Action(calcBeat+29, delegate {game.cpu2CantBop = true;} ),
// new BeatAction.Action(calcBeat+29, delegate {game.CPU1.GetComponent<Animator>().DoScaledAnimationAsync("duck", 1f);}),
// new BeatAction.Action(calcBeat+29, delegate {game.CPU2.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f);}),
// new BeatAction.Action(calcBeat+29, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
// new BeatAction.Action(calcBeat+30, delegate {game.playerCantBop = true;} ),
// new BeatAction.Action(calcBeat+30, delegate {game.CPU2.GetComponent<Animator>().DoScaledAnimationAsync("duck", 1f);}),
// new BeatAction.Action(calcBeat+30, delegate {game.Player.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f);}),
// new BeatAction.Action(calcBeat+30, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
// new BeatAction.Action(calcBeat+30.5, delegate {game.cpu1CantBop = false;} ),
// new BeatAction.Action(calcBeat+31.5, delegate {game.cpu2CantBop = false;} ),
// new BeatAction.Action(calcBeat+32.5, delegate {game.playerCantBop = false;} )
});
// });
}
// Update is called once per frame
void Update()
{
float normalizedBeat = Conductor.instance.GetPositionFromBeat(appearBeat, 40f);
anim.DoNormalizedAnimation("move", normalizedBeat, 0);
anim.Play("move", -1, normalizedBeat);
anim.speed = 0;
if (normalizedBeat > 1) Destroy(gameObject);
}
public void DuckSuccessArch(PlayerActionEvent caller, float state)
{
game.DuckSuccess(targetBeat);
}
// public void DuckSuccessArch(PlayerActionEvent caller, float state)
// {
// game.Player.GetComponent<Animator>().DoScaledAnimationAsync("duck", 1f);
// SoundByte.PlayOneShotGame("airboarder/crouch");
// }
public void DuckMissArch(PlayerActionEvent caller)
{
game.DuckMiss(targetBeat);
}
// public void DuckMissArch(PlayerActionEvent caller)
// {
// game.DuckMiss(targetBeat);
// }
public void DuckEmptyArch(PlayerActionEvent caller)
{
game.DuckEmpty(targetBeat);
}
public void CrouchSuccessArch(PlayerActionEvent caller, float state)
{
game.CrouchSuccess(targetBeat);
}
// public void DuckEmptyArch(PlayerActionEvent caller)
// {
// game.DuckEmpty(targetBeat);
// }
// public void CrouchSuccessArch(PlayerActionEvent caller, float state)
// {
// game.CrouchSuccess(targetBeat);
// }
public void CrouchMissArch(PlayerActionEvent caller)
{
game.CrouchMiss(targetBeat);
}
// public void CrouchMissArch(PlayerActionEvent caller)
// {
// game.CrouchMiss(targetBeat);
// }
public void CrouchEmptyArch(PlayerActionEvent caller)
{
game.CrouchEmpty(targetBeat);
}
// public void CrouchEmptyArch(PlayerActionEvent caller)
// {
// game.CrouchEmpty(targetBeat);
// }
}
}