From 973df96566d50655704b54ee5f2792d3ff3a776b Mon Sep 17 00:00:00 2001 From: Braedon Date: Fri, 4 Feb 2022 22:48:35 -0500 Subject: [PATCH] Some DJ School logic and animations, DJ Yellow is not currently animatable. --- Assets/Resources/Games/djSchool.prefab | 591 +++++++++++++++++- .../Sprites/Games/DJ School/Animations.meta | 8 + .../Games/DJ School/Animations/Flash.anim | 375 +++++++++++ .../DJ School/Animations/Flash.anim.meta | 8 + .../DJ School/Animations/FlashInverse.anim | 330 ++++++++++ .../Animations/FlashInverse.anim.meta | 8 + .../Games/DJ School/Animations/Student.meta | 8 + .../DJ School/Animations/Student/Hold.anim | 81 +++ .../Animations/Student/Hold.anim.meta | 8 + .../DJ School/Animations/Student/HoldBop.anim | 74 +++ .../Animations/Student/HoldBop.anim.meta | 8 + .../DJ School/Animations/Student/Idle.anim | 68 ++ .../Animations/Student/Idle.anim.meta | 8 + .../DJ School/Animations/Student/IdleBop.anim | 74 +++ .../Animations/Student/IdleBop.anim.meta | 8 + .../Animations/Student/Student.controller | 211 +++++++ .../Student/Student.controller.meta | 8 + .../DJ School/Animations/Student/Swipe.anim | 74 +++ .../Animations/Student/Swipe.anim.meta | 8 + .../Games/DJ School/Animations/Turntable.meta | 8 + .../Turntable/DJYellow_Turntable.anim | 125 ++++ .../Turntable/DJYellow_Turntable.anim.meta | 8 + .../Turntable/Student_Turntable_Swipe.anim | 143 +++++ .../Student_Turntable_Swipe.anim.meta | 8 + .../Animations/Turntable/TurnTable.controller | 98 +++ .../Turntable/TurnTable.controller.meta | 8 + .../Turntable/TurnTable_Player.controller | 72 +++ .../TurnTable_Player.controller.meta | 8 + .../DJ School/Animations/flash.controller | 72 +++ .../Animations/flash.controller.meta | 8 + .../Animations/flashInverse.controller | 72 +++ .../Animations/flashInverse.controller.meta | 8 + .../Games/DJ School/background.png.meta | 26 +- .../Sprites/Games/DJ School/flash.png.meta | 96 +++ .../Sprites/Games/DJ School/slam.png.meta | 96 +++ .../Sprites/Games/DJ School/table.png.meta | 96 +++ Assets/Scripts/GameManager.cs | 2 +- Assets/Scripts/Games/DJSchool/DJSchool.cs | 41 ++ Assets/Scripts/Games/DJSchool/Student.cs | 135 ++++ Assets/Scripts/Games/DJSchool/Student.cs.meta | 11 + Assets/Scripts/Minigames.cs | 3 +- Assets/Scripts/Util/EasingFunctions.cs | 1 + 42 files changed, 3062 insertions(+), 41 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Flash.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Flash.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/FlashInverse.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/FlashInverse.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/Hold.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/Hold.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/HoldBop.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/HoldBop.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/Idle.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/Idle.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/IdleBop.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/IdleBop.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/Swipe.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Student/Swipe.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/DJYellow_Turntable.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/DJYellow_Turntable.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/Student_Turntable_Swipe.anim create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/Student_Turntable_Swipe.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable.controller create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable.controller.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable_Player.controller create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable_Player.controller.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/flash.controller create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/flash.controller.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/flashInverse.controller create mode 100644 Assets/Resources/Sprites/Games/DJ School/Animations/flashInverse.controller.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/flash.png.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/slam.png.meta create mode 100644 Assets/Resources/Sprites/Games/DJ School/table.png.meta create mode 100644 Assets/Scripts/Games/DJSchool/Student.cs create mode 100644 Assets/Scripts/Games/DJSchool/Student.cs.meta diff --git a/Assets/Resources/Games/djSchool.prefab b/Assets/Resources/Games/djSchool.prefab index f8a663c3..92845643 100644 --- a/Assets/Resources/Games/djSchool.prefab +++ b/Assets/Resources/Games/djSchool.prefab @@ -1,5 +1,203 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &814322394801864036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6896244816049684070} + - component: {fileID: 3712131214946688229} + - component: {fileID: 425697063287312286} + m_Layer: 0 + m_Name: flashInverse + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6896244816049684070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 814322394801864036} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 17.42, y: -9.42, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8555870243713460004} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3712131214946688229 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 814322394801864036} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -43 + m_Sprite: {fileID: 21300000, guid: 16363667eb8772f4ab686ef69a0d1e40, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 15.78, y: 11.09} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &425697063287312286 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 814322394801864036} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b828390a1caba5e4da65798b5b12e33f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2309574411658450725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6129296098221589374} + - component: {fileID: 8891605649292273292} + - component: {fileID: 6744863557779612979} + m_Layer: 0 + m_Name: slam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6129296098221589374 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2309574411658450725} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.43, y: -3.103, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8555870243713460004} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8891605649292273292 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2309574411658450725} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 100 + m_Sprite: {fileID: 21300000, guid: 82b35bd6b6a2d9d4c90a3c5a8dc4ef91, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.02, y: 2.87} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &6744863557779612979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2309574411658450725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 54588eb7ee0680643aeaf61dcf609903, type: 3} + m_Name: + m_EditorClassIdentifier: + time: 0.04 --- !u!1 &2570987087158414682 GameObject: m_ObjectHideFlags: 0 @@ -10,8 +208,9 @@ GameObject: m_Component: - component: {fileID: 3262376870945000243} - component: {fileID: 8653669424728578938} + - component: {fileID: 6515925186680079964} m_Layer: 0 - m_Name: TurnTable + m_Name: TurnTable_Yellow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -25,11 +224,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2570987087158414682} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.245, y: -4.263, z: 0} + m_LocalPosition: {x: -4.17, y: -2.356, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3491821540871733713} - m_RootOrder: 1 + m_Father: {fileID: 8555870243713460004} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8653669424728578938 SpriteRenderer: @@ -82,6 +281,25 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &6515925186680079964 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2570987087158414682} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e5b305ddeadd3c145a438e93c145b4f9, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &2996380184485462804 GameObject: m_ObjectHideFlags: 0 @@ -275,9 +493,16 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4833945694140080900} + - {fileID: 5835815594661565722} + - {fileID: 2466268055493966469} - {fileID: 7194150316695991075} - {fileID: 494968338276370368} - {fileID: 3491821540871733713} + - {fileID: 3172136440734163899} + - {fileID: 3262376870945000243} + - {fileID: 3383202640005975782} + - {fileID: 6896244816049684070} + - {fileID: 6129296098221589374} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -295,6 +520,191 @@ MonoBehaviour: m_EditorClassIdentifier: EligibleHits: [] firstEnable: 0 + student: {fileID: 49615016973798198} +--- !u!1 &5664174828068506126 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2466268055493966469} + - component: {fileID: 6888184887646139822} + m_Layer: 0 + m_Name: table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2466268055493966469 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5664174828068506126} + 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: 8555870243713460004} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6888184887646139822 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5664174828068506126} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -40 + m_Sprite: {fileID: 21300000, guid: 14370324759ca6142a5b3cf7bb735445, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 19.2, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6081281633915995718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3383202640005975782} + - component: {fileID: 3803902285241582992} + - component: {fileID: 4615762161773970404} + m_Layer: 0 + m_Name: flash + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3383202640005975782 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6081281633915995718} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 17.42, y: -9.42, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8555870243713460004} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3803902285241582992 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6081281633915995718} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -43 + m_Sprite: {fileID: 21300000, guid: 16363667eb8772f4ab686ef69a0d1e40, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 15.78, y: 11.09} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &4615762161773970404 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6081281633915995718} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e12c922f0326fb145a24520582d64f30, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &6150620717603857755 GameObject: m_ObjectHideFlags: 0 @@ -387,7 +797,7 @@ GameObject: m_Component: - component: {fileID: 3491821540871733713} m_Layer: 0 - m_Name: DJ Yellow (1) + m_Name: DJ Yellow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -405,9 +815,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6194700147666594011} - - {fileID: 3262376870945000243} m_Father: {fileID: 8555870243713460004} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6557773406086407626 GameObject: @@ -438,7 +847,7 @@ Transform: m_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] m_Father: {fileID: 8555870243713460004} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1376192019837859333 SpriteRenderer: @@ -501,8 +910,9 @@ GameObject: m_Component: - component: {fileID: 3172136440734163899} - component: {fileID: 1753773854860719206} + - component: {fileID: 539340207039008012} m_Layer: 0 - m_Name: TurnTable + m_Name: TurnTable_Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -516,11 +926,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7162777404145272222} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.4710001, y: -2.882, z: 0} + m_LocalPosition: {x: 1.383, y: -3.84, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 494968338276370368} - m_RootOrder: 1 + m_Father: {fileID: 8555870243713460004} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1753773854860719206 SpriteRenderer: @@ -573,6 +983,107 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &539340207039008012 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7162777404145272222} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f568591d1e1443f42b519407d28481ec, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7168043026974794965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5835815594661565722} + - component: {fileID: 1566298067735474021} + m_Layer: 0 + m_Name: FlashWhite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5835815594661565722 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7168043026974794965} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.2047, y: -0.1023, z: 0} + m_LocalScale: {x: 20.304338, y: 11.710139, z: 1} + m_Children: [] + m_Father: {fileID: 8555870243713460004} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1566298067735474021 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7168043026974794965} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -45 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 0.8160377, g: 0.9841287, b: 1, a: 0} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &8392193811723269136 GameObject: m_ObjectHideFlags: 0 @@ -582,6 +1093,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 494968338276370368} + - component: {fileID: 6832877913119887699} + - component: {fileID: 49615016973798198} m_Layer: 0 m_Name: Student m_TagString: Untagged @@ -601,7 +1114,57 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8999951430074934072} - - {fileID: 3172136440734163899} m_Father: {fileID: 8555870243713460004} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &6832877913119887699 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8392193811723269136} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ff13c9fdeec893409f81328a002672a, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &49615016973798198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8392193811723269136} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23185f6d213e9184fae5e6841b42c226, type: 3} + m_Name: + m_EditorClassIdentifier: + inList: 0 + lastState: 0 + state: + gameObject: {fileID: 0} + early: 0 + perfect: 0 + late: 0 + createBeat: 0 + isEligible: 0 + eligibleHitsList: [] + aceTimes: 0 + anim: {fileID: 0} + holdBeat: 0 + swipeBeat: 0 + isHolding: 0 + flash: {fileID: 1566298067735474021} + flashFX: {fileID: 6081281633915995718} + flashFXInverse: {fileID: 814322394801864036} + TurnTable: {fileID: 7162777404145272222} + slamFX: {fileID: 2309574411658450725} diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations.meta b/Assets/Resources/Sprites/Games/DJ School/Animations.meta new file mode 100644 index 00000000..993ee15f --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8594fa11babaef45a244fd9e1af8c91 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Flash.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/Flash.anim new file mode 100644 index 00000000..cd87d31a --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Flash.anim @@ -0,0 +1,375 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flash + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 10.1, y: -8.28, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -64.53333, y: 61.06666, 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: 0.15 + value: {x: 0.42, y: 0.88, z: 0} + inSlope: {x: -64.53333, y: 61.06666, 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: + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.5793, y: 0.5793, z: 0.5793} + inSlope: {x: 0, 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} + - serializedVersion: 3 + time: 0.15 + value: {x: 1.8537163, y: 1.8537163, z: 1.8537163} + inSlope: {x: 0, 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: + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.15 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 10.1 + inSlope: 0 + outSlope: -64.53333 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.42 + inSlope: -64.53333 + 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: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -8.28 + inSlope: 0 + outSlope: 61.06666 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.88 + inSlope: 61.06666 + 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: + 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: 0.15 + 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: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5793 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.8537163 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5793 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.8537163 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5793 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.8537163 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Flash.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Flash.anim.meta new file mode 100644 index 00000000..bb26f628 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Flash.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a4933e645d80e0408ff651aeb907b19 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/FlashInverse.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/FlashInverse.anim new file mode 100644 index 00000000..63e27844 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/FlashInverse.anim @@ -0,0 +1,330 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FlashInverse + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -13.4, y: 10.45, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 92.13333, y: -63.799995, 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: 0.15 + value: {x: 0.42, y: 0.88, z: 0} + inSlope: {x: 92.13333, y: -63.799995, 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: + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.5793, y: 0.5793, z: 0.5793} + inSlope: {x: 0, 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} + - serializedVersion: 3 + time: 0.15 + value: {x: 1.8537163, y: 1.8537163, z: 1.8537163} + inSlope: {x: 0, 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: + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.15 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -13.4 + inSlope: 0 + outSlope: 92.13333 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.42 + inSlope: 92.13333 + 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: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 10.45 + inSlope: 0 + outSlope: -63.799995 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.88 + inSlope: -63.799995 + 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: + 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: 0.15 + 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: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5793 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.8537163 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5793 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.8537163 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5793 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.8537163 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/FlashInverse.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/FlashInverse.anim.meta new file mode 100644 index 00000000..62e2bcbd --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/FlashInverse.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d37f21575fa8c9d49a6c0e25a17f48a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Student.meta new file mode 100644 index 00000000..b3fd3ef2 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 278461765a75be349863adc7dbbf9b5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Hold.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Hold.anim new file mode 100644 index 00000000..ef886b9c --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Hold.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hold + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -7280605794216780270, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.016666668 + value: {fileID: -1108324220791026482, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.033333335 + value: {fileID: -84044037535237813, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -7280605794216780270, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -1108324220791026482, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -84044037535237813, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.050000004 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0 + functionName: TransitionBackToIdle + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Hold.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Hold.anim.meta new file mode 100644 index 00000000..6f91d929 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Hold.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3958816d51b511b4a9c0505c45de204a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/HoldBop.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/HoldBop.anim new file mode 100644 index 00000000..f32e84b5 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/HoldBop.anim @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HoldBop + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 7890052151456789346, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.033333335 + value: {fileID: -5664848765385770971, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.1 + value: {fileID: -8624972230825856309, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 7890052151456789346, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -5664848765385770971, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -8624972230825856309, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.11666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/HoldBop.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/HoldBop.anim.meta new file mode 100644 index 00000000..ee27154f --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/HoldBop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d83059a036ff2bc4fabac58e92982fcf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Idle.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Idle.anim new file mode 100644 index 00000000..0f573fe4 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Idle.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Idle.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Idle.anim.meta new file mode 100644 index 00000000..2121d7f1 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8512f23eb7c8ffd4eb866fbabedcd2ac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/IdleBop.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/IdleBop.anim new file mode 100644 index 00000000..6844665b --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/IdleBop.anim @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleBop + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -474008126291752816, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.033333335 + value: {fileID: 6775225630280950889, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.083333336 + value: {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -474008126291752816, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: 6775225630280950889, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/IdleBop.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/IdleBop.anim.meta new file mode 100644 index 00000000..e50f4c54 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/IdleBop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5fc1cff93334064a805a2de41ad3cbc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller new file mode 100644 index 00000000..a88acf4c --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller @@ -0,0 +1,211 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7055007684483605004 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hold + 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: 3958816d51b511b4a9c0505c45de204a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4698968861401447970 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 0 + 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: 8512f23eb7c8ffd4eb866fbabedcd2ac, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-295531023391595954 +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: -4698968861401447970} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Student + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6962450605454016305} + 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!1102 &1884598382658345919 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HoldBop + 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: d83059a036ff2bc4fabac58e92982fcf, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &6962450605454016305 +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: -7055007684483605004} + m_Position: {x: 430, y: -30, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1884598382658345919} + m_Position: {x: 580, y: -160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8690647671553181706} + m_Position: {x: 540, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4698968861401447970} + m_Position: {x: 270, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7914765862687888288} + m_Position: {x: 330, y: -170, 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: -4698968861401447970} +--- !u!1102 &7914765862687888288 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleBop + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -295531023391595954} + 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: c5fc1cff93334064a805a2de41ad3cbc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8690647671553181706 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Swipe + 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: 3a79ba8317b15824f876dd2e0802ac0f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller.meta new file mode 100644 index 00000000..81bc6062 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ff13c9fdeec893409f81328a002672a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Swipe.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Swipe.anim new file mode 100644 index 00000000..6699f640 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Swipe.anim @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Swipe + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 5817979385575274063, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.033333335 + value: {fileID: -2717095282070868293, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.083333336 + value: {fileID: -6154985277085878723, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 5817979385575274063, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -2717095282070868293, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -6154985277085878723, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Swipe.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Swipe.anim.meta new file mode 100644 index 00000000..1b68873f --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Swipe.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a79ba8317b15824f876dd2e0802ac0f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable.meta new file mode 100644 index 00000000..71cb8b8f --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e58f27eae1ff9749a6c764d8895af07 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/DJYellow_Turntable.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/DJYellow_Turntable.anim new file mode 100644 index 00000000..313155dd --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/DJYellow_Turntable.anim @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DJYellow_Turntable + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.016666668 + value: {fileID: -6808396579860639100, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.033333335 + value: {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.05 + value: {fileID: -647411209407345727, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.06666667 + value: {fileID: 7096670032117368111, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.083333336 + value: {fileID: 6926160837623600213, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.1 + value: {fileID: -7440528176705837575, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.11666667 + value: {fileID: 7091854079307194003, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.13333334 + value: {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.15 + value: {fileID: -60426646923268813, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.16666667 + value: {fileID: -6326371371039055405, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.18333334 + value: {fileID: 8107383951289109478, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.2 + value: {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.21666667 + value: {fileID: -6215106890456281241, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.23333333 + value: {fileID: 5391697474062777944, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.25 + value: {fileID: 3844131486646104688, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.26666668 + value: {fileID: 4577315598492740499, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.28333333 + value: {fileID: 3398781665254508244, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.3 + value: {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.31666666 + value: {fileID: 5480753857023637297, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6808396579860639100, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -647411209407345727, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 7096670032117368111, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 6926160837623600213, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -7440528176705837575, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 7091854079307194003, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -60426646923268813, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6326371371039055405, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 8107383951289109478, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6215106890456281241, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 5391697474062777944, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 3844131486646104688, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 4577315598492740499, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 3398781665254508244, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 5480753857023637297, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.33333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/DJYellow_Turntable.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/DJYellow_Turntable.anim.meta new file mode 100644 index 00000000..895c330e --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/DJYellow_Turntable.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2db9ad0b9fc481342920c6ef41d93f90 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/Student_Turntable_Swipe.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/Student_Turntable_Swipe.anim new file mode 100644 index 00000000..8072d0d3 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/Student_Turntable_Swipe.anim @@ -0,0 +1,143 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Student_Turntable_Swipe + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.016666668 + value: {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.033333335 + value: {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.05 + value: {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.06666667 + value: {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.083333336 + value: {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.1 + value: {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.11666667 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.13333334 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.15 + value: {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.16666667 + value: {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.18333334 + value: {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.2 + value: {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.23333333 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.25 + value: {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.26666668 + value: {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.28333333 + value: {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.3 + value: {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.31666666 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.33333334 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.35 + value: {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.4 + value: {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.43333334 + value: {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.5 + value: {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.56666666 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - time: 0.6166667 + value: {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: -6413161211560599989, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 6419061626408863453, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 2073874090203155938, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 8861929893788052115, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + - {fileID: 836921579124155561, guid: 51c96d61d37a84e4d93a68bdb8f63768, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/Student_Turntable_Swipe.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/Student_Turntable_Swipe.anim.meta new file mode 100644 index 00000000..6f03ef71 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/Student_Turntable_Swipe.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25a8947a28ccfd844bfc124a369158ae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable.controller b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable.controller new file mode 100644 index 00000000..3376e913 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable.controller @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-5067386718420115209 +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: -4794490017198022742} + 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: -4794490017198022742} +--- !u!1102 &-4794490017198022742 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DJYellow_Turntable + 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: 2db9ad0b9fc481342920c6ef41d93f90, 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: TurnTable + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5067386718420115209} + 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!1102 &7059580487404901148 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Student_Turntable_Swipe + 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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable.controller.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable.controller.meta new file mode 100644 index 00000000..d68d9f8f --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5b305ddeadd3c145a438e93c145b4f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable_Player.controller b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable_Player.controller new file mode 100644 index 00000000..0a21684b --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable_Player.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: TurnTable_Player + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7912412267696003998} + 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!1102 &5253913825935331998 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Student_Turntable_Swipe + 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: 25a8947a28ccfd844bfc124a369158ae, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &7912412267696003998 +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: 5253913825935331998} + 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: 5253913825935331998} diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable_Player.controller.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable_Player.controller.meta new file mode 100644 index 00000000..b146c9c9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Turntable/TurnTable_Player.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f568591d1e1443f42b519407d28481ec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/flash.controller b/Assets/Resources/Sprites/Games/DJ School/Animations/flash.controller new file mode 100644 index 00000000..c010a0bb --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/flash.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7359449914026236545 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flash + 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: 7a4933e645d80e0408ff651aeb907b19, 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: flash + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1176349080027762773} + 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 &1176349080027762773 +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: -7359449914026236545} + 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: -7359449914026236545} diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/flash.controller.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/flash.controller.meta new file mode 100644 index 00000000..5d4cadbd --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/flash.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e12c922f0326fb145a24520582d64f30 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/flashInverse.controller b/Assets/Resources/Sprites/Games/DJ School/Animations/flashInverse.controller new file mode 100644 index 00000000..4e398bde --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/flashInverse.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-4944020288404806460 +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: 8043451306763059640} + 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: 8043451306763059640} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: flashInverse + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4944020288404806460} + 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!1102 &8043451306763059640 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FlashInverse + 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: d37f21575fa8c9d49a6c0e25a17f48a8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/flashInverse.controller.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/flashInverse.controller.meta new file mode 100644 index 00000000..7f353d15 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/flashInverse.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b828390a1caba5e4da65798b5b12e33f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/background.png.meta b/Assets/Resources/Sprites/Games/DJ School/background.png.meta index abea3f25..ed384000 100644 --- a/Assets/Resources/Sprites/Games/DJ School/background.png.meta +++ b/Assets/Resources/Sprites/Games/DJ School/background.png.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -75,30 +75,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/flash.png.meta b/Assets/Resources/Sprites/Games/DJ School/flash.png.meta new file mode 100644 index 00000000..4e6493ce --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/flash.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 16363667eb8772f4ab686ef69a0d1e40 +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: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2048 + 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: diff --git a/Assets/Resources/Sprites/Games/DJ School/slam.png.meta b/Assets/Resources/Sprites/Games/DJ School/slam.png.meta new file mode 100644 index 00000000..d7a5b29a --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/slam.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 82b35bd6b6a2d9d4c90a3c5a8dc4ef91 +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: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2048 + 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: diff --git a/Assets/Resources/Sprites/Games/DJ School/table.png.meta b/Assets/Resources/Sprites/Games/DJ School/table.png.meta new file mode 100644 index 00000000..8b8e2a66 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/table.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 14370324759ca6142a5b3cf7bb735445 +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: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2048 + 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: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index e9acf2cb..81dd3ced 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -45,7 +45,7 @@ namespace RhythmHeavenMania private void Awake() { - autoplay = true; + // autoplay = true; instance = this; } diff --git a/Assets/Scripts/Games/DJSchool/DJSchool.cs b/Assets/Scripts/Games/DJSchool/DJSchool.cs index 9550333b..a7d9594a 100644 --- a/Assets/Scripts/Games/DJSchool/DJSchool.cs +++ b/Assets/Scripts/Games/DJSchool/DJSchool.cs @@ -1,9 +1,17 @@ +using UnityEngine; + using RhythmHeavenMania.Util; namespace RhythmHeavenMania.Games.DJSchool { public class DJSchool : Minigame { + [Header("Components")] + [SerializeField] private Student student; + + [Header("Properties")] + public GameEvent bop = new GameEvent(); + public static DJSchool instance { get; private set; } private void Awake() @@ -11,6 +19,33 @@ namespace RhythmHeavenMania.Games.DJSchool instance = this; } + private void Update() + { + if (Conductor.instance.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1)) + { + if (Conductor.instance.songPositionInBeats >= bop.startBeat && Conductor.instance.songPositionInBeats < bop.startBeat + bop.length) + { + if (student.anim.IsAnimationNotPlaying()) + { + if (student.isHolding) + { + student.anim.Play("HoldBop", 0, 0); + } + else + { + student.anim.Play("IdleBop", 0, 0); + } + } + } + } + } + + public void Bop(float beat, float length) + { + bop.startBeat = beat; + bop.length = length; + } + public void BreakCmon(float beat) { MultiSound.Play(new MultiSound.Sound[] @@ -19,6 +54,9 @@ namespace RhythmHeavenMania.Games.DJSchool new MultiSound.Sound("djSchool/breakCmon2", beat + 1f), new MultiSound.Sound("djSchool/ooh", beat + 2f), }); + + student.holdBeat = beat; + student.ResetState(); } public void ScratchoHey(float beat) @@ -29,6 +67,9 @@ namespace RhythmHeavenMania.Games.DJSchool new MultiSound.Sound("djSchool/scratchoHey2", beat + 1f), new MultiSound.Sound("djSchool/hey", beat + 2f), }); + + student.swipeBeat = beat; + student.ResetState(); } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/DJSchool/Student.cs b/Assets/Scripts/Games/DJSchool/Student.cs new file mode 100644 index 00000000..98636f23 --- /dev/null +++ b/Assets/Scripts/Games/DJSchool/Student.cs @@ -0,0 +1,135 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using DG.Tweening; +using RhythmHeavenMania.Util; +using Starpelly; + +namespace RhythmHeavenMania.Games.DJSchool +{ + public class Student : PlayerActionObject + { + public Animator anim; + + [Header("Properties")] + public float holdBeat; + public float swipeBeat; + public bool isHolding; + + [Header("Components")] + [SerializeField] private SpriteRenderer flash; + [SerializeField] private GameObject flashFX; + [SerializeField] private GameObject flashFXInverse; + [SerializeField] private GameObject TurnTable; + [SerializeField] private GameObject slamFX; + + private void Start() + { + anim = GetComponent(); + TurnTable.GetComponent().speed = 0; + } + + private void Update() + { + if (!isHolding) + { + float normalizedBeatHold = Conductor.instance.GetPositionFromBeat(holdBeat, 2); + + StateCheck(normalizedBeatHold); + + if (PlayerInput.Pressed()) + { + if (state.perfect) + { + Hold(true); + } + else if (state.notPerfect()) + { + Hold(false); + } + } + } + else if (isHolding) + { + float normalizedBeatSwipe = Conductor.instance.GetPositionFromBeat(swipeBeat, 2); + + StateCheck(normalizedBeatSwipe); + + print(normalizedBeatSwipe); ; + + if (PlayerInput.PressedUp()) + { + if (state.perfect) + { + Swipe(); + } + else if (state.notPerfect()) + { + UnHold(); + } + } + } + } + + public void Hold(bool ace) + { + isHolding = true; + + Jukebox.PlayOneShotGame("djSchool/recordStop"); + anim.Play("Hold", 0, 0); + + if (ace) + { + FlashFX(true); + } + } + + public void UnHold() + { + anim.speed = -1; + anim.Play("Hold", 0, 0); + } + + public void Swipe() + { + isHolding = false; + + Jukebox.PlayOneShotGame("djSchool/recordSwipe"); + anim.Play("Swipe", 0, 0); + + FlashFX(false); + + TurnTable.GetComponent().speed = 1; + TurnTable.GetComponent().Play("Student_Turntable_Swipe", 0, 0); + + Instantiate(slamFX).SetActive(true); + } + + private void FlashFX(bool inverse) + { + GameObject prefab = flashFX; + + if (inverse) + prefab = flashFXInverse; + + GameObject flashFX_ = Instantiate(prefab, this.transform.parent); + flashFX_.SetActive(true); + Destroy(flashFX_, 0.5f); + + flash.color = "D0FBFF".Hex2RGB(); + flash.color = new Color(flash.color.r, flash.color.g, flash.color.b, 0.85f); + flash.DOColor(new Color(flash.color.r, flash.color.g, flash.color.b, 0), 0.15f); + } + + public void TransitionBackToIdle() + { + // for letting go of "hold" + if (anim.speed == 0) + { + anim.speed = 1; + anim.Play("Idle", 0, 0); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/DJSchool/Student.cs.meta b/Assets/Scripts/Games/DJSchool/Student.cs.meta new file mode 100644 index 00000000..5bc07672 --- /dev/null +++ b/Assets/Scripts/Games/DJSchool/Student.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 23185f6d213e9184fae5e6841b42c226 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 1342e09a..23297799 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -152,8 +152,9 @@ namespace RhythmHeavenMania new GameAction("keep-up", delegate { }, 4f, true), new GameAction("high kick-toe!", delegate { }, 3f), }), - new Minigame("djSchool", "DJ School \n[Non-Playable]", "B888F8", false, false, new List() + new Minigame("djSchool", "DJ School \n[Non-Playable]", "008c97", false, false, new List() { + new GameAction("bop", delegate { DJSchool.instance.Bop(eventCaller.currentBeat, eventCaller.currentLength); }, 0.5f, true), new GameAction("break c'mon ooh", delegate { DJSchool.instance.BreakCmon(eventCaller.currentBeat); }, 3f), new GameAction("scratch-o hey", delegate { DJSchool.instance.ScratchoHey(eventCaller.currentBeat); }, 3f), }), diff --git a/Assets/Scripts/Util/EasingFunctions.cs b/Assets/Scripts/Util/EasingFunctions.cs index 85206315..f0a7f295 100644 --- a/Assets/Scripts/Util/EasingFunctions.cs +++ b/Assets/Scripts/Util/EasingFunctions.cs @@ -111,6 +111,7 @@ namespace RhythmHeavenMania.Util public static float Instant(float start, float end, float value) { + // this is lazy return Mathf.Lerp(end, end, value); }