From 4b365305cfdbc9d9a88e15fac33a643a9d4c3ecc Mon Sep 17 00:00:00 2001 From: MarcUs7 <96580944+MarcUs7i@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:48:43 +0200 Subject: [PATCH] minor changes --- .../{SharpBlock/SFX.meta => Spikes.meta} | 2 +- Assets/game/Enemys/Spikes/Spikes.cs | 18 ++ Assets/game/Enemys/Spikes/Spikes.cs.meta | 11 ++ Assets/game/Enemys/Spikes/spike.png | Bin 0 -> 269 bytes Assets/game/Enemys/Spikes/spike.png.meta | 183 ++++++++++++++++++ UserSettings/Layouts/default-2021.dwlt | 98 +++++----- 6 files changed, 262 insertions(+), 50 deletions(-) rename Assets/game/Enemys/{SharpBlock/SFX.meta => Spikes.meta} (77%) create mode 100644 Assets/game/Enemys/Spikes/Spikes.cs create mode 100644 Assets/game/Enemys/Spikes/Spikes.cs.meta create mode 100644 Assets/game/Enemys/Spikes/spike.png create mode 100644 Assets/game/Enemys/Spikes/spike.png.meta diff --git a/Assets/game/Enemys/SharpBlock/SFX.meta b/Assets/game/Enemys/Spikes.meta similarity index 77% rename from Assets/game/Enemys/SharpBlock/SFX.meta rename to Assets/game/Enemys/Spikes.meta index d8b83652..df9c20d3 100644 --- a/Assets/game/Enemys/SharpBlock/SFX.meta +++ b/Assets/game/Enemys/Spikes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f0b2971fecaf5ae4ba09a25de6133f77 +guid: f7e2e02c5a6c3714895b813f4539a32e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/game/Enemys/Spikes/Spikes.cs b/Assets/game/Enemys/Spikes/Spikes.cs new file mode 100644 index 00000000..b8857a62 --- /dev/null +++ b/Assets/game/Enemys/Spikes/Spikes.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Spikes : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/game/Enemys/Spikes/Spikes.cs.meta b/Assets/game/Enemys/Spikes/Spikes.cs.meta new file mode 100644 index 00000000..cd500e3d --- /dev/null +++ b/Assets/game/Enemys/Spikes/Spikes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 38e91d8d9d1d8094d8ac95904380d58d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/game/Enemys/Spikes/spike.png b/Assets/game/Enemys/Spikes/spike.png new file mode 100644 index 0000000000000000000000000000000000000000..944d9fa6ce008f6dc83f62e58e4d4a2527ade3e1 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;37{K$B+p3tJ80DH7E$Un7-)$-Sck;yK{kp z(&f8fjpR5ui;i2`J=K}>kn5x8daar$*C$T=`@5g#W`+tfn=Vu2Zjn&)d7x_< NJYD@<);T3K0RU=RY7GDY literal 0 HcmV?d00001 diff --git a/Assets/game/Enemys/Spikes/spike.png.meta b/Assets/game/Enemys/Spikes/spike.png.meta new file mode 100644 index 00000000..5c95171a --- /dev/null +++ b/Assets/game/Enemys/Spikes/spike.png.meta @@ -0,0 +1,183 @@ +fileFormatVersion: 2 +guid: af413e424ab3796478ae3e7a7f58a529 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 257d2476..a28f3318 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -16,10 +16,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 43 - width: 1600 + width: 1440 height: 817 m_ShowMode: 4 - m_Title: Inspector + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -44,7 +44,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1600 + width: 1440 height: 817 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1600 + width: 1440 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -91,7 +91,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 797 - width: 1600 + width: 1440 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -115,12 +115,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1600 + width: 1440 height: 767 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 26 + controlID: 19 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 680 + width: 679 height: 767 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 99 + controlID: 116 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,10 +163,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 680 + width: 679 height: 392 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -190,10 +190,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 392 - width: 680 + width: 679 height: 375 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -219,14 +219,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 680 + x: 679 y: 0 - width: 546 + width: 470 height: 767 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 122 + controlID: 97 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -244,7 +244,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 546 + width: 470 height: 469 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -270,7 +270,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 469 - width: 546 + width: 470 height: 298 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -294,12 +294,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1226 + x: 1149 y: 0 - width: 374 + width: 291 height: 767 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -327,7 +327,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 465 - width: 679 + width: 678 height: 354 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -342,7 +342,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 679, y: 333} + m_TargetSize: {x: 678, y: 333} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -357,8 +357,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -339.5 - m_HBaseRangeMax: 339.5 + m_HBaseRangeMin: -339 + m_HBaseRangeMax: 339 m_VBaseRangeMin: -166.5 m_VBaseRangeMax: 166.5 m_HAllowExceedBaseRangeMin: 1 @@ -378,23 +378,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 679 + width: 678 height: 333 m_Scale: {x: 1, y: 1} - m_Translation: {x: 339.5, y: 166.5} + m_Translation: {x: 339, y: 166.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -339.5 + x: -339 y: -166.5 - width: 679 + width: 678 height: 333 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 679, y: 354} + m_LastWindowPixelSize: {x: 678, y: 354} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -422,7 +422,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 679 + width: 678 height: 371 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1006,9 +1006,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 680 + x: 679 y: 73 - width: 544 + width: 468 height: 448 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1018,9 +1018,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 06750000 - m_LastClickedID: 29958 - m_ExpandedIDs: dcfaffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 7a89ffff788dffff6490ffff9490fffff692ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1064,9 +1064,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 680 + x: 679 y: 542 - width: 544 + width: 468 height: 277 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1084,23 +1084,23 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/game/Enemys + - Assets/game/Scenes m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/game/Enemys + - Assets/game/Scenes m_LastFoldersGridSize: 64 m_LastProjectPath: C:\Users\Marc Tismonar\unity\SynthMaze m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 111} - m_SelectedIDs: 4e7d0000 - m_LastClickedID: 32078 - m_ExpandedIDs: 00000000e27c0000f47c0000467d00004e7d0000707d000000ca9a3bffffff7f + m_SelectedIDs: 16fc0000 + m_LastClickedID: 64534 + m_ExpandedIDs: 00000000b0fb0000b4fb000004fc000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1128,7 +1128,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000e27c0000 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1204,9 +1204,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1226 + x: 1149 y: 73 - width: 373 + width: 290 height: 746 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: