feat: Player Dash & DoubleJump

This commit is contained in:
2026-06-09 14:01:18 +02:00
parent 1e9e4ace81
commit 8698d55b9f
10 changed files with 11190 additions and 238 deletions

File diff suppressed because one or more lines are too long

View File

@@ -31,6 +31,33 @@ BlendTree:
m_UseAutomaticThresholds: 1 m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0 m_NormalizedBlendValues: 0
m_BlendType: 0 m_BlendType: 0
--- !u!1102 &-6381344988828740851
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dash
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1707061254423578856}
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: 1827226128182048838, guid: 73d62a0e73492fa4882bcd58f6d3fb5c, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-5485362655117760516 --- !u!1101 &-5485362655117760516
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -172,6 +199,28 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1101 &-1707061254423578856
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: 5056364956027464035}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.052862823
m_TransitionOffset: 0
m_ExitTime: 0.9365646
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1393746875540931567 --- !u!1101 &-1393746875540931567
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -243,7 +292,7 @@ AnimatorStateMachine:
m_Position: {x: 320, y: -50, z: 0} m_Position: {x: 320, y: -50, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -5389070569500098327} m_State: {fileID: -5389070569500098327}
m_Position: {x: 320, y: -220, z: 0} m_Position: {x: 330, y: -220, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 7954013121776325208} m_State: {fileID: 7954013121776325208}
m_Position: {x: 320, y: -100, z: 0} m_Position: {x: 320, y: -100, z: 0}
@@ -253,6 +302,9 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -1360090912894744725} m_State: {fileID: -1360090912894744725}
m_Position: {x: 320, y: 50, z: 0} m_Position: {x: 320, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: -6381344988828740851}
m_Position: {x: 310, y: -280, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: m_AnyStateTransitions:
- {fileID: 3102003643764817722} - {fileID: 3102003643764817722}
@@ -262,6 +314,7 @@ AnimatorStateMachine:
- {fileID: 7865788189404303621} - {fileID: 7865788189404303621}
- {fileID: 6118380436746846840} - {fileID: 6118380436746846840}
- {fileID: -1393746875540931567} - {fileID: -1393746875540931567}
- {fileID: 787173314633410819}
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
@@ -354,6 +407,12 @@ AnimatorController:
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
- m_Name: trigger_dash
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
@@ -392,6 +451,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &787173314633410819
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: trigger_dash
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6381344988828740851}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.092222214
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &2666831125099755100 --- !u!1102 &2666831125099755100
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6

View File

@@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 73d62a0e73492fa4882bcd58f6d3fb5c
ModelImporter:
serializedVersion: 24200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
generateMeshLods: 0
meshLodGenerationFlags: 0
maximumMeshLod: -1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -3504,7 +3504,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3} - target: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3}
propertyPath: m_LocalScale.x propertyPath: m_LocalScale.x
value: 18.545647 value: 19.04638
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3} - target: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3}
propertyPath: m_LocalScale.z propertyPath: m_LocalScale.z
@@ -3512,7 +3512,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3} - target: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0.06 value: -0.01
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3} - target: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -3790,7 +3790,6 @@ GameObject:
- component: {fileID: 401419405} - component: {fileID: 401419405}
- component: {fileID: 401419404} - component: {fileID: 401419404}
- component: {fileID: 401419403} - component: {fileID: 401419403}
- component: {fileID: 401419402}
m_Layer: 8 m_Layer: 8
m_Name: Lava m_Name: Lava
m_TagString: Untagged m_TagString: Untagged
@@ -3798,28 +3797,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!64 &401419402
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 401419401}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &401419403 --- !u!23 &401419403
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3886,10 +3863,11 @@ Transform:
m_GameObject: {fileID: 401419401} m_GameObject: {fileID: 401419401}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.31, z: 29.54} m_LocalPosition: {x: 0, y: 0.77, z: 29.54}
m_LocalScale: {x: 1.9495, y: 1, z: 2.0764887} m_LocalScale: {x: 1.9495, y: 1, z: 2.0764887}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 1731480614}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &401925650 --- !u!1001 &401925650
@@ -5235,6 +5213,11 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 539316505} m_GameObject: {fileID: 539316505}
m_Mesh: {fileID: 89712945287117100, guid: 3d620c9bb0ffa294392346026c6ab8cf, type: 3} m_Mesh: {fileID: 89712945287117100, guid: 3d620c9bb0ffa294392346026c6ab8cf, type: 3}
--- !u!4 &542372047 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5975185516744476182, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3}
m_PrefabInstance: {fileID: 7509459121321357906}
m_PrefabAsset: {fileID: 0}
--- !u!4 &543456692 stripped --- !u!4 &543456692 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3} m_CorrespondingSourceObject: {fileID: 2819500458535056574, guid: d300926439843ef41a17d1d5a9504679, type: 3}
@@ -7179,7 +7162,6 @@ GameObject:
- component: {fileID: 800130726} - component: {fileID: 800130726}
- component: {fileID: 800130725} - component: {fileID: 800130725}
- component: {fileID: 800130724} - component: {fileID: 800130724}
- component: {fileID: 800130723}
m_Layer: 8 m_Layer: 8
m_Name: Water m_Name: Water
m_TagString: Untagged m_TagString: Untagged
@@ -7187,28 +7169,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!64 &800130723
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 800130722}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &800130724 --- !u!23 &800130724
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -7275,10 +7235,11 @@ Transform:
m_GameObject: {fileID: 800130722} m_GameObject: {fileID: 800130722}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.31, z: 7.17} m_LocalPosition: {x: 0, y: 0.77, z: 7.17}
m_LocalScale: {x: 1.9495, y: 1, z: 2.0764887} m_LocalScale: {x: 1.9495, y: 1, z: 2.0764887}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 840811593}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &838987264 --- !u!1 &838987264
@@ -7423,6 +7384,119 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 987553818} m_Father: {fileID: 987553818}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &840811592
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 840811593}
- component: {fileID: 840811596}
- component: {fileID: 840811595}
- component: {fileID: 840811594}
m_Layer: 8
m_Name: Water Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &840811593
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 840811592}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 800130726}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &840811594
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 840811592}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &840811595
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 840811592}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: -876546973899608171, guid: 686dda421146ea44f9306d2861c7b99c, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &840811596
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 840811592}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &855419395 --- !u!1001 &855419395
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -8843,8 +8917,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 961739749} m_GameObject: {fileID: 961739749}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.17364813, y: 0, z: 0, w: 0.9848078} m_LocalRotation: {x: 0.17364815, y: 0, z: 0, w: 0.9848078}
m_LocalPosition: {x: 0.060596474, y: 4.56085, z: -1.3222187} m_LocalPosition: {x: 0.060596474, y: 4.0580807, z: 0.059129477}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -8865,7 +8939,7 @@ MonoBehaviour:
_settings: _settings:
FollowSmoothness: 0.1 FollowSmoothness: 0.1
LookSensitivity: 20 LookSensitivity: 20
Distance: 5.47 Distance: 4
VerticalOffset: 1.51 VerticalOffset: 1.51
DefaultPitch: 20 DefaultPitch: 20
MinPitch: -30 MinPitch: -30
@@ -11667,6 +11741,11 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 987553818} m_Father: {fileID: 987553818}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1568881802 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7720528356556129324, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3}
m_PrefabInstance: {fileID: 7509459121321357906}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1599200096 --- !u!1 &1599200096
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -12672,6 +12751,119 @@ PrefabInstance:
addedObject: {fileID: 1733805907} addedObject: {fileID: 1733805907}
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d300926439843ef41a17d1d5a9504679, type: 3} m_SourcePrefab: {fileID: 100100000, guid: d300926439843ef41a17d1d5a9504679, type: 3}
--- !u!1 &1731480613
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1731480614}
- component: {fileID: 1731480617}
- component: {fileID: 1731480616}
- component: {fileID: 1731480615}
m_Layer: 8
m_Name: Lava Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1731480614
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1731480613}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 401419405}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &1731480615
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1731480613}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1731480616
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1731480613}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: -876546973899608171, guid: 2a802416a7e0d3243b0f94d499f9a428, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1731480617
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1731480613}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1733604668 --- !u!1 &1733604668
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -14929,75 +15121,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2116708941} m_GameObject: {fileID: 2116708941}
m_Mesh: {fileID: 89712945287117100, guid: 3d620c9bb0ffa294392346026c6ab8cf, type: 3} m_Mesh: {fileID: 89712945287117100, guid: 3d620c9bb0ffa294392346026c6ab8cf, type: 3}
--- !u!1001 &1519274406152870515
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1460354215582670400, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_Name
value: PlayerDie
objectReference: {fileID: 0}
- target: {fileID: 1460354215582670400, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalPosition.x
value: 0.060596474
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalPosition.y
value: 1.1800001
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalPosition.z
value: 3.8179
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4881990645007621289, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5622814903896473750, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5622814903896473750, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d34206fa24da9c845a1ae3390884da1f, type: 3}
--- !u!1001 &3144349268233915440 --- !u!1001 &3144349268233915440
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -15108,17 +15231,17 @@ PrefabInstance:
value: Player value: Player
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8598809244101507902, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} - target: {fileID: 8598809244101507902, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3}
propertyPath: _events.OnDie.m_PersistentCalls.m_Calls.Array.size propertyPath: _references.DashJointsLevel.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8598809244101507902, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3}
propertyPath: _events.OnDie.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2436197850869798173, guid: 0eb1544a04974db4d881e5abe9183f76, type: 3}
- target: {fileID: 8598809244101507902, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3}
propertyPath: _events.OnDie.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8598809244101507902, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3}
propertyPath: '_references.DashJointsLevel.Array.data[0]'
value:
objectReference: {fileID: 542372047}
- target: {fileID: 8598809244101507902, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3}
propertyPath: '_references.DashJointsLevel.Array.data[1]'
value:
objectReference: {fileID: 1568881802}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
@@ -15205,4 +15328,3 @@ SceneRoots:
- {fileID: 278774735} - {fileID: 278774735}
- {fileID: 879316445} - {fileID: 879316445}
- {fileID: 19566490} - {fileID: 19566490}
- {fileID: 1519274406152870515}

View File

@@ -1,8 +1,10 @@
using System.Collections;
using TMPro.EditorUtilities; using TMPro.EditorUtilities;
using UnityEngine; using UnityEngine;
using UnityEngine.Events; using UnityEngine.Events;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
using UnityEngine.UI; using UnityEngine.UI;
using static Player;
using static UnityEditor.Experimental.GraphView.GraphView; using static UnityEditor.Experimental.GraphView.GraphView;
public class Player : MonoBehaviour public class Player : MonoBehaviour
@@ -15,6 +17,7 @@ public class Player : MonoBehaviour
Moving, Moving,
Jumping, Jumping,
Falling, Falling,
Dashing,
Stunned, Stunned,
Dead, Dead,
Loser, Loser,
@@ -37,6 +40,26 @@ public class Player : MonoBehaviour
public float StickedGravity = -5; public float StickedGravity = -5;
} }
[System.Serializable]
public class Dash
{
[Tooltip("Can the player dash?")]
public bool CanDash = true;
public float DashDuration = .3f;
public float DashDelay = 1.5f;
public float DashForce = 50;
}
[System.Serializable]
public class DoubleJump
{
[Tooltip("Can the player duble jump?")]
public bool CanDoubleJump = true;
}
[System.Serializable] [System.Serializable]
public class Settings public class Settings
{ {
@@ -76,23 +99,21 @@ public class Player : MonoBehaviour
[Header("Features")] [Header("Features")]
public WallRun WallRun; public WallRun WallRun;
public Dash Dash;
public DoubleJump DoubleJump;
} }
[System.Serializable] [System.Serializable]
public class References public class References
{ {
public CharacterController Controller;
public InputActionAsset InputActions; public InputActionAsset InputActions;
public CharacterController Controller;
public GameObject COG;
public GameObject DiePrefab; public GameObject DiePrefab;
public ParticleSystem[] DashEffects;
public Transform[] DashJointsLevel;
} }
/*[System.Serializable]
public class Events
{
public UnityEvent OnLose;
public UnityEvent OnDie;
}*/
[System.Serializable] [System.Serializable]
public class StateContainer public class StateContainer
{ {
@@ -105,6 +126,9 @@ public class Player : MonoBehaviour
[Tooltip("Is player sticked to wall?")] [Tooltip("Is player sticked to wall?")]
public bool IsStickedToWall; public bool IsStickedToWall;
[Tooltip("Is player dashing?")]
public bool IsDashing = false;
[Tooltip("Can player stick to walls?")] [Tooltip("Can player stick to walls?")]
public bool CanStickToWalls; public bool CanStickToWalls;
@@ -120,6 +144,9 @@ public class Player : MonoBehaviour
[Tooltip("Elapsed time since sticked to wall")] [Tooltip("Elapsed time since sticked to wall")]
[Range(-1, 1)] public float StickedTime; [Range(-1, 1)] public float StickedTime;
[Tooltip("Elapsed time since dash")]
[Range(-1, 1)] public float DashingTime;
[Tooltip("Current velocity in m/s")] [Tooltip("Current velocity in m/s")]
public Vector3 Velocity; public Vector3 Velocity;
@@ -133,7 +160,6 @@ public class Player : MonoBehaviour
[SerializeField] private Settings _settings; [SerializeField] private Settings _settings;
[SerializeField] private References _references; [SerializeField] private References _references;
//[SerializeField] private Events _events;
[SerializeField, ReadOnly] private StateContainer _state; [SerializeField, ReadOnly] private StateContainer _state;
public StateContainer State => _state; public StateContainer State => _state;
@@ -185,6 +211,8 @@ public class Player : MonoBehaviour
private InputAction _moveAction; private InputAction _moveAction;
private InputAction _runAction; private InputAction _runAction;
private InputAction _jumpAction; private InputAction _jumpAction;
private InputAction _targetAction;
private InputAction _dashAction;
// Camera // Camera
private Camera _camera; private Camera _camera;
@@ -200,6 +228,11 @@ public class Player : MonoBehaviour
private Vector3 _lastPlatformPosition; private Vector3 _lastPlatformPosition;
private Quaternion _lastPlatformRotation; private Quaternion _lastPlatformRotation;
private Vector3 _platformVelocity; private Vector3 _platformVelocity;
// Double Jump
private bool _doubleJump;
private float _doubleJumpTime;
#endregion #endregion
#region Unity Lifecycle #region Unity Lifecycle
@@ -219,6 +252,8 @@ public class Player : MonoBehaviour
_moveAction = _references.InputActions.FindActionMap("Player").FindAction("Move"); _moveAction = _references.InputActions.FindActionMap("Player").FindAction("Move");
_runAction = _references.InputActions.FindActionMap("Player").FindAction("Sprint"); _runAction = _references.InputActions.FindActionMap("Player").FindAction("Sprint");
_jumpAction = _references.InputActions.FindActionMap("Player").FindAction("Jump"); _jumpAction = _references.InputActions.FindActionMap("Player").FindAction("Jump");
_targetAction = _references.InputActions.FindActionMap("Player").FindAction("Target");
_dashAction = _references.InputActions.FindActionMap("Player").FindAction("Attack");
// Camera // Camera
_camera = Camera.main; _camera = Camera.main;
@@ -235,6 +270,8 @@ public class Player : MonoBehaviour
_moveAction?.Enable(); _moveAction?.Enable();
_runAction?.Enable(); _runAction?.Enable();
_jumpAction?.Enable(); _jumpAction?.Enable();
_targetAction?.Enable();
_dashAction?.Enable();
} }
void OnDisable() void OnDisable()
@@ -242,6 +279,8 @@ public class Player : MonoBehaviour
_moveAction?.Disable(); _moveAction?.Disable();
_runAction?.Disable(); _runAction?.Disable();
_jumpAction?.Disable(); _jumpAction?.Disable();
_targetAction?.Disable();
_dashAction?.Disable();
} }
void Update() void Update()
@@ -252,6 +291,7 @@ public class Player : MonoBehaviour
SetGravity(t); SetGravity(t);
SetVelocity(t); SetVelocity(t);
SetJump(); SetJump();
SetDash();
SetMovement(t); SetMovement(t);
SetState(); SetState();
} }
@@ -281,6 +321,13 @@ public class Player : MonoBehaviour
bool wasGrounded = _state.IsGrounded; bool wasGrounded = _state.IsGrounded;
bool isGrounded = rayHit || sphereHit; bool isGrounded = rayHit || sphereHit;
// Double Jump
if (isGrounded)
{
_doubleJump = false;
_doubleJumpTime = 0;
}
// Wall run // Wall run
if (_settings.WallRun.CanRunOnWalls && !_state.CanStickToWalls) if (_settings.WallRun.CanRunOnWalls && !_state.CanStickToWalls)
{ {
@@ -389,7 +436,7 @@ public class Player : MonoBehaviour
// Reset platform velocity // Reset platform velocity
_platformVelocity = Vector3.zero; _platformVelocity = Vector3.zero;
_state.FallingTime = 0; ; _state.FallingTime = 0;
} }
else else
{ {
@@ -447,6 +494,7 @@ public class Player : MonoBehaviour
case PlayerState.Loser: case PlayerState.Loser:
case PlayerState.Dead: case PlayerState.Dead:
allowInput = false; allowInput = false;
_state.Running = 0;
break; break;
} }
@@ -492,19 +540,66 @@ public class Player : MonoBehaviour
private void SetJump() private void SetJump()
{ {
if (_jumpAction.triggered && (_state.IsGrounded || _state.IsStickedToWall)) if (_state.IsPaused)
return;
if (_jumpAction.triggered && (_state.IsGrounded || _state.IsStickedToWall || (!_doubleJump && _settings.DoubleJump.CanDoubleJump)))
{ {
if (_state.IsStickedToWall) if (_state.IsStickedToWall)
{
_state.Velocity = Vector3.Lerp(_wallNormal, Vector3.up, .4f).normalized * _settings.JumpForce * 1.6f; _state.Velocity = Vector3.Lerp(_wallNormal, Vector3.up, .4f).normalized * _settings.JumpForce * 1.6f;
_doubleJump = false;
_doubleJumpTime = 0;
}
else else
{
_state.Velocity.y = _settings.JumpForce; _state.Velocity.y = _settings.JumpForce;
if (!_doubleJump)
_doubleJump = true;
}
_state.Ground = null; _state.Ground = null;
_state.IsStickedToWall = false; _state.IsStickedToWall = false;
_state.CanStickToWalls = false; _state.CanStickToWalls = false;
_groundCheckRadius = _references.Controller.radius + _settings.GroundTolerance; _groundCheckRadius = _references.Controller.radius + _settings.GroundTolerance;
} }
if (_doubleJump)
{
_doubleJumpTime += Time.deltaTime;
}
}
private void SetDash()
{
if (!_settings.Dash.CanDash || _state.IsPaused)
return;
_state.DashingTime = Mathf.Clamp(_state.DashingTime + Time.deltaTime, 0, _settings.Dash.DashDelay);
float dashLoad = Mathf.Pow(Mathf.Clamp01((_state.DashingTime - _settings.Dash.DashDuration) / (_settings.Dash.DashDelay - _settings.Dash.DashDuration)), 2);
foreach (Transform jnt in _references.DashJointsLevel)
jnt.localScale = new Vector3(1, dashLoad, 1);
if (!_state.IsDashing)
{
if (_dashAction.triggered && !_targetAction.IsPressed() && _state.DashingTime == _settings.Dash.DashDelay && !_state.IsStickedToWall)
{
_state.Velocity += transform.forward * _settings.Dash.DashForce;
_state.IsDashing = true;
_state.DashingTime = 0;
foreach(ParticleSystem p in _references.DashEffects)
p.Play();
}
}
else if(_state.DashingTime >= _settings.Dash.DashDuration)
{
_state.IsDashing = false;
}
} }
private void SetMovement(float deltaTime) private void SetMovement(float deltaTime)
@@ -521,23 +616,26 @@ public class Player : MonoBehaviour
_references.Controller.Move(motion * deltaTime); _references.Controller.Move(motion * deltaTime);
// Rotate Player // Rotate Player
if (_state.HorizontalVelocity.sqrMagnitude > .001f) if (_state.HorizontalVelocity.magnitude > .01f)
{ {
Vector3 velocity = _state.HorizontalVelocity; Vector3 velocity = _state.HorizontalVelocity;
if (_state.Running > 0)
{
velocity = Vector3.Lerp(velocity, Vector3.down, _state.Running * .4f).normalized;
}
Quaternion targetRot = Quaternion.LookRotation(velocity, Vector3.up); Quaternion controlerRot = Quaternion.LookRotation(velocity, Vector3.up);
if (_state.IsStickedToWall) if (_state.IsStickedToWall)
targetRot = Quaternion.LookRotation(_wallDirection); controlerRot = Quaternion.LookRotation(_wallDirection);
float t = _settings.RotationSpeed * deltaTime; float t = _settings.RotationSpeed * deltaTime;
targetRot = Quaternion.Slerp(transform.rotation, targetRot, t); controlerRot = Quaternion.Slerp(transform.rotation, controlerRot, t);
transform.rotation = targetRot; transform.rotation = controlerRot;
} }
// Rotate COG
float angle = Mathf.Lerp(0, 5, _state.Running);
if (_doubleJump)
angle = Mathf.Clamp01(_doubleJumpTime * 3) * 360;
_references.COG.transform.localRotation = Quaternion.Euler(angle, 0, 0);
} }
private void SetState() private void SetState()
@@ -549,7 +647,11 @@ public class Player : MonoBehaviour
return; return;
} }
if (State.IsGrounded || State.IsStickedToWall) if (_state.IsDashing)
{
State.CurrentState = PlayerState.Dashing;
}
else if (State.IsGrounded || State.IsStickedToWall)
{ {
if (State.HorizontalVelocity.sqrMagnitude > .1f) if (State.HorizontalVelocity.sqrMagnitude > .1f)
{ {
@@ -571,22 +673,7 @@ public class Player : MonoBehaviour
State.CurrentState = PlayerState.Falling; State.CurrentState = PlayerState.Falling;
} }
} }
//TriggerStateEvents();
} }
/*private void TriggerStateEvents()
{
switch (_state.CurrentState)
{
case PlayerState.Loser:
_events.OnLose?.Invoke();
break;
case PlayerState.Dead:
_events.OnDie?.Invoke();
break;
}
}*/
#endregion #endregion
} }

View File

@@ -45,9 +45,10 @@ public class PlayerAnimation : MonoBehaviour
private void Init() private void Init()
{ {
_stateMapper = new PlayerAnimationStateMapper[8]; _stateMapper = new PlayerAnimationStateMapper[9];
int i = 0;
_stateMapper[0] = new PlayerAnimationStateMapper() _stateMapper[i++] = new PlayerAnimationStateMapper()
{ {
PlayerState = Player.PlayerState.Idle, PlayerState = Player.PlayerState.Idle,
AnimatorState = "move", AnimatorState = "move",
@@ -55,7 +56,7 @@ public class PlayerAnimation : MonoBehaviour
Trigger = "trigger_move", Trigger = "trigger_move",
}; };
_stateMapper[1] = new PlayerAnimationStateMapper() _stateMapper[i++] = new PlayerAnimationStateMapper()
{ {
PlayerState = Player.PlayerState.Moving, PlayerState = Player.PlayerState.Moving,
AnimatorState = "move", AnimatorState = "move",
@@ -63,7 +64,7 @@ public class PlayerAnimation : MonoBehaviour
Trigger = "trigger_move", Trigger = "trigger_move",
}; };
_stateMapper[2] = new PlayerAnimationStateMapper() _stateMapper[i++] = new PlayerAnimationStateMapper()
{ {
PlayerState = Player.PlayerState.Jumping, PlayerState = Player.PlayerState.Jumping,
AnimatorState = "jump", AnimatorState = "jump",
@@ -71,7 +72,15 @@ public class PlayerAnimation : MonoBehaviour
Trigger = "trigger_jump", Trigger = "trigger_jump",
}; };
_stateMapper[3] = new PlayerAnimationStateMapper() _stateMapper[i++] = new PlayerAnimationStateMapper()
{
PlayerState = Player.PlayerState.Dashing,
AnimatorState = "dash",
BlockingState = "",
Trigger = "trigger_dash",
};
_stateMapper[i++] = new PlayerAnimationStateMapper()
{ {
PlayerState = Player.PlayerState.Falling, PlayerState = Player.PlayerState.Falling,
AnimatorState = "fall", AnimatorState = "fall",
@@ -79,7 +88,7 @@ public class PlayerAnimation : MonoBehaviour
Trigger = "trigger_fall", Trigger = "trigger_fall",
}; };
_stateMapper[4] = new PlayerAnimationStateMapper() _stateMapper[i++] = new PlayerAnimationStateMapper()
{ {
PlayerState = Player.PlayerState.Stunned, PlayerState = Player.PlayerState.Stunned,
AnimatorState = "stun", AnimatorState = "stun",
@@ -87,7 +96,7 @@ public class PlayerAnimation : MonoBehaviour
Trigger = "trigger_stun", Trigger = "trigger_stun",
}; };
_stateMapper[5] = new PlayerAnimationStateMapper() _stateMapper[i++] = new PlayerAnimationStateMapper()
{ {
PlayerState = Player.PlayerState.Dead, PlayerState = Player.PlayerState.Dead,
AnimatorState = "eliminate", AnimatorState = "eliminate",
@@ -95,7 +104,7 @@ public class PlayerAnimation : MonoBehaviour
Trigger = "trigger_eliminate", Trigger = "trigger_eliminate",
}; };
_stateMapper[6] = new PlayerAnimationStateMapper() _stateMapper[i++] = new PlayerAnimationStateMapper()
{ {
PlayerState = Player.PlayerState.Loser, PlayerState = Player.PlayerState.Loser,
AnimatorState = "lose", AnimatorState = "lose",
@@ -103,7 +112,7 @@ public class PlayerAnimation : MonoBehaviour
Trigger = "trigger_lose", Trigger = "trigger_lose",
}; };
_stateMapper[7] = new PlayerAnimationStateMapper() _stateMapper[i++] = new PlayerAnimationStateMapper()
{ {
PlayerState = Player.PlayerState.Winner, PlayerState = Player.PlayerState.Winner,
AnimatorState = "win", AnimatorState = "win",

View File

@@ -107,6 +107,12 @@
}, },
{ {
"m_Id": "36e2c0caa7d44b20af89867520faf670" "m_Id": "36e2c0caa7d44b20af89867520faf670"
},
{
"m_Id": "e5402cb0771d45da9b46813f842af99e"
},
{
"m_Id": "df228179198742f08e453ac1c0c297d8"
} }
], ],
"m_GroupDatas": [], "m_GroupDatas": [],
@@ -437,9 +443,23 @@
{ {
"m_OutputSlot": { "m_OutputSlot": {
"m_Node": { "m_Node": {
"m_Id": "ef21b77334b34141b99da85df3426e97" "m_Id": "df228179198742f08e453ac1c0c297d8"
}, },
"m_SlotId": 2 "m_SlotId": 3
},
"m_InputSlot": {
"m_Node": {
"m_Id": "e5402cb0771d45da9b46813f842af99e"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "e5402cb0771d45da9b46813f842af99e"
},
"m_SlotId": 3
}, },
"m_InputSlot": { "m_InputSlot": {
"m_Node": { "m_Node": {
@@ -462,6 +482,34 @@
"m_SlotId": 2 "m_SlotId": 2
} }
}, },
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "ef21b77334b34141b99da85df3426e97"
},
"m_SlotId": 2
},
"m_InputSlot": {
"m_Node": {
"m_Id": "df228179198742f08e453ac1c0c297d8"
},
"m_SlotId": 2
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "ef21b77334b34141b99da85df3426e97"
},
"m_SlotId": 2
},
"m_InputSlot": {
"m_Node": {
"m_Id": "e5402cb0771d45da9b46813f842af99e"
},
"m_SlotId": 1
}
},
{ {
"m_OutputSlot": { "m_OutputSlot": {
"m_Node": { "m_Node": {
@@ -493,8 +541,8 @@
], ],
"m_VertexContext": { "m_VertexContext": {
"m_Position": { "m_Position": {
"x": 0.0, "x": 476.0,
"y": 0.0 "y": -17.000001907348634
}, },
"m_Blocks": [ "m_Blocks": [
{ {
@@ -510,8 +558,8 @@
}, },
"m_FragmentContext": { "m_FragmentContext": {
"m_Position": { "m_Position": {
"x": 0.0, "x": 476.0,
"y": 200.0 "y": 183.0
}, },
"m_Blocks": [ "m_Blocks": [
{ {
@@ -567,10 +615,10 @@
"m_Expanded": true, "m_Expanded": true,
"m_Position": { "m_Position": {
"serializedVersion": "2", "serializedVersion": "2",
"x": -468.0000305175781, "x": -12.000008583068848,
"y": 183.00001525878907, "y": 165.99998474121095,
"width": 136.00003051757813, "width": 136.0000457763672,
"height": 34.0 "height": 34.00001525878906
} }
}, },
"m_Slots": [ "m_Slots": [
@@ -591,6 +639,31 @@
} }
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "03420a400c4143109ba0b280070353dd",
"m_Id": 3,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_LiteralMode": false
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -701,10 +774,10 @@
"m_Expanded": true, "m_Expanded": true,
"m_Position": { "m_Position": {
"serializedVersion": "2", "serializedVersion": "2",
"x": -466.0, "x": -10.00000286102295,
"y": 146.0, "y": 129.0,
"width": 134.0, "width": 134.00003051757813,
"height": 34.00001525878906 "height": 33.99998474121094
} }
}, },
"m_Slots": [ "m_Slots": [
@@ -820,10 +893,10 @@
"m_Expanded": true, "m_Expanded": true,
"m_Position": { "m_Position": {
"serializedVersion": "2", "serializedVersion": "2",
"x": -498.0000305175781, "x": -164.00001525878907,
"y": 432.0000305175781, "y": 424.0,
"width": 166.0, "width": 166.00001525878907,
"height": 152.00003051757813 "height": 152.0
} }
}, },
"m_Slots": [ "m_Slots": [
@@ -906,6 +979,31 @@
"m_Labels": [] "m_Labels": []
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "1bb433f938b14318a69f6d6a951167f3",
"m_Id": 0,
"m_DisplayName": "Edge1",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Edge1",
"m_StageCapability": 3,
"m_Value": {
"x": 0.05000000074505806,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_LiteralMode": false
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode", "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -1027,7 +1125,7 @@
"m_ShaderOutputName": "Edge2", "m_ShaderOutputName": "Edge2",
"m_StageCapability": 3, "m_StageCapability": 3,
"m_Value": { "m_Value": {
"x": 0.15000000596046449, "x": 0.12999999523162843,
"y": 1.0, "y": 1.0,
"z": 1.0, "z": 1.0,
"w": 1.0 "w": 1.0
@@ -1122,6 +1220,31 @@
} }
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "280ad0e63e004310a8097bf42f474ff2",
"m_Id": 1,
"m_DisplayName": "Edge2",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Edge2",
"m_StageCapability": 3,
"m_Value": {
"x": 0.11999999731779099,
"y": 1.0,
"z": 1.0,
"w": 1.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_LiteralMode": false
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
@@ -1353,9 +1476,9 @@
"m_Expanded": true, "m_Expanded": true,
"m_Position": { "m_Position": {
"serializedVersion": "2", "serializedVersion": "2",
"x": -227.0, "x": 249.0000457763672,
"y": 290.0000305175781, "y": 272.9999694824219,
"width": 125.99998474121094, "width": 125.99992370605469,
"height": 142.0 "height": 142.0
} }
}, },
@@ -1421,6 +1544,31 @@
"m_SerializedDescriptor": "SurfaceDescription.Occlusion" "m_SerializedDescriptor": "SurfaceDescription.Occlusion"
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "35cdacebf9a54a238c1b70194e217847",
"m_Id": 2,
"m_DisplayName": "T",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "T",
"m_StageCapability": 3,
"m_Value": {
"x": 0.800000011920929,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_LiteralMode": false
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode", "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -1807,10 +1955,10 @@
"m_Expanded": true, "m_Expanded": true,
"m_Position": { "m_Position": {
"serializedVersion": "2", "serializedVersion": "2",
"x": -227.0, "x": 249.0000457763672,
"y": 441.0000305175781, "y": 424.0,
"width": 125.99998474121094, "width": 125.99992370605469,
"height": 141.99996948242188 "height": 142.0
} }
}, },
"m_Slots": [ "m_Slots": [
@@ -2195,7 +2343,7 @@
"m_ShaderOutputName": "Edge1", "m_ShaderOutputName": "Edge1",
"m_StageCapability": 3, "m_StageCapability": 3,
"m_Value": { "m_Value": {
"x": 0.10000000149011612, "x": 0.10999999940395355,
"y": 0.0, "y": 0.0,
"z": 0.0, "z": 0.0,
"w": 0.0 "w": 0.0
@@ -2403,6 +2551,31 @@
"m_Labels": [] "m_Labels": []
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "7d5a343c8e71457497e3803bf1847fc9",
"m_Id": 1,
"m_DisplayName": "B",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "B",
"m_StageCapability": 3,
"m_Value": {
"x": 1.0,
"y": 1.0,
"z": 1.0,
"w": 1.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_LiteralMode": false
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.CategoryData", "m_Type": "UnityEditor.ShaderGraph.CategoryData",
@@ -2433,8 +2606,8 @@
"m_Expanded": true, "m_Expanded": true,
"m_Position": { "m_Position": {
"serializedVersion": "2", "serializedVersion": "2",
"x": -497.9998474121094, "x": -501.0000305175781,
"y": 236.0, "y": 58.00000762939453,
"width": 152.00006103515626, "width": 152.00006103515626,
"height": 142.0 "height": 142.0
} }
@@ -3053,6 +3226,31 @@
} }
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "b0663d46826a4367bc8f67a2fe338b57",
"m_Id": 0,
"m_DisplayName": "A",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "A",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_LiteralMode": false
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -3221,10 +3419,10 @@
"m_Expanded": true, "m_Expanded": true,
"m_Position": { "m_Position": {
"serializedVersion": "2", "serializedVersion": "2",
"x": -318.9998779296875, "x": 157.00001525878907,
"y": 129.00001525878907, "y": 112.0,
"width": 130.00009155273438, "width": 130.00001525878907,
"height": 141.99998474121095 "height": 142.0
} }
}, },
"m_Slots": [ "m_Slots": [
@@ -3421,6 +3619,96 @@
"m_Space": 3 "m_Space": 3
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SmoothstepNode",
"m_ObjectId": "df228179198742f08e453ac1c0c297d8",
"m_Group": {
"m_Id": ""
},
"m_Name": "Smoothstep",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -501.00006103515627,
"y": 211.00001525878907,
"width": 152.00009155273438,
"height": 142.00001525878907
}
},
"m_Slots": [
{
"m_Id": "1bb433f938b14318a69f6d6a951167f3"
},
{
"m_Id": "280ad0e63e004310a8097bf42f474ff2"
},
{
"m_Id": "e93c9dd322cf4daa8e306e9e6c5d4a50"
},
{
"m_Id": "efb9ac79520f4a3eb88e483228fd49ad"
}
],
"synonyms": [
"curve"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.LerpNode",
"m_ObjectId": "e5402cb0771d45da9b46813f842af99e",
"m_Group": {
"m_Id": ""
},
"m_Name": "Lerp",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -324.0000305175781,
"y": 331.9999694824219,
"width": 208.00003051757813,
"height": 326.0000305175781
}
},
"m_Slots": [
{
"m_Id": "b0663d46826a4367bc8f67a2fe338b57"
},
{
"m_Id": "7d5a343c8e71457497e3803bf1847fc9"
},
{
"m_Id": "35cdacebf9a54a238c1b70194e217847"
},
{
"m_Id": "03420a400c4143109ba0b280070353dd"
}
],
"synonyms": [
"mix",
"blend",
"linear interpolate"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -3471,6 +3759,31 @@
"m_LiteralMode": false "m_LiteralMode": false
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "e93c9dd322cf4daa8e306e9e6c5d4a50",
"m_Id": 2,
"m_DisplayName": "In",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "In",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_LiteralMode": false
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -3581,6 +3894,31 @@
"m_HashType": 0 "m_HashType": 0
} }
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "efb9ac79520f4a3eb88e483228fd49ad",
"m_Id": 3,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_LiteralMode": false
}
{ {
"m_SGVersion": 0, "m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DotProductNode", "m_Type": "UnityEditor.ShaderGraph.DotProductNode",