From b75ca2be150755c1782be151cda231706e7f231e Mon Sep 17 00:00:00 2001 From: Seanski2 Date: Thu, 22 Feb 2024 22:50:54 -0500 Subject: [PATCH] Revert "bgs are done woooo" This reverts commit f4ca272731ae62ae755fe14e7a9d4c37c5ea35f4. --- Assets/Resources/Games/tunnel.prefab | 10 +- .../Tunnel/Backgrounds/Animation/Quiz.anim | 126 +++++++++++++++++- .../Backgrounds/Animation/QuizBG.controller | 72 ++++++++++ .../Animation/QuizBG.controller.meta | 8 ++ .../Tunnel/Backgrounds/Animation/QuizFar.anim | 2 +- 5 files changed, 207 insertions(+), 11 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizBG.controller create mode 100644 Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizBG.controller.meta diff --git a/Assets/Resources/Games/tunnel.prefab b/Assets/Resources/Games/tunnel.prefab index 8868ba242..913e50e2e 100644 --- a/Assets/Resources/Games/tunnel.prefab +++ b/Assets/Resources/Games/tunnel.prefab @@ -17225,7 +17225,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3538292895231490712 Transform: m_ObjectHideFlags: 0 @@ -22985,7 +22985,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3574537891729843495 Transform: m_ObjectHideFlags: 0 @@ -22994,8 +22994,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8980645018926008009} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.31, y: 3.3, z: 2} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalPosition: {x: -0.31, y: 3.98, z: 2} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5220323096420822735} @@ -23025,7 +23025,7 @@ Animator: m_GameObject: {fileID: 8980645018926008009} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 22100000, guid: 41fc3d0f483236844a64689ecc8404b7, type: 2} + m_Controller: {fileID: 9100000, guid: 7f8352a1cbeb4b0489e9eda5595530ae, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/Quiz.anim b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/Quiz.anim index c50029cea..a162fd51b 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/Quiz.anim +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/Quiz.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -13.29534, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.6666666 + value: {x: -22.1589, y: 0, z: 0} + inSlope: {x: -13.29534, y: -0, z: -0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Scroll m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -24,19 +49,26 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 3938139061 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 1.6666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -46,7 +78,91 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: -13.29534 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.6666666 + value: -22.1589 + inSlope: -13.29534 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Scroll + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.6666666 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Scroll + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.6666666 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Scroll + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizBG.controller b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizBG.controller new file mode 100644 index 000000000..91b923824 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizBG.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: QuizBG + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 273883148992903927} + 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 &273883148992903927 +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: 8729206287432211112} + m_Position: {x: 200, y: 0, 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: 8729206287432211112} +--- !u!1102 &8729206287432211112 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Quiz + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 49487354b25a41a46b4e03d4ca390679, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizBG.controller.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizBG.controller.meta new file mode 100644 index 000000000..eeb50f9d9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizBG.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f8352a1cbeb4b0489e9eda5595530ae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizFar.anim b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizFar.anim index bcf6d7b28..29ea7ef76 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizFar.anim +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/QuizFar.anim @@ -36,7 +36,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0