From 529508a8f4a151fc4779fe80c8f383aafe4564ab Mon Sep 17 00:00:00 2001 From: Pasha Bibko <156938226+PashaBibko@users.noreply.github.com> Date: Thu, 22 Jan 2026 16:14:45 +0000 Subject: [PATCH] GDBS:KJSG --- Assets/Prefabs/PlayerReplayer.prefab | 23 ++++ Assets/Scripts/PlayerController.cs | 7 +- Assets/Scripts/WindowSpawner.cs | 1 - Assets/Tmp/Character/Character_V002.fbx.meta | 33 +++++- .../Tmp/Character/PlayerAnimator.controller | 110 ++++++++++++++++++ .../Character/PlayerAnimator.controller.meta | 8 ++ 6 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 Assets/Tmp/Character/PlayerAnimator.controller create mode 100644 Assets/Tmp/Character/PlayerAnimator.controller.meta diff --git a/Assets/Prefabs/PlayerReplayer.prefab b/Assets/Prefabs/PlayerReplayer.prefab index 8389d1e..4f0dc8a 100644 --- a/Assets/Prefabs/PlayerReplayer.prefab +++ b/Assets/Prefabs/PlayerReplayer.prefab @@ -74,6 +74,7 @@ GameObject: - component: {fileID: 1013965729963872153} - component: {fileID: 7220179918976106526} - component: {fileID: 9011244016352067911} + - component: {fileID: 7092592538514510748} - component: {fileID: 5849392838882679854} - component: {fileID: 582799264655932961} m_Layer: 0 @@ -122,6 +123,7 @@ MonoBehaviour: DeathIndices: be000000f8000000eb0100005a0200008f020000 ExternalCamera: {fileID: 0} FrontLayerImage: {fileID: 0} + PlayerAnimator: {fileID: 7092592538514510748} --- !u!20 &7220179918976106526 Camera: m_ObjectHideFlags: 0 @@ -217,6 +219,27 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 +--- !u!95 &7092592538514510748 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5082956827802089079} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} + m_Controller: {fileID: 9100000, guid: e025644b7538c1849b3a256447c60283, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!136 &5849392838882679854 CapsuleCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index a7d3d5b..75687a4 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -1,6 +1,4 @@ -using System; -using System.IO; -using System.Linq; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -19,6 +17,7 @@ namespace InterfaceOff.WorldScene [SerializeField] private int[] DeathIndices; [SerializeField] private ExternalCamera ExternalCamera; [SerializeField] private Image FrontLayerImage; + [SerializeField] private Animator PlayerAnimator; private const int MAX_WINDOWS = 20; @@ -48,6 +47,8 @@ namespace InterfaceOff.WorldScene private void Update() { + PlayerAnimator.Play("Block"); + if (PlayerAlive) { /* Updates the position according to the lerp */ diff --git a/Assets/Scripts/WindowSpawner.cs b/Assets/Scripts/WindowSpawner.cs index d7080c7..258734f 100644 --- a/Assets/Scripts/WindowSpawner.cs +++ b/Assets/Scripts/WindowSpawner.cs @@ -106,7 +106,6 @@ namespace InterfaceOff int currentMaxSpawnTime = MAX_SPAWN_TIME - (int)ScoreTracker.CurrentScore(); currentMaxSpawnTime = Math.Clamp(currentMaxSpawnTime, MIN_SPAWN_TIME + 1, MAX_SPAWN_TIME); - Debug.Log(currentMaxSpawnTime); /* Decreases the spawn counter and spawns if at 0 */ TimeTillNextSpawn = Math.Max(0, TimeTillNextSpawn - 1); diff --git a/Assets/Tmp/Character/Character_V002.fbx.meta b/Assets/Tmp/Character/Character_V002.fbx.meta index f5679c1..a4de18f 100644 --- a/Assets/Tmp/Character/Character_V002.fbx.meta +++ b/Assets/Tmp/Character/Character_V002.fbx.meta @@ -31,7 +31,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Block + takeName: rig|rigAction + internalID: 3374748389425109202 + firstFrame: 50 + lastFrame: 100 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + 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: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -99,7 +128,7 @@ ModelImporter: autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Assets/Tmp/Character/PlayerAnimator.controller b/Assets/Tmp/Character/PlayerAnimator.controller new file mode 100644 index 0000000..f02cef3 --- /dev/null +++ b/Assets/Tmp/Character/PlayerAnimator.controller @@ -0,0 +1,110 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7073915574825939632 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Block + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 3374748389425109202, guid: a5e9b155d3591d148a80b7c45f032f9f, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-3254614109000526741 +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: -7073915574825939632} + m_Position: {x: 380, y: 150, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7073915574825939632} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerAnimator + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: IsBlock + 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: -3254614109000526741} + 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} + - serializedVersion: 5 + m_Name: New Layer + m_StateMachine: {fileID: 6306321788118116818} + 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!1107 &6306321788118116818 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} diff --git a/Assets/Tmp/Character/PlayerAnimator.controller.meta b/Assets/Tmp/Character/PlayerAnimator.controller.meta new file mode 100644 index 0000000..a78b01a --- /dev/null +++ b/Assets/Tmp/Character/PlayerAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e025644b7538c1849b3a256447c60283 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: