From c653d487acee5f38e21ac3b2b54fa1ec944fc8e3 Mon Sep 17 00:00:00 2001 From: Starpelly Date: Tue, 28 Dec 2021 02:38:55 -0500 Subject: [PATCH] Spaceball pretty much finalized. --- .../Spaceball/Animations/Alien.controller | 130 +++ .../Animations/Alien.controller.meta | 8 + .../Games/Spaceball/Animations/AlienIdle.anim | 178 ++++ .../Spaceball/Animations/AlienIdle.anim.meta | 8 + .../Games/Spaceball/Animations/AlienShow.anim | 375 ++++++++ .../Spaceball/Animations/AlienShow.anim.meta | 8 + .../Spaceball/Animations/AlienSwing.anim | 855 ++++++++++++++++++ .../Spaceball/Animations/AlienSwing.anim.meta | 8 + .../Sprites/Games/Spaceball/alien.png.meta | 116 ++- Assets/Scenes/Game.unity | 338 +++++-- Assets/Scripts/Conductor.cs | 17 +- Assets/Scripts/EventCaller.cs | 1 + Assets/Scripts/Games/Spaceball/Alien.cs | 51 ++ Assets/Scripts/Games/Spaceball/Alien.cs.meta | 11 + Assets/Scripts/Games/Spaceball/Spaceball.cs | 2 + .../Scripts/Games/Spaceball/SpaceballBall.cs | 7 +- .../Games/Spaceball/SpaceballPlayer.cs | 4 +- Assets/Shaders/Invert.mat | 3 +- Assets/spaceball.json | 206 ++++- Packages/manifest.json | 99 +- Packages/packages-lock.json | 73 -- ProjectSettings/AudioManager.asset | 2 +- ProjectSettings/PackageManagerSettings.asset | 6 - ProjectSettings/ProjectVersion.txt | 4 +- 24 files changed, 2225 insertions(+), 285 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/Spaceball/Animations/Alien.controller create mode 100644 Assets/Resources/Sprites/Games/Spaceball/Animations/Alien.controller.meta create mode 100644 Assets/Resources/Sprites/Games/Spaceball/Animations/AlienIdle.anim create mode 100644 Assets/Resources/Sprites/Games/Spaceball/Animations/AlienIdle.anim.meta create mode 100644 Assets/Resources/Sprites/Games/Spaceball/Animations/AlienShow.anim create mode 100644 Assets/Resources/Sprites/Games/Spaceball/Animations/AlienShow.anim.meta create mode 100644 Assets/Resources/Sprites/Games/Spaceball/Animations/AlienSwing.anim create mode 100644 Assets/Resources/Sprites/Games/Spaceball/Animations/AlienSwing.anim.meta create mode 100644 Assets/Scripts/Games/Spaceball/Alien.cs create mode 100644 Assets/Scripts/Games/Spaceball/Alien.cs.meta diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/Alien.controller b/Assets/Resources/Sprites/Games/Spaceball/Animations/Alien.controller new file mode 100644 index 00000000..f54d4096 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/Alien.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8040514357878065134 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AlienSwing + 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: 23764946ac936224e8cc3641bc77b776, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2632137863610277329 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AlienShow + 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: 6cfecbcd55c3d8c438060274614e28fa, 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: Alien + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2832590496160857996} + 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 &2832590496160857996 +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: 4267179663084992922} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8040514357878065134} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2632137863610277329} + m_Position: {x: 270, y: 130, 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: 4267179663084992922} +--- !u!1102 &4267179663084992922 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AlienIdle + 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: 88a0afc9313d6f648927d73d7bb444bc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/Alien.controller.meta b/Assets/Resources/Sprites/Games/Spaceball/Animations/Alien.controller.meta new file mode 100644 index 00000000..e0360ea9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/Alien.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 391778ddb03b5d54492bdf0b4e8193f0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienIdle.anim b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienIdle.anim new file mode 100644 index 00000000..023ce3c4 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienIdle.anim @@ -0,0 +1,178 @@ +%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: AlienIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - 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: Sprite + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1333401826788945531, guid: de9e3e71d21bccc49b0f8973960575b1, 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 + - serializedVersion: 2 + path: 850496168 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: 1333401826788945531, guid: de9e3e71d21bccc49b0f8973960575b1, 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: + - 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: localEulerAnglesRaw.x + path: Sprite + 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: localEulerAnglesRaw.y + path: Sprite + 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: localEulerAnglesRaw.z + path: Sprite + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Sprite + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienIdle.anim.meta b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienIdle.anim.meta new file mode 100644 index 00000000..790d9fbc --- /dev/null +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88a0afc9313d6f648927d73d7bb444bc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienShow.anim b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienShow.anim new file mode 100644 index 00000000..773c5794 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienShow.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: AlienShow + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: Sprite + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.043, y: -0.174, 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.083333336 + value: {x: -0.043, y: -0.34, 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.043, y: -0.174, 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.25 + value: {x: -0.043, y: -0.34, 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: Sprite + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1333401826788945531, guid: de9e3e71d21bccc49b0f8973960575b1, type: 3} + - time: 0.083333336 + value: {fileID: -3445709363609947430, guid: de9e3e71d21bccc49b0f8973960575b1, type: 3} + - time: 0.16666667 + value: {fileID: 5516209010568758635, guid: de9e3e71d21bccc49b0f8973960575b1, type: 3} + - time: 0.25 + value: {fileID: 3906657198060525574, guid: de9e3e71d21bccc49b0f8973960575b1, 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: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 850496168 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1333401826788945531, guid: de9e3e71d21bccc49b0f8973960575b1, type: 3} + - {fileID: -3445709363609947430, guid: de9e3e71d21bccc49b0f8973960575b1, type: 3} + - {fileID: 5516209010568758635, guid: de9e3e71d21bccc49b0f8973960575b1, type: 3} + - {fileID: 3906657198060525574, guid: de9e3e71d21bccc49b0f8973960575b1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + 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: localEulerAnglesRaw.x + path: Sprite + 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: localEulerAnglesRaw.y + path: Sprite + 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: localEulerAnglesRaw.z + path: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.043 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.043 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -0.043 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -0.043 + 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: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.174 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.34 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -0.174 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -0.34 + 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: Sprite + 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.083333336 + 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.25 + 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: Sprite + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Sprite + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienShow.anim.meta b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienShow.anim.meta new file mode 100644 index 00000000..2ad34064 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienShow.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6cfecbcd55c3d8c438060274614e28fa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienSwing.anim b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienSwing.anim new file mode 100644 index 00000000..3ae9e8d9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienSwing.anim @@ -0,0 +1,855 @@ +%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: AlienSwing + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, 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, y: 0, z: 23.19} + 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, y: 0, z: 34.85} + 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.18333334 + value: {x: 0, y: 0, z: 21.2} + 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.23333333 + value: {x: 0, y: 0, 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.28333333 + value: {x: 0, y: 0, z: -22.4} + 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.36666667 + value: {x: 0, y: 0, z: -35.48} + 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.43333334 + value: {x: 0, y: 0, z: -20.2} + 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.5 + value: {x: 0, y: 0, 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.55 + value: {x: 0, y: 0, 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: Sprite + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.001, y: -0.187, 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.09, y: -0.174, 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.203, y: -0.113, 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.18333334 + value: {x: 0.112, y: -0.161, 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.23333333 + value: {x: -0.001, y: -0.187, 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.36666667 + value: {x: -0.118, y: -0.131, 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.43333334 + value: {x: -0.001, y: -0.161, 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.5 + value: {x: -0.043, y: -0.161, 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.55 + value: {x: -0.001, y: -0.187, 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: Sprite + 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: 850496168 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 850496168 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.55 + 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: 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.18333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + 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: localEulerAnglesRaw.x + path: Sprite + 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.18333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + 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: localEulerAnglesRaw.y + path: Sprite + 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: 23.19 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 34.85 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.18333334 + value: 21.2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: -22.4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: -35.48 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: -20.2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + 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: localEulerAnglesRaw.z + path: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.001 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.09 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.203 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.18333334 + value: 0.112 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -0.001 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: -0.118 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: -0.001 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.043 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: -0.001 + 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: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.187 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -0.174 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: -0.113 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.18333334 + value: -0.161 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -0.187 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: -0.131 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: -0.161 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.161 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: -0.187 + 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: Sprite + 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.18333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + 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: Sprite + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Sprite + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Sprite + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienSwing.anim.meta b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienSwing.anim.meta new file mode 100644 index 00000000..d3319b71 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/AlienSwing.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 23764946ac936224e8cc3641bc77b776 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Spaceball/alien.png.meta b/Assets/Resources/Sprites/Games/Spaceball/alien.png.meta index 64d6d237..3d0daf4f 100644 --- a/Assets/Resources/Sprites/Games/Spaceball/alien.png.meta +++ b/Assets/Resources/Sprites/Games/Spaceball/alien.png.meta @@ -1,7 +1,19 @@ fileFormatVersion: 2 guid: de9e3e71d21bccc49b0f8973960575b1 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: 1333401826788945531 + second: alien_0 + - first: + 213: -3445709363609947430 + second: alien_1 + - first: + 213: 5516209010568758635 + second: alien_2 + - first: + 213: 3906657198060525574 + second: alien_3 externalObjects: {} serializedVersion: 11 mipmaps: @@ -41,12 +53,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 72 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,9 +87,105 @@ 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 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: alien_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 166 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b7eac9495e1318210800000000000000 + internalID: 1333401826788945531 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: alien_1 + rect: + serializedVersion: 2 + x: 166 + y: 0 + width: 166 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ad2bac607916e20d0800000000000000 + internalID: -3445709363609947430 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: alien_2 + rect: + serializedVersion: 2 + x: 332 + y: 0 + width: 166 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b6582c57ed28d8c40800000000000000 + internalID: 5516209010568758635 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: alien_3 + rect: + serializedVersion: 2 + x: 498 + y: 0 + width: 166 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 608de95f50c373630800000000000000 + internalID: 3906657198060525574 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 6c6e60cc..c0ee0958 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -151,7 +151,6 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1887572352} - {fileID: 328180753} - {fileID: 2018765196} - {fileID: 574625344} @@ -160,6 +159,7 @@ Transform: - {fileID: 211847235} - {fileID: 1248149317} - {fileID: 211682326} + - {fileID: 715910466} m_Father: {fileID: 1923614611} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -183,6 +183,7 @@ MonoBehaviour: Balls: - {fileID: 21300000, guid: fd733e2c15cee3c45833588b6ca7dbb9, type: 3} - {fileID: 21300000, guid: 4a309d486a5074d4bbe8276af96a7466, type: 3} + alien: {fileID: 715910468} --- !u!1 &10060140 GameObject: m_ObjectHideFlags: 0 @@ -1329,7 +1330,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6433985} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} --- !u!199 &211682327 ParticleSystemRenderer: @@ -6135,7 +6136,7 @@ Transform: - {fileID: 770771952} - {fileID: 1522620880} m_Father: {fileID: 6433985} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &211847236 Animator: @@ -6332,6 +6333,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &259960322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 259960323} + - component: {fileID: 259960324} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &259960323 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259960322} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.043, y: -0.174, z: 0} + m_LocalScale: {x: 0.8796917, y: 0.8796917, z: 0.8796917} + m_Children: [] + m_Father: {fileID: 715910466} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &259960324 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259960322} + 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: 0 + m_Sprite: {fileID: 1333401826788945531, guid: de9e3e71d21bccc49b0f8973960575b1, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.3055556, y: 2.0833333} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &311483434 GameObject: m_ObjectHideFlags: 0 @@ -6592,7 +6675,7 @@ Transform: m_LocalScale: {x: 600, y: 600, z: 1} m_Children: [] m_Father: {fileID: 6433985} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &328180754 SpriteRenderer: @@ -6634,7 +6717,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -900 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} m_Color: {r: 0, g: 0, b: 0.45098042, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -7163,7 +7246,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 92cf585c80f8fb843964e525aef1406c, type: 3} + m_audioClip: {fileID: 8300000, guid: c0b3e65059fb3cd49aa056342f2246c8, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -7621,7 +7704,7 @@ Transform: m_LocalScale: {x: 0.9468, y: 0.9767606, z: 1} m_Children: [] m_Father: {fileID: 6433985} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &574625345 SpriteRenderer: @@ -8480,6 +8563,71 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &715910465 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 715910466} + - component: {fileID: 715910468} + - component: {fileID: 715910467} + m_Layer: 0 + m_Name: Alien + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &715910466 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715910465} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 259960323} + - {fileID: 745231710} + m_Father: {fileID: 6433985} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &715910467 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715910465} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 391778ddb03b5d54492bdf0b4e8193f0, 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 &715910468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715910465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdd5be636e18a974c94d01c287c07dd7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &741732137 GameObject: m_ObjectHideFlags: 0 @@ -8562,6 +8710,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &745231709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 745231710} + - component: {fileID: 745231711} + m_Layer: 0 + m_Name: alien_shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &745231710 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745231709} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1.345, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 715910466} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &745231711 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745231709} + 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: 0 + m_Sprite: {fileID: 21300000, guid: 12fd4a4ff8d4a4349b7c74c8c290d35c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.1, y: 0.6} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &767089604 GameObject: m_ObjectHideFlags: 0 @@ -10915,7 +11145,7 @@ Transform: m_Children: - {fileID: 843772669} m_Father: {fileID: 6433985} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1284248502 GameObject: @@ -11264,7 +11494,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -200 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} m_Color: {r: 0, g: 0, b: 0.45098042, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -11387,7 +11617,7 @@ Transform: m_LocalScale: {x: 1.7977456, y: 1.7977456, z: 1.7977456} m_Children: [] m_Father: {fileID: 6433985} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1409967395 SpriteRenderer: @@ -13358,7 +13588,7 @@ Transform: - {fileID: 198549518} - {fileID: 350516831} m_Father: {fileID: 6433985} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1850992747 MonoBehaviour: @@ -13628,88 +13858,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1887572351 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1887572352} - - component: {fileID: 1887572353} - m_Layer: 0 - m_Name: spaceballtest0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1887572352 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887572351} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0091, y: 0.3303, z: 0} - m_LocalScale: {x: 1.0660563, y: 1.0660563, z: 1.0660563} - m_Children: [] - m_Father: {fileID: 6433985} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1887572353 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887572351} - 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: -50 - m_Sprite: {fileID: 21300000, guid: dd41926c7de63174bb17d10b6810d670, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.57254905} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 17.777779, y: 10} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1911843475 GameObject: m_ObjectHideFlags: 0 @@ -14221,7 +14369,7 @@ Transform: m_Children: - {fileID: 1351316438} m_Father: {fileID: 6433985} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2018765197 SpriteRenderer: @@ -14407,7 +14555,7 @@ MonoBehaviour: playerEntities: [] currentEvent: 0 currentPlayerEvent: 0 - txt: {fileID: 4900000, guid: 4b7512c586e16a847a5b8490bf35e852, type: 3} + txt: {fileID: 4900000, guid: 50b54b23c06076c4598134813da27f18, type: 3} startOffset: 0.5 GameCamera: {fileID: 519420031} CursorCam: {fileID: 79134728} diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index 86efc241..76e241ef 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -104,12 +104,21 @@ namespace RhythmHeavenMania mst_f = mst_f + (Time.deltaTime * framesSinceLastSame) * musicSource.pitch; - if (mst_f < lastMst_F) + if (mst_f <= lastMst_F) { - mst_f = lastMst_F; + // mst_f = lastMst_F; + float b = lastMst_F + (Time.deltaTime) * musicSource.pitch; + + mst_f = b; + // print(b); + // print(mst_f + " " + b + " " + lastMst_F); + } + else if (mst_f < lastTime) + { + Debug.LogError("What the fuck."); } - print($"{lastMst_F}, {mst_f}"); + // print($"{lastMst_F}, {mst_f}"); } else { @@ -124,7 +133,7 @@ namespace RhythmHeavenMania //determine how many beats since the song started songPositionInBeats = songPosition / secPerBeat; - // print($"{musicSource.time}(AudioSource.time), {Time.frameCount}(Time.fasrameCount)"); + // print($"{mst_f}(AudioSource.time), {Time.frameCount}(Time.fasrameCount)"); // print($"{musicSource.time}(0), {mst_f}"); diff --git a/Assets/Scripts/EventCaller.cs b/Assets/Scripts/EventCaller.cs index 5ff3558c..d94b732f 100644 --- a/Assets/Scripts/EventCaller.cs +++ b/Assets/Scripts/EventCaller.cs @@ -91,6 +91,7 @@ namespace RhythmHeavenMania new GameAction("shoot", delegate { Spaceball.instance.Shoot(currentBeat, false, currentType); }, true ), new GameAction("shootHigh", delegate { Spaceball.instance.Shoot(currentBeat, true, currentType); }, true ), new GameAction("costume", delegate { Spaceball.instance.Costume(currentType); }, true ), + new GameAction("alien", delegate { Spaceball.instance.alien.Show(currentBeat); }, true ), // new GameAction("cameraZoom", delegate { Spaceball.instance.CameraZoom(currentBeat, currentLength, currentValA); } ), }) }; diff --git a/Assets/Scripts/Games/Spaceball/Alien.cs b/Assets/Scripts/Games/Spaceball/Alien.cs new file mode 100644 index 00000000..d15063e0 --- /dev/null +++ b/Assets/Scripts/Games/Spaceball/Alien.cs @@ -0,0 +1,51 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace RhythmHeavenMania.Games.Spaceball +{ + public class Alien : MonoBehaviour + { + private Animator anim; + + private float showBeat = 0; + private bool isShowing = false; + + private void Start() + { + anim = GetComponent(); + anim.Play("AlienIdle", 0, 0); + } + + private void Update() + { + if (Conductor.instance.musicSource.isPlaying && !isShowing) + { + anim.Play("AlienSwing", 0, Conductor.instance.loopPositionInAnalog * 2); + anim.speed = 0; + } + else if (!Conductor.instance.musicSource.isPlaying) + { + anim.Play("AlienIdle", 0, 0); + } + + if (isShowing) + { + float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(showBeat, 1f); + anim.Play("AlienShow", 0, normalizedBeat); + anim.speed = 0; + + if (normalizedBeat >= 2) + { + isShowing = false; + } + } + } + + public void Show(float showBeat) + { + isShowing = true; + this.showBeat = showBeat; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/Spaceball/Alien.cs.meta b/Assets/Scripts/Games/Spaceball/Alien.cs.meta new file mode 100644 index 00000000..abe5a8f8 --- /dev/null +++ b/Assets/Scripts/Games/Spaceball/Alien.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fdd5be636e18a974c94d01c287c07dd7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/Spaceball/Spaceball.cs b/Assets/Scripts/Games/Spaceball/Spaceball.cs index 81a38211..2cf58ca9 100644 --- a/Assets/Scripts/Games/Spaceball/Spaceball.cs +++ b/Assets/Scripts/Games/Spaceball/Spaceball.cs @@ -25,6 +25,8 @@ namespace RhythmHeavenMania.Games.Spaceball private List allCameraEvents = new List(); + public Alien alien; + public static Spaceball instance { get; set; } public override void OnGameSwitch() diff --git a/Assets/Scripts/Games/Spaceball/SpaceballBall.cs b/Assets/Scripts/Games/Spaceball/SpaceballBall.cs index f5c95f33..cc5fd5c1 100644 --- a/Assets/Scripts/Games/Spaceball/SpaceballBall.cs +++ b/Assets/Scripts/Games/Spaceball/SpaceballBall.cs @@ -25,6 +25,9 @@ namespace RhythmHeavenMania.Games.Spaceball anim = GetComponent(); e.gameObject = this.gameObject; + + float rot = Random.Range(0, 360); + Sprite.gameObject.transform.eulerAngles = new Vector3(0, 0, rot); } private void Update() @@ -80,10 +83,6 @@ namespace RhythmHeavenMania.Games.Spaceball Instantiate(Spaceball.instance.Dust, Spaceball.instance.Dust.transform.parent).SetActive(true); Destroy(this.gameObject); } - else if (Conductor.instance.songPositionInBeats < startBeat) - { - Destroy(this.gameObject); - } } public void MakeEligible(bool early, bool perfect, bool late) diff --git a/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs b/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs index 3a6e64f9..05ea036b 100644 --- a/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs +++ b/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs @@ -57,12 +57,14 @@ namespace RhythmHeavenMania.Games.Spaceball public void Swing() { bool canHit = (EligibleHits.Count > 0) && (currentHitInList < EligibleHits.Count); + if (canHit) { if (EligibleHits[currentHitInList].perfect) { Jukebox.PlayOneShotGame("spaceball/hit"); - EligibleHits[currentHitInList].gameObject.GetComponent().Holder.transform.DOLocalMove(new Vector3(Random.Range(0, 8), 0, -600), 5f); + EligibleHits[currentHitInList].gameObject.GetComponent().Holder.transform.DOLocalMove(new Vector3(Random.Range(0, 25), 0, -600), 7f).SetEase(Ease.Linear); + EligibleHits[currentHitInList].gameObject.GetComponent().Holder.transform.GetChild(0).gameObject.AddComponent().rotateSpeed = -95; EligibleHits[currentHitInList].gameObject.GetComponent().enabled = false; EligibleHits[currentHitInList].gameObject.GetComponent().enabled = false; diff --git a/Assets/Shaders/Invert.mat b/Assets/Shaders/Invert.mat index 679619fd..c21ea8bd 100644 --- a/Assets/Shaders/Invert.mat +++ b/Assets/Shaders/Invert.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Invert m_Shader: {fileID: 4800000, guid: 186aee7e6d6053f4f8f0cca0ed3d25ac, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -75,4 +75,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/spaceball.json b/Assets/spaceball.json index a523ab7e..72f9abe6 100644 --- a/Assets/spaceball.json +++ b/Assets/spaceball.json @@ -1,10 +1,10 @@ { - "bpm": 135, + "bpm": 105, "entities": [ { "beat": 0, "length": 0, - "valA": 170, + "valA": 4, "datamodel": "spaceball/cameraZoom" }, { @@ -18,32 +18,29 @@ "type": 1, "datamodel": "spaceball/shoot" }, - { - "beat": 8, - "length": 42, - "valA": 30, - "datamodel": "spaceball/cameraZoom" - }, { "beat": 6, "datamodel": "spaceball/shoot" }, { "beat": 8, - "datamodel": "gameManager/switchGame/forkLifter" + "length": 4, + "valA": 20, + "datamodel": "spaceball/cameraZoom" }, { "beat": 8, - "datamodel": "forkLifter/pea" + "datamodel": "spaceball/shoot" }, { - "beat": 11, - "datamodel": "gameManager/switchGame/spaceball" + "beat": 10, + "datamodel": "spaceball/shoot" }, { - "beat": 11, - "type": 1, - "datamodel": "spaceball/costume" + "beat": 12, + "length": 0.25, + "valA": 10, + "datamodel": "spaceball/cameraZoom" }, { "beat": 14, @@ -51,26 +48,29 @@ }, { "beat": 16, - "datamodel": "gameManager/switchGame/clappyTrio" + "datamodel": "spaceball/shoot" }, { - "beat": 17, - "length": 2, - "datamodel": "clappyTrio/clap" + "beat": 18, + "datamodel": "spaceball/shoot" + }, + { + "beat": 20, + "datamodel": "spaceball/shoot" }, { "beat": 22, - "datamodel": "gameManager/switchGame/spaceball" + "datamodel": "spaceball/shoot" }, { "beat": 22, - "type": 2, - "datamodel": "spaceball/costume" + "length": 4, + "valA": 20, + "datamodel": "spaceball/cameraZoom" }, { - "beat": 23, - "type": 1, - "datamodel": "spaceball/shootHigh" + "beat": 24, + "datamodel": "spaceball/shoot" }, { "beat": 26, @@ -81,20 +81,14 @@ "datamodel": "spaceball/shootHigh" }, { - "beat": 28, - "datamodel": "spaceball/shoot" - }, - { - "beat": 28, - "datamodel": "forkLifter/pea" - }, - { - "beat": 29.5, - "datamodel": "gameManager/switchGame/forkLifter" + "beat": 32, + "length": 4, + "valA": 10, + "datamodel": "spaceball/cameraZoom" }, { "beat": 32, - "datamodel": "gameManager/switchGame/spaceball" + "datamodel": "spaceball/shoot" }, { "beat": 34, @@ -122,17 +116,147 @@ }, { "beat": 44, - "length": 2, - "valA": 170, + "length": 1, + "valA": 20, "datamodel": "spaceball/cameraZoom" }, { "beat": 48, - "datamodel":"gameManager/switchGame/forkLifter" + "datamodel": "spaceball/shoot" }, { "beat": 50, - "datamodel":"forkLifter/pea" - } + "datamodel": "spaceball/shoot" + }, + { + "beat": 52, + "datamodel": "spaceball/shootHigh" + }, + { + "beat": 56, + "datamodel": "spaceball/shoot" + }, + { + "beat": 58, + "datamodel": "spaceball/shoot" + }, + { + "beat": 60, + "datamodel": "spaceball/shootHigh" + }, + { + "beat": 64, + "datamodel": "spaceball/shoot" + }, + { + "beat": 66, + "datamodel": "spaceball/shoot" + }, + { + "beat": 68, + "datamodel": "spaceball/shoot" + }, + { + "beat": 70, + "datamodel": "spaceball/shoot" + }, + { + "beat": 72, + "datamodel": "spaceball/shoot" + }, + { + "beat": 72, + "datamodel": "spaceball/alien" + }, + { + "beat": 74, + "datamodel": "spaceball/alien" + }, + { + "beat": 74, + "datamodel": "spaceball/shoot" + }, + { + "beat": 76, + "datamodel": "spaceball/shootHigh" + }, + { + "beat": 80, + "datamodel": "spaceball/shoot" + }, + { + "beat": 82, + "datamodel": "spaceball/shoot" + }, + { + "beat": 84, + "datamodel": "spaceball/shoot" + }, + { + "beat": 85, + "datamodel": "spaceball/alien" + }, + { + "beat": 86, + "datamodel": "spaceball/shoot" + }, + { + "beat": 86, + "type": 1, + "datamodel": "spaceball/costume" + }, + { + "beat": 87, + "datamodel": "spaceball/alien" + }, + { + "beat": 88, + "datamodel": "spaceball/shoot" + }, + { + "beat": 89, + "datamodel": "spaceball/alien" + }, + { + "beat": 90, + "datamodel": "spaceball/shoot" + }, + { + "beat": 92, + "datamodel": "spaceball/shootHigh" + }, + { + "beat": 96, + "type": 2, + "datamodel": "spaceball/costume" + }, + { + "beat": 96, + "datamodel": "spaceball/shoot" + }, + { + "beat": 98, + "datamodel": "spaceball/shoot" + }, + { + "beat": 100, + "datamodel": "spaceball/shoot" + }, + { + "beat": 102, + "datamodel": "spaceball/shoot" + }, + { + "beat": 104, + "datamodel": "spaceball/shoot" + }, + { + "beat": 106, + "datamodel": "spaceball/shoot" + }, + { + "beat": 108, + "datamodel": "spaceball/shootHigh" + }, ] } \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index c2af547b..e3361a47 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,59 +1,54 @@ { - "dependencies" : { - "com.unity.2d.animation" : "5.0.9", - "com.unity.2d.pixel-perfect" : "4.0.1", - "com.unity.2d.psdimporter" : "4.1.2", - "com.unity.2d.sprite" : "1.0.0", - "com.unity.2d.spriteshape" : "5.1.6", - "com.unity.2d.tilemap" : "1.0.0", - "com.unity.collab-proxy" : "1.15.4", - "com.unity.ide.rider" : "2.0.7", - "com.unity.ide.visualstudio" : "2.0.12", - "com.unity.ide.vscode" : "1.2.4", - "com.unity.test-framework" : "1.1.29", - "com.unity.textmeshpro" : "3.0.6", - "com.unity.timeline" : "1.4.8", - "com.unity.ugui" : "1.0.0", - "com.unity.modules.ai" : "1.0.0", - "com.unity.modules.androidjni" : "1.0.0", - "com.unity.modules.animation" : "1.0.0", - "com.unity.modules.assetbundle" : "1.0.0", - "com.unity.modules.audio" : "1.0.0", - "com.unity.modules.cloth" : "1.0.0", - "com.unity.modules.director" : "1.0.0", - "com.unity.modules.imageconversion" : "1.0.0", - "com.unity.modules.imgui" : "1.0.0", - "com.unity.modules.jsonserialize" : "1.0.0", - "com.unity.modules.particlesystem" : "1.0.0", - "com.unity.modules.physics" : "1.0.0", - "com.unity.modules.physics2d" : "1.0.0", - "com.unity.modules.screencapture" : "1.0.0", - "com.unity.modules.terrain" : "1.0.0", - "com.unity.modules.terrainphysics" : "1.0.0", - "com.unity.modules.tilemap" : "1.0.0", - "com.unity.modules.ui" : "1.0.0", - "com.unity.modules.uielements" : "1.0.0", - "com.unity.modules.umbra" : "1.0.0", - "com.unity.modules.unityanalytics" : "1.0.0", - "com.unity.modules.unitywebrequest" : "1.0.0", - "com.unity.modules.unitywebrequestassetbundle" : "1.0.0", - "com.unity.modules.unitywebrequestaudio" : "1.0.0", - "com.unity.modules.unitywebrequesttexture" : "1.0.0", - "com.unity.modules.unitywebrequestwww" : "1.0.0", - "com.unity.modules.vehicles" : "1.0.0", - "com.unity.modules.video" : "1.0.0", - "com.unity.modules.vr" : "1.0.0", - "com.unity.modules.wind" : "1.0.0", - "com.unity.modules.xr" : "1.0.0", - "jillejr.newtonsoft.json-for-unity" : "13.0.102" + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.collab-proxy": "1.15.4", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.12", + "com.unity.ide.vscode": "1.2.4", + "com.unity.test-framework": "1.1.29", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.4.8", + "com.unity.ugui": "1.0.0", + "jillejr.newtonsoft.json-for-unity": "13.0.102", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" }, - "scopedRegistries" : [ + "scopedRegistries": [ { - "name" : "jilleJr", - "url" : "https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity", - "scopes" : [ + "name": "jilleJr", + "url": "https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity", + "scopes": [ "jillejr.newtonsoft.json-for-unity" ] } ] -} \ No newline at end of file +} diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index a8550fa5..92c7f41f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,77 +1,11 @@ { "dependencies": { - "com.unity.2d.animation": { - "version": "5.0.9", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.2d.common": "4.0.3", - "com.unity.mathematics": "1.1.0", - "com.unity.2d.sprite": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.uielements": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.2d.common": { - "version": "4.0.3", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.2d.sprite": "1.0.0", - "com.unity.modules.uielements": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.2d.path": { - "version": "4.0.2", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.2d.pixel-perfect": { - "version": "4.0.1", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.2d.psdimporter": { - "version": "4.1.2", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.2d.common": "4.0.3", - "com.unity.2d.animation": "5.0.9", - "com.unity.2d.sprite": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.2d.sprite": { "version": "1.0.0", "depth": 0, "source": "builtin", "dependencies": {} }, - "com.unity.2d.spriteshape": { - "version": "5.1.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "4.0.3", - "com.unity.2d.path": "4.0.2", - "com.unity.modules.physics2d": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.2d.tilemap": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, "com.unity.collab-proxy": { "version": "1.15.4", "depth": 0, @@ -114,13 +48,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.mathematics": { - "version": "1.1.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.nuget.newtonsoft-json": { "version": "2.0.0", "depth": 1, diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index df1e8090..76ae8000 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -8,7 +8,7 @@ AudioManager: Rolloff Scale: 1 Doppler Factor: 1 Default Speaker Mode: 2 - m_SampleRate: 0 + m_SampleRate: 96000 m_DSPBufferSize: 1024 m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index cacc37d9..cc542455 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -12,9 +12,6 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreviewPackages: 0 - m_EnablePackageDependencies: 0 - m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 oneTimeWarningShown: 0 m_Registries: @@ -23,14 +20,12 @@ MonoBehaviour: m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 - m_Capabilities: 7 - m_Id: scoped:jilleJr m_Name: jilleJr m_Url: https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity m_Scopes: - jillejr.newtonsoft.json-for-unity m_IsDefault: 0 - m_Capabilities: 0 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: @@ -42,7 +37,6 @@ MonoBehaviour: m_Scopes: - jillejr.newtonsoft.json-for-unity m_IsDefault: 0 - m_Capabilities: 0 m_Modified: 0 m_Name: jilleJr m_Url: https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 495468b1..4c9401b9 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.24f1 -m_EditorVersionWithRevision: 2020.3.24f1 (79c78de19888) +m_EditorVersion: 2020.3.25f1 +m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418)