diff --git a/Assets/game/Enemys/SkullGuy/SFX.meta b/Assets/game/Enemys/SkullGuy/SFX.meta deleted file mode 100644 index 3392b384..00000000 --- a/Assets/game/Enemys/SkullGuy/SFX.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7abe19096fbf1e44f8e3873ad634cf55 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/game/Enemys/SkullGuy/Scripts/SkullGuy.cs b/Assets/game/Enemys/SkullGuy/Scripts/SkullGuy.cs index 6cd0651e..17437620 100644 --- a/Assets/game/Enemys/SkullGuy/Scripts/SkullGuy.cs +++ b/Assets/game/Enemys/SkullGuy/Scripts/SkullGuy.cs @@ -6,7 +6,6 @@ public class SkullGuy : MonoBehaviour { [Header("GameObjects")] private Rigidbody2D rb; - public AudioSource audioSource; public Animator animator; [Header("Variables")] @@ -45,7 +44,6 @@ public class SkullGuy : MonoBehaviour if (collision.gameObject.CompareTag("Ground")) { StartCoroutine(ChangeDirection()); - audioSource.Play(); } if (collision.gameObject.CompareTag("Player")) diff --git a/Assets/game/Scenes/level2.unity b/Assets/game/Scenes/level2.unity index 914dc18b..f1073cc6 100644 --- a/Assets/game/Scenes/level2.unity +++ b/Assets/game/Scenes/level2.unity @@ -2370,7 +2370,6 @@ GameObject: - component: {fileID: 406194637} - component: {fileID: 406194636} - component: {fileID: 406194635} - - component: {fileID: 406194642} m_Layer: 0 m_Name: SharpBlock m_TagString: Enemy @@ -2531,102 +2530,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &406194642 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 406194634} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {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!114 &406194643 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2639,11 +2542,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 734179d4d7ad3314cbf982dbc559d45b, type: 3} m_Name: m_EditorClassIdentifier: - audioSource: {fileID: 406194642} + audioSource: {fileID: 0} animator: {fileID: 406194637} speed: 10 timeDelayOnHit: 5 - isMovingRight: 0 + isMovingRightOrUp: 1 + horizontal: 1 --- !u!1 &417760883 GameObject: m_ObjectHideFlags: 0 @@ -4230,7 +4134,6 @@ GameObject: - component: {fileID: 803065909} - component: {fileID: 803065914} - component: {fileID: 803065915} - - component: {fileID: 803065916} m_Layer: 0 m_Name: SkullGuy m_TagString: Enemy @@ -4356,7 +4259,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e339814e10ef0544aac899be9222f479, type: 3} m_Name: m_EditorClassIdentifier: - audioSource: {fileID: 803065916} animator: {fileID: 803065909} speed: 5 timeDelayOnHit: 1 @@ -4408,102 +4310,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.6, y: 1.28} m_EdgeRadius: 0 ---- !u!82 &803065916 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 803065908} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {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!1 &825647016 GameObject: m_ObjectHideFlags: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 27a7ffd3..257d2476 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1600 height: 817 m_ShowMode: 4 - m_Title: Project + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 124 + controlID: 26 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 125 + controlID: 99 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -192,8 +192,8 @@ MonoBehaviour: y: 392 width: 680 height: 375 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -226,7 +226,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 65 + controlID: 122 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1018,8 +1018,8 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: b65e0000 - m_LastClickedID: 0 + m_SelectedIDs: 06750000 + m_LastClickedID: 29958 m_ExpandedIDs: dcfaffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1084,23 +1084,23 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/game/Scripts/Save + - Assets/game/Enemys m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/game/Scripts/Save + - Assets/game/Enemys m_LastFoldersGridSize: 64 m_LastProjectPath: C:\Users\Marc Tismonar\unity\SynthMaze m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 159} - m_SelectedIDs: b2800000 - m_LastClickedID: 32946 - m_ExpandedIDs: 00000000e27c0000f47c0000467d0000487d0000647d000000ca9a3bffffff7f + scrollPos: {x: 0, y: 111} + m_SelectedIDs: 4e7d0000 + m_LastClickedID: 32078 + m_ExpandedIDs: 00000000e27c0000f47c0000467d00004e7d0000707d000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: