diff --git a/Assets/BossRoom/Material/Dungeon/boss_arena.mat b/Assets/BossRoom/Material/Dungeon/boss_arena.mat index 0fd3be7e0..011e4968d 100644 --- a/Assets/BossRoom/Material/Dungeon/boss_arena.mat +++ b/Assets/BossRoom/Material/Dungeon/boss_arena.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: boss_arena m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION _NORMALMAP + m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 62d7fb22c0ec4164f9c6ef1c5846ca8c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: diff --git a/Assets/BossRoom/Models/DungeonPieces.FBX b/Assets/BossRoom/Models/DungeonPieces.FBX index 6809327dd..7919bf637 100644 --- a/Assets/BossRoom/Models/DungeonPieces.FBX +++ b/Assets/BossRoom/Models/DungeonPieces.FBX @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7266a923c5b4db99f542c8755234c0c89ccf304ad461c15a0865234bd44b599 -size 1592800 +oid sha256:63ea8f8ab69850975d032471374e040ff1f19e7cf91b6dc2e31fd37feaaf04ee +size 1594528 diff --git a/Assets/BossRoom/PostProcessing/PostProcessVolume Profile.asset b/Assets/BossRoom/PostProcessing/PostProcessVolume Profile.asset index a8c584a4d..d532615c6 100644 --- a/Assets/BossRoom/PostProcessing/PostProcessVolume Profile.asset +++ b/Assets/BossRoom/PostProcessing/PostProcessVolume Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87a22e968f15bf24f40750c23b21373d77ff58fb5b8527e111fa23a62ce3180c -size 23371 +oid sha256:b4b8618d32524a2936f296a576ae3f03ff0bd59c4f3c191d6bd6f381558f7a0a +size 23375 diff --git a/Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_spawn_door.prefab b/Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_spawn_door.prefab index 5975763b5..2e0d49bba 100644 --- a/Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_spawn_door.prefab +++ b/Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_spawn_door.prefab @@ -51,7 +51,7 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -439,7 +439,7 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -646,7 +646,7 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 diff --git a/Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_torch2.prefab b/Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_torch2.prefab index 15e2c40d0..366ef317e 100644 --- a/Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_torch2.prefab +++ b/Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_torch2.prefab @@ -50,13 +50,13 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 m_Bias: 0.05 m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_NearPlane: 0.0234 m_CullingMatrixOverride: e00: 1 e01: 0 @@ -275,13 +275,13 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 - m_Resolution: -1 + m_Type: 2 + m_Resolution: 2 m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_Strength: 0.884 + m_Bias: 1.12 + m_NormalBias: 0.61 + m_NearPlane: 0.1 m_CullingMatrixOverride: e00: 1 e01: 0 diff --git a/Assets/BossRoom/Prefabs/Dungeon/Dungeon.prefab b/Assets/BossRoom/Prefabs/Dungeon/Dungeon.prefab index eb0453904..f1c0e0e95 100644 --- a/Assets/BossRoom/Prefabs/Dungeon/Dungeon.prefab +++ b/Assets/BossRoom/Prefabs/Dungeon/Dungeon.prefab @@ -39074,7 +39074,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7980115660496427320, guid: 774df9f23c339504c921336572edb699, type: 3} propertyPath: m_LocalPosition.x - value: 135.71 + value: 135.42 objectReference: {fileID: 0} - target: {fileID: 7980115660496427320, guid: 774df9f23c339504c921336572edb699, type: 3} propertyPath: m_LocalPosition.y @@ -89420,7 +89420,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7980115660496427320, guid: 774df9f23c339504c921336572edb699, type: 3} propertyPath: m_LocalPosition.x - value: 127.73 + value: 127.51 objectReference: {fileID: 0} - target: {fileID: 7980115660496427320, guid: 774df9f23c339504c921336572edb699, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab b/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab index 1540feb7f..1ab29dd1d 100644 --- a/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab +++ b/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab @@ -1,5 +1,115 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &164094916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 164094917} + - component: {fileID: 164094919} + - component: {fileID: 164094918} + m_Layer: 0 + m_Name: Point Light (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &164094917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 164094916} + m_LocalRotation: {x: -0, y: -0, z: 0.00000000745058, w: 1} + m_LocalPosition: {x: -1.73, y: -25.046114, z: -1.4002156} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4920663751426647139} + m_RootOrder: 96 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &164094919 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 164094916} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 0.5975877, b: 0.28627455, a: 1} + m_Intensity: 2.5 + m_Range: 240.86 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!114 &164094918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 164094916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f1c83ea9dfad3d46aaf1d61e74e7faa, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TargetLight: {fileID: 164094919} + m_MinIntensity: 1 + m_MaxIntensity: 3 + m_Smoothing: 36 --- !u!1 &554900382229186213 GameObject: m_ObjectHideFlags: 0 @@ -245,7 +355,7 @@ Transform: m_GameObject: {fileID: 1317383661315508840} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -34.616104, y: 8.532433, z: 109.21108} - m_LocalScale: {x: 12, y: 12, z: 12} + m_LocalScale: {x: 56.51431, y: 56.51431, z: 56.51431} m_Children: - {fileID: 1542329270150831046} - {fileID: 1542329270995496232} @@ -343,6 +453,8 @@ Transform: - {fileID: 8515083028342485757} - {fileID: 9215320845868057429} - {fileID: 8135191846433530663} + - {fileID: 164094917} + - {fileID: 6821737242145051659} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -689,7 +801,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} propertyPath: m_LocalPosition.x - value: -7.83 + value: -8.03 objectReference: {fileID: 0} - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} propertyPath: m_LocalPosition.y @@ -3072,6 +3184,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 2698721903467665021, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} m_PrefabInstance: {fileID: 3464601860640226133} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3464601860905635123 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4920663751426647139} + m_Modifications: + - target: {fileID: 1899106884463111546, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_Name + value: env_door_boss_head + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_RootOrder + value: 97 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalPosition.x + value: -5.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalPosition.y + value: -32 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalPosition.z + value: 4.49 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 4897062626467851486, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + - {fileID: 8778471712971589033, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} +--- !u!4 &6821737242145051659 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + m_PrefabInstance: {fileID: 3464601860905635123} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3464601860990837294 PrefabInstance: m_ObjectHideFlags: 0 @@ -4883,7 +5071,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} propertyPath: m_LocalPosition.x - value: 5.39 + value: 5.69 objectReference: {fileID: 0} - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/BossRoom/Scenes/BossRoom.unity b/Assets/BossRoom/Scenes/BossRoom.unity index e7367084e..0b801cc15 100644 --- a/Assets/BossRoom/Scenes/BossRoom.unity +++ b/Assets/BossRoom/Scenes/BossRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8893b9fdc6872bd0e2dd2b6c7e77fb81e9b18233b3d7e5b872d882822c16735 -size 147345 +oid sha256:0aee7f1cfd2abb411f003e1c84f761355c99c000230c0d90f7e49db5b9b30b1b +size 145972 diff --git a/Assets/BossRoom/Scenes/BossRoom/NavMesh-DungeonNavMesh.asset b/Assets/BossRoom/Scenes/BossRoom/NavMesh-DungeonNavMesh.asset deleted file mode 100644 index 5addb06d8..000000000 --- a/Assets/BossRoom/Scenes/BossRoom/NavMesh-DungeonNavMesh.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b2b725734ba41f7d4e8233a06faaf2f158a4985f6cbcde98b246c2a723e1874 -size 18968 diff --git a/Assets/BossRoom/Scenes/BossRoom/NavMesh-DungeonNavMesh.asset.meta b/Assets/BossRoom/Scenes/BossRoom/NavMesh-DungeonNavMesh.asset.meta deleted file mode 100644 index 1592c3115..000000000 --- a/Assets/BossRoom/Scenes/BossRoom/NavMesh-DungeonNavMesh.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 587909119c903484284f5e84347e514c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 23800000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/BossRoom/Scenes/BossRoom/NavMesh-Patch1.asset b/Assets/BossRoom/Scenes/BossRoom/NavMesh-Patch1.asset index 5e609451f..d03f283e7 100644 --- a/Assets/BossRoom/Scenes/BossRoom/NavMesh-Patch1.asset +++ b/Assets/BossRoom/Scenes/BossRoom/NavMesh-Patch1.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a65c2d95ad1109c02114a6217312747db65ee17403c8eb110c45d86e25a07a1 +oid sha256:aeee11f917fe205a49d8aff960394ff3ef43976cd357939f62410da6cea96f8b size 18788 diff --git a/Assets/BossRoom/Textures/Characters/GroundCircle.png b/Assets/BossRoom/Textures/Characters/GroundCircle.png deleted file mode 100644 index 491b4863e..000000000 --- a/Assets/BossRoom/Textures/Characters/GroundCircle.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f2bb4b8d7e91a655981caaed0b44695f727b6fb55fcad29bb3d0a7d2b788a89 -size 29970 diff --git a/Assets/BossRoom/Textures/Environment/env_deco_boss_arena_mtl.tga b/Assets/BossRoom/Textures/Environment/env_deco_boss_arena_mtl.tga new file mode 100644 index 000000000..72f9033f0 --- /dev/null +++ b/Assets/BossRoom/Textures/Environment/env_deco_boss_arena_mtl.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cefff98a5e69039576469388006771b4a41a111d2351108e5677fb63dda0d050 +size 16777260 diff --git a/Assets/BossRoom/Textures/Environment/env_deco_boss_arena_mtl.tga.meta b/Assets/BossRoom/Textures/Environment/env_deco_boss_arena_mtl.tga.meta new file mode 100644 index 000000000..78f4f72b2 --- /dev/null +++ b/Assets/BossRoom/Textures/Environment/env_deco_boss_arena_mtl.tga.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 62d7fb22c0ec4164f9c6ef1c5846ca8c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BossRoom/Textures/UI/br_icon.png b/Assets/BossRoom/Textures/UI/br_icon.png new file mode 100644 index 000000000..b61e926b4 --- /dev/null +++ b/Assets/BossRoom/Textures/UI/br_icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57317cdabfeb34d9a907e41ad45eee13550a30985ebabb04d1a1a00ec02c299f +size 93548 diff --git a/Assets/BossRoom/Textures/UI/br_icon.png.meta b/Assets/BossRoom/Textures/UI/br_icon.png.meta new file mode 100644 index 000000000..45ac74cc3 --- /dev/null +++ b/Assets/BossRoom/Textures/UI/br_icon.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 5949d615b86cc174e9eb5bcecc2a543e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BossRoom/Textures/UI/ui_connecting.png b/Assets/BossRoom/Textures/UI/ui_connecting.png new file mode 100644 index 000000000..1497f0c9c --- /dev/null +++ b/Assets/BossRoom/Textures/UI/ui_connecting.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e49c59d2cbeabf9b1924ef8eb7416556f48ca6e321bd2fcef969d74ada69940 +size 12478 diff --git a/Assets/BossRoom/Textures/Characters/GroundCircle.png.meta b/Assets/BossRoom/Textures/UI/ui_connecting.png.meta similarity index 100% rename from Assets/BossRoom/Textures/Characters/GroundCircle.png.meta rename to Assets/BossRoom/Textures/UI/ui_connecting.png.meta diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1e7dd0435..e97816aaf 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b728feb1570306d8fb8680270ac738e90912df2979f85d7386136ef942f3409 -size 19902 +oid sha256:4f5c071ca7bf442a2eabdb420c97f16bd488d29dca6f2df824914f0d752d1a0b +size 20855