From 787d5394c75b4afda8366c4faec078762a9385a9 Mon Sep 17 00:00:00 2001 From: Miguel Astor Date: Sun, 26 Jul 2026 00:59:17 -0400 Subject: [PATCH] TO SQUASH: added basic balls. --- .../150_0.controller.meta => Animations.meta} | 6 +- .../BasicBall.controller} | 97 ++- .../BasicBall.controller.meta} | 2 +- Assets/Animations/BasicBallMove.anim | 111 +++ .../BasicBallMove.anim.meta} | 2 +- .../BasicBallSpawn.anim} | 31 +- .../BasicBallSpawn.anim.meta} | 2 +- Assets/Prefabs/BasicBall.prefab | 296 +++++++ .../BasicBall.prefab.meta} | 5 +- Assets/Scenes/Game.unity | 734 +++++++++++++++++- Assets/Scripts/Game/BallSpawner.cs | 86 ++ Assets/Scripts/Game/BallSpawner.cs.meta | 2 + .../Game/Balls.meta} | 6 +- Assets/Scripts/Game/Balls/BasicBall.cs | 45 ++ Assets/Scripts/Game/Balls/BasicBall.cs.meta | 2 + Assets/Scripts/Game/MusicManager.cs | 1 + Assets/Sprites/150_0.controller | 73 -- Assets/Sprites/150_3.controller | 73 -- Assets/Sprites/800.png | Bin 0 -> 3829 bytes Assets/Sprites/800.png.meta | 532 +++++++++++++ Assets/Sprites/801.png | Bin 0 -> 700 bytes Assets/Sprites/801.png.meta | 284 +++++++ Assets/Sprites/Menu_key.anim | 90 --- Assets/Sprites/Spark.anim | 105 --- ProjectSettings/TagManager.asset | 4 +- 25 files changed, 2186 insertions(+), 403 deletions(-) rename Assets/{Sprites/150_0.controller.meta => Animations.meta} (52%) rename Assets/{Sprites/160_0.controller => Animations/BasicBall.controller} (59%) rename Assets/{Sprites/160_0.controller.meta => Animations/BasicBall.controller.meta} (79%) create mode 100644 Assets/Animations/BasicBallMove.anim rename Assets/{Sprites/Menu_key_slot.anim.meta => Animations/BasicBallMove.anim.meta} (79%) rename Assets/{Sprites/Menu_key_slot.anim => Animations/BasicBallSpawn.anim} (60%) rename Assets/{Sprites/Spark.anim.meta => Animations/BasicBallSpawn.anim.meta} (79%) create mode 100644 Assets/Prefabs/BasicBall.prefab rename Assets/{Sprites/Menu_key.anim.meta => Prefabs/BasicBall.prefab.meta} (52%) create mode 100644 Assets/Scripts/Game/BallSpawner.cs create mode 100644 Assets/Scripts/Game/BallSpawner.cs.meta rename Assets/{Sprites/150_3.controller.meta => Scripts/Game/Balls.meta} (52%) create mode 100644 Assets/Scripts/Game/Balls/BasicBall.cs create mode 100644 Assets/Scripts/Game/Balls/BasicBall.cs.meta delete mode 100644 Assets/Sprites/150_0.controller delete mode 100644 Assets/Sprites/150_3.controller create mode 100644 Assets/Sprites/800.png create mode 100644 Assets/Sprites/800.png.meta create mode 100644 Assets/Sprites/801.png create mode 100644 Assets/Sprites/801.png.meta delete mode 100644 Assets/Sprites/Menu_key.anim delete mode 100644 Assets/Sprites/Spark.anim diff --git a/Assets/Sprites/150_0.controller.meta b/Assets/Animations.meta similarity index 52% rename from Assets/Sprites/150_0.controller.meta rename to Assets/Animations.meta index 381bb0d..7e5f0a2 100644 --- a/Assets/Sprites/150_0.controller.meta +++ b/Assets/Animations.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: cf8c2ea096586eb12b90fb799240f992 -NativeFormatImporter: +guid: 464dc6987115ac3b3b06ba6b2589e47f +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Sprites/160_0.controller b/Assets/Animations/BasicBall.controller similarity index 59% rename from Assets/Sprites/160_0.controller rename to Assets/Animations/BasicBall.controller index eb4b0d4..223e344 100644 --- a/Assets/Sprites/160_0.controller +++ b/Assets/Animations/BasicBall.controller @@ -1,17 +1,16 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-1683454504887995212 +--- !u!1102 &-8072136444709145894 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Spark + m_Name: BasicBallMove m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 4584152792005956047} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -21,25 +20,50 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 30599b6734e6c60959c3d1423470442e, type: 2} + m_Motion: {fileID: 7400000, guid: 821ca81fbf72bd8b59f2efc8afe0c44f, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1107 &-7724360499700703595 +AnimatorStateMachine: + serializedVersion: 7 + 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: 2477769040900410040} + m_Position: {x: 130, y: 290, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8072136444709145894} + m_Position: {x: 410, y: 290, 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: 540, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 2477769040900410040} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: 160_0 + m_Name: BasicBall serializedVersion: 6 m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: 3261086539393598923} + m_StateMachine: {fileID: -7724360499700703595} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -50,29 +74,7 @@ AnimatorController: m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} m_EvaluateTransitionsOnStart: 1 ---- !u!1107 &3261086539393598923 -AnimatorStateMachine: - serializedVersion: 7 - 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: -1683454504887995212} - m_Position: {x: 340, y: 120, 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: 620, y: 130, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -1683454504887995212} ---- !u!1101 &4584152792005956047 +--- !u!1101 &473710425214726682 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -81,16 +83,43 @@ AnimatorStateTransition: m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 0} + m_DstState: {fileID: -8072136444709145894} m_Solo: 0 m_Mute: 0 - m_IsExit: 1 + m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0.516129 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &2477769040900410040 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BasicBallSpawn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 473710425214726682} + 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: 8da326c94e991d812ba6b7fd35f50dab, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Sprites/160_0.controller.meta b/Assets/Animations/BasicBall.controller.meta similarity index 79% rename from Assets/Sprites/160_0.controller.meta rename to Assets/Animations/BasicBall.controller.meta index 88b64c0..c971390 100644 --- a/Assets/Sprites/160_0.controller.meta +++ b/Assets/Animations/BasicBall.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 34a1ba88e3d4fe7f8a04c187ba4e8936 +guid: eebf828ed88b63bed9b6ca00bce33adb NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/Animations/BasicBallMove.anim b/Assets/Animations/BasicBallMove.anim new file mode 100644 index 0000000..89028f2 --- /dev/null +++ b/Assets/Animations/BasicBallMove.anim @@ -0,0 +1,111 @@ +%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: BasicBallMove + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1161032844881099263, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.05 + value: {fileID: -4093326247334013586, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.15 + value: {fileID: -4951747244660380106, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.18333334 + value: {fileID: -7222465479537791635, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.23333333 + value: {fileID: 1742362000383344053, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.33333334 + value: {fileID: -3340961364049822172, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.38333333 + value: {fileID: -8707830178416684617, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.45 + value: {fileID: 7593493683129403863, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.5 + value: {fileID: 5819339525145806464, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.56666666 + value: {fileID: -7252784088276576268, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.65 + value: {fileID: -1159720723709614477, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.68333334 + value: {fileID: -6448449701792710382, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.78333336 + value: {fileID: -3177881155838323319, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - time: 0.8333333 + value: {fileID: 5979088685979819851, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1161032844881099263, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -4093326247334013586, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -4951747244660380106, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -7222465479537791635, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: 1742362000383344053, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -3340961364049822172, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -8707830178416684617, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: 7593493683129403863, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: 5819339525145806464, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -7252784088276576268, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -1159720723709614477, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -6448449701792710382, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: -3177881155838323319, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + - {fileID: 5979088685979819851, guid: 39d05345e2871e1bb8eeee9c37eed831, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.84999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Sprites/Menu_key_slot.anim.meta b/Assets/Animations/BasicBallMove.anim.meta similarity index 79% rename from Assets/Sprites/Menu_key_slot.anim.meta rename to Assets/Animations/BasicBallMove.anim.meta index bb8d892..9b5553c 100644 --- a/Assets/Sprites/Menu_key_slot.anim.meta +++ b/Assets/Animations/BasicBallMove.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f8f9aa4dd158d4bb95fa1452627a79a +guid: 821ca81fbf72bd8b59f2efc8afe0c44f NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Sprites/Menu_key_slot.anim b/Assets/Animations/BasicBallSpawn.anim similarity index 60% rename from Assets/Sprites/Menu_key_slot.anim rename to Assets/Animations/BasicBallSpawn.anim index c841b7d..15e9013 100644 --- a/Assets/Sprites/Menu_key_slot.anim +++ b/Assets/Animations/BasicBallSpawn.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Menu_key_slot + m_Name: BasicBallSpawn serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,19 +21,21 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 7237685753823095570, guid: 5dd5cb85e1611b711bb4e87af673045e, type: 3} - - time: 0.083333336 - value: {fileID: -1539647790023181718, guid: 5dd5cb85e1611b711bb4e87af673045e, type: 3} - - time: 0.16666667 - value: {fileID: 7717131122486000048, guid: 5dd5cb85e1611b711bb4e87af673045e, type: 3} - - time: 0.25 - value: {fileID: -507724509468476920, guid: 5dd5cb85e1611b711bb4e87af673045e, type: 3} + value: {fileID: -5935670719357520905, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + - time: 0.13333334 + value: {fileID: 1341743680904588612, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + - time: 0.26666668 + value: {fileID: -790874883384713186, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + - time: 0.36666667 + value: {fileID: -5665054031305154661, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + - time: 0.5 + value: {fileID: 5734073590863070508, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} flags: 2 - m_SampleRate: 12 + m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -50,16 +52,17 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 7237685753823095570, guid: 5dd5cb85e1611b711bb4e87af673045e, type: 3} - - {fileID: -1539647790023181718, guid: 5dd5cb85e1611b711bb4e87af673045e, type: 3} - - {fileID: 7717131122486000048, guid: 5dd5cb85e1611b711bb4e87af673045e, type: 3} - - {fileID: -507724509468476920, guid: 5dd5cb85e1611b711bb4e87af673045e, type: 3} + - {fileID: -5935670719357520905, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + - {fileID: 1341743680904588612, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + - {fileID: -790874883384713186, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + - {fileID: -5665054031305154661, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + - {fileID: 5734073590863070508, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Sprites/Spark.anim.meta b/Assets/Animations/BasicBallSpawn.anim.meta similarity index 79% rename from Assets/Sprites/Spark.anim.meta rename to Assets/Animations/BasicBallSpawn.anim.meta index 6915998..0eb9fbf 100644 --- a/Assets/Sprites/Spark.anim.meta +++ b/Assets/Animations/BasicBallSpawn.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 30599b6734e6c60959c3d1423470442e +guid: 8da326c94e991d812ba6b7fd35f50dab NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Prefabs/BasicBall.prefab b/Assets/Prefabs/BasicBall.prefab new file mode 100644 index 0000000..380c8dc --- /dev/null +++ b/Assets/Prefabs/BasicBall.prefab @@ -0,0 +1,296 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5170544452824093409 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2641659179608538614} + - component: {fileID: 6200400392179026484} + - component: {fileID: 6177789857826534568} + - component: {fileID: 4828794698784945871} + - component: {fileID: 8875077711704980112} + - component: {fileID: 5186376995738172530} + - component: {fileID: 93000031149638056} + m_Layer: 0 + m_Name: BasicBall + m_TagString: Ball + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2641659179608538614 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5170544452824093409} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6200400392179026484 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5170544452824093409} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_MaskInteraction: 0 + m_Sprite: {fileID: -5935670719357520905, guid: 400282fe7c512b55c85309bebf0a2179, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.17, y: 0.18} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!95 &6177789857826534568 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5170544452824093409} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: eebf828ed88b63bed9b6ca00bce33adb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &4828794698784945871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5170544452824093409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5788fcee29b49660abecc58bc2095706, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::BasicBall + animator: {fileID: 6177789857826534568} + spawnSound: {fileID: 8300000, guid: 39ac5ebaed90d56bc94a1513178225e2, type: 3} + bounceSound: {fileID: 8300000, guid: a36177a84709d5c51ae647a599008d1d, type: 3} + hitSound: {fileID: 8300000, guid: 0535a1781b9d2e8018f56aa45b71932a, type: 3} +--- !u!82 &8875077711704980112 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5170544452824093409} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!58 &5186376995738172530 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5170544452824093409} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.09 +--- !u!50 &93000031149638056 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5170544452824093409} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/Assets/Sprites/Menu_key.anim.meta b/Assets/Prefabs/BasicBall.prefab.meta similarity index 52% rename from Assets/Sprites/Menu_key.anim.meta rename to Assets/Prefabs/BasicBall.prefab.meta index 5c1b659..2c64d13 100644 --- a/Assets/Sprites/Menu_key.anim.meta +++ b/Assets/Prefabs/BasicBall.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 2013472d02e462c4f9e7596ec136410a -NativeFormatImporter: +guid: 4b9ec3a3bc88610fa80938a4d6850568 +PrefabImporter: externalObjects: {} - mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index c00feb7..9e5d742 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -222,7 +222,7 @@ GameObject: - component: {fileID: 118530398} - component: {fileID: 118530400} m_Layer: 0 - m_Name: Board + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -314,6 +314,183 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2fc998065c092c32ba2452cd6a674a11, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::GameBoard +--- !u!1 &240489635 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 240489637} + - component: {fileID: 240489636} + m_Layer: 0 + m_Name: Ball Spawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &240489636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240489635} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b45a86a9500699daf8af02a61c756b2b, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::BallSpawner + basicBallPrefab: {fileID: 5170544452824093409, guid: 4b9ec3a3bc88610fa80938a4d6850568, type: 3} + nuclearBallPrefab: {fileID: 0} + glassBallPrefab: {fileID: 0} + eyeBallPrefab: {fileID: 0} + oozeBallPrefab: {fileID: 0} + fruitBallPrefab: {fileID: 0} + gameBoard: {fileID: 297740150} +--- !u!4 &240489637 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240489635} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.49136, y: 0.30891, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &297740150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 297740152} + - component: {fileID: 297740151} + m_Layer: 8 + m_Name: Game Board + m_TagString: EditorOnly + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &297740151 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 297740150} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 0, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &297740152 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 297740150} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.83032, y: -0.00023, z: 0} + m_LocalScale: {x: 4.7397203, y: 4.798382, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &470931997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 470931998} + m_Layer: 0 + m_Name: Walls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &470931998 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470931997} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.7759, y: 0.01, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2050805088} + - {fileID: 1846312116} + - {fileID: 1826182598} + - {fileID: 1357719766} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &933658173 GameObject: m_ObjectHideFlags: 0 @@ -459,6 +636,558 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &1357719764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1357719766} + - component: {fileID: 1357719765} + - component: {fileID: 1357719767} + m_Layer: 8 + m_Name: Right Wall + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1357719765 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357719764} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 11 + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &1357719766 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357719764} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.47119373, y: 5.6844773, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 470931998} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1357719767 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357719764} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!1 &1826182596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1826182598} + - component: {fileID: 1826182597} + - component: {fileID: 1826182599} + m_Layer: 8 + m_Name: Left Wall + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1826182597 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826182596} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 11 + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &1826182598 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826182596} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.212, y: -0.0104, z: 0} + m_LocalScale: {x: 0.47119373, y: 5.6844773, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 470931998} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1826182599 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826182596} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!1 &1846312114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1846312116} + - component: {fileID: 1846312115} + - component: {fileID: 1846312117} + m_Layer: 8 + m_Name: Bottom Wall + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1846312115 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1846312114} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 11 + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &1846312116 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1846312114} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.0001, y: -2.5006, z: 0} + m_LocalScale: {x: 9.3933, y: 0.1811, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 470931998} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1846312117 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1846312114} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!1 &2050805086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2050805088} + - component: {fileID: 2050805087} + - component: {fileID: 2050805089} + m_Layer: 8 + m_Name: Top Wall + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &2050805087 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050805086} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 11 + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &2050805088 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050805086} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.9705, y: 2.481, z: 0} + m_LocalScale: {x: 9.3933, y: 0.1811, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 470931998} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2050805089 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050805086} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1001 &2090615130 PrefabInstance: m_ObjectHideFlags: 0 @@ -586,3 +1315,6 @@ SceneRoots: - {fileID: 6303327586367475970} - {fileID: 118530399} - {fileID: 933658175} + - {fileID: 297740152} + - {fileID: 240489637} + - {fileID: 470931998} diff --git a/Assets/Scripts/Game/BallSpawner.cs b/Assets/Scripts/Game/BallSpawner.cs new file mode 100644 index 0000000..e8896bf --- /dev/null +++ b/Assets/Scripts/Game/BallSpawner.cs @@ -0,0 +1,86 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +public class BallSpawner : MonoBehaviour +{ + public GameObject basicBallPrefab; + + public GameObject nuclearBallPrefab; + + public GameObject glassBallPrefab; + + public GameObject eyeBallPrefab; + + public GameObject oozeBallPrefab; + + public GameObject fruitBallPrefab; + + public GameObject gameBoard; + + private static WaitForSeconds _waitForSeconds0_5 = new WaitForSeconds(0.5f); + + private Queue ballQueue = new Queue(); + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + int currentLevel = PlayerPrefs.GetInt("CurrentLevel"); + + ballQueue.Enqueue(() => SpawnBasicBall()); + ballQueue.Enqueue(() => SpawnBasicBall()); + ballQueue.Enqueue(() => SpawnBasicBall()); + ballQueue.Enqueue(() => SpawnBasicBall()); + + StartCoroutine(SpawnBalls()); + } + + private void SpawnBasicBall() + { + if (basicBallPrefab == null || gameBoard == null) + { + Debug.LogWarning("BallSpawner: Missing basicBallPrefab or gameBoard reference."); + return; + } + + Vector3 spawnPosition = GetRandomPositionInsideGameBoard(); + Instantiate(basicBallPrefab, spawnPosition, Quaternion.identity); + } + + private Vector3 GetRandomPositionInsideGameBoard() + { + Bounds bounds; + + Collider2D collider2D = gameBoard.GetComponent(); + if (collider2D != null) + { + bounds = collider2D.bounds; + } + else + { + Renderer boardRenderer = gameBoard.GetComponent(); + if (boardRenderer == null) + { + Debug.LogWarning("BallSpawner: gameBoard needs a Collider2D or Renderer to read bounds."); + return gameBoard.transform.position; + } + + bounds = boardRenderer.bounds; + } + + float randomX = Random.Range(bounds.min.x, bounds.max.x); + float randomY = Random.Range(bounds.min.y, bounds.max.y); + + return new Vector3(randomX, randomY, gameBoard.transform.position.z); + } + + private IEnumerator SpawnBalls() + { + while (ballQueue.Count > 0) + { + System.Action spawnAction = ballQueue.Dequeue(); + spawnAction.Invoke(); + yield return _waitForSeconds0_5; + } + } +} diff --git a/Assets/Scripts/Game/BallSpawner.cs.meta b/Assets/Scripts/Game/BallSpawner.cs.meta new file mode 100644 index 0000000..f0ff571 --- /dev/null +++ b/Assets/Scripts/Game/BallSpawner.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b45a86a9500699daf8af02a61c756b2b \ No newline at end of file diff --git a/Assets/Sprites/150_3.controller.meta b/Assets/Scripts/Game/Balls.meta similarity index 52% rename from Assets/Sprites/150_3.controller.meta rename to Assets/Scripts/Game/Balls.meta index f6a8b06..bdcfd9d 100644 --- a/Assets/Sprites/150_3.controller.meta +++ b/Assets/Scripts/Game/Balls.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e08229d4de491321aa98a92a6d9417ea -NativeFormatImporter: +guid: 1b9d11fbe5aebe016b8940bc88822ac2 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/Game/Balls/BasicBall.cs b/Assets/Scripts/Game/Balls/BasicBall.cs new file mode 100644 index 0000000..8aeb30b --- /dev/null +++ b/Assets/Scripts/Game/Balls/BasicBall.cs @@ -0,0 +1,45 @@ +using UnityEngine; + +public class BasicBall : MonoBehaviour +{ + private Animator animator; + + public AudioClip spawnSound; + + public AudioClip bounceSound; + + public AudioClip hitSound; + + private AudioSource audioSource; + + private Vector2 speed; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + audioSource = GetComponent(); + animator = GetComponent(); + speed = new Vector2(Random.Range(-0.05f, 0.05f), Random.Range(-0.05f, 0.05f)); + + audioSource.PlayOneShot(spawnSound); + } + + // Update is called once per frame + void FixedUpdate() + { + AnimatorStateInfo stateInfo = animator.GetCurrentAnimatorStateInfo(0); + + if (stateInfo.IsName("BasicBallMove")) { + transform.Translate(speed); + } + } + + void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.CompareTag("Wall") || collision.gameObject.CompareTag("Ball")) + { + ContactPoint2D contact = collision.GetContact(0); + speed = Vector2.Reflect(speed, contact.normal); + } + } +} diff --git a/Assets/Scripts/Game/Balls/BasicBall.cs.meta b/Assets/Scripts/Game/Balls/BasicBall.cs.meta new file mode 100644 index 0000000..61e9c99 --- /dev/null +++ b/Assets/Scripts/Game/Balls/BasicBall.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5788fcee29b49660abecc58bc2095706 \ No newline at end of file diff --git a/Assets/Scripts/Game/MusicManager.cs b/Assets/Scripts/Game/MusicManager.cs index 32e756a..7f98d83 100644 --- a/Assets/Scripts/Game/MusicManager.cs +++ b/Assets/Scripts/Game/MusicManager.cs @@ -1,6 +1,7 @@ using UnityEngine; using System.Collections.Generic; +// Idea from https://discussions.unity.com/t/play-audio-in-queue/239402/2 public class MusicManager : MonoBehaviour { public AudioClip intro; diff --git a/Assets/Sprites/150_0.controller b/Assets/Sprites/150_0.controller deleted file mode 100644 index f073316..0000000 --- a/Assets/Sprites/150_0.controller +++ /dev/null @@ -1,73 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-4107120003760893777 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Menu_key - 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: 2013472d02e462c4f9e7596ec136410a, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-3035319082947296396 -AnimatorStateMachine: - serializedVersion: 7 - 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: -4107120003760893777} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -4107120003760893777} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 150_0 - serializedVersion: 6 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -3035319082947296396} - 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} - m_EvaluateTransitionsOnStart: 1 diff --git a/Assets/Sprites/150_3.controller b/Assets/Sprites/150_3.controller deleted file mode 100644 index f5e7353..0000000 --- a/Assets/Sprites/150_3.controller +++ /dev/null @@ -1,73 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-5829137054489020484 -AnimatorStateMachine: - serializedVersion: 7 - 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: -4223859337196172115} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -4223859337196172115} ---- !u!1102 &-4223859337196172115 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Menu_key_slot - 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: 8f8f9aa4dd158d4bb95fa1452627a79a, 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: 150_3 - serializedVersion: 6 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -5829137054489020484} - 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} - m_EvaluateTransitionsOnStart: 1 diff --git a/Assets/Sprites/800.png b/Assets/Sprites/800.png new file mode 100644 index 0000000000000000000000000000000000000000..1edcfcf228e2ff4113df62073b02a3a4ee05663c GIT binary patch literal 3829 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