diff --git a/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab b/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab index 1ab29dd1d..9f7f09b97 100644 --- a/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab +++ b/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab @@ -484,7 +484,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3089459954010257330} m_LocalRotation: {x: -0, y: -0, z: 0.00000000745058, w: 1} - m_LocalPosition: {x: 5.56, y: -27.2, z: 3.69} + m_LocalPosition: {x: 5.03, y: -27.2, z: 3.69} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4920663751426647139} @@ -704,7 +704,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8024516856666363213} m_LocalRotation: {x: -0, y: -0, z: 0.00000000745058, w: 1} - m_LocalPosition: {x: 5.5, y: -27.29, z: 3.72} + m_LocalPosition: {x: 4.9700003, y: -27.29, z: 3.72} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4920663751426647139} @@ -5071,7 +5071,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} propertyPath: m_LocalPosition.x - value: 5.69 + value: 5.16 objectReference: {fileID: 0} - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} propertyPath: m_LocalPosition.y @@ -6795,7 +6795,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: 6e5deea61a7dedb48b2e17997b9ce8ae, type: 3} propertyPath: m_LocalPosition.x - value: 4.92 + value: 4.3900003 objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: 6e5deea61a7dedb48b2e17997b9ce8ae, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/BossRoom/Prefabs/UnityLogo.prefab b/Assets/BossRoom/Prefabs/UnityLogo.prefab index 5bf04cf20..ed14e2e80 100644 --- a/Assets/BossRoom/Prefabs/UnityLogo.prefab +++ b/Assets/BossRoom/Prefabs/UnityLogo.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 4830495133983295676} - component: {fileID: 3896334357925260767} - - component: {fileID: 8873642300272255832} m_Layer: 5 m_Name: UnityLogo m_TagString: Untagged @@ -27,8 +26,9 @@ RectTransform: m_GameObject: {fileID: 630803024441172499} 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_Children: [] + m_LocalScale: {x: 2.3184574, y: 2.3184574, z: 2.3184574} + m_Children: + - {fileID: 2969922668818974908} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45,13 +45,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 630803024441172499} m_CullTransparentMesh: 1 ---- !u!114 &8873642300272255832 +--- !u!1 &1522151037112848792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5662191764720021811} + - component: {fileID: 8760031903830424161} + - component: {fileID: 8590189102615315013} + m_Layer: 5 + m_Name: Room8Logo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5662191764720021811 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522151037112848792} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -515.60205} + m_LocalScale: {x: 1.6256403, y: 1.6256403, z: 1.6256403} + m_Children: [] + m_Father: {fileID: 2969922668818974908} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 214.16077, y: -217.48001} + m_SizeDelta: {x: 240, y: 240} + m_Pivot: {x: 1, y: 0} +--- !u!222 &8760031903830424161 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522151037112848792} + m_CullTransparentMesh: 1 +--- !u!114 &8590189102615315013 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630803024441172499} + m_GameObject: {fileID: 1522151037112848792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db4fcca0a37980a43a5f38ff7323ae9f, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2347915125398422390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5990270645428196693} + - component: {fileID: 211198310058035430} + - component: {fileID: 2803625384056052699} + m_Layer: 5 + m_Name: UnityLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5990270645428196693 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2347915125398422390} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -515.60205} + m_LocalScale: {x: 3.794851, y: 3.794851, z: 3.794851} + m_Children: [] + m_Father: {fileID: 2969922668818974908} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -275.375, y: -308.55652} + m_SizeDelta: {x: 240, y: 240} + m_Pivot: {x: 1, y: 0} +--- !u!222 &211198310058035430 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2347915125398422390} + m_CullTransparentMesh: 1 +--- !u!114 &2803625384056052699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2347915125398422390} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -75,3 +195,263 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3083368590741069673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2969922668818974908} + m_Layer: 0 + m_Name: Parent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2969922668818974908 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3083368590741069673} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 64, y: 67, z: 135.86885} + m_LocalScale: {x: 0.23061512, y: 0.23061512, z: 0.23061512} + m_Children: + - {fileID: 6155517030257939499} + - {fileID: 939525282127280633} + - {fileID: 3898163960996705018} + - {fileID: 5662191764720021811} + - {fileID: 5990270645428196693} + m_Father: {fileID: 4830495133983295676} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5827317574496726061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 939525282127280633} + - component: {fileID: 908059956069000130} + - component: {fileID: 5737582613485632199} + m_Layer: 5 + m_Name: SFLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &939525282127280633 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5827317574496726061} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -515.60205} + m_LocalScale: {x: 1.2485836, y: 1.2485836, z: 1.2485836} + m_Children: [] + m_Father: {fileID: 2969922668818974908} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 962.50543, y: -215.9621} + m_SizeDelta: {x: 240, y: 240} + m_Pivot: {x: 1, y: 0} +--- !u!222 &908059956069000130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5827317574496726061} + m_CullTransparentMesh: 1 +--- !u!114 &5737582613485632199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5827317574496726061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8b704eb1afcdb4b469679f41a7f6e07e, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7791852178043251978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6155517030257939499} + - component: {fileID: 5798843922686489002} + - component: {fileID: 4911132191845325078} + m_Layer: 5 + m_Name: bg_gradient + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6155517030257939499 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7791852178043251978} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -486.80023} + m_LocalScale: {x: 15.6343565, y: 3.5328696, z: 5.220968} + m_Children: [] + m_Father: {fileID: 2969922668818974908} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 1824, y: -407.60205} + m_SizeDelta: {x: 240, y: 240} + m_Pivot: {x: 1, y: 0} +--- !u!222 &5798843922686489002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7791852178043251978} + m_CullTransparentMesh: 1 +--- !u!114 &4911132191845325078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7791852178043251978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 63a5feb5930bc3f4089f640653896679, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8037385311914000071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3898163960996705018} + - component: {fileID: 2376737941854812430} + - component: {fileID: 3669955647800299122} + m_Layer: 5 + m_Name: JHLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3898163960996705018 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8037385311914000071} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -515.60205} + m_LocalScale: {x: 1.2485836, y: 1.2485836, z: 1.2485836} + m_Children: [] + m_Father: {fileID: 2969922668818974908} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 646.3943, y: -213.68524} + m_SizeDelta: {x: 240, y: 240} + m_Pivot: {x: 1, y: 0} +--- !u!222 &2376737941854812430 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8037385311914000071} + m_CullTransparentMesh: 1 +--- !u!114 &3669955647800299122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8037385311914000071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9212dfff105ad2c4b95ace52ae931384, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/BossRoom/Scenes/MainMenu.unity b/Assets/BossRoom/Scenes/MainMenu.unity index 5b3b045f8..05793aba5 100644 --- a/Assets/BossRoom/Scenes/MainMenu.unity +++ b/Assets/BossRoom/Scenes/MainMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bfaec7eab23696295a495e54bbab784a26d89ec04a2f6143b30d442be657893 -size 38743 +oid sha256:b518cb9a20d5378d1b674316a9c459520220d0d1730038f9e5c6883b8faac366 +size 43170 diff --git a/Assets/BossRoom/Textures/UI/JHayesMnS_logo.png b/Assets/BossRoom/Textures/UI/JHayesMnS_logo.png new file mode 100644 index 000000000..4768f52ee --- /dev/null +++ b/Assets/BossRoom/Textures/UI/JHayesMnS_logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ff44a16e2c40d20d8d2a447612579b5d07f9b00613f3aafa3839ed7a40373f7 +size 4477876 diff --git a/Assets/BossRoom/Textures/UI/JHayesMnS_logo.png.meta b/Assets/BossRoom/Textures/UI/JHayesMnS_logo.png.meta new file mode 100644 index 000000000..2e7a7f323 --- /dev/null +++ b/Assets/BossRoom/Textures/UI/JHayesMnS_logo.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 9212dfff105ad2c4b95ace52ae931384 +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/BossRoom/Textures/UI/Room8_logo.png b/Assets/BossRoom/Textures/UI/Room8_logo.png new file mode 100644 index 000000000..df2f0e0db --- /dev/null +++ b/Assets/BossRoom/Textures/UI/Room8_logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:890bbb314cab5fe1108a6af8c358993c1e3d1e2543d1d11482aeb863420c7f8c +size 4481493 diff --git a/Assets/BossRoom/Textures/UI/Room8_logo.png.meta b/Assets/BossRoom/Textures/UI/Room8_logo.png.meta new file mode 100644 index 000000000..d237ad783 --- /dev/null +++ b/Assets/BossRoom/Textures/UI/Room8_logo.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: db4fcca0a37980a43a5f38ff7323ae9f +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/BossRoom/Textures/UI/StormFlag_logo.png b/Assets/BossRoom/Textures/UI/StormFlag_logo.png new file mode 100644 index 000000000..3d4355ff5 --- /dev/null +++ b/Assets/BossRoom/Textures/UI/StormFlag_logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c05401a322e63fb0aa0b332e3bebb008ab04a6d3d8b424ba4764db526130b98 +size 4501946 diff --git a/Assets/BossRoom/Textures/UI/StormFlag_logo.png.meta b/Assets/BossRoom/Textures/UI/StormFlag_logo.png.meta new file mode 100644 index 000000000..7b8a52353 --- /dev/null +++ b/Assets/BossRoom/Textures/UI/StormFlag_logo.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 8b704eb1afcdb4b469679f41a7f6e07e +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/BossRoom/Textures/UI/ui_bg_gradient.png b/Assets/BossRoom/Textures/UI/ui_bg_gradient.png new file mode 100644 index 000000000..b338a6217 --- /dev/null +++ b/Assets/BossRoom/Textures/UI/ui_bg_gradient.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59b4f6c288d84072986ed3d80da98ecc137292f93d34b3f38997eccfc65b67cf +size 43873 diff --git a/Assets/BossRoom/Textures/UI/ui_bg_gradient.png.meta b/Assets/BossRoom/Textures/UI/ui_bg_gradient.png.meta new file mode 100644 index 000000000..8f7c358d5 --- /dev/null +++ b/Assets/BossRoom/Textures/UI/ui_bg_gradient.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 63a5feb5930bc3f4089f640653896679 +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/BossRoom/VFX/Prefabs/Environment/FX_Torch_Fire.prefab b/Assets/BossRoom/VFX/Prefabs/Environment/FX_Torch_Fire.prefab index 5d9ed9a5e..0e2fef18c 100644 --- a/Assets/BossRoom/VFX/Prefabs/Environment/FX_Torch_Fire.prefab +++ b/Assets/BossRoom/VFX/Prefabs/Environment/FX_Torch_Fire.prefab @@ -47,7 +47,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -4851,7 +4851,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -14607,7 +14607,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -19415,7 +19415,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1