From 3b084673262583646f9da9a0cfca69c3626160a9 Mon Sep 17 00:00:00 2001 From: Iazubi Date: Fri, 25 Oct 2024 17:06:20 -0700 Subject: [PATCH] Transition from Lore to Main and vice versa Bottom left buttons transitions to the lore page and vice versa --- Assets/LorePage.meta | 8 + Assets/MainMenuUI/LoreToMainMenu.cs | 11 + Assets/MainMenuUI/LoreToMainMenu.cs.meta | 2 + Assets/MainMenuUI/MainMenuToLore.cs | 11 + Assets/MainMenuUI/MainMenuToLore.cs.meta | 2 + Assets/Scenes/Lore.unity | 22 +- Assets/Scenes/Lore.unity.meta | 2 +- Assets/Scenes/mainMenu.unity | 358 +++++++++++++++++++++- ProjectSettings/EditorBuildSettings.asset | 3 + 9 files changed, 398 insertions(+), 21 deletions(-) create mode 100644 Assets/LorePage.meta create mode 100644 Assets/MainMenuUI/LoreToMainMenu.cs create mode 100644 Assets/MainMenuUI/LoreToMainMenu.cs.meta create mode 100644 Assets/MainMenuUI/MainMenuToLore.cs create mode 100644 Assets/MainMenuUI/MainMenuToLore.cs.meta diff --git a/Assets/LorePage.meta b/Assets/LorePage.meta new file mode 100644 index 0000000..77e8c50 --- /dev/null +++ b/Assets/LorePage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: caffdd0e0f56c2c4f98ab1aca361bf04 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MainMenuUI/LoreToMainMenu.cs b/Assets/MainMenuUI/LoreToMainMenu.cs new file mode 100644 index 0000000..5e93d9d --- /dev/null +++ b/Assets/MainMenuUI/LoreToMainMenu.cs @@ -0,0 +1,11 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class LoreToMainMenu : MonoBehaviour +{ + // Method to load the "mainMenu" scene + public void LoadMainMenu() + { + SceneManager.LoadScene("mainMenu"); + } +} diff --git a/Assets/MainMenuUI/LoreToMainMenu.cs.meta b/Assets/MainMenuUI/LoreToMainMenu.cs.meta new file mode 100644 index 0000000..497662a --- /dev/null +++ b/Assets/MainMenuUI/LoreToMainMenu.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c05a531b177d1984b85027308cbc9dea \ No newline at end of file diff --git a/Assets/MainMenuUI/MainMenuToLore.cs b/Assets/MainMenuUI/MainMenuToLore.cs new file mode 100644 index 0000000..a2e4f05 --- /dev/null +++ b/Assets/MainMenuUI/MainMenuToLore.cs @@ -0,0 +1,11 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class MainMenuToLore : MonoBehaviour +{ + // Method to load the "Lore" scene + public void LoadLoreScene() + { + SceneManager.LoadScene("Lore"); + } +} diff --git a/Assets/MainMenuUI/MainMenuToLore.cs.meta b/Assets/MainMenuUI/MainMenuToLore.cs.meta new file mode 100644 index 0000000..2ec3f0f --- /dev/null +++ b/Assets/MainMenuUI/MainMenuToLore.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9637e4167ef18934eb14d7ff957d9729 \ No newline at end of file diff --git a/Assets/Scenes/Lore.unity b/Assets/Scenes/Lore.unity index 067787c..b53765f 100644 --- a/Assets/Scenes/Lore.unity +++ b/Assets/Scenes/Lore.unity @@ -119,7 +119,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1415439309 +--- !u!1 &629065841 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -127,9 +127,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1415439312} - - component: {fileID: 1415439311} - - component: {fileID: 1415439310} + - component: {fileID: 629065844} + - component: {fileID: 629065843} + - component: {fileID: 629065842} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -137,21 +137,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &1415439310 +--- !u!81 &629065842 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415439309} + m_GameObject: {fileID: 629065841} m_Enabled: 1 ---- !u!20 &1415439311 +--- !u!20 &629065843 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415439309} + m_GameObject: {fileID: 629065841} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -196,13 +196,13 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &1415439312 +--- !u!4 &629065844 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415439309} + m_GameObject: {fileID: 629065841} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} @@ -215,4 +215,4 @@ Transform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1415439312} + - {fileID: 629065844} diff --git a/Assets/Scenes/Lore.unity.meta b/Assets/Scenes/Lore.unity.meta index 6edbde7..97262a7 100644 --- a/Assets/Scenes/Lore.unity.meta +++ b/Assets/Scenes/Lore.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8589d14a3fbe40140a88026a965887e7 +guid: 9760ba12b30d3aa46874b4ede3d8d470 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/mainMenu.unity b/Assets/Scenes/mainMenu.unity index fff1332..634cb73 100644 --- a/Assets/Scenes/mainMenu.unity +++ b/Assets/Scenes/mainMenu.unity @@ -216,6 +216,7 @@ RectTransform: - {fileID: 1621325361} - {fileID: 565560804} - {fileID: 1299303615} + - {fileID: 792139130} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -251,7 +252,7 @@ RectTransform: m_GameObject: {fileID: 565560803} 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 663930717} @@ -259,8 +260,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 100} + m_AnchoredPosition: {x: 0, y: -44} + m_SizeDelta: {x: 275, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &565560805 MonoBehaviour: @@ -492,7 +493,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter The Paul Zone + m_text: Fight For Freedom m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -571,6 +572,152 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 663930716} m_CullTransparentMesh: 1 +--- !u!1 &792139129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 792139130} + - component: {fileID: 792139133} + - component: {fileID: 792139132} + - component: {fileID: 792139131} + - component: {fileID: 792139134} + m_Layer: 5 + m_Name: Lore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &792139130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792139129} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7324368, y: 0.7324368, z: 0.7324368} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1868218632} + m_Father: {fileID: 447492282} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -420, y: -450} + m_SizeDelta: {x: 150, y: 75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &792139131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792139129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 792139132} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1595602254} + m_TargetAssemblyTypeName: MainMenuToLore, Assembly-CSharp + m_MethodName: LoadLoreScene + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &792139132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792139129} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &792139133 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792139129} + m_CullTransparentMesh: 1 +--- !u!114 &792139134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792139129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9637e4167ef18934eb14d7ff957d9729, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &860871536 GameObject: m_ObjectHideFlags: 0 @@ -736,7 +883,7 @@ RectTransform: m_GameObject: {fileID: 1299303614} 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1496410249} @@ -744,8 +891,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -138} - m_SizeDelta: {x: 300, y: 100} + m_AnchoredPosition: {x: 0, y: -191} + m_SizeDelta: {x: 275, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1299303616 MonoBehaviour: @@ -790,7 +937,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1299303617} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 11500000, guid: 8aa67d308b16cc444b3c95f90d78d521, type: 3} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1299303617 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1009,6 +1168,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496410248} m_CullTransparentMesh: 1 +--- !u!1 &1595602251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1595602253} + - component: {fileID: 1595602254} + m_Layer: 0 + m_Name: LoreGameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1595602253 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595602251} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 273.53836, y: 22.505363, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1595602254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595602251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9637e4167ef18934eb14d7ff957d9729, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1621325360 GameObject: m_ObjectHideFlags: 0 @@ -1066,7 +1269,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 7853139185308270890, guid: cf0799e8f13416440b8c8ada93e3c61b, type: 3} + m_Sprite: {fileID: -8009826392110483304, guid: fdc7a928c4e2b9f43832ccbb302d53d1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1084,6 +1287,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1621325360} m_CullTransparentMesh: 1 +--- !u!1 &1868218631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1868218632} + - component: {fileID: 1868218634} + - component: {fileID: 1868218633} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1868218632 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868218631} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 792139130} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1868218633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868218631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Lore + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 37 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1868218634 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868218631} + m_CullTransparentMesh: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1092,3 +1431,4 @@ SceneRoots: - {fileID: 447492282} - {fileID: 632931516} - {fileID: 1334956894} + - {fileID: 1595602253} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 5fb6ae1..16bfdd6 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,6 +8,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/mainMenu.unity guid: 0eaa95ea9dd228c439538653cda5730e + - enabled: 1 + path: Assets/Scenes/Lore.unity + guid: 9760ba12b30d3aa46874b4ede3d8d470 - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02