diff --git a/Assets/Resources/Games/djSchool.prefab b/Assets/Resources/Games/djSchool.prefab index 914dee3f..cc12f5f1 100644 --- a/Assets/Resources/Games/djSchool.prefab +++ b/Assets/Resources/Games/djSchool.prefab @@ -102,6 +102,88 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1653020671514717787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6826476109408312543} + - component: {fileID: 7149090226985644132} + m_Layer: 0 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6826476109408312543 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1653020671514717787} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.454, y: 0.6, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3491821540871733713} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7149090226985644132 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1653020671514717787} + 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: 8 + m_Sprite: {fileID: 4687460023271215300, guid: 0df5efc655895e943b8d6771eea1306b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.45, y: 2.96} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2309574411658450725 GameObject: m_ObjectHideFlags: 0 @@ -197,7 +279,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 54588eb7ee0680643aeaf61dcf609903, type: 3} m_Name: m_EditorClassIdentifier: - time: 0.01 + time: 0.04 --- !u!1 &2570987087158414682 GameObject: m_ObjectHideFlags: 0 @@ -370,7 +452,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 10 m_Sprite: {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -521,6 +603,7 @@ MonoBehaviour: EligibleHits: [] firstEnable: 0 student: {fileID: 49615016973798198} + djYellow: {fileID: 6350785533834960028} --- !u!1 &5664174828068506126 GameObject: m_ObjectHideFlags: 0 @@ -716,7 +799,7 @@ GameObject: - component: {fileID: 6194700147666594011} - component: {fileID: 1281418251896367363} m_Layer: 0 - m_Name: Sprite + m_Name: Torso m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -776,7 +859,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 5 - m_Sprite: {fileID: 306361454967822772, guid: 6699199725b13df49890af7952a86f65, type: 3} + m_Sprite: {fileID: 700090431445789584, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -796,6 +879,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3491821540871733713} + - component: {fileID: 5889636835452694393} m_Layer: 0 m_Name: DJ Yellow m_TagString: Untagged @@ -815,9 +899,29 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6194700147666594011} + - {fileID: 6826476109408312543} m_Father: {fileID: 8555870243713460004} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &5889636835452694393 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6350785533834960028} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ab4c1f3865ecd1440a618b3497824bbc, 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 &6557773406086407626 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/forkLifter.png b/Assets/Resources/Sprites/Editor/GameIcons/forkLifter.png index f1419dd9..abf675d5 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/forkLifter.png and b/Assets/Resources/Sprites/Editor/GameIcons/forkLifter.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/spaceball.png b/Assets/Resources/Sprites/Editor/GameIcons/spaceball.png index c522118c..70c5f40f 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/spaceball.png and b/Assets/Resources/Sprites/Editor/GameIcons/spaceball.png differ diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow.meta new file mode 100644 index 00000000..604262f0 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff0e8e4f11393e54db09d253fb10e6e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/BreakCmon.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/BreakCmon.anim new file mode 100644 index 00000000..c28c6663 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/BreakCmon.anim @@ -0,0 +1,355 @@ +%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: BreakCmon + 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: -0.92, y: 0.53, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.033333335 + value: {x: -0.92, y: 0.587, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.06666667 + value: {x: -0.92, y: 0.701, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.16666667 + value: {x: -0.962, y: 0.701, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.2 + value: {x: -0.988, y: 0.701, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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: Head + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -9119840070923137743, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.033333335 + value: {fileID: -6852697811705853465, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.06666667 + value: {fileID: -3061816035182550508, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.1 + value: {fileID: -4279815329582042047, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.13333334 + value: {fileID: 1290906537661400376, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.16666667 + value: {fileID: 2813687529508643564, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.2 + value: {fileID: -8449013430742748012, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + attribute: m_Sprite + path: Torso + classID: 212 + script: {fileID: 0} + m_SampleRate: 30 + 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: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3869152129 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -9119840070923137743, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: -6852697811705853465, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: -3061816035182550508, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: -4279815329582042047, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 1290906537661400376, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 2813687529508643564, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: -8449013430742748012, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.23333333 + 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: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.92 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -0.92 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -0.92 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -0.962 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: -0.988 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.53 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.587 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.701 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.701 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.701 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Head + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/BreakCmon.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/BreakCmon.anim.meta new file mode 100644 index 00000000..259a1f0c --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/BreakCmon.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbfc9117a4a23d14ab64f2006b6e29f2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/DJ Yellow.controller b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/DJ Yellow.controller new file mode 100644 index 00000000..efb7ce68 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/DJ Yellow.controller @@ -0,0 +1,217 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5879001725381571711 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Scratcho2 + 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: 2524cdc37f0bd3d469e9a434a990d445, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-5779869121243268710 +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: 388957863343072032} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4530319559384764395} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2327221866203974778} + m_Position: {x: 270, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4759536022385124974} + m_Position: {x: 305, y: 195, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5879001725381571711} + m_Position: {x: 340, y: 260, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4845232959518907384} + m_Position: {x: 375, y: 325, 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: 388957863343072032} +--- !u!1102 &-4530319559384764395 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BreakCmon + 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: bbfc9117a4a23d14ab64f2006b6e29f2, 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: DJ Yellow + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5779869121243268710} + 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 &388957863343072032 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: c9a39945e4f1c2442a6c9d42e3e18e12, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &2327221866203974778 +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: c8aad0f4c87c21841bcbef878894a58b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &4759536022385124974 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Scratcho + 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: 7b31795e6e1cf174eb6aa7c7edc6ddb1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &4845232959518907384 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hey + 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: 5d556099eae00934b98362fe09bb15e2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/DJ Yellow.controller.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/DJ Yellow.controller.meta new file mode 100644 index 00000000..a82e6cf2 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/DJ Yellow.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab4c1f3865ecd1440a618b3497824bbc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hey.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hey.anim new file mode 100644 index 00000000..0bd9f326 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hey.anim @@ -0,0 +1,119 @@ +%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: Hey + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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: Head + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 6164702815264369135, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.033333335 + value: {fileID: 532322254164542584, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.06666667 + value: {fileID: -3966103247544606092, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + attribute: m_Sprite + path: Torso + classID: 212 + script: {fileID: 0} + m_SampleRate: 30 + 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: 130111906 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3869152129 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 6164702815264369135, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 532322254164542584, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: -3966103247544606092, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.10000001 + 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: 0 + 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: Head + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hey.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hey.anim.meta new file mode 100644 index 00000000..1cee5e88 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hey.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d556099eae00934b98362fe09bb15e2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hold.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hold.anim new file mode 100644 index 00000000..f9e2aeda --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hold.anim @@ -0,0 +1,286 @@ +%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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.094, y: 0.734, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.033333335 + value: {x: 0.191, y: 0.651, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.06666667 + value: {x: 0.184, y: 0.679, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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: Head + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 9103593749776465035, guid: 0df5efc655895e943b8d6771eea1306b, type: 3} + attribute: m_Sprite + path: Head + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -7897984728498327633, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.033333335 + value: {fileID: 2300229899535866167, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.06666667 + value: {fileID: 5980989039126267469, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + attribute: m_Sprite + path: Torso + classID: 212 + script: {fileID: 0} + m_SampleRate: 30 + 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: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 3869152129 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 9103593749776465035, guid: 0df5efc655895e943b8d6771eea1306b, type: 3} + - {fileID: -7897984728498327633, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 2300229899535866167, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 5980989039126267469, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.10000001 + 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: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.094 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.191 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.184 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.734 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.651 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.679 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Head + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hold.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hold.anim.meta new file mode 100644 index 00000000..5b546e7c --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Hold.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8aad0f4c87c21841bcbef878894a58b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Idle.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Idle.anim new file mode 100644 index 00000000..e7c83615 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Idle.anim @@ -0,0 +1,213 @@ +%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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.417, y: 0.585, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Head + m_ScaleCurves: [] + m_FloatCurves: [] + 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: 3869152129 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.417 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.585 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Head + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Idle.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Idle.anim.meta new file mode 100644 index 00000000..c33c5c1c --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9a39945e4f1c2442a6c9d42e3e18e12 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho.anim new file mode 100644 index 00000000..a5de7302 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho.anim @@ -0,0 +1,325 @@ +%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: Scratcho + 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: 0.184, y: 0.397, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.033333335 + value: {x: 0.083, y: 0.678, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.1 + value: {x: 0.094, y: 0.526, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.13333334 + value: {x: 0.184, y: 0.397, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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: Head + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1076822054609707624, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.033333335 + value: {fileID: 8141265415314385592, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.1 + value: {fileID: 85121438970637506, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.13333334 + value: {fileID: 5628735845299456583, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + attribute: m_Sprite + path: Torso + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 9103593749776465035, guid: 0df5efc655895e943b8d6771eea1306b, type: 3} + attribute: m_Sprite + path: Head + classID: 212 + script: {fileID: 0} + m_SampleRate: 30 + 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: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3869152129 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 130111906 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1076822054609707624, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 8141265415314385592, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 85121438970637506, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 5628735845299456583, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 9103593749776465035, guid: 0df5efc655895e943b8d6771eea1306b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + 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: 0.184 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.083 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.094 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.184 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.397 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.678 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.526 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.397 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho.anim.meta new file mode 100644 index 00000000..0ac058cc --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b31795e6e1cf174eb6aa7c7edc6ddb1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho2.anim b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho2.anim new file mode 100644 index 00000000..5968d3dc --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho2.anim @@ -0,0 +1,286 @@ +%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: Scratcho2 + 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: 0.184, y: 0.397, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.033333335 + value: {x: 0.083, y: 0.678, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.1 + value: {x: 0.126, y: 0.442, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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: Head + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 85121438970637506, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.033333335 + value: {fileID: 8141265415314385592, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.1 + value: {fileID: -1076822054609707624, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + attribute: m_Sprite + path: Torso + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 9103593749776465035, guid: 0df5efc655895e943b8d6771eea1306b, type: 3} + attribute: m_Sprite + path: Head + classID: 212 + script: {fileID: 0} + m_SampleRate: 30 + 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: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3869152129 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 130111906 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 85121438970637506, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 8141265415314385592, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: -1076822054609707624, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 9103593749776465035, guid: 0df5efc655895e943b8d6771eea1306b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.13333334 + 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: 0.184 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.083 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.126 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.397 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.678 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.442 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho2.anim.meta b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho2.anim.meta new file mode 100644 index 00000000..5a11922b --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/DJ Yellow/Scratcho2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2524cdc37f0bd3d469e9a434a990d445 +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 index a88acf4c..0c5a5195 100644 --- a/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller +++ b/Assets/Resources/Sprites/Games/DJ School/Animations/Student/Student.controller @@ -122,6 +122,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &2611244123214319260 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Scratcho + 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: --- !u!1107 &6962450605454016305 AnimatorStateMachine: serializedVersion: 6 diff --git a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Heads.png b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Heads.png new file mode 100644 index 00000000..8898ba1a Binary files /dev/null and b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Heads.png differ diff --git a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_idle.png.meta b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Heads.png.meta similarity index 70% rename from Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_idle.png.meta rename to Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Heads.png.meta index eda51ddc..f9802678 100644 --- a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_idle.png.meta +++ b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Heads.png.meta @@ -1,22 +1,19 @@ fileFormatVersion: 2 -guid: 6699199725b13df49890af7952a86f65 +guid: 0df5efc655895e943b8d6771eea1306b TextureImporter: internalIDToNameTable: - first: - 213: 306361454967822772 - second: djYellow_idle_0 + 213: 4687460023271215300 + second: djYellow_Heads_0 - first: - 213: 2607761759735486020 - second: djYellow_idle_1 + 213: 9103593749776465035 + second: djYellow_Heads_1 - first: - 213: 1546373356957593294 - second: djYellow_idle_2 + 213: -1476842852793195437 + second: djYellow_Heads_2 - first: - 213: 2142544312468128732 - second: djYellow_idle_3 - - first: - 213: -4483207627742438429 - second: djYellow_idle_4 + 213: -8492697867676836618 + second: djYellow_Heads_3 externalObjects: {} serializedVersion: 11 mipmaps: @@ -47,7 +44,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -80,10 +77,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -92,10 +89,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -104,10 +101,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: WebGL - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,13 +115,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: djYellow_idle_0 + name: djYellow_Heads_0 rect: serializedVersion: 2 x: 4 y: 4 - width: 802 - height: 728 + width: 345 + height: 296 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -132,20 +129,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 4b99a30ce1a604400800000000000000 - internalID: 306361454967822772 + spriteID: 4c0dce15e043d0140800000000000000 + internalID: 4687460023271215300 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: djYellow_idle_1 + name: djYellow_Heads_1 rect: serializedVersion: 2 - x: 814 + x: 357 y: 4 - width: 802 - height: 728 + width: 345 + height: 296 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -153,20 +150,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 44691e30181a03420800000000000000 - internalID: 2607761759735486020 + spriteID: b8c74e25846765e70800000000000000 + internalID: 9103593749776465035 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: djYellow_idle_2 + name: djYellow_Heads_2 rect: serializedVersion: 2 - x: 1624 + x: 710 y: 4 - width: 802 - height: 728 + width: 345 + height: 296 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -174,20 +171,20 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: ecee5970062d57510800000000000000 - internalID: 1546373356957593294 + spriteID: 354ef220043318be0800000000000000 + internalID: -1476842852793195437 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: djYellow_idle_3 + name: djYellow_Heads_3 rect: serializedVersion: 2 - x: 2434 + x: 1063 y: 4 - width: 802 - height: 728 + width: 345 + height: 296 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -195,29 +192,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: cd3423453b8dbbd10800000000000000 - internalID: 2142544312468128732 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: djYellow_idle_4 - rect: - serializedVersion: 2 - x: 3244 - y: 4 - width: 802 - height: 728 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 3eb17166a6278c1c0800000000000000 - internalID: -4483207627742438429 + spriteID: 6fc976c1940e32a80800000000000000 + internalID: -8492697867676836618 vertices: [] indices: edges: [] diff --git a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Torso.png b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Torso.png new file mode 100644 index 00000000..f12caebf Binary files /dev/null and b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Torso.png differ diff --git a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Torso.png.meta b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Torso.png.meta new file mode 100644 index 00000000..e587203f --- /dev/null +++ b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_Torso.png.meta @@ -0,0 +1,720 @@ +fileFormatVersion: 2 +guid: 15a4d1a63a113d64ab903fd38f759b6d +TextureImporter: + internalIDToNameTable: + - first: + 213: 700090431445789584 + second: djYellow_Torso_0 + - first: + 213: 5980989039126267469 + second: djYellow_Torso_14 + - first: + 213: -9119840070923137743 + second: djYellow_Torso_5 + - first: + 213: -7897984728498327633 + second: djYellow_Torso_12 + - first: + 213: 12266843153997324 + second: djYellow_Torso_14 + - first: + 213: -3061816035182550508 + second: djYellow_Torso_7 + - first: + 213: 532322254164542584 + second: djYellow_Torso_23 + - first: + 213: -7749792712589346508 + second: djYellow_Torso_1 + - first: + 213: -4279815329582042047 + second: djYellow_Torso_5 + - first: + 213: 1290906537661400376 + second: djYellow_Torso_9 + - first: + 213: 7957578405759094433 + second: djYellow_Torso_2 + - first: + 213: 7655561789685363201 + second: djYellow_Torso_15 + - first: + 213: -8449013430742748012 + second: djYellow_Torso_11 + - first: + 213: 2300229899535866167 + second: djYellow_Torso_2 + - first: + 213: -6852697811705853465 + second: djYellow_Torso_6 + - first: + 213: 2813687529508643564 + second: djYellow_Torso_10 + - first: + 213: -6879033596239357 + second: djYellow_Torso_14 + - first: + 213: 269699855831311367 + second: djYellow_Torso_15 + - first: + 213: -1076822054609707624 + second: djYellow_Torso_15 + - first: + 213: -1457410329324320135 + second: djYellow_Torso_3 + - first: + 213: 85121438970637506 + second: djYellow_Torso_7 + - first: + 213: 5628735845299456583 + second: djYellow_Torso_11 + - first: + 213: 6164702815264369135 + second: djYellow_Torso_15 + - first: + 213: 8141265415314385592 + second: djYellow_Torso_19 + - first: + 213: -3966103247544606092 + second: djYellow_Torso_23 + 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: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: djYellow_Torso_0 + rect: + serializedVersion: 2 + x: 4 + y: 2212 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 09be9f4c98837b900800000000000000 + internalID: 700090431445789584 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_4 + rect: + serializedVersion: 2 + x: 814 + y: 2212 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d4640aaa7ddb00350800000000000000 + internalID: 5980989039126267469 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_8 + rect: + serializedVersion: 2 + x: 1624 + y: 2212 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 13dc04446c1df6180800000000000000 + internalID: -9119840070923137743 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_12 + rect: + serializedVersion: 2 + x: 2434 + y: 2212 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fafa5681cb8b46290800000000000000 + internalID: -7897984728498327633 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_16 + rect: + serializedVersion: 2 + x: 3244 + y: 2212 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c0e95bcf0a49b2000800000000000000 + internalID: 12266843153997324 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_20 + rect: + serializedVersion: 2 + x: 4054 + y: 2212 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4126957c98e3285d0800000000000000 + internalID: -3061816035182550508 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_24 + rect: + serializedVersion: 2 + x: 4864 + y: 2212 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 87443811540336700800000000000000 + internalID: 532322254164542584 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_1 + rect: + serializedVersion: 2 + x: 4 + y: 1476 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 439733b8694337490800000000000000 + internalID: -7749792712589346508 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_5 + rect: + serializedVersion: 2 + x: 814 + y: 1476 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 144bdf712aa0b94c0800000000000000 + internalID: -4279815329582042047 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_9 + rect: + serializedVersion: 2 + x: 1624 + y: 1476 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 835898f08a83ae110800000000000000 + internalID: 1290906537661400376 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_13 + rect: + serializedVersion: 2 + x: 2434 + y: 1476 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1ae0793266ffe6e60800000000000000 + internalID: 7957578405759094433 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_17 + rect: + serializedVersion: 2 + x: 3244 + y: 1476 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 102ff3603e40e3a60800000000000000 + internalID: 7655561789685363201 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_21 + rect: + serializedVersion: 2 + x: 4054 + y: 1476 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 494f21eac031fba80800000000000000 + internalID: -8449013430742748012 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_2 + rect: + serializedVersion: 2 + x: 4 + y: 740 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 739519f08ee0cef10800000000000000 + internalID: 2300229899535866167 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_6 + rect: + serializedVersion: 2 + x: 814 + y: 740 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7e90d2cb5a356e0a0800000000000000 + internalID: -6852697811705853465 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_10 + rect: + serializedVersion: 2 + x: 1624 + y: 740 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ce22f4986e93c0720800000000000000 + internalID: 2813687529508643564 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_14 + rect: + serializedVersion: 2 + x: 2434 + y: 740 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 302291e2e8f87eff0800000000000000 + internalID: -6879033596239357 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_18 + rect: + serializedVersion: 2 + x: 3244 + y: 740 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 704acc6079a2eb300800000000000000 + internalID: 269699855831311367 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_22 + rect: + serializedVersion: 2 + x: 4054 + y: 740 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 89d9eaceb0c5e01f0800000000000000 + internalID: -1076822054609707624 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_3 + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 97a83a4f60d36cbe0800000000000000 + internalID: -1457410329324320135 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_7 + rect: + serializedVersion: 2 + x: 814 + y: 4 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2cc6d9c6f796e2100800000000000000 + internalID: 85121438970637506 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_11 + rect: + serializedVersion: 2 + x: 1624 + y: 4 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 74a0591dd694d1e40800000000000000 + internalID: 5628735845299456583 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_15 + rect: + serializedVersion: 2 + x: 2434 + y: 4 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fe9eea96c8c6d8550800000000000000 + internalID: 6164702815264369135 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_19 + rect: + serializedVersion: 2 + x: 3244 + y: 4 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8baacfdc2c59bf070800000000000000 + internalID: 8141265415314385592 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: djYellow_Torso_23 + rect: + serializedVersion: 2 + x: 4054 + y: 4 + width: 802 + height: 728 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 472a4931c1295f8c0800000000000000 + internalID: -3966103247544606092 + vertices: [] + indices: + edges: [] + weights: [] + 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/djYellow/djYellow_buildup.png b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_buildup.png deleted file mode 100644 index c22863e3..00000000 Binary files a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_buildup.png and /dev/null differ diff --git a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_buildup.png.meta b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_buildup.png.meta deleted file mode 100644 index 0ec45892..00000000 --- a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_buildup.png.meta +++ /dev/null @@ -1,288 +0,0 @@ -fileFormatVersion: 2 -guid: d5e7aceff2282a548bd33ff5a5f08ad8 -TextureImporter: - internalIDToNameTable: - - first: - 213: 5753728522458550069 - second: djYellow_buildup_0 - - first: - 213: 6026955181090075214 - second: djYellow_buildup_1 - - first: - 213: 8057686874398445793 - second: djYellow_buildup_2 - - first: - 213: -1840784195983799418 - second: djYellow_buildup_3 - - first: - 213: -1260761878050078194 - second: djYellow_buildup_4 - - first: - 213: 5051532891053279283 - second: djYellow_buildup_5 - - first: - 213: 8665669436033422954 - second: djYellow_buildup_6 - 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: 0 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - 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: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 4096 - 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: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: djYellow_buildup_0 - rect: - serializedVersion: 2 - x: 4 - y: 1476 - width: 802 - height: 728 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 53fcc2b4b9959df40800000000000000 - internalID: 5753728522458550069 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: djYellow_buildup_1 - rect: - serializedVersion: 2 - x: 814 - y: 1476 - width: 802 - height: 728 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e42f2161ecb04a350800000000000000 - internalID: 6026955181090075214 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: djYellow_buildup_2 - rect: - serializedVersion: 2 - x: 1624 - y: 1476 - width: 802 - height: 728 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 1e0d8d35587a2df60800000000000000 - internalID: 8057686874398445793 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: djYellow_buildup_3 - rect: - serializedVersion: 2 - x: 4 - y: 740 - width: 802 - height: 728 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 68b8b32d6883476e0800000000000000 - internalID: -1840784195983799418 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: djYellow_buildup_4 - rect: - serializedVersion: 2 - x: 814 - y: 740 - width: 802 - height: 728 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e02887070cfd08ee0800000000000000 - internalID: -1260761878050078194 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: djYellow_buildup_5 - rect: - serializedVersion: 2 - x: 1624 - y: 740 - width: 802 - height: 728 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 338ce667666aa1640800000000000000 - internalID: 5051532891053279283 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: djYellow_buildup_6 - rect: - serializedVersion: 2 - x: 4 - y: 4 - width: 802 - height: 728 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a665bbb7074a24870800000000000000 - internalID: 8665669436033422954 - vertices: [] - indices: - edges: [] - weights: [] - 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/djYellow/djYellow_idle.png b/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_idle.png deleted file mode 100644 index c167e183..00000000 Binary files a/Assets/Resources/Sprites/Games/DJ School/djYellow/djYellow_idle.png and /dev/null differ diff --git a/Assets/Resources/Sprites/Games/DJ School/student.png.meta b/Assets/Resources/Sprites/Games/DJ School/student.png.meta index 8a6b1f90..0797355e 100644 --- a/Assets/Resources/Sprites/Games/DJ School/student.png.meta +++ b/Assets/Resources/Sprites/Games/DJ School/student.png.meta @@ -68,7 +68,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 diff --git a/Assets/Scripts/Games/DJSchool/DJSchool.cs b/Assets/Scripts/Games/DJSchool/DJSchool.cs index a7d9594a..034d179b 100644 --- a/Assets/Scripts/Games/DJSchool/DJSchool.cs +++ b/Assets/Scripts/Games/DJSchool/DJSchool.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using UnityEngine; using RhythmHeavenMania.Util; @@ -8,6 +9,7 @@ namespace RhythmHeavenMania.Games.DJSchool { [Header("Components")] [SerializeField] private Student student; + [SerializeField] private GameObject djYellow; [Header("Properties")] public GameEvent bop = new GameEvent(); @@ -55,6 +57,13 @@ namespace RhythmHeavenMania.Games.DJSchool new MultiSound.Sound("djSchool/ooh", beat + 2f), }); + BeatAction.New(djYellow, new List() + { + new BeatAction.Action(beat, delegate { djYellow.GetComponent().Play("BreakCmon", 0, 0); }), + new BeatAction.Action(beat + 1f, delegate { djYellow.GetComponent().Play("BreakCmon", 0, 0); }), + new BeatAction.Action(beat + 2f, delegate { djYellow.GetComponent().Play("Hold", 0, 0); }), + }); + student.holdBeat = beat; student.ResetState(); } @@ -68,6 +77,13 @@ namespace RhythmHeavenMania.Games.DJSchool new MultiSound.Sound("djSchool/hey", beat + 2f), }); + BeatAction.New(djYellow, new List() + { + new BeatAction.Action(beat, delegate { djYellow.GetComponent().Play("Scratcho", 0, 0); }), + new BeatAction.Action(beat + 1f, delegate { djYellow.GetComponent().Play("Scratcho2", 0, 0); }), + new BeatAction.Action(beat + 2.05f, delegate { djYellow.GetComponent().Play("Hey", 0, 0); }), + }); + student.swipeBeat = beat; student.ResetState(); } diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs b/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs index caf7cabe..30d9cb6d 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs @@ -34,6 +34,8 @@ namespace RhythmHeavenMania.Games.ForkLifter private bool isEating = false; + public int hitOnFrame; + // Burger shit public bool topbun, middleburger, bottombun; @@ -50,13 +52,16 @@ namespace RhythmHeavenMania.Games.ForkLifter anim = GetComponent(); } - private void Update() + private void LateUpdate() { if (PlayerInput.Pressed()) { + hitOnFrame = 0; Stab(null); } + print(hitOnFrame); + if (ForkLifter.instance.EligibleHits.Count == 0) { currentHitInList = 0; @@ -118,7 +123,7 @@ namespace RhythmHeavenMania.Games.ForkLifter public void Stab(Pea p) { - if (isEating) return; + if (isEating || hitOnFrame > 0) return; if (p == null) { diff --git a/Assets/Scripts/Games/ForkLifter/Pea.cs b/Assets/Scripts/Games/ForkLifter/Pea.cs index 723e74ff..e2d26a85 100644 --- a/Assets/Scripts/Games/ForkLifter/Pea.cs +++ b/Assets/Scripts/Games/ForkLifter/Pea.cs @@ -180,7 +180,7 @@ namespace RhythmHeavenMania.Games.ForkLifter StateCheck(normalizedBeat); - if (PlayerInput.Pressed()) + if (PlayerInput.Pressed() && ForkLifterPlayer.instance.hitOnFrame == 0) { if (state.perfect) { @@ -194,6 +194,8 @@ namespace RhythmHeavenMania.Games.ForkLifter { Late(); } + + ForkLifterPlayer.instance.hitOnFrame++; } if (normalizedBeat > 1.35f) diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 44495526..0de6ddc6 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -295,11 +295,13 @@ namespace RhythmHeavenMania.Editor if (changedMusic || currentRemixPath != path) { - byte[] bytes = OggVorbis.VorbisPlugin.GetOggVorbis(Conductor.instance.musicSource.clip, 1); - var musicFile = archive.CreateEntry("song.ogg", System.IO.Compression.CompressionLevel.NoCompression); - using (var zipStream = musicFile.Open()) - zipStream.Write(bytes, 0, bytes.Length); + // this gets rid of the music file for some reason, someone remind me to find a fix for this soon } + + byte[] bytes = OggVorbis.VorbisPlugin.GetOggVorbis(Conductor.instance.musicSource.clip, 1); + var musicFile = archive.CreateEntry("song.ogg", System.IO.Compression.CompressionLevel.NoCompression); + using (var zipStream = musicFile.Open()) + zipStream.Write(bytes, 0, bytes.Length); } currentRemixPath = path;