diff --git a/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab index e502f3391..b9762cba2 100644 --- a/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab +++ b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab @@ -122,7 +122,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -5838772972447684026, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3} + m_Sprite: {fileID: 21300000, guid: 66a470aa734e32040b424353a0f0de39, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/Assets/BossRoom/Textures/UI/ui_sound_settings.png b/Assets/BossRoom/Textures/UI/ui_sound_settings.png new file mode 100644 index 000000000..84f8e0b7a --- /dev/null +++ b/Assets/BossRoom/Textures/UI/ui_sound_settings.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dd2003dbf213c01004bc3255a5602f7d3e45b5c08a3d7fa3cbd310b62012d52 +size 21288 diff --git a/Assets/BossRoom/Textures/UI/ui_sound_settings.png.meta b/Assets/BossRoom/Textures/UI/ui_sound_settings.png.meta new file mode 100644 index 000000000..6748e79fc --- /dev/null +++ b/Assets/BossRoom/Textures/UI/ui_sound_settings.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 66a470aa734e32040b424353a0f0de39 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + 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: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SceneRecources/T_Ceramic_Tile_M.TGA b/Assets/BossRoom/VFX/Textures/T_Ceramic_Tile_M.TGA similarity index 100% rename from Assets/SceneRecources/T_Ceramic_Tile_M.TGA rename to Assets/BossRoom/VFX/Textures/T_Ceramic_Tile_M.TGA diff --git a/Assets/SceneRecources/T_Ceramic_Tile_M.TGA.meta b/Assets/BossRoom/VFX/Textures/T_Ceramic_Tile_M.TGA.meta similarity index 100% rename from Assets/SceneRecources/T_Ceramic_Tile_M.TGA.meta rename to Assets/BossRoom/VFX/Textures/T_Ceramic_Tile_M.TGA.meta diff --git a/Assets/SceneRecources/T_Perlin_Noise_M.TGA b/Assets/BossRoom/VFX/Textures/T_Perlin_Noise_M.TGA similarity index 100% rename from Assets/SceneRecources/T_Perlin_Noise_M.TGA rename to Assets/BossRoom/VFX/Textures/T_Perlin_Noise_M.TGA diff --git a/Assets/SceneRecources/T_Perlin_Noise_M.TGA.meta b/Assets/BossRoom/VFX/Textures/T_Perlin_Noise_M.TGA.meta similarity index 100% rename from Assets/SceneRecources/T_Perlin_Noise_M.TGA.meta rename to Assets/BossRoom/VFX/Textures/T_Perlin_Noise_M.TGA.meta diff --git a/Assets/SceneRecources.meta b/Assets/SceneRecources.meta deleted file mode 100644 index 9313def0c..000000000 --- a/Assets/SceneRecources.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2862fb36162367f479edca72a04de860 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: