From a18eb9da14ff68638bf0f05799e9e988e391e190 Mon Sep 17 00:00:00 2001 From: jdepuy <42752908+jdepuy@users.noreply.github.com> Date: Thu, 25 Mar 2021 16:10:27 -0400 Subject: [PATCH 1/3] Update to Main Menu- now with 3D background and Logo garden --- .../Prefabs/UI/CharSel_Background.prefab | 200 ++++++++- Assets/BossRoom/Prefabs/UnityLogo.prefab | 390 +++++++++++++++++- Assets/BossRoom/Scenes/MainMenu.unity | 4 +- .../BossRoom/Textures/UI/JHayesMnS_logo.png | 3 + ...le_BG.png.meta => JHayesMnS_logo.png.meta} | 2 +- Assets/BossRoom/Textures/UI/Lobby_BG.png | 3 - Assets/BossRoom/Textures/UI/Room8_logo.png | 3 + ...{Lobby_BG.png.meta => Room8_logo.png.meta} | 30 +- .../BossRoom/Textures/UI/StormFlag_logo.png | 3 + .../Textures/UI/StormFlag_logo.png.meta | 108 +++++ Assets/BossRoom/Textures/UI/Title_BG.png | 3 - .../BossRoom/Textures/UI/ui_bg_gradient.png | 3 + .../Textures/UI/ui_bg_gradient.png.meta | 108 +++++ .../VFX/Prefabs/Torch/FX_Torch_Fire.prefab | 8 +- 14 files changed, 835 insertions(+), 33 deletions(-) create mode 100644 Assets/BossRoom/Textures/UI/JHayesMnS_logo.png rename Assets/BossRoom/Textures/UI/{Title_BG.png.meta => JHayesMnS_logo.png.meta} (98%) delete mode 100644 Assets/BossRoom/Textures/UI/Lobby_BG.png create mode 100644 Assets/BossRoom/Textures/UI/Room8_logo.png rename Assets/BossRoom/Textures/UI/{Lobby_BG.png.meta => Room8_logo.png.meta} (78%) create mode 100644 Assets/BossRoom/Textures/UI/StormFlag_logo.png create mode 100644 Assets/BossRoom/Textures/UI/StormFlag_logo.png.meta delete mode 100644 Assets/BossRoom/Textures/UI/Title_BG.png create mode 100644 Assets/BossRoom/Textures/UI/ui_bg_gradient.png create mode 100644 Assets/BossRoom/Textures/UI/ui_bg_gradient.png.meta diff --git a/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab b/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab index 1540feb7f..9f7f09b97 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} @@ -372,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} @@ -592,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} @@ -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.16 objectReference: {fileID: 0} - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} propertyPath: m_LocalPosition.y @@ -6607,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..701165b83 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:fd1c5ad96be593c5454871baa09c150043749e7c69730dc5d5000486636c283c +size 43435 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/Title_BG.png.meta b/Assets/BossRoom/Textures/UI/JHayesMnS_logo.png.meta similarity index 98% rename from Assets/BossRoom/Textures/UI/Title_BG.png.meta rename to Assets/BossRoom/Textures/UI/JHayesMnS_logo.png.meta index 71498ebb2..2e7a7f323 100644 --- a/Assets/BossRoom/Textures/UI/Title_BG.png.meta +++ b/Assets/BossRoom/Textures/UI/JHayesMnS_logo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aa1a90221e6adf542887197de3c3852d +guid: 9212dfff105ad2c4b95ace52ae931384 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/BossRoom/Textures/UI/Lobby_BG.png b/Assets/BossRoom/Textures/UI/Lobby_BG.png deleted file mode 100644 index ba67019c3..000000000 --- a/Assets/BossRoom/Textures/UI/Lobby_BG.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86e1a5a31b10be245f2fe44461a8c9ec4eb25c2e856e6d1bca5ccb20fb690c00 -size 1414578 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/Lobby_BG.png.meta b/Assets/BossRoom/Textures/UI/Room8_logo.png.meta similarity index 78% rename from Assets/BossRoom/Textures/UI/Lobby_BG.png.meta rename to Assets/BossRoom/Textures/UI/Room8_logo.png.meta index a7b5c8692..d237ad783 100644 --- a/Assets/BossRoom/Textures/UI/Lobby_BG.png.meta +++ b/Assets/BossRoom/Textures/UI/Room8_logo.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: cc49d6e2843f1c444aaac2c32deccfcd +guid: db4fcca0a37980a43a5f38ff7323ae9f TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -35,13 +35,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,9 +50,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -75,13 +75,25 @@ TextureImporter: 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: 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/Title_BG.png b/Assets/BossRoom/Textures/UI/Title_BG.png deleted file mode 100644 index 9b5b5f009..000000000 --- a/Assets/BossRoom/Textures/UI/Title_BG.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9453cbb527e58e31cd109d26486448cfd1cf427cecfc95bb54faedc5f1a26c83 -size 2188800 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/Torch/FX_Torch_Fire.prefab b/Assets/BossRoom/VFX/Prefabs/Torch/FX_Torch_Fire.prefab index adcf9d1f5..c95f57f3f 100644 --- a/Assets/BossRoom/VFX/Prefabs/Torch/FX_Torch_Fire.prefab +++ b/Assets/BossRoom/VFX/Prefabs/Torch/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 From dd2007ad56933a79d0570948d1cf14363e56f11a Mon Sep 17 00:00:00 2001 From: jdepuy <42752908+jdepuy@users.noreply.github.com> Date: Fri, 26 Mar 2021 12:36:44 -0400 Subject: [PATCH 2/3] Updated CharSel_Background prefab so it has no colliders, changed hierarchy of UnityLogo prefab --- .../Prefabs/UI/CharSel_Background.prefab | 247 ++++++++++------ Assets/BossRoom/Prefabs/UnityLogo.prefab | 275 ++++++------------ 2 files changed, 249 insertions(+), 273 deletions(-) diff --git a/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab b/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab index 9f7f09b97..a025b5bc5 100644 --- a/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab +++ b/Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab @@ -909,7 +909,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &3234345934838456955 stripped Transform: @@ -975,7 +976,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &3263701879421858790 stripped Transform: @@ -1041,7 +1043,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &5183051475224248315 stripped Transform: @@ -1107,7 +1110,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &4999727750412628632 stripped Transform: @@ -1173,7 +1177,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &3026354410201873862 stripped Transform: @@ -1239,7 +1244,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &2739670314806559634 stripped Transform: @@ -1305,7 +1311,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2633666134721422644 stripped Transform: @@ -1371,7 +1378,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &2976957566934501913 stripped Transform: @@ -1445,7 +1453,8 @@ PrefabInstance: propertyPath: m_Name value: env_rock objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6664442740537142151, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} --- !u!4 &2530991597359301258 stripped Transform: @@ -1511,7 +1520,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &4556211054437197120 stripped Transform: @@ -1577,7 +1587,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8619486518123324128, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} --- !u!4 &744763515804582010 stripped Transform: @@ -1643,7 +1654,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &6084772302248676129 stripped Transform: @@ -1709,7 +1721,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &3657063113099343713 stripped Transform: @@ -1775,7 +1788,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &3867829615690795967 stripped Transform: @@ -1841,7 +1855,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &4177558615837457137 stripped Transform: @@ -1907,7 +1922,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &6864563551950278584 stripped Transform: @@ -2047,7 +2063,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &3564558474089530698 stripped Transform: @@ -2113,7 +2130,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &912274811401280800 stripped Transform: @@ -2179,7 +2197,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8619486518123324128, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} --- !u!4 &4073471928574029972 stripped Transform: @@ -2245,7 +2264,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &7308070030084154003 stripped Transform: @@ -2319,7 +2339,8 @@ PrefabInstance: propertyPath: m_Name value: env_rock (1) objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6664442740537142151, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} --- !u!4 &293547408551421237 stripped Transform: @@ -2385,7 +2406,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &315001900675195761 stripped Transform: @@ -2451,7 +2473,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &179715095809354956 stripped Transform: @@ -2517,7 +2540,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8619486518123324128, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} --- !u!4 &3380408451001089066 stripped Transform: @@ -2583,7 +2607,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &1542329270733806462 stripped Transform: @@ -2653,7 +2678,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4897062626467851486, guid: 702ab0d292bbb1a4cb6821e2ffcad426, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 702ab0d292bbb1a4cb6821e2ffcad426, type: 3} --- !u!4 &6821737240886408707 stripped Transform: @@ -2719,7 +2745,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2175789611110148677 stripped Transform: @@ -2781,7 +2808,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4897062626467851486, guid: 028c030816ef0094b81d3239f296e369, type: 3} + - {fileID: 8778471712971589033, guid: 028c030816ef0094b81d3239f296e369, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 028c030816ef0094b81d3239f296e369, type: 3} --- !u!4 &6821737241329974283 stripped Transform: @@ -2847,7 +2876,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &2175789610813866665 stripped Transform: @@ -2913,7 +2943,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2175789611652344471 stripped Transform: @@ -2979,7 +3010,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8220524271094872161 stripped Transform: @@ -3045,7 +3077,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8220524271010362682 stripped Transform: @@ -3111,7 +3144,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8619486518123324128, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} --- !u!4 &3380408450136048289 stripped Transform: @@ -3177,7 +3211,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &1542329270995496232 stripped Transform: @@ -3319,7 +3354,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8619486518123324128, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} --- !u!4 &3380408450032615351 stripped Transform: @@ -3385,7 +3421,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8220524272313890799 stripped Transform: @@ -3451,7 +3488,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1542329270150831046 stripped Transform: @@ -3517,7 +3555,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8619486518123324128, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} --- !u!4 &3380408449366138002 stripped Transform: @@ -3583,7 +3622,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2175789612560067261 stripped Transform: @@ -3649,7 +3689,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1542329270275864979 stripped Transform: @@ -3715,7 +3756,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &2175789612356243214 stripped Transform: @@ -3781,7 +3823,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &2175789612369088605 stripped Transform: @@ -3847,7 +3890,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8220524271961446367 stripped Transform: @@ -3913,7 +3957,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &2175789612448415053 stripped Transform: @@ -3979,7 +4024,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2175789612438555974 stripped Transform: @@ -4045,7 +4091,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8243883689471615297 stripped Transform: @@ -4111,7 +4158,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1638842208548707075 stripped Transform: @@ -4177,7 +4225,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1625720810058963086 stripped Transform: @@ -4243,7 +4292,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &2001397688677709984 stripped Transform: @@ -4309,7 +4359,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8380985825850896864 stripped Transform: @@ -4375,7 +4426,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1430945200787393532 stripped Transform: @@ -4441,7 +4493,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8928409966773851272 stripped Transform: @@ -4507,7 +4560,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &1520803213867290794 stripped Transform: @@ -4647,7 +4701,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &1834740943003492376 stripped Transform: @@ -4713,7 +4768,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &1327774315117055442 stripped Transform: @@ -4779,7 +4835,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1872207809922079481 stripped Transform: @@ -4919,7 +4976,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &7251287495355780583 stripped Transform: @@ -4985,7 +5043,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &434748549844287899 stripped Transform: @@ -5051,7 +5110,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &7034815778319695098 stripped Transform: @@ -5179,7 +5239,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &7750363908168442344 stripped Transform: @@ -5245,7 +5306,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &7488168991789412365 stripped Transform: @@ -5311,7 +5373,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &7278730828392968038 stripped Transform: @@ -5377,7 +5440,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &7331735469837142498 stripped Transform: @@ -5505,7 +5569,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &7738129568973818823 stripped Transform: @@ -5571,7 +5636,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &9093977143369369932 stripped Transform: @@ -5637,7 +5703,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &8482147364920586566 stripped Transform: @@ -5703,7 +5770,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &9170315215096482054 stripped Transform: @@ -5843,7 +5911,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &8239405506365050426 stripped Transform: @@ -5983,7 +6052,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &8576695604743464035 stripped Transform: @@ -6049,7 +6119,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &5633666960414606392 stripped Transform: @@ -6115,7 +6186,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &5451397896499240620 stripped Transform: @@ -6181,7 +6253,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &2934847741690845232 stripped Transform: @@ -6247,7 +6320,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &5461440007803685514 stripped Transform: @@ -6313,7 +6387,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &6667348915953369171 stripped Transform: @@ -6379,7 +6454,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &5838643131072430612 stripped Transform: @@ -6445,7 +6521,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &6007102251735563566 stripped Transform: @@ -6511,7 +6588,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &6365576875482174626 stripped Transform: @@ -6577,7 +6655,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8619486518123324128, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} --- !u!4 &7509401185041245797 stripped Transform: @@ -6643,7 +6722,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8619486518123324128, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} --- !u!4 &7342158933333170647 stripped Transform: @@ -6709,7 +6789,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &4119662209576114786 stripped Transform: @@ -6775,7 +6856,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2aa4510a758056646b97aa382d0d4583, type: 3} --- !u!4 &5910141258658947805 stripped Transform: @@ -6903,7 +6985,8 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &5899669677500254489 stripped Transform: diff --git a/Assets/BossRoom/Prefabs/UnityLogo.prefab b/Assets/BossRoom/Prefabs/UnityLogo.prefab index ed14e2e80..f6bd16feb 100644 --- a/Assets/BossRoom/Prefabs/UnityLogo.prefab +++ b/Assets/BossRoom/Prefabs/UnityLogo.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &630803024441172499 +--- !u!1 &813433419005793441 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,54 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4830495133983295676} - - component: {fileID: 3896334357925260767} - m_Layer: 5 - m_Name: UnityLogo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4830495133983295676 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 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} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -240, y: 200} - m_SizeDelta: {x: 240, y: 240} - m_Pivot: {x: 1, y: 0} ---- !u!222 &3896334357925260767 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630803024441172499} - m_CullTransparentMesh: 1 ---- !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} + - component: {fileID: 5819218367807517706} + - component: {fileID: 7478160891267628888} + - component: {fileID: 7593168301171033980} m_Layer: 5 m_Name: Room8Logo m_TagString: Untagged @@ -63,40 +18,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5662191764720021811 +--- !u!224 &5819218367807517706 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1522151037112848792} + m_GameObject: {fileID: 813433419005793441} 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_LocalPosition: {x: 0, y: 0, z: 16.963217} + m_LocalScale: {x: 0.37489715, y: 0.37489715, z: 0.37489715} m_Children: [] - m_Father: {fileID: 2969922668818974908} - m_RootOrder: 3 + m_Father: {fileID: 6728233343538482565} + 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: 214.16077, y: -217.48001} + m_AnchoredPosition: {x: -51.619446, y: 37.927025} m_SizeDelta: {x: 240, y: 240} m_Pivot: {x: 1, y: 0} ---- !u!222 &8760031903830424161 +--- !u!222 &7478160891267628888 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1522151037112848792} + m_GameObject: {fileID: 813433419005793441} m_CullTransparentMesh: 1 ---- !u!114 &8590189102615315013 +--- !u!114 &7593168301171033980 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1522151037112848792} + m_GameObject: {fileID: 813433419005793441} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -120,7 +75,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2347915125398422390 +--- !u!1 &1627823859708323626 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -128,9 +83,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5990270645428196693} - - component: {fileID: 211198310058035430} - - component: {fileID: 2803625384056052699} + - component: {fileID: 6728233343538482565} + - component: {fileID: 2901635766932728038} m_Layer: 5 m_Name: UnityLogo m_TagString: Untagged @@ -138,99 +92,38 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5990270645428196693 +--- !u!224 &6728233343538482565 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_GameObject: {fileID: 1627823859708323626} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.8461382, y: 2.8461382, z: 2.8461382} + m_Children: + - {fileID: 1396111946460101824} + - {fileID: 2904591236590417859} + - {fileID: 5819218367807517706} + - {fileID: 5582095487201022060} + m_Father: {fileID: 0} + 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: -275.375, y: -308.55652} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 240, y: 240} - m_Pivot: {x: 1, y: 0} ---- !u!222 &211198310058035430 + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &2901635766932728038 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2347915125398422390} + m_GameObject: {fileID: 1627823859708323626} 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} - 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: 8031a22fd570c96428327ba9af6306cd, 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 &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 +--- !u!1 &4522556800561366607 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -238,50 +131,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 939525282127280633} - - component: {fileID: 908059956069000130} - - component: {fileID: 5737582613485632199} + - component: {fileID: 5582095487201022060} + - component: {fileID: 2069529997113232863} + - component: {fileID: 4088805848748580578} m_Layer: 5 - m_Name: SFLogo + m_Name: UnityLogo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &939525282127280633 +--- !u!224 &5582095487201022060 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5827317574496726061} + m_GameObject: {fileID: 4522556800561366607} 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_LocalPosition: {x: 0, y: 0, z: 16.963217} + m_LocalScale: {x: 0.8751499, y: 0.8751499, z: 0.8751499} m_Children: [] - m_Father: {fileID: 2969922668818974908} - m_RootOrder: 1 + m_Father: {fileID: 6728233343538482565} + 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: 962.50543, y: -215.9621} + m_AnchoredPosition: {x: -164.51392, y: 16.923376} m_SizeDelta: {x: 240, y: 240} m_Pivot: {x: 1, y: 0} ---- !u!222 &908059956069000130 +--- !u!222 &2069529997113232863 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5827317574496726061} + m_GameObject: {fileID: 4522556800561366607} m_CullTransparentMesh: 1 ---- !u!114 &5737582613485632199 +--- !u!114 &4088805848748580578 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5827317574496726061} + m_GameObject: {fileID: 4522556800561366607} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -295,7 +188,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8b704eb1afcdb4b469679f41a7f6e07e, type: 3} + m_Sprite: {fileID: 21300000, guid: 8031a22fd570c96428327ba9af6306cd, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -305,7 +198,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7791852178043251978 +--- !u!1 &5659031706063841556 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -313,50 +206,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6155517030257939499} - - component: {fileID: 5798843922686489002} - - component: {fileID: 4911132191845325078} + - component: {fileID: 1396111946460101824} + - component: {fileID: 1354513213091276539} + - component: {fileID: 5893485489383260158} m_Layer: 5 - m_Name: bg_gradient + m_Name: SFLogo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6155517030257939499 +--- !u!224 &1396111946460101824 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7791852178043251978} + m_GameObject: {fileID: 5659031706063841556} 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_LocalPosition: {x: 0, y: 0, z: 16.963217} + m_LocalScale: {x: 0.2879422, y: 0.2879422, z: 0.2879422} m_Children: [] - m_Father: {fileID: 2969922668818974908} + m_Father: {fileID: 6728233343538482565} 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_AnchoredPosition: {x: 120.960236, y: 38.277084} m_SizeDelta: {x: 240, y: 240} m_Pivot: {x: 1, y: 0} ---- !u!222 &5798843922686489002 +--- !u!222 &1354513213091276539 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7791852178043251978} + m_GameObject: {fileID: 5659031706063841556} m_CullTransparentMesh: 1 ---- !u!114 &4911132191845325078 +--- !u!114 &5893485489383260158 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7791852178043251978} + m_GameObject: {fileID: 5659031706063841556} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -370,7 +263,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63a5feb5930bc3f4089f640653896679, type: 3} + m_Sprite: {fileID: 21300000, guid: 8b704eb1afcdb4b469679f41a7f6e07e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -380,7 +273,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8037385311914000071 +--- !u!1 &8204615639488035838 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -388,9 +281,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3898163960996705018} - - component: {fileID: 2376737941854812430} - - component: {fileID: 3669955647800299122} + - component: {fileID: 2904591236590417859} + - component: {fileID: 4516547201382349879} + - component: {fileID: 3222444386290518859} m_Layer: 5 m_Name: JHLogo m_TagString: Untagged @@ -398,40 +291,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3898163960996705018 +--- !u!224 &2904591236590417859 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8037385311914000071} + m_GameObject: {fileID: 8204615639488035838} 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_LocalPosition: {x: 0, y: 0, z: 16.963217} + m_LocalScale: {x: 0.2879422, y: 0.2879422, z: 0.2879422} m_Children: [] - m_Father: {fileID: 2969922668818974908} - m_RootOrder: 2 + m_Father: {fileID: 6728233343538482565} + 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: 646.3943, y: -213.68524} + m_AnchoredPosition: {x: 48.06018, y: 38.802147} m_SizeDelta: {x: 240, y: 240} m_Pivot: {x: 1, y: 0} ---- !u!222 &2376737941854812430 +--- !u!222 &4516547201382349879 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8037385311914000071} + m_GameObject: {fileID: 8204615639488035838} m_CullTransparentMesh: 1 ---- !u!114 &3669955647800299122 +--- !u!114 &3222444386290518859 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8037385311914000071} + m_GameObject: {fileID: 8204615639488035838} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} From 5274d41e831f2c723936bba5d09b57087d173fe7 Mon Sep 17 00:00:00 2001 From: jdepuy <42752908+jdepuy@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:40:40 -0400 Subject: [PATCH 3/3] Update to SF logo bases off David's suggestion to make it horizontal --- Assets/BossRoom/Prefabs/UnityLogo.prefab | 2 +- Assets/BossRoom/Textures/UI/StormFlag_logo.png | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/BossRoom/Prefabs/UnityLogo.prefab b/Assets/BossRoom/Prefabs/UnityLogo.prefab index f6bd16feb..c34335ac2 100644 --- a/Assets/BossRoom/Prefabs/UnityLogo.prefab +++ b/Assets/BossRoom/Prefabs/UnityLogo.prefab @@ -232,7 +232,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 120.960236, y: 38.277084} + m_AnchoredPosition: {x: 146.67712, y: 37.3} m_SizeDelta: {x: 240, y: 240} m_Pivot: {x: 1, y: 0} --- !u!222 &1354513213091276539 diff --git a/Assets/BossRoom/Textures/UI/StormFlag_logo.png b/Assets/BossRoom/Textures/UI/StormFlag_logo.png index 3d4355ff5..17af1f940 100644 --- a/Assets/BossRoom/Textures/UI/StormFlag_logo.png +++ b/Assets/BossRoom/Textures/UI/StormFlag_logo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c05401a322e63fb0aa0b332e3bebb008ab04a6d3d8b424ba4764db526130b98 -size 4501946 +oid sha256:732728f291a0a7322c16d7c3e5f1281c8e79f6ad3e96f355d8f9eafdb53f7170 +size 23972