Merge branch 'main' into Rizzz

This commit is contained in:
frizbee19 authored and GitHub committed 2022-02-24 22:24:55 -06:00
commit 76ce9ef694
13 files changed
+436 -421

No files matched your search

+2
View File
@@ -275,6 +275,7 @@ MonoBehaviour:
m_GroundCheck: {fileID: 5439994587561021437}
m_CeilingCheck: {fileID: 5439994588348099274}
m_CrouchDisableCollider: {fileID: 5439994587591701586}
m_Grounded: 0
OnLandEvent:
m_PersistentCalls:
m_Calls: []
@@ -357,6 +358,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
controller: {fileID: 5439994587591701584}
animator: {fileID: 5439994586602100319}
runSpeed: 40
--- !u!1 &5439994588348099269
GameObject:
+68
View File
@@ -0,0 +1,68 @@
%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: fuki-move-airborne
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 1750011889439919240, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 8
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 1750011889439919240, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.125
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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d4294898f325f41f4b3ead56c73acfff
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant: