Merge branch 'main' into feature/menus

This commit is contained in:
cyndrdev 2021-03-25 11:27:13 +00:00
commit 242ccb6fcb
111 changed files with 106255 additions and 6885 deletions

View File

@ -9,10 +9,10 @@ Material:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: orb_MAT m_Name: orb_MAT
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _PARALLAXMAP _SPECULAR_SETUP m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _PARALLAXMAP
m_LightmapFlags: 2 m_LightmapFlags: 2
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1 m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000 m_CustomRenderQueue: 2000
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: Opaque
@ -21,11 +21,11 @@ Material:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- _BaseMap: - _BaseMap:
m_Texture: {fileID: 2800000, guid: a2e6f3d878ecfc7418724c9e950c02ed, type: 3} m_Texture: {fileID: 2800000, guid: 8e93b1c758b8a3b438b0d7844c063367, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _BumpMap: - _BumpMap:
m_Texture: {fileID: 2800000, guid: 13bcb9385640733409b6a7c756c24b15, type: 3} m_Texture: {fileID: 2800000, guid: 1b4589dbbea565b4e8cc4b61e98c64f7, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap: - _DetailAlbedoMap:
@ -41,15 +41,15 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _EmissionMap: - _EmissionMap:
m_Texture: {fileID: 2800000, guid: 49cf6831f4fdfb14ca0da2f2b4cba3ad, type: 3} m_Texture: {fileID: 2800000, guid: f7b2251cc58bc884cbf3087301816671, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 2800000, guid: a2e6f3d878ecfc7418724c9e950c02ed, type: 3} m_Texture: {fileID: 2800000, guid: 8e93b1c758b8a3b438b0d7844c063367, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: 4394e74068b8e5a419fcb60f39b0d9da, type: 3} m_Texture: {fileID: 2800000, guid: ff2993c63fa88024395a9569248e2d18, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _OcclusionMap: - _OcclusionMap:
@ -57,11 +57,11 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _ParallaxMap: - _ParallaxMap:
m_Texture: {fileID: 2800000, guid: 1e939620d235cd54ebe979b288421314, type: 3} m_Texture: {fileID: 2800000, guid: 26c048fd9c781ce4faf6fb43cff77a8a, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _SpecGlossMap: - _SpecGlossMap:
m_Texture: {fileID: 2800000, guid: a6482166787d0804cb31dc3237dc9a42, type: 3} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- unity_Lightmaps: - unity_Lightmaps:
@ -82,7 +82,7 @@ Material:
- _BumpScale: 1 - _BumpScale: 1
- _ClearCoatMask: 0 - _ClearCoatMask: 0
- _ClearCoatSmoothness: 0 - _ClearCoatSmoothness: 0
- _Cull: 0 - _Cull: 2
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DetailAlbedoMapScale: 1 - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
@ -96,17 +96,17 @@ Material:
- _Parallax: 0.005 - _Parallax: 0.005
- _QueueOffset: 0 - _QueueOffset: 0
- _ReceiveShadows: 1 - _ReceiveShadows: 1
- _Smoothness: 0.5 - _Smoothness: 0.546
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
- _Surface: 0 - _Surface: 0
- _WorkflowMode: 0 - _WorkflowMode: 1
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 1.8039216, b: 2, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &7081404539000308866 --- !u!114 &7081404539000308866

BIN
game/Assets/AlphaChar/A_Walk.fbx (Stored with Git LFS)

Binary file not shown.

View File

@ -1,159 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-4669982441730671944
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 2131420891638955038}
m_Position: {x: 90, y: 170, z: 0}
- serializedVersion: 1
m_State: {fileID: -748621450404397517}
m_Position: {x: 90, y: 80, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: -110, y: 10, z: 0}
m_EntryPosition: {x: 110, y: 270, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 2131420891638955038}
--- !u!1102 &-748621450404397517
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Walk
m_Speed: 5
m_CycleOffset: 0
m_Transitions:
- {fileID: 1187370376802235764}
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: 85e9b3e9f334ee44e840d547fdd6f304, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Char Ctrl
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Is Walking
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -4669982441730671944}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1187370376802235764
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Is Walking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2131420891638955038}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.90566045
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &2131420891638955038
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 4452622808242892610}
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: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &4452622808242892610
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: StartWalking
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Is Walking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -748621450404397517}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9884527
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

BIN
game/Assets/Character_Anim/A_Jump_Boost.fbx (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,105 @@
fileFormatVersion: 2
guid: 6cfe6c0ef6afb4f439385e34a5486ecf
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
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
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
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
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/Character_Anim/A_Jump_InAir.fbx (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,105 @@
fileFormatVersion: 2
guid: 2fc348bd669c9b74ea8f07ad1c281eb3
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
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
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
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
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/Character_Anim/A_Jump_Landing.fbx (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,105 @@
fileFormatVersion: 2
guid: 30db38f9e3b5a88438a6278460306135
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
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
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
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
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/Character_Anim/A_Jump_TakeOff.fbx (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,105 @@
fileFormatVersion: 2
guid: be4164daf5813fc40a05977ffd5542f0
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
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
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
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
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/Character_Anim/A_Run.fbx (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,105 @@
fileFormatVersion: 2
guid: 98c2cd39b2a3a324792ea610b532654e
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
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
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
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
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/Character_Anim/A_Walk.fbx (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,11 +1,11 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: f56ca56a969bf2844a912c84e69bbcdf guid: ac247fb003b929844b101e718dc3ca13
ModelImporter: ModelImporter:
serializedVersion: 20200 serializedVersion: 20200
internalIDToNameTable: internalIDToNameTable:
- first: - first:
74: 1827226128182048838 74: 1827226128182048838
second: Walk second: Take 001
externalObjects: {} externalObjects: {}
materials: materials:
materialImportMode: 2 materialImportMode: 2
@ -33,36 +33,7 @@ ModelImporter:
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] extraUserProperties: []
clipAnimations: clipAnimations: []
- serializedVersion: 16
name: Walk
takeName: Take 001
internalID: 0
firstFrame: 1300
lastFrame: 1459
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1300
isReadable: 0 isReadable: 0
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 85e9b3e9f334ee44e840d547fdd6f304 guid: 4992e4c74822c624da6c52ac33801b96
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 7400000 mainObjectFileID: 7400000

View File

@ -0,0 +1,608 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8633728715219653837
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: 7417648013747824764}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 4
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1101 &-8237246380781921263
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: InBoostState
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3221672209289342883}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 4
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1101 &-7916693450357402312
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: InJumpState
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: InBoostState
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6158004599323219404}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 4
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1101 &-7402131631877207942
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: InJumpState
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7175674927923829264}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 4
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1102 &-7175674927923829264
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump Begin
m_Speed: 5
m_CycleOffset: 0
m_Transitions:
- {fileID: 6627086963765148649}
- {fileID: -3069531632362253192}
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: 400a0aac0b38d2c429ba53b3f5d47cc5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-4669982441730671944
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 2131420891638955038}
m_Position: {x: 90, y: 170, z: 0}
- serializedVersion: 1
m_State: {fileID: -748621450404397517}
m_Position: {x: -160, y: 170, z: 0}
- serializedVersion: 1
m_State: {fileID: -908005854898768128}
m_Position: {x: -290, y: -80, z: 0}
- serializedVersion: 1
m_State: {fileID: -7175674927923829264}
m_Position: {x: -290, y: -10, z: 0}
- serializedVersion: 1
m_State: {fileID: 3221672209289342883}
m_Position: {x: -290, y: -150, z: 0}
- serializedVersion: 1
m_State: {fileID: 6158004599323219404}
m_Position: {x: -30, y: -110, z: 0}
- serializedVersion: 1
m_State: {fileID: 7417648013747824764}
m_Position: {x: -290, y: -220, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: -210, y: 370, z: 0}
m_EntryPosition: {x: 110, y: 270, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 2131420891638955038}
--- !u!1101 &-3069531632362253192
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: -908005854898768128}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2107755844975236895
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: InJumpState
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: InBoostState
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6158004599323219404}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 4
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1102 &-908005854898768128
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump In-Air
m_Speed: 5
m_CycleOffset: 0
m_Transitions:
- {fileID: -7916693450357402312}
- {fileID: -8237246380781921263}
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: 27061ef040be78341a048a60a7740aa8, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-748621450404397517
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Walk
m_Speed: 5
m_CycleOffset: 0
m_Transitions:
- {fileID: 1575648880716201585}
- {fileID: 1187370376802235764}
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: f94f0f6129b7c334d8fd3147d2f4b628, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Char Ctrl
serializedVersion: 5
m_AnimatorParameters:
- m_Name: IsWalking
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: InJumpState
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: InBoostState
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -4669982441730671944}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1187370376802235764
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsWalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2131420891638955038}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.90566045
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1575648880716201585
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: InJumpState
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7175674927923829264}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 4
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1102 &2131420891638955038
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -7402131631877207942}
- {fileID: 4452622808242892610}
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: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &2544625993618665896
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsWalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2131420891638955038}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08
m_TransitionOffset: 0
m_ExitTime: 0.8
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &2660762485539089672
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: IsWalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -748621450404397517}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &3221672209289342883
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump Boost
m_Speed: 5
m_CycleOffset: 0
m_Transitions:
- {fileID: -2107755844975236895}
- {fileID: -8633728715219653837}
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: 862a19d8877420b4387f911a8c68110c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &4452622808242892610
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: StartWalking
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsWalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -748621450404397517}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9884527
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5991315514625531727
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: InJumpState
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: InBoostState
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6158004599323219404}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.86238533
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 4
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1102 &6158004599323219404
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump Land
m_Speed: 5
m_CycleOffset: 0
m_Transitions:
- {fileID: 2544625993618665896}
- {fileID: 2660762485539089672}
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: 4dfa008826a8a5e4caa29a9f4b4e9fbe, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &6627086963765148649
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: InJumpState
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: InBoostState
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6158004599323219404}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 4
m_OrderedInterruption: 0
m_CanTransitionToSelf: 1
--- !u!1102 &7417648013747824764
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump In-Air Post-Boost
m_Speed: 5
m_CycleOffset: 0
m_Transitions:
- {fileID: 5991315514625531727}
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: 27061ef040be78341a048a60a7740aa8, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0228856d50ce2a845abd7b3eda114390, type: 3}
m_Name: PA_Freeze
m_EditorClassIdentifier:
_artefactID: 12
_dialogueKey:
_name: Freeze
_power: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c2e37ff6639a22e4eacc5e95d8e13723
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76553ada4233edc458c3fed9b69e128f, type: 3}
m_Name: objectTimeScale
m_EditorClassIdentifier:
_initialValue: 1
_readOnly: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9b68e167db44c0c42837e9a679da964e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,4 +2,7 @@ fileFormatVersion: 2
guid: b27f58ae5d5c33a4bb2d1f4f34bd036d guid: b27f58ae5d5c33a4bb2d1f4f34bd036d
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {}
userData: userData:
assetBundleName:
assetBundleVariant:

View File

@ -44,7 +44,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 27f3f5345a3cb684195f070b3d44bc05, type: 3} m_Script: {fileID: 11500000, guid: 27f3f5345a3cb684195f070b3d44bc05, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_musicId: event:/Music/WIPMusic _musicId: event:/Music/MultiMusic
_trackDeltaPerSecond: 0.5
_musicBus: _musicBus:
BusName: Music BusName: Music
PlayerPref: {fileID: 11400000, guid: 45598e626e9c27c428f33cca2dd341e2, type: 2} PlayerPref: {fileID: 11400000, guid: 45598e626e9c27c428f33cca2dd341e2, type: 2}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4cc71201ee62efb488f75c38d71a1bba guid: a1767ed7c727a304f90471918467166d
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -0,0 +1,60 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1670603406037581903
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1670603406037581902}
- component: {fileID: 1670603406037581897}
- component: {fileID: 1670603406037581898}
m_Layer: 0
m_Name: MusicTriggerZone
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1670603406037581902
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670603406037581903}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -26, y: 0, z: 57}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1670603406037581897
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670603406037581903}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 10, y: 10, z: 1}
m_Center: {x: 0, y: 5, z: 0}
--- !u!114 &1670603406037581898
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670603406037581903}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 42ae269bbe33edf4fb811511820ba248, type: 3}
m_Name:
m_EditorClassIdentifier:
_track: 7

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 69243a66990c1e7459a7579bf6208a7d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -135,13 +135,13 @@ CharacterController:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Height: 1.7 m_Height: 1.5
m_Radius: 0.4 m_Radius: 0.4
m_SlopeLimit: 45 m_SlopeLimit: 45
m_StepOffset: 0.3 m_StepOffset: 0.3
m_SkinWidth: 0.01 m_SkinWidth: 0.01
m_MinMoveDistance: 0.001 m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0.85, z: 0} m_Center: {x: 0, y: 0.75, z: 0}
--- !u!114 &13726836969441783 --- !u!114 &13726836969441783
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -157,6 +157,7 @@ MonoBehaviour:
_movementSettings: {fileID: 11400000, guid: 0c168708f93291545b51df2eec8f4ac3, type: 2} _movementSettings: {fileID: 11400000, guid: 0c168708f93291545b51df2eec8f4ac3, type: 2}
_inputHandler: {fileID: 13726836969441782} _inputHandler: {fileID: 13726836969441782}
_controller: {fileID: 13726836969441545} _controller: {fileID: 13726836969441545}
_animController: {fileID: 4397130014773710380}
_powers: {fileID: 13726837176080779} _powers: {fileID: 13726837176080779}
_graphics: {fileID: 13726837642651460} _graphics: {fileID: 13726837642651460}
_renderers: _renderers:
@ -166,6 +167,8 @@ MonoBehaviour:
_jumpColor: {r: 1, g: 0.95084643, b: 0, a: 0} _jumpColor: {r: 1, g: 0.95084643, b: 0, a: 0}
_boostColor: {r: 1, g: 0, b: 0.9173207, a: 0} _boostColor: {r: 1, g: 0, b: 0.9173207, a: 0}
_exhaustedColor: {r: 1, g: 0, b: 0, a: 0} _exhaustedColor: {r: 1, g: 0, b: 0, a: 0}
objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2}
frozenTime: {fileID: 11400000, guid: 19273ba4ac237ab4381926cfb195dda8, type: 2}
--- !u!114 &13726836969441780 --- !u!114 &13726836969441780
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -296,6 +299,10 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_ActionId: b118302a-6162-4223-8a6c-38ff2d6b4133 m_ActionId: b118302a-6162-4223-8a6c-38ff2d6b4133
m_ActionName: ArtefactPreview/LookDelta[/Mouse/delta] m_ActionName: ArtefactPreview/LookDelta[/Mouse/delta]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 29f1599e-fe43-47df-ad25-8e712263d0ab
m_ActionName: CoreMap/Freeze[/Keyboard/g]
m_NeverAutoSwitchControlSchemes: 0 m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme: Gamepad m_DefaultControlScheme: Gamepad
m_DefaultActionMap: CoreMap m_DefaultActionMap: CoreMap
@ -329,10 +336,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0e73a47345d899f4ca1e5e08683c2b82, type: 3} m_Script: {fileID: 11500000, guid: 0e73a47345d899f4ca1e5e08683c2b82, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_cheatBlink: 1 _cheatBlink: 0
_cheatBoost: 1 _cheatBoost: 0
_cheatFreeze: 0
_blink: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2} _blink: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2}
_boost: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2} _boost: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2}
_freeze: {fileID: 0}
--- !u!114 &3320306143821152633 --- !u!114 &3320306143821152633
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -483,8 +492,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bb840fd42f6526f4893e136a093cf1bd, type: 3} m_Script: {fileID: 11500000, guid: bb840fd42f6526f4893e136a093cf1bd, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
animator: {fileID: 0}
fadeScreen: {fileID: 0}
_respawnPosition: {fileID: 11400000, guid: 20fad56702134eb469a652ba680b48b2, type: 2} _respawnPosition: {fileID: 11400000, guid: 20fad56702134eb469a652ba680b48b2, type: 2}
_playerDeath: {fileID: 11400000, guid: 22fd384aef0d08146831d35c2ab7f983, type: 2} _playerDeath: {fileID: 11400000, guid: 22fd384aef0d08146831d35c2ab7f983, type: 2}
_playerRespawn: {fileID: 11400000, guid: 6e31084a96bb93a44a85563a6208d0da, type: 2} _playerRespawn: {fileID: 11400000, guid: 6e31084a96bb93a44a85563a6208d0da, type: 2}
@ -515,7 +522,7 @@ Transform:
m_GameObject: {fileID: 13726837642651461} m_GameObject: {fileID: 13726837642651461}
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, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.85, z: 0.8} m_LocalScale: {x: 0.7, y: 0.75, z: 0.7}
m_Children: m_Children:
- {fileID: 3910566560202895193} - {fileID: 3910566560202895193}
- {fileID: 13726836532781129} - {fileID: 13726836532781129}
@ -600,7 +607,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1703779518772407877} m_GameObject: {fileID: 1703779518772407877}
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.381, z: -0.026} m_LocalPosition: {x: -0.036, y: 1.403, z: -0.093}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_Children: [] m_Children: []
m_Father: {fileID: 13726837642651460} m_Father: {fileID: 13726837642651460}

View File

@ -87,6 +87,122 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Cameras value: Cameras
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.x
value: 1.4999695
objectReference: {fileID: 0}
- target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.z
value: -0.7294996
objectReference: {fileID: 0}
- target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.w
value: 0.72316885
objectReference: {fileID: 0}
- target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.x
value: -0.012375496
objectReference: {fileID: 0}
- target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.y
value: -0.6904594
objectReference: {fileID: 0}
- target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.z
value: -0.011815742
objectReference: {fileID: 0}
- target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.w
value: 0.97784
objectReference: {fileID: 0}
- target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.x
value: -0.13644
objectReference: {fileID: 0}
- target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.y
value: 0.15792163
objectReference: {fileID: 0}
- target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.z
value: -0.0165495
objectReference: {fileID: 0}
- target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.w
value: 0.97784
objectReference: {fileID: 0}
- target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.x
value: -0.13643998
objectReference: {fileID: 0}
- target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.y
value: 0.15792166
objectReference: {fileID: 0}
- target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.z
value: -0.016549498
objectReference: {fileID: 0}
- target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_XAxis.Value
value: -89.63728
objectReference: {fileID: 0}
- target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_XAxis.Value
value: -89.63728
objectReference: {fileID: 0}
- target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.x
value: 1.4999695
objectReference: {fileID: 0}
- target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.y
value: -0.80000305
objectReference: {fileID: 0}
- target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.z
value: -0.7294996
objectReference: {fileID: 0}
- target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.w
value: 0.5667831
objectReference: {fileID: 0}
- target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.x
value: 0.06921981
objectReference: {fileID: 0}
- target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.y
value: -0.8148993
objectReference: {fileID: 0}
- target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.z
value: 0.099521644
objectReference: {fileID: 0}
- target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_Follow propertyPath: m_Follow
value: value:
@ -95,6 +211,46 @@ PrefabInstance:
propertyPath: m_LookAt propertyPath: m_LookAt
value: value:
objectReference: {fileID: 3150647428828152554} objectReference: {fileID: 3150647428828152554}
- target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_XAxis.Value
value: -89.63728
objectReference: {fileID: 0}
- target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9705022
objectReference: {fileID: 0}
- target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.x
value: -0.13541612
objectReference: {fileID: 0}
- target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.y
value: 0.19838297
objectReference: {fileID: 0}
- target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_LocalRotation.z
value: -0.020789675
objectReference: {fileID: 0}
- target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_XAxis.Value
value: -89.63728
objectReference: {fileID: 0}
- target: {fileID: 8137033370021049976, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} m_SourcePrefab: {fileID: 100100000, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3}
--- !u!4 &4676633831245457905 stripped --- !u!4 &4676633831245457905 stripped
@ -158,18 +314,22 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 13726836969441545, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_Height
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 13726836969441545, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_Center.y
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - target: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_Camera propertyPath: m_Camera
value: value:
objectReference: {fileID: 4676633831388223340} objectReference: {fileID: 4676633831388223340}
- target: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_ActionEvents.Array.data[5].m_ActionId
value: 0eb55067-1328-4b0a-9494-b427befe049a
objectReference: {fileID: 0}
- target: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_ActionEvents.Array.data[5].m_ActionName
value: CoreMap/New action
objectReference: {fileID: 0}
- target: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: Blink
objectReference: {fileID: 0}
- target: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - target: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Player value: Player
@ -179,37 +339,9 @@ PrefabInstance:
value: value:
objectReference: {fileID: 4676633831388223340} objectReference: {fileID: 4676633831388223340}
- target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: _cheatBlink propertyPath: _freeze
value: 0 value:
objectReference: {fileID: 0} objectReference: {fileID: 11400000, guid: 0cd9cf6494bb6f54d9b97631010d780e, type: 2}
- target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: _cheatBoost
value: 0
objectReference: {fileID: 0}
- target: {fileID: 13726837642651460, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_LocalScale.x
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 13726837642651460, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_LocalScale.y
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 13726837642651460, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_LocalScale.z
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 7741442472643640439, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_LocalPosition.x
value: -0.036
objectReference: {fileID: 0}
- target: {fileID: 7741442472643640439, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_LocalPosition.y
value: 1.403
objectReference: {fileID: 0}
- target: {fileID: 7741442472643640439, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: m_LocalPosition.z
value: -0.093
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
--- !u!4 &4676633831945762709 stripped --- !u!4 &4676633831945762709 stripped

File diff suppressed because it is too large Load Diff

View File

@ -87,6 +87,7 @@ MonoBehaviour:
fallAwayTime: 1 fallAwayTime: 1
dissolve: {fileID: 2100000, guid: 98767dd77414bad44b23ef5332c1d8f1, type: 2} dissolve: {fileID: 2100000, guid: 98767dd77414bad44b23ef5332c1d8f1, type: 2}
_renderer: {fileID: 6378198502367496824} _renderer: {fileID: 6378198502367496824}
objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2}
_settings: {fileID: 11400000, guid: 36275776eda5c8249bf45e01721afe36, type: 2} _settings: {fileID: 11400000, guid: 36275776eda5c8249bf45e01721afe36, type: 2}
_graphics: {fileID: 4864755999650917293} _graphics: {fileID: 4864755999650917293}
--- !u!54 &980120856895548943 --- !u!54 &980120856895548943

View File

@ -0,0 +1,51 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1907884617390317472
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 197761351512446430}
- component: {fileID: 600618092916283916}
m_Layer: 0
m_Name: FallawayFloorChain
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &197761351512446430
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1907884617390317472}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &600618092916283916
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1907884617390317472}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59c45615fb0d0ce4fb951b03d885acdf, type: 3}
m_Name:
m_EditorClassIdentifier:
_settings: {fileID: 11400000, guid: 36275776eda5c8249bf45e01721afe36, type: 2}
_spacing: 1.93
_delay: 0.1
_forwards: 1
_prefab: {fileID: 8773676356524340268, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
_length: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e72cb2e11c8a50248a284aabf3b87985
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,322 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2220041284483646358
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2220041284483646359}
- component: {fileID: 2220041284483646357}
- component: {fileID: 2220041284483646356}
- component: {fileID: 2220041284483646354}
m_Layer: 5
m_Name: PlayerUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2220041284483646359
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284483646358}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2220041284586465449}
- {fileID: 2220041284891186932}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2220041284483646357
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284483646358}
m_CullTransparentMesh: 1
--- !u!114 &2220041284483646356
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284483646358}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &2220041284483646354
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284483646358}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7befeb001df190b4b8ff21ffa8aa3eec, type: 3}
m_Name:
m_EditorClassIdentifier:
cooldownImage: {fileID: 2220041284521989762}
freeze: {fileID: 11400000, guid: 0cd9cf6494bb6f54d9b97631010d780e, type: 2}
freezePanel: {fileID: 2220041284586465448}
frozenTime: {fileID: 11400000, guid: 19273ba4ac237ab4381926cfb195dda8, type: 2}
--- !u!1 &2220041284521989764
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2220041284521989765}
- component: {fileID: 2220041284521989763}
- component: {fileID: 2220041284521989762}
m_Layer: 5
m_Name: Cooldown
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2220041284521989765
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284521989764}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2220041284891186932}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -50, y: -50}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2220041284521989763
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284521989764}
m_CullTransparentMesh: 1
--- !u!114 &2220041284521989762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284521989764}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.8627451}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a11777191ca1ac140accf07b15900e79, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 2
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2220041284586465448
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2220041284586465449}
- component: {fileID: 2220041284586465463}
- component: {fileID: 2220041284586465462}
m_Layer: 5
m_Name: FreezePanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2220041284586465449
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284586465448}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2220041284483646359}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2220041284586465463
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284586465448}
m_CullTransparentMesh: 1
--- !u!114 &2220041284586465462
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284586465448}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.16378963, b: 0.2264151, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2220041284891186935
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2220041284891186932}
- component: {fileID: 2220041284891186930}
- component: {fileID: 2220041284891186933}
m_Layer: 5
m_Name: Hourglass
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2220041284891186932
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284891186935}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2220041284521989765}
m_Father: {fileID: 2220041284483646359}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -80, y: -78}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2220041284891186930
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284891186935}
m_CullTransparentMesh: 1
--- !u!114 &2220041284891186933
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220041284891186935}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: aaef6bac05ac36e48ade031f9a4230be, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9cd4e8a96e33818468d6db4407b760e3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &4449396798674854612 --- !u!1 &1150255153773548759
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -8,49 +8,47 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4449396798674854634} - component: {fileID: 7672633439318125585}
- component: {fileID: 4449396798674854635} - component: {fileID: 697448341302567644}
- component: {fileID: 4449396798674854632} - component: {fileID: 547292502171110631}
- component: {fileID: 4449396798674854633} - component: {fileID: 7728908912666711682}
- component: {fileID: 4449396798674854614}
- component: {fileID: 4449396798674854615}
m_Layer: 0 m_Layer: 0
m_Name: Safe Zone m_Name: Quad
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &4449396798674854634 --- !u!4 &7672633439318125585
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4449396798674854612} m_GameObject: {fileID: 1150255153773548759}
m_LocalRotation: {x: -0, y: 0.70394546, z: -0, w: 0.7102541} m_LocalRotation: {x: 0.70710677, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -13.763916, y: -2.875824, z: -3.3844023} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.32437897, y: 1.6604103, z: 1.6020799} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 4449396798674854634}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 89.489, z: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &4449396798674854635 --- !u!33 &697448341302567644
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4449396798674854612} m_GameObject: {fileID: 1150255153773548759}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &4449396798674854632 --- !u!23 &547292502171110631
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4449396798674854612} m_GameObject: {fileID: 1150255153773548759}
m_Enabled: 0 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -84,20 +82,53 @@ MeshRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &4449396798674854633 --- !u!64 &7728908912666711682
MeshCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4449396798674854612} m_GameObject: {fileID: 1150255153773548759}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 0 m_Enabled: 1
serializedVersion: 4 serializedVersion: 4
m_Convex: 0 m_Convex: 0
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &4449396798674854612
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4449396798674854634}
- component: {fileID: 4449396798674854614}
- component: {fileID: 4449396798674854615}
m_Layer: 0
m_Name: Safe Zone
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4449396798674854634
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4449396798674854612}
m_LocalRotation: {x: -0, y: 0.70394546, z: -0, w: 0.7102541}
m_LocalPosition: {x: -13.763916, y: -2.875824, z: -3.3844023}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7672633439318125585}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 89.489, z: 0}
--- !u!65 &4449396798674854614 --- !u!65 &4449396798674854614
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -109,7 +140,7 @@ BoxCollider:
m_IsTrigger: 1 m_IsTrigger: 1
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 10, y: 2.220446e-16, z: 10} m_Size: {x: 1, y: 0.5, z: 1}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4449396798674854615 --- !u!114 &4449396798674854615
MonoBehaviour: MonoBehaviour:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 79b8b10c70131894eb35fc815dd27679
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f4666c0f84a0ffa4485d1262087cf48a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 629b80fb2362fe948a2482ae209214eb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 112000000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,144 @@
fileFormatVersion: 2
guid: e4eb4b2fe64354d43897141958b0824b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -662,6 +662,39 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3ea432459c1408040880f4c027fab559, type: 3} m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3ea432459c1408040880f4c027fab559, type: 3}
m_PrefabInstance: {fileID: 3060674078935020117} m_PrefabInstance: {fileID: 3060674078935020117}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &239903584
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 239903585}
m_Layer: 0
m_Name: MusicTriggers
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &239903585
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 239903584}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 796404683}
- {fileID: 1869566704}
- {fileID: 1060814304}
m_Father: {fileID: 0}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &240211937 stripped --- !u!1 &240211937 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3}
@ -2285,6 +2318,14 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.15792163
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: -0.0165495
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: PlayerObjects value: PlayerObjects
@ -2333,10 +2374,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9122906920607805875, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
--- !u!4 &783507384 stripped --- !u!4 &783507384 stripped
@ -2354,6 +2391,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 3060674078300009146} m_PrefabInstance: {fileID: 3060674078300009146}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &796404683 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
m_PrefabInstance: {fileID: 1670603406786800517}
m_PrefabAsset: {fileID: 0}
--- !u!1 &797647646 stripped --- !u!1 &797647646 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
@ -3092,6 +3134,84 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3}
m_PrefabInstance: {fileID: 3060674079011159413} m_PrefabInstance: {fileID: 3060674079011159413}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &1060814303
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 239903585}
m_Modifications:
- target: {fileID: 1670603406037581897, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_Size.x
value: 18
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581897, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_Size.y
value: 18
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581897, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_Size.z
value: 18
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581898, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: _track
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.x
value: 14.5
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.z
value: -31
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581903, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_Name
value: MusicTriggerZone (2)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
--- !u!4 &1060814304 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
m_PrefabInstance: {fileID: 1060814303}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1063558645 --- !u!1001 &1063558645
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5993,6 +6113,72 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3}
m_PrefabInstance: {fileID: 3060674078962375218} m_PrefabInstance: {fileID: 3060674078962375218}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &1869566703
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 239903585}
m_Modifications:
- target: {fileID: 1670603406037581898, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: _track
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.x
value: -7
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.z
value: 27
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.w
value: 0.97629607
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.y
value: -0.21643952
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581903, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_Name
value: MusicTriggerZone (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
--- !u!4 &1869566704 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
m_PrefabInstance: {fileID: 1869566703}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1871781663 stripped --- !u!1 &1871781663 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
@ -6764,6 +6950,67 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1001 &1670603406786800517
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 239903585}
m_Modifications:
- target: {fileID: 1670603406037581898, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: _track
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.x
value: -26
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalPosition.z
value: 57
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670603406037581903, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
propertyPath: m_Name
value: MusicTriggerZone
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3}
--- !u!1001 &3060674077596672761 --- !u!1001 &3060674077596672761
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -58123,15 +58370,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 953.24054 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 546.3486 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 366.31305 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w

View File

@ -1,9 +1,10 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using UnityEngine; using UnityEngine;
using FMOD; using FMOD;
using FMOD.Studio;
using FMODUnity; using FMODUnity;
using EventInstance = FMOD.Studio.EventInstance;
[RequireComponent(typeof(FMODUnity.StudioBankLoader))] [RequireComponent(typeof(FMODUnity.StudioBankLoader))]
public class AudioManager : MonoBehaviour public class AudioManager : MonoBehaviour
@ -26,6 +27,14 @@ public class AudioManager : MonoBehaviour
[EventRef] [EventRef]
private string _musicId; private string _musicId;
[SerializeField]
private float _trackDeltaPerSecond;
private const string TRACK_PARAM = "Track";
private float _currentTrack = 1f;
private int _targetTrack = 1;
[SerializeField] [SerializeField]
private AdjustableAudioBus _musicBus; private AdjustableAudioBus _musicBus;
@ -37,20 +46,36 @@ public class AudioManager : MonoBehaviour
[SerializeField] [SerializeField]
private AdjustableAudioBus _uiBus; private AdjustableAudioBus _uiBus;
public AudioManager Instance { get; private set; } private static AudioManager _instance;
private EventInstance _musicInstance; private EventInstance _musicInstance;
public static void SetTrack( int track, bool forceLower = false )
{
if ( forceLower || track > _instance._targetTrack )
{
_instance._targetTrack = track;
}
}
void Update()
{
float dt = Time.deltaTime;
float maxDelta = dt * _trackDeltaPerSecond;
_currentTrack = Mathf.MoveTowards( _currentTrack, (float) _targetTrack, maxDelta );
_musicInstance.setParameterByName( TRACK_PARAM, _currentTrack );
}
void Awake() void Awake()
{ {
if ( Instance != null ) if ( _instance != null )
{ {
Destroy( gameObject ); Destroy( gameObject );
return; return;
} }
Instance = this; _instance = this;
GetComponent<StudioBankLoader>().enabled = true; GetComponent<StudioBankLoader>().enabled = true;

View File

@ -0,0 +1,19 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class MusicTriggerZone : MonoBehaviour
{
[SerializeField]
[Range( 1, 7 )]
private int _track = 1;
[SerializeField]
private bool _forceIfLower;
private void OnTriggerEnter( Collider other )
{
AudioManager.SetTrack( _track, _forceIfLower );
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 42ae269bbe33edf4fb811511820ba248
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5,11 +5,25 @@ using UnityEngine;
public class PlayerAnimationController : MonoBehaviour public class PlayerAnimationController : MonoBehaviour
{ {
private const string IS_WALKING = "IsWalking";
private const string IN_JUMP_STATE = "InJumpState";
private const string IN_BOOST_STATE = "InBoostState";
public struct AnimationParams
{
public bool IsWalking;
public bool InJumpState;
public bool InBoostState;
}
[SerializeField] private Animator _animator; [SerializeField] private Animator _animator;
[SerializeField] private CharacterController _controller; [SerializeField] private CharacterController _controller;
private void Update() private AnimationParams _params;
public void ProcessAnimUpdate( AnimationParams animParams )
{ {
_animator.SetBool("Is Walking", _controller.velocity.magnitude > 0.01f); _animator.SetBool(IS_WALKING, animParams.IsWalking);
_animator.SetBool(IN_JUMP_STATE, animParams.InJumpState);
_animator.SetBool(IN_BOOST_STATE, animParams.InBoostState);
} }
} }

View File

@ -1,6 +1,9 @@
using Extensions; using Extensions;
using UnityEngine; using UnityEngine;
using NaughtyAttributes; using NaughtyAttributes;
using Ktyl.Util;
using System.Collections;
using UnityEngine.UI;
public class PlayerController : MonoBehaviour public class PlayerController : MonoBehaviour
{ {
@ -16,6 +19,9 @@ public class PlayerController : MonoBehaviour
[SerializeField] [SerializeField]
private CharacterController _controller; private CharacterController _controller;
[SerializeField]
private PlayerAnimationController _animController;
[SerializeField] [SerializeField]
private PlayerPowers _powers; private PlayerPowers _powers;
@ -68,6 +74,15 @@ public class PlayerController : MonoBehaviour
private const float TAU = Mathf.PI * 2f; private const float TAU = Mathf.PI * 2f;
private const float HALF_PI = Mathf.PI / 2f; private const float HALF_PI = Mathf.PI / 2f;
private float timeSinceStop;
[Header("Power Freeze")]
[SerializeField]
private SerialFloat objectTimeScale;
[SerializeField]
private SerialFloat frozenTime;
private enum JumpState private enum JumpState
{ {
None, None,
@ -149,6 +164,33 @@ public class PlayerController : MonoBehaviour
} }
} }
private void UpdateFreeze( float dt)
{
if ( _powers.Freeze.CanConsume && _inputHandler.InputState.Freeze.GetRawValue() )
{
_powers.Freeze.Consume();
objectTimeScale.Value = 0f;
}
if (_powers.Freeze.timeSinceConsume > frozenTime)
{
UnfreezeTime();
}
}
private void UnfreezeTime()
{
objectTimeScale.Value = 1f;
}
private void FreezeReset()
{
_powers.Freeze.Reset();
}
private void UpdateJump(float dt) private void UpdateJump(float dt)
{ {
_fallTime = _grounded ? 0f : (_fallTime + dt); _fallTime = _grounded ? 0f : (_fallTime + dt);
@ -255,6 +297,17 @@ public class PlayerController : MonoBehaviour
} }
} }
private void UpdateAnims()
{
var animParams = new PlayerAnimationController.AnimationParams();
animParams.IsWalking = _controller.velocity.sqrMagnitude > 0.01f;
animParams.InJumpState = _jumpState != JumpState.None;
animParams.InBoostState = _jumpState == JumpState.Boost || _jumpState == JumpState.Exhausted;
_animController.ProcessAnimUpdate( animParams );
}
private void FixedUpdate() private void FixedUpdate()
{ {
float dt = Time.fixedDeltaTime; float dt = Time.fixedDeltaTime;
@ -273,10 +326,12 @@ public class PlayerController : MonoBehaviour
UpdateJump( dt ); UpdateJump( dt );
UpdateLook( dt ); UpdateLook( dt );
UpdateBlink( dt ); UpdateBlink( dt );
UpdateFreeze( dt );
UpdateGravity( dt ); UpdateGravity( dt );
UpdateDrag( dt ); UpdateDrag( dt );
UpdateMovement( dt ); UpdateMovement( dt );
UpdateDebug(); UpdateDebug();
UpdateAnims();
_controller.Move( _controller.Move(
new Vector3( new Vector3(

View File

@ -24,15 +24,17 @@ public class PlayerInputHandler : MonoBehaviour
public BufferedInput Jump; public BufferedInput Jump;
public BufferedInput Blink; public BufferedInput Blink;
public BufferedInput Use; public BufferedInput Use;
public BufferedInput Freeze;
public CameraRelativeInput Move; public CameraRelativeInput Move;
public Vector2 Look; public Vector2 Look;
public float MoveRotation; public float MoveRotation;
public PlayerInputState( float jumpBuffer, float blinkBuffer, float useBuffer ) public PlayerInputState( float jumpBuffer, float blinkBuffer, float useBuffer , float freezeBuffer)
{ {
Jump = new BufferedInput( jumpBuffer ); Jump = new BufferedInput( jumpBuffer );
Blink = new BufferedInput( blinkBuffer ); Blink = new BufferedInput( blinkBuffer );
Use = new BufferedInput( useBuffer ); Use = new BufferedInput( useBuffer );
Freeze = new BufferedInput( freezeBuffer );
Move = new CameraRelativeInput(); Move = new CameraRelativeInput();
Look = Vector2.zero; Look = Vector2.zero;
} }
@ -42,6 +44,7 @@ public class PlayerInputHandler : MonoBehaviour
Jump.Update(deltaTime); Jump.Update(deltaTime);
Blink.Update(deltaTime); Blink.Update(deltaTime);
Use.Update(deltaTime); Use.Update(deltaTime);
Freeze.Update(deltaTime);
} }
} }
@ -51,11 +54,12 @@ public class PlayerInputHandler : MonoBehaviour
private void Awake() private void Awake()
{ {
_state = new PlayerInputState( _state = new PlayerInputState(
_inputSettings.JumpBufferTime, _inputSettings.JumpBufferTime,
_inputSettings.BlinkBufferTime, _inputSettings.BlinkBufferTime,
_inputSettings.UseBufferTime _inputSettings.UseBufferTime,
); _inputSettings.FreezeBufferTime
) ;
// run a first time update to ensure the dialogue system has an updated // run a first time update to ensure the dialogue system has an updated
// value for the player's input control scheme // value for the player's input control scheme
@ -64,7 +68,7 @@ public class PlayerInputHandler : MonoBehaviour
private void FixedUpdate() private void FixedUpdate()
{ {
_state.Update( Time.fixedDeltaTime ); _state.Update( Time.fixedDeltaTime);
float cameraRotation = _camera.transform.rotation.eulerAngles.y; float cameraRotation = _camera.transform.rotation.eulerAngles.y;
_state.Move.SetAngle(-cameraRotation); _state.Move.SetAngle(-cameraRotation);
@ -92,4 +96,10 @@ public class PlayerInputHandler : MonoBehaviour
if(context.started) if(context.started)
EventHandler.current.ArtefactPickUp(_nearbyArtefactID.Value); EventHandler.current.ArtefactPickUp(_nearbyArtefactID.Value);
} }
public void Freeze(InputAction.CallbackContext context)
{
_state.Freeze.Set( context.ReadValueAsButton() );
}
} }

View File

@ -8,7 +8,7 @@ public class PlayerInputSettings : ScriptableObject
public float JumpBufferTime => _jumpBufferTime; public float JumpBufferTime => _jumpBufferTime;
public float BlinkBufferTime => _blinkBufferTime; public float BlinkBufferTime => _blinkBufferTime;
public float UseBufferTime => _useBufferTime; public float UseBufferTime => _useBufferTime;
public float FreezeBufferTime => _freezeBufferTime;
public float MouseSensitivity => _mouseSens; public float MouseSensitivity => _mouseSens;
public float JoypadSensitivity => _joypadSens; public float JoypadSensitivity => _joypadSens;
@ -22,6 +22,9 @@ public class PlayerInputSettings : ScriptableObject
private float _useBufferTime; private float _useBufferTime;
[SerializeField] [SerializeField]
private float _freezeBufferTime;
[SerializeField]
private float _mouseSens; private float _mouseSens;
[SerializeField] [SerializeField]

View File

@ -7,26 +7,34 @@ using UnityEngine.Events;
[CreateAssetMenu(menuName = "KernelPanic/Player/Power", fileName = "PlayerPower.asset")] [CreateAssetMenu(menuName = "KernelPanic/Player/Power", fileName = "PlayerPower.asset")]
public class PlayerPower : ScriptableObject public class PlayerPower : ScriptableObject
{ {
[SerializeField] [SerializeField]
private bool _regenerateOnGround; private bool _regenerateOnGround;
[SerializeField] [SerializeField]
private bool _regenerateInAir; private bool _regenerateInAir;
[SerializeField]
private float _regenerateTime; public float regenerateTime => _regenerateTime;
[SerializeField] private float _regenerateTime;
private bool _unlocked; private bool _unlocked;
private bool _cheated; private bool _cheated;
private bool _consumed; private bool _consumed;
private float _timeSinceConsume; public float cooldown => _cooldown;
private float _cooldown;
public float timeSinceConsume => _timeSinceConsume;
public float _timeSinceConsume;
private UnityEvent _onUnlock = new UnityEvent(); private UnityEvent _onUnlock = new UnityEvent();
public UnityEvent OnUnlock => _onUnlock; public UnityEvent OnUnlock => _onUnlock;
public void UpdatePower( float deltaTime, bool cheat, bool grounded) public void UpdatePower( float deltaTime, bool cheat, bool grounded)
{ {
_cheated = cheat; _cheated = cheat;
bool regenerate = grounded ? _regenerateOnGround : _regenerateInAir; bool regenerate = grounded ? _regenerateOnGround : _regenerateInAir;
@ -34,9 +42,11 @@ public class PlayerPower : ScriptableObject
if ( _consumed && regenerate ) if ( _consumed && regenerate )
{ {
_timeSinceConsume += deltaTime; _timeSinceConsume += deltaTime;
_cooldown = _regenerateTime - timeSinceConsume;
if ( _timeSinceConsume > _regenerateTime ) if ( _timeSinceConsume > _regenerateTime )
{ {
this.Reset(); this.Reset();
} }
} }
@ -52,6 +62,7 @@ public class PlayerPower : ScriptableObject
{ {
_consumed = false; _consumed = false;
_timeSinceConsume = 0f; _timeSinceConsume = 0f;
_cooldown = 0f;
} }
public void Unlock() public void Unlock()

View File

@ -12,6 +12,9 @@ public class PlayerPowers : MonoBehaviour
[SerializeField] [SerializeField]
private bool _cheatBoost; private bool _cheatBoost;
[SerializeField]
private bool _cheatFreeze;
[Header( "References" )] [Header( "References" )]
[SerializeField] [SerializeField]
private PlayerPower _blink; private PlayerPower _blink;
@ -19,12 +22,17 @@ public class PlayerPowers : MonoBehaviour
[SerializeField] [SerializeField]
private PlayerPower _boost; private PlayerPower _boost;
[SerializeField]
private PlayerPower _freeze;
public PlayerPower Blink => _blink; public PlayerPower Blink => _blink;
public PlayerPower Boost => _boost; public PlayerPower Boost => _boost;
public PlayerPower Freeze => _freeze;
public void UpdatePowers( float dt, bool grounded ) public void UpdatePowers( float dt, bool grounded )
{ {
_blink.UpdatePower( dt, _cheatBlink, grounded ); _blink.UpdatePower( dt, _cheatBlink, grounded );
_boost.UpdatePower( dt, _cheatBoost, grounded ); _boost.UpdatePower( dt, _cheatBoost, grounded );
_freeze.UpdatePower(dt, _cheatFreeze, grounded);
} }
} }

View File

@ -0,0 +1,52 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[RequireComponent(typeof(BoxCollider))]
public class ArrowWall : MonoBehaviour
{
[SerializeField] private TrapSettings _settings;
[SerializeField] private ParticleSystem _particles;
private float _killTimer = -1;
private void OnTriggerEnter(Collider other)
{
if (!other.TryGetComponent(out PlayerDeath _)) return;
// TODO: pressure plate 'click' sound
// set kill timer to zero, start counting
_killTimer = 0;
}
private void OnTriggerStay(Collider other)
{
// bail if the other thing cant die
if (!other.TryGetComponent(out PlayerDeath playerDeath)) return;
// TODO: implications for time freeze
_killTimer += Time.deltaTime;
if (_killTimer > _settings.ArrowWall.delay)
{
// TODO: arrow whoosh noises
// reset
_particles.Play();
// kill player
playerDeath.Respawn();
_killTimer = -1;
}
}
private void OnTriggerExit(Collider other)
{
if (!other.TryGetComponent(out PlayerDeath _)) return;
_killTimer = -1;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d770ad30f1334c64fa5e3fa00e27777f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +1,8 @@
using Ktyl.Util;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using DG.Tweening; using DG.Tweening;
using Ktyl.Util;
using UnityEngine; using UnityEngine;
[RequireComponent(typeof(Rigidbody))] [RequireComponent(typeof(Rigidbody))]
@ -12,14 +12,14 @@ public class FallawayFloor : MonoBehaviour
public float speed; public float speed;
// Time it takes for ogjecct to begin moving towards the ground. // Time it takes for ogjecct to begin moving towards the ground.
public float fallAwayTime; public float fallAwayTime;
public Material dissolve;
[SerializeField] private Renderer _renderer;
[SerializeField] private TrapSettings _settings; [SerializeField] private TrapSettings _settings;
[SerializeField] private GameObject _graphics; [SerializeField] private GameObject _graphics;
private Rigidbody rb; private Rigidbody rb;
private Vector3 initialPosition; private Vector3 initialPosition;
public bool Falling => _triggered;
private bool _triggered = false; private bool _triggered = false;
private void Start() private void Start()
@ -32,7 +32,11 @@ public class FallawayFloor : MonoBehaviour
private void LateUpdate() private void LateUpdate()
{ {
if (!_triggered) return; if (!_triggered)
{
transform.position = initialPosition;
return;
}
if (_settings.FallawayFloor.CanRespawn) if (_settings.FallawayFloor.CanRespawn)
{ {
@ -50,19 +54,40 @@ public class FallawayFloor : MonoBehaviour
{ {
if (!_triggered && other.CompareTag("Player")) if (!_triggered && other.CompareTag("Player"))
{ {
StartCoroutine(Fall()); Fall();
} }
} }
private IEnumerator Fall() //The platform gets destroyed after the player resumes frozen time on a platform
private void OnTriggerStay(Collider other)
{ {
if (!_triggered && other.CompareTag("Player"))
{
Fall();
}
}
public void Fall()
{
// already falling
if (_triggered) return;
// time stop
if (_settings.ObjectTimeScale == 0) return;
StartCoroutine(FallCR());
}
private IEnumerator FallCR()
{
_triggered = true;
_graphics.transform.DOShakePosition( _graphics.transform.DOShakePosition(
fallAwayTime, fallAwayTime,
_settings.FallawayFloor.ShakeStrength); _settings.FallawayFloor.ShakeStrength);
FMODUnity.RuntimeManager.PlayOneShot(_settings.FallawayFloor.FMODEvent); FMODUnity.RuntimeManager.PlayOneShot(_settings.FallawayFloor.FMODEvent);
_triggered = true;
// wait a moment // wait a moment
yield return new WaitForSeconds(fallAwayTime); yield return new WaitForSeconds(fallAwayTime);

View File

@ -0,0 +1,158 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
#if UNITY_EDITOR
using UnityEditor;
#endif
public partial class FallawayFloorChain : MonoBehaviour
{
[SerializeField] private float _spacing;
[SerializeField] private float _delay;
[SerializeField] private bool _forwards;
private readonly List<FallawayFloor> _segments = new List<FallawayFloor>();
private bool _triggered;
private void Start()
{
GetComponentsInChildren(_segments);
}
private void LateUpdate()
{
if (_triggered) return;
for (int i = 0; i < _segments.Count; i++)
{
if (_segments[i].Falling)
{
StartCoroutine(FallCR());
break;
}
}
}
private IEnumerator FallCR()
{
_triggered = true;
var wait = new WaitForSeconds(_delay);
if (_forwards)
{
for (int i = 0; i < _segments.Count; i++)
{
_segments[i].Fall();
yield return wait;
}
}
else
{
for (int i = _segments.Count - 1; i >= 0; i--)
{
_segments[i].Fall();
yield return wait;
}
}
yield return new WaitUntil(() =>
{
var idx = _forwards ? _segments.Count - 1 : 0;
foreach (var segment in _segments)
{
if (segment.Falling) return false;
}
_triggered = false;
if (!_segments[idx].Falling)
{
_triggered = false;
return true;
}
return false;
});
}
}
#region Editor
#if UNITY_EDITOR
public partial class FallawayFloorChain
{
[SerializeField] private GameObject _prefab;
[Range(1,16)]
[SerializeField] private int _length;
public float EDITOR_Spacing => _spacing;
public int EDITOR_Length => _length;
public void EDITOR_Refresh()
{
if (_length == transform.childCount) return;
for (int i = transform.childCount - 1; i >= 0; i--)
{
DestroyImmediate(transform.GetChild(i).gameObject);
}
_segments.Clear();
for (int i = 0; i < _length; i++)
{
var platform = Instantiate(_prefab, transform).GetComponent<FallawayFloor>();
_segments.Add(platform);
}
EDITOR_RefreshSpacing();
}
public void EDITOR_RefreshSpacing()
{
for (int i = 0; i < _segments.Count; i++)
{
_segments[i].transform.localPosition = Vector3.forward * _spacing * i;
}
}
}
[CustomEditor(typeof(FallawayFloorChain))]
public class FallawayFloorChainEditor : Editor
{
private FallawayFloorChain _data;
private void OnEnable()
{
_data = target as FallawayFloorChain;
}
public override void OnInspectorGUI()
{
var spacing = _data.EDITOR_Spacing;
base.OnInspectorGUI();
if (_data.transform.childCount != _data.EDITOR_Length)
{
_data.EDITOR_Refresh();
}
if (spacing != _data.EDITOR_Spacing)
{
_data.EDITOR_RefreshSpacing();
}
}
}
#endif
#endregion

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 59c45615fb0d0ce4fb951b03d885acdf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -3,11 +3,15 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using DG.Tweening; using DG.Tweening;
using Ktyl.Util; using Ktyl.Util;
using TMPro;
using UnityEngine; using UnityEngine;
[CreateAssetMenu(menuName = "KernelPanic/Traps/Settings")] [CreateAssetMenu(menuName = "KernelPanic/Traps/Settings")]
public class TrapSettings : ScriptableObject public class TrapSettings : ScriptableObject
{ {
public float ObjectTimeScale => _objectTimeScale;
[SerializeField] private SerialFloat _objectTimeScale;
[Serializable] [Serializable]
public struct FallawayFloorSettings public struct FallawayFloorSettings
{ {
@ -31,4 +35,13 @@ public class TrapSettings : ScriptableObject
} }
public FallawayFloorSettings FallawayFloor => _fallawayFloor; public FallawayFloorSettings FallawayFloor => _fallawayFloor;
[SerializeField] private FallawayFloorSettings _fallawayFloor; [SerializeField] private FallawayFloorSettings _fallawayFloor;
[Serializable]
public struct ArrowWallSettings
{
public float delay;
}
public ArrowWallSettings ArrowWall => _arrowWall;
[SerializeField] private ArrowWallSettings _arrowWall;
} }

View File

@ -0,0 +1,44 @@
using Ktyl.Util;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class FreezeUI : MonoBehaviour
{
[SerializeField]
private Image cooldownImage;
[SerializeField]
private PlayerPower freeze;
[SerializeField]
private GameObject freezePanel;
[SerializeField]
private SerialFloat frozenTime;
private float cooldownTimer = 0f;
public void updateCooldownUI(float rawCooldownTimer, float regenerateTime, float timeSinceConsume)
{
if (rawCooldownTimer <= 0)
cooldownTimer = 0;
else
cooldownTimer = rawCooldownTimer / regenerateTime;
cooldownImage.fillAmount = cooldownTimer;
if (rawCooldownTimer > frozenTime)
freezePanel.SetActive(true);
else
freezePanel.SetActive(false);
}
private void Update()
{
updateCooldownUI(freeze.cooldown, freeze.regenerateTime, freeze.timeSinceConsume);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7befeb001df190b4b8ff21ffa8aa3eec
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -44,6 +44,14 @@
"expectedControlType": "Button", "expectedControlType": "Button",
"processors": "", "processors": "",
"interactions": "" "interactions": ""
},
{
"name": "Freeze",
"type": "Button",
"id": "29f1599e-fe43-47df-ad25-8e712263d0ab",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
} }
], ],
"bindings": [ "bindings": [
@ -200,6 +208,28 @@
"action": "Blink", "action": "Blink",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
},
{
"name": "",
"id": "8c9e09a3-477e-4760-bdba-f81beaec4988",
"path": "<Keyboard>/g",
"interactions": "",
"processors": "",
"groups": "PCMR",
"action": "Freeze",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6774e0ae-b8a1-4146-b779-01bbab6de14b",
"path": "<Gamepad>/buttonEast",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Freeze",
"isComposite": false,
"isPartOfComposite": false
} }
] ]
}, },

View File

@ -15,5 +15,6 @@ MonoBehaviour:
_jumpBufferTime: 0.1 _jumpBufferTime: 0.1
_blinkBufferTime: 0.1 _blinkBufferTime: 0.1
_useBufferTime: 0.1 _useBufferTime: 0.1
_freezeBufferTime: 2
_mouseSens: 0.15 _mouseSens: 0.15
_joypadSens: 1 _joypadSens: 1

View File

@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 24d28ac60e22b5547b2beb8679625039, type: 3}
m_Name: Freeze
m_EditorClassIdentifier:
_regenerateOnGround: 1
_regenerateInAir: 1
_regenerateTime: 7
_timeSinceConsume: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0cd9cf6494bb6f54d9b97631010d780e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76553ada4233edc458c3fed9b69e128f, type: 3}
m_Name: frozenTime
m_EditorClassIdentifier:
_initialValue: 3
_readOnly: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 19273ba4ac237ab4381926cfb195dda8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -12,9 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 93dc605253d04fe45a05492fb3feacc2, type: 3} m_Script: {fileID: 11500000, guid: 93dc605253d04fe45a05492fb3feacc2, type: 3}
m_Name: Trap Settings m_Name: Trap Settings
m_EditorClassIdentifier: m_EditorClassIdentifier:
_objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2}
_fallawayFloor: _fallawayFloor:
_prefab: {fileID: 8773676356524340268, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
_fmodEvent: event:/Environment/Traps/FallingPlatform _fmodEvent: event:/Environment/Traps/FallingPlatform
_respawnTime: {fileID: 11400000, guid: 1d2951ab5083d4d48a319ff00a9eb8bd, type: 2} _respawnTime: {fileID: 11400000, guid: 1d2951ab5083d4d48a319ff00a9eb8bd, type: 2}
_safeTime: {fileID: 11400000, guid: 27c10a061baeec8469e96d4f995c1445, type: 2} _safeTime: {fileID: 11400000, guid: 27c10a061baeec8469e96d4f995c1445, type: 2}
_shakeStrength: 0.1 _shakeStrength: 0.1
_popInEase: 27 _popInEase: 27
_arrowWall:
delay: 2

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 19008748323c67c42ba1b644df014f55
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 094334fe2c676634a87026c228e6aeeb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/UI/PlayerUI/Cooldown/3702524 1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,144 @@
fileFormatVersion: 2
guid: a11777191ca1ac140accf07b15900e79
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: 2
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,144 @@
fileFormatVersion: 2
guid: aaef6bac05ac36e48ade031f9a4230be
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: 2
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
game/FMOD Project/Assets/CaiStuff/Music/Drone_Revival.ogg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/FMOD Project/Assets/CaiStuff/Music/Drum1_Revival.ogg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/FMOD Project/Assets/CaiStuff/Music/Drum2_Revival.ogg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/FMOD Project/Assets/CaiStuff/Music/Duduk_Revival.ogg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/FMOD Project/Assets/CaiStuff/Music/Dulcimer_Revival.ogg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/FMOD Project/Assets/CaiStuff/Music/Harp_Revival.ogg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/FMOD Project/Assets/CaiStuff/Music/Strings_Revival.ogg (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More