From b6828a975ab3b4e8fc817f1e0b7b65f6a72036f6 Mon Sep 17 00:00:00 2001 From: Reinier Vens Date: Sun, 14 Mar 2021 03:56:49 +0000 Subject: [PATCH] Save/Load and Main Menu Submenus Redid all of the property panel UI prefabs (oof) Implemented saving and loading of the game state Moved sector generation to sector constructor (along with loading from save file) Entity settings now separate from player settings Player settings (incl. saved run) now statically accessible from game manager Added animations and submenus to the main menu Unified main menu settings and properties panel styles for prefab reusability --- Assets/Materials/UI/Entrance.mat | 2 +- Assets/Prefabs/UI/Properties Panel.meta | 8 + .../{ => Properties Panel}/Attribute.prefab | 0 .../Attribute.prefab.meta | 0 .../{ => Properties Panel}/Bool Field.prefab | 21 +- .../Bool Field.prefab.meta | 0 .../Button Field.prefab | 40 +- .../Button Field.prefab.meta | 0 .../{ => Properties Panel}/Enum Field.prefab | 98 +- .../Enum Field.prefab.meta | 0 .../Increment Field.prefab | 24 +- .../Increment Field.prefab.meta | 0 .../{ => Properties Panel}/Input Field.prefab | 40 +- .../Input Field.prefab.meta | 0 .../Progress Field.prefab | 42 +- .../Progress Field.prefab.meta | 0 .../Properties Panel.prefab | 0 .../Properties Panel.prefab.meta | 0 .../{ => Properties Panel}/Properties.prefab | 0 .../Properties.prefab.meta | 0 .../Property Button.prefab | 18 +- .../Property Button.prefab.meta | 0 .../Property Label.prefab | 18 +- .../Property Label.prefab.meta | 0 .../Property List 1.prefab | 0 .../Property List 1.prefab.meta | 0 .../Property List.prefab | 0 .../Property List.prefab.meta | 0 .../Property Section.prefab | 4 +- .../Property Section.prefab.meta | 0 .../UI/{ => Properties Panel}/Property.prefab | 14 +- .../Property.prefab.meta | 0 .../Ranged Float Field.prefab | 49 +- .../Ranged Float Field.prefab.meta | 0 .../UI/Properties Panel/Text Button.prefab | 214 +++ .../Properties Panel/Text Button.prefab.meta | 7 + Assets/Scenes/Main Menu.unity | 1361 ++++++++++------- Assets/Scenes/TestScene.unity | 115 +- Assets/Scripts/Gameplay/ActionGameManager.cs | 54 +- Assets/Scripts/Gameplay/GameSettings.cs | 2 +- Assets/Scripts/MainMenu.cs | 186 ++- Assets/Scripts/ServerShared/Entity.cs | 8 +- .../Scripts/ServerShared/EntitySerializer.cs | 110 +- Assets/Scripts/ServerShared/EntitySettings.cs | 9 + .../ServerShared/EntitySettings.cs.meta | 3 + Assets/Scripts/ServerShared/OrbitalEntity.cs | 2 +- Assets/Scripts/ServerShared/PlayerSettings.cs | 7 +- Assets/Scripts/ServerShared/SavedGame.cs | 83 + Assets/Scripts/ServerShared/SavedGame.cs.meta | 3 + Assets/Scripts/ServerShared/Sector.cs | 225 ++- .../Scripts/ServerShared/SectorGenerator.cs | 163 -- .../ServerShared/SectorGenerator.cs.meta | 3 - Assets/Scripts/ServerShared/Ship.cs | 2 +- Assets/Scripts/UI/EnumField.cs | 4 +- Assets/Scripts/UI/InventoryMenu.cs | 4 +- Assets/Scripts/UI/PropertiesPanel.cs | 8 +- Assets/Scripts/UI/SectorMap.cs | 42 +- Assets/Scripts/UI/TextButton.cs | 35 + Assets/Scripts/UI/TextButton.cs.meta | 11 + Assets/Scripts/UI/TradeMenu.cs | 4 +- GameData/PlayerSettings.msgpack | Bin 7 -> 11 bytes Packages/packages-lock.json | 2 +- UserSettings/EditorUserSettings.asset | 2 +- 63 files changed, 1948 insertions(+), 1099 deletions(-) create mode 100644 Assets/Prefabs/UI/Properties Panel.meta rename Assets/Prefabs/UI/{ => Properties Panel}/Attribute.prefab (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Attribute.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Bool Field.prefab (98%) rename Assets/Prefabs/UI/{ => Properties Panel}/Bool Field.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Button Field.prefab (94%) rename Assets/Prefabs/UI/{ => Properties Panel}/Button Field.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Enum Field.prefab (87%) rename Assets/Prefabs/UI/{ => Properties Panel}/Enum Field.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Increment Field.prefab (98%) rename Assets/Prefabs/UI/{ => Properties Panel}/Increment Field.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Input Field.prefab (96%) rename Assets/Prefabs/UI/{ => Properties Panel}/Input Field.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Progress Field.prefab (94%) rename Assets/Prefabs/UI/{ => Properties Panel}/Progress Field.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Properties Panel.prefab (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Properties Panel.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Properties.prefab (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Properties.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property Button.prefab (98%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property Button.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property Label.prefab (98%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property Label.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property List 1.prefab (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property List 1.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property List.prefab (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property List.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property Section.prefab (98%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property Section.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property.prefab (97%) rename Assets/Prefabs/UI/{ => Properties Panel}/Property.prefab.meta (100%) rename Assets/Prefabs/UI/{ => Properties Panel}/Ranged Float Field.prefab (96%) rename Assets/Prefabs/UI/{ => Properties Panel}/Ranged Float Field.prefab.meta (100%) create mode 100644 Assets/Prefabs/UI/Properties Panel/Text Button.prefab create mode 100644 Assets/Prefabs/UI/Properties Panel/Text Button.prefab.meta create mode 100644 Assets/Scripts/ServerShared/EntitySettings.cs create mode 100644 Assets/Scripts/ServerShared/EntitySettings.cs.meta create mode 100644 Assets/Scripts/ServerShared/SavedGame.cs create mode 100644 Assets/Scripts/ServerShared/SavedGame.cs.meta delete mode 100644 Assets/Scripts/ServerShared/SectorGenerator.cs delete mode 100644 Assets/Scripts/ServerShared/SectorGenerator.cs.meta create mode 100644 Assets/Scripts/UI/TextButton.cs create mode 100644 Assets/Scripts/UI/TextButton.cs.meta diff --git a/Assets/Materials/UI/Entrance.mat b/Assets/Materials/UI/Entrance.mat index 15f60d91e..13455373e 100644 --- a/Assets/Materials/UI/Entrance.mat +++ b/Assets/Materials/UI/Entrance.mat @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 9025249fbeb4b594680d2749b521bb41, type: 3} + m_Texture: {fileID: 2800000, guid: 6c9ab17a8574de140969db991b89994f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Prefabs/UI/Properties Panel.meta b/Assets/Prefabs/UI/Properties Panel.meta new file mode 100644 index 000000000..ef2975168 --- /dev/null +++ b/Assets/Prefabs/UI/Properties Panel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51b106861158ad342aa0ac02a7ed80c3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/Attribute.prefab b/Assets/Prefabs/UI/Properties Panel/Attribute.prefab similarity index 100% rename from Assets/Prefabs/UI/Attribute.prefab rename to Assets/Prefabs/UI/Properties Panel/Attribute.prefab diff --git a/Assets/Prefabs/UI/Attribute.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Attribute.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Attribute.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Attribute.prefab.meta diff --git a/Assets/Prefabs/UI/Bool Field.prefab b/Assets/Prefabs/UI/Properties Panel/Bool Field.prefab similarity index 98% rename from Assets/Prefabs/UI/Bool Field.prefab rename to Assets/Prefabs/UI/Properties Panel/Bool Field.prefab index 3f6220f00..d005cdba5 100644 --- a/Assets/Prefabs/UI/Bool Field.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Bool Field.prefab @@ -75,10 +75,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 4 - m_Top: 6 - m_Bottom: 6 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 4 m_ChildForceExpandWidth: 1 @@ -200,7 +200,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 365, y: 0} + m_AnchoredPosition: {x: 335, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!114 &7661950294707789148 @@ -217,6 +217,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -278,7 +279,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: -1 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 2 @@ -342,7 +343,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -425,7 +426,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Dolor with very long name that forces expand + m_text: Dolor m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2} m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f, @@ -435,8 +436,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Prefabs/UI/Bool Field.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Bool Field.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Bool Field.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Bool Field.prefab.meta diff --git a/Assets/Prefabs/UI/Button Field.prefab b/Assets/Prefabs/UI/Properties Panel/Button Field.prefab similarity index 94% rename from Assets/Prefabs/UI/Button Field.prefab rename to Assets/Prefabs/UI/Properties Panel/Button Field.prefab index 5434e056c..0d208cbde 100644 --- a/Assets/Prefabs/UI/Button Field.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Button Field.prefab @@ -75,8 +75,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -227,7 +227,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 28 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 2 @@ -247,6 +247,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -285,7 +286,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6566784227922820063} - - component: {fileID: 6566784227922820061} - component: {fileID: 1185277543755028150} - component: {fileID: 6566784227922820057} - component: {fileID: 226212844} @@ -317,26 +317,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6566784227922820061 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6566784227922820056} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 32 - m_FlexibleWidth: 1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!222 &1185277543755028150 CanvasRenderer: m_ObjectHideFlags: 0 @@ -373,10 +353,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 4 - m_Top: 6 - m_Bottom: 6 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 4 m_ChildForceExpandWidth: 1 @@ -462,8 +442,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Prefabs/UI/Button Field.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Button Field.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Button Field.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Button Field.prefab.meta diff --git a/Assets/Prefabs/UI/Enum Field.prefab b/Assets/Prefabs/UI/Properties Panel/Enum Field.prefab similarity index 87% rename from Assets/Prefabs/UI/Enum Field.prefab rename to Assets/Prefabs/UI/Properties Panel/Enum Field.prefab index 7025cd455..aded92530 100644 --- a/Assets/Prefabs/UI/Enum Field.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Enum Field.prefab @@ -1,80 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1444953513211870612 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1444953513211870613} - - component: {fileID: 1444953513211870611} - - component: {fileID: 1444953513211870610} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1444953513211870613 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1444953513211870612} - 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_Father: {fileID: 1444953513611246322} - m_RootOrder: 0 - 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!222 &1444953513211870611 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1444953513211870612} - m_CullTransparentMesh: 0 ---- !u!114 &1444953513211870610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1444953513211870612} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 0.09803922} - 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: 21300000, guid: 61501af80fabaac44ace015a55851277, type: 3} - 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!1 &1444953513591056482 GameObject: m_ObjectHideFlags: 0 @@ -105,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1444953513611246322} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -150,8 +75,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -241,7 +166,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1444953513211870613} - {fileID: 1444953513591056483} - {fileID: 1444953514355799430} m_Father: {fileID: 1444953514731475974} @@ -304,7 +228,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 28 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 2 @@ -324,6 +248,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -429,8 +354,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -539,7 +464,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1444953513611246322} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -567,7 +492,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -645,7 +570,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Label: {fileID: 1444953513817938007} - Dropdown: {fileID: 0} + Dropdown: {fileID: 1073031607} + DropdownLabel: {fileID: 1444953513591056480} --- !u!114 &4632392883281417793 MonoBehaviour: m_ObjectHideFlags: 0 @@ -659,7 +585,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 + m_Left: 0 m_Right: 0 m_Top: 0 m_Bottom: 0 diff --git a/Assets/Prefabs/UI/Enum Field.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Enum Field.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Enum Field.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Enum Field.prefab.meta diff --git a/Assets/Prefabs/UI/Increment Field.prefab b/Assets/Prefabs/UI/Properties Panel/Increment Field.prefab similarity index 98% rename from Assets/Prefabs/UI/Increment Field.prefab rename to Assets/Prefabs/UI/Properties Panel/Increment Field.prefab index 488cc4b4a..db1ffa153 100644 --- a/Assets/Prefabs/UI/Increment Field.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Increment Field.prefab @@ -105,6 +105,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -187,7 +188,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: -1 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 2 @@ -269,8 +270,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -410,10 +411,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 8 - m_Top: 6 - m_Bottom: 6 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 4 m_ChildForceExpandWidth: 1 @@ -475,7 +476,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 24, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!222 &5145711774446738166 @@ -544,6 +545,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -648,8 +650,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -673,7 +675,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 diff --git a/Assets/Prefabs/UI/Increment Field.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Increment Field.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Increment Field.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Increment Field.prefab.meta diff --git a/Assets/Prefabs/UI/Input Field.prefab b/Assets/Prefabs/UI/Properties Panel/Input Field.prefab similarity index 96% rename from Assets/Prefabs/UI/Input Field.prefab rename to Assets/Prefabs/UI/Properties Panel/Input Field.prefab index 087a26c6e..d5784a8cb 100644 --- a/Assets/Prefabs/UI/Input Field.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Input Field.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 23155009655760172} - - component: {fileID: 23155009655760174} - component: {fileID: 5404697270043232325} - component: {fileID: 6586910564433979167} - component: {fileID: 1618696626055083012} @@ -41,26 +40,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &23155009655760174 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 23155009655760171} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 32 - m_FlexibleWidth: 1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!222 &5404697270043232325 CanvasRenderer: m_ObjectHideFlags: 0 @@ -96,10 +75,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 4 m_ChildForceExpandWidth: 1 @@ -185,8 +164,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -316,7 +295,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 28 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 2 @@ -466,6 +445,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -644,8 +624,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294111986 - m_fontColor: {r: 0.95, g: 0.95, b: 0.95, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Prefabs/UI/Input Field.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Input Field.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Input Field.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Input Field.prefab.meta diff --git a/Assets/Prefabs/UI/Progress Field.prefab b/Assets/Prefabs/UI/Properties Panel/Progress Field.prefab similarity index 94% rename from Assets/Prefabs/UI/Progress Field.prefab rename to Assets/Prefabs/UI/Properties Panel/Progress Field.prefab index 4af15c203..1360e00de 100644 --- a/Assets/Prefabs/UI/Progress Field.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Progress Field.prefab @@ -159,7 +159,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3301729265155698787} - - component: {fileID: 3301729265155698799} - component: {fileID: 3301729265155698785} - component: {fileID: 256436433275418348} - component: {fileID: 308454102} @@ -191,26 +190,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3301729265155698799 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3301729265155698788} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 32 - m_FlexibleWidth: 1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!222 &3301729265155698785 CanvasRenderer: m_ObjectHideFlags: 0 @@ -246,10 +225,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 4 - m_Top: 6 - m_Bottom: 6 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 4 m_ChildForceExpandWidth: 1 @@ -335,8 +314,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -446,10 +425,10 @@ RectTransform: m_Father: {fileID: 8626591645481506733} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -10, y: 0} + m_SizeDelta: {x: -10, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8579295300066914487 GameObject: @@ -504,6 +483,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -554,7 +534,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: -1 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 2 diff --git a/Assets/Prefabs/UI/Progress Field.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Progress Field.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Progress Field.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Progress Field.prefab.meta diff --git a/Assets/Prefabs/UI/Properties Panel.prefab b/Assets/Prefabs/UI/Properties Panel/Properties Panel.prefab similarity index 100% rename from Assets/Prefabs/UI/Properties Panel.prefab rename to Assets/Prefabs/UI/Properties Panel/Properties Panel.prefab diff --git a/Assets/Prefabs/UI/Properties Panel.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Properties Panel.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Properties Panel.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Properties Panel.prefab.meta diff --git a/Assets/Prefabs/UI/Properties.prefab b/Assets/Prefabs/UI/Properties Panel/Properties.prefab similarity index 100% rename from Assets/Prefabs/UI/Properties.prefab rename to Assets/Prefabs/UI/Properties Panel/Properties.prefab diff --git a/Assets/Prefabs/UI/Properties.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Properties.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Properties.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Properties.prefab.meta diff --git a/Assets/Prefabs/UI/Property Button.prefab b/Assets/Prefabs/UI/Properties Panel/Property Button.prefab similarity index 98% rename from Assets/Prefabs/UI/Property Button.prefab rename to Assets/Prefabs/UI/Properties Panel/Property Button.prefab index 1abfb9035..342160309 100644 --- a/Assets/Prefabs/UI/Property Button.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Property Button.prefab @@ -33,10 +33,10 @@ RectTransform: m_Father: {fileID: 1613450655389604793} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 192.5, y: -24.16} - m_SizeDelta: {x: 361, y: 36.32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1613450655044732637 CanvasRenderer: @@ -151,7 +151,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: -1 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 2 @@ -219,12 +219,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 + m_Left: 4 m_Right: 4 - m_Top: 6 - m_Bottom: 6 + m_Top: 4 + m_Bottom: 4 m_ChildAlignment: 4 - m_Spacing: 4 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 diff --git a/Assets/Prefabs/UI/Property Button.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Property Button.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Property Button.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Property Button.prefab.meta diff --git a/Assets/Prefabs/UI/Property Label.prefab b/Assets/Prefabs/UI/Properties Panel/Property Label.prefab similarity index 98% rename from Assets/Prefabs/UI/Property Label.prefab rename to Assets/Prefabs/UI/Properties Panel/Property Label.prefab index 2373916f4..77133101c 100644 --- a/Assets/Prefabs/UI/Property Label.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Property Label.prefab @@ -76,8 +76,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -150,7 +150,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: -1 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 3 @@ -231,10 +231,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 8 - m_Top: 6 - m_Bottom: 6 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 4 m_ChildForceExpandWidth: 1 @@ -320,8 +320,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Prefabs/UI/Property Label.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Property Label.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Property Label.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Property Label.prefab.meta diff --git a/Assets/Prefabs/UI/Property List 1.prefab b/Assets/Prefabs/UI/Properties Panel/Property List 1.prefab similarity index 100% rename from Assets/Prefabs/UI/Property List 1.prefab rename to Assets/Prefabs/UI/Properties Panel/Property List 1.prefab diff --git a/Assets/Prefabs/UI/Property List 1.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Property List 1.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Property List 1.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Property List 1.prefab.meta diff --git a/Assets/Prefabs/UI/Property List.prefab b/Assets/Prefabs/UI/Properties Panel/Property List.prefab similarity index 100% rename from Assets/Prefabs/UI/Property List.prefab rename to Assets/Prefabs/UI/Properties Panel/Property List.prefab diff --git a/Assets/Prefabs/UI/Property List.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Property List.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Property List.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Property List.prefab.meta diff --git a/Assets/Prefabs/UI/Property Section.prefab b/Assets/Prefabs/UI/Properties Panel/Property Section.prefab similarity index 98% rename from Assets/Prefabs/UI/Property Section.prefab rename to Assets/Prefabs/UI/Properties Panel/Property Section.prefab index b09c5ade8..f0629b763 100644 --- a/Assets/Prefabs/UI/Property Section.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Property Section.prefab @@ -75,8 +75,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Prefabs/UI/Property Section.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Property Section.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Property Section.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Property Section.prefab.meta diff --git a/Assets/Prefabs/UI/Property.prefab b/Assets/Prefabs/UI/Properties Panel/Property.prefab similarity index 97% rename from Assets/Prefabs/UI/Property.prefab rename to Assets/Prefabs/UI/Properties Panel/Property.prefab index f31cd6b4c..06e3eca26 100644 --- a/Assets/Prefabs/UI/Property.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Property.prefab @@ -78,8 +78,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -152,7 +152,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: -1 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 3 @@ -231,10 +231,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 4 - m_Top: 6 - m_Bottom: 6 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 4 m_ChildForceExpandWidth: 1 diff --git a/Assets/Prefabs/UI/Property.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Property.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Property.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Property.prefab.meta diff --git a/Assets/Prefabs/UI/Ranged Float Field.prefab b/Assets/Prefabs/UI/Properties Panel/Ranged Float Field.prefab similarity index 96% rename from Assets/Prefabs/UI/Ranged Float Field.prefab rename to Assets/Prefabs/UI/Properties Panel/Ranged Float Field.prefab index 07c5826d3..a95a826c4 100644 --- a/Assets/Prefabs/UI/Ranged Float Field.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Ranged Float Field.prefab @@ -32,10 +32,10 @@ RectTransform: m_Father: {fileID: 7146463267720429741} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4073014376677579701 CanvasRenderer: @@ -106,10 +106,10 @@ RectTransform: m_Father: {fileID: 7146463267720429741} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_SizeDelta: {x: -10, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2002492103477548874 GameObject: @@ -217,10 +217,10 @@ RectTransform: m_Father: {fileID: 7146463267720429741} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3491766746367124251 GameObject: @@ -255,10 +255,10 @@ RectTransform: m_Father: {fileID: 3222204141728529077} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.635, y: 0} - m_AnchorMax: {x: 0.635, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 16, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3123360186942093854 CanvasRenderer: @@ -305,7 +305,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3491766746367124251} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} m_Name: @@ -369,7 +369,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 32 + m_PreferredHeight: -1 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -408,10 +408,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 12 - m_Right: 4 - m_Top: 6 - m_Bottom: 6 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 4 m_ChildForceExpandWidth: 1 @@ -487,7 +487,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Slider Field + m_text: Slider FieldSlider FieldSlider FieldSlider FieldSlider FieldSlider FieldSlider + FieldSlider Field m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2} m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f, @@ -497,8 +498,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -664,7 +665,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.635 + m_Value: 1 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -682,7 +683,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: -1 + m_MinHeight: 24 m_PreferredWidth: 0 m_PreferredHeight: -1 m_FlexibleWidth: 2 diff --git a/Assets/Prefabs/UI/Ranged Float Field.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Ranged Float Field.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Ranged Float Field.prefab.meta rename to Assets/Prefabs/UI/Properties Panel/Ranged Float Field.prefab.meta diff --git a/Assets/Prefabs/UI/Properties Panel/Text Button.prefab b/Assets/Prefabs/UI/Properties Panel/Text Button.prefab new file mode 100644 index 000000000..65d6df6d7 --- /dev/null +++ b/Assets/Prefabs/UI/Properties Panel/Text Button.prefab @@ -0,0 +1,214 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3462739465108434284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3462739465108434285} + - component: {fileID: 3462739465108434320} + - component: {fileID: 3462739465108434287} + - component: {fileID: 3462739465108434286} + - component: {fileID: 3462739465108434322} + - component: {fileID: 2983484326545269840} + m_Layer: 5 + m_Name: Text Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3462739465108434285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462739465108434284} + 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_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3462739465108434320 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462739465108434284} + m_CullTransparentMesh: 1 +--- !u!114 &3462739465108434287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462739465108434284} + 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: This is a button! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2} + m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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: 1 + 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!114 &3462739465108434286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462739465108434284} + 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: 0.85, g: 0.95199996, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, 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: 3462739465108434287} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3462739465108434322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462739465108434284} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd434ac0757d3f24f933a753493df22d, type: 3} + m_Name: + m_EditorClassIdentifier: + Button: {fileID: 3462739465108434286} + Label: {fileID: 3462739465108434287} + AnimationDuration: 0.1 + HoverSpacing: 8 +--- !u!114 &2983484326545269840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462739465108434284} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58ab24f16cf869f4d88cd351417103a6, type: 3} + m_Name: + m_EditorClassIdentifier: + Label: {fileID: 3462739465108434287} + Button: {fileID: 3462739465108434286} diff --git a/Assets/Prefabs/UI/Properties Panel/Text Button.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Text Button.prefab.meta new file mode 100644 index 000000000..f5335761a --- /dev/null +++ b/Assets/Prefabs/UI/Properties Panel/Text Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c7113183a38d6f84b8ffe6fa7c342896 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index effeb364f..6f3e6edfd 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -247,7 +247,7 @@ Transform: m_Children: - {fileID: 801832274} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &356429273 GameObject: @@ -376,9 +376,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} m_Name: m_EditorClassIdentifier: - m_NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2} + m_NoiseProfile: {fileID: 11400000, guid: 20a705aea2d80e0478fb89b6f43d8530, type: 2} m_PivotOffset: {x: 0, y: 0, z: 0} - m_AmplitudeGain: 1 + m_AmplitudeGain: 2 m_FrequencyGain: 0.25 mNoiseOffsets: {x: 0, y: 0, z: 0} --- !u!114 &412917868 @@ -399,14 +399,14 @@ MonoBehaviour: m_LookaheadIgnoreY: 0 m_HorizontalDamping: 0.5 m_VerticalDamping: 0.5 - m_ScreenX: 0.2 - m_ScreenY: 0.17 + m_ScreenX: 0.19 + m_ScreenY: 0.18 m_DeadZoneWidth: 0 m_DeadZoneHeight: 0 m_SoftZoneWidth: 0.8 m_SoftZoneHeight: 0.8 m_BiasX: 0 - m_BiasY: 0.00000001862645 + m_BiasY: 0 m_CenterOnActivate: 1 --- !u!114 &412917869 MonoBehaviour: @@ -433,16 +433,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 1 - m_LookaheadSmoothing: 30 + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 0 - m_XDamping: 10.2 - m_YDamping: 10.3 - m_ZDamping: 10.3 + m_XDamping: 0 + m_YDamping: 0 + m_ZDamping: 0 m_TargetMovementOnly: 0 - m_ScreenX: 0.8 - m_ScreenY: 0.31 - m_CameraDistance: 150 + m_ScreenX: 0.74 + m_ScreenY: 0.26 + m_CameraDistance: 146.53 m_DeadZoneWidth: 0 m_DeadZoneHeight: 0 m_DeadZoneDepth: 0 @@ -546,7 +546,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &564164468 GameObject: @@ -575,7 +575,7 @@ Transform: m_GameObject: {fileID: 564164468} 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: 0.25, y: 0.25, z: 0.25} m_Children: [] m_Father: {fileID: 1340266884} m_RootOrder: 1 @@ -802,13 +802,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 741153267} - m_LocalRotation: {x: 0.023619473, y: 0.88916016, z: -0.45464548, w: 0.046193115} - m_LocalPosition: {x: -94.98617, y: -27.664396, z: 123.45666} + m_LocalRotation: {x: 0.015506899, y: 0.9502416, z: -0.3074132, w: 0.04793321} + m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 412917866} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &750375533 GameObject: @@ -820,7 +820,6 @@ GameObject: m_Component: - component: {fileID: 750375534} - component: {fileID: 750375535} - - component: {fileID: 750375536} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -840,7 +839,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &750375535 MonoBehaviour: @@ -868,20 +867,6 @@ MonoBehaviour: Heightmap: {fileID: 8400000, guid: 2fc21a9d3e9647948b56e384cd9378b3, type: 2} ParticleColors: {fileID: 2800000, guid: 56db63da398b2d04394ddbccedce943c, type: 3} GravityCamera: {fileID: 2103364771} ---- !u!114 &750375536 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 750375533} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d7c7b928d043a3449b93bce9de03d1c, type: 3} - m_Name: - m_EditorClassIdentifier: - Title: {fileID: 866549248} - ButtonPrototype: {fileID: 1112612993} --- !u!1 &765320284 GameObject: m_ObjectHideFlags: 0 @@ -1061,17 +1046,17 @@ PrefabInstance: - target: {fileID: 7852221720971737233, guid: 046dde0f4600bce41ad33c476f99b309, type: 3} propertyPath: m_LocalScale.x - value: 25 + value: 35 objectReference: {fileID: 0} - target: {fileID: 7852221720971737233, guid: 046dde0f4600bce41ad33c476f99b309, type: 3} propertyPath: m_LocalScale.y - value: 25 + value: 35 objectReference: {fileID: 0} - target: {fileID: 7852221720971737233, guid: 046dde0f4600bce41ad33c476f99b309, type: 3} propertyPath: m_LocalScale.z - value: 25 + value: 35 objectReference: {fileID: 0} - target: {fileID: 7852221720971737233, guid: 046dde0f4600bce41ad33c476f99b309, type: 3} @@ -1086,143 +1071,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 801832273} m_PrefabAsset: {fileID: 0} ---- !u!1 &866549246 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 866549247} - - component: {fileID: 866549249} - - component: {fileID: 866549248} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &866549247 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866549246} - 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_Father: {fileID: 1413908899} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &866549248 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866549246} - 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: 'aetheria - - terminus' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} - m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294962892 - m_fontColor: {r: 0.8, g: 0.9333333, b: 1, 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: 110 - m_fontSizeBase: 110 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 16 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -20 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 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: 1 - 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 &866549249 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866549246} - m_CullTransparentMesh: 1 --- !u!1 &965376321 GameObject: m_ObjectHideFlags: 0 @@ -1329,8 +1177,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965376321} - m_LocalRotation: {x: 0.023619473, y: 0.88916016, z: -0.45464548, w: 0.046193115} - m_LocalPosition: {x: -94.98617, y: -27.664396, z: 123.45666} + m_LocalRotation: {x: 0.015506899, y: 0.9502416, z: -0.3074132, w: 0.04793321} + m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1464,8 +1312,9 @@ GameObject: - component: {fileID: 991231191} - component: {fileID: 991231190} - component: {fileID: 991231189} + - component: {fileID: 991231193} m_Layer: 5 - m_Name: Canvas + m_Name: Main Menu Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1501,9 +1350,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 + m_ReferencePixelsPerUnit: 50 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} + m_ReferenceResolution: {x: 1280, y: 720} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 @@ -1543,208 +1392,33 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 1413908899} + - {fileID: 6584140821722344271} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1112612988 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1112612989} - - component: {fileID: 1112612992} - - component: {fileID: 1112612991} - - component: {fileID: 1112612990} - - component: {fileID: 1112612993} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1112612989 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1112612988} - 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_Father: {fileID: 1413908899} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1112612990 +--- !u!114 &991231193 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1112612988} + m_GameObject: {fileID: 991231188} 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: 0.8, g: 0.9333333, b: 1, a: 1} - m_HighlightedColor: {r: 1, g: 1, b: 1, 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: 1112612991} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1112612991 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1112612988} - 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: This is a button! - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} - m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, 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: 32 - m_fontSizeBase: 32 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 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: 1 - 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 &1112612992 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1112612988} - m_CullTransparentMesh: 1 ---- !u!114 &1112612993 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1112612988} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Script: {fileID: 11500000, guid: 3d7c7b928d043a3449b93bce9de03d1c, type: 3} m_Name: m_EditorClassIdentifier: + InGame: 0 + PanelPrototype: {fileID: 6584140821722344273} + FadeTime: 0.5 + FadeDistance: 1024 + FadeAlphaExponent: 2 + FadePositionExponent: 2 --- !u!1 &1131053606 GameObject: m_ObjectHideFlags: 0 @@ -1858,7 +1532,7 @@ Transform: - {fileID: 2103364770} - {fileID: 1988716753} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1311800795 GameObject: @@ -1987,7 +1661,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1340266883 GameObject: @@ -2021,7 +1695,7 @@ Transform: - {fileID: 1734434094} - {fileID: 678287591} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1362573162 GameObject: @@ -2051,72 +1725,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1413908898 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1413908899} - - component: {fileID: 1413908900} - m_Layer: 5 - m_Name: Menu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1413908899 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1413908898} - 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: - - {fileID: 866549247} - - {fileID: 1112612989} - m_Father: {fileID: 991231192} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 128, y: 0} - m_SizeDelta: {x: 512, y: -256} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1413908900 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1413908898} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 16 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1001 &1429393530 PrefabInstance: m_ObjectHideFlags: 0 @@ -2127,7 +1737,7 @@ PrefabInstance: - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, type: 3} @@ -2402,7 +2012,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1854054862 GameObject: @@ -2460,7 +2070,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1872107548 GameObject: @@ -2617,99 +2227,6 @@ Camera: m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &2016902026 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2016902028} - - component: {fileID: 2016902027} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &2016902027 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2016902026} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - 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!4 &2016902028 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2016902026} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &2103364769 GameObject: m_ObjectHideFlags: 0 @@ -2784,3 +2301,787 @@ Camera: m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!224 &4195065044884773788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065044884773789} + 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_Father: {fileID: 4195065045459113048} + m_RootOrder: 0 + 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, y: 1} +--- !u!1 &4195065044884773789 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4195065044884773788} + - component: {fileID: 4195065044884773791} + - component: {fileID: 4195065044884773790} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &4195065044884773790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065044884773789} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &4195065044884773791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065044884773789} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 8 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &4195065044983066082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4195065044983066085} + - component: {fileID: 4195065044983066087} + - component: {fileID: 4195065044983066084} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &4195065044983066084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065044983066082} + 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: 0.44583336, b: 0.050000012, a: 0.65882355} + 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: 21300000, guid: 7ed12bf887e951949bd02894a21fb3ff, type: 3} + 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!224 &4195065044983066085 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065044983066082} + 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_Father: {fileID: 4195065046045742823} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4195065044983066087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065044983066082} + m_CullTransparentMesh: 0 +--- !u!224 &4195065045459113048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065045459113049} + 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: + - {fileID: 4195065044884773788} + m_Father: {fileID: 4195065046457725746} + m_RootOrder: 0 + 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, y: 1} +--- !u!1 &4195065045459113049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4195065045459113048} + - component: {fileID: 4195065045459113053} + - component: {fileID: 4195065045459113050} + - component: {fileID: 4195065045459113051} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &4195065045459113050 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065045459113049} + m_CullTransparentMesh: 0 +--- !u!114 &4195065045459113051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065045459113049} + 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: 10917, 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!114 &4195065045459113053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065045459113049} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!1 &4195065046045742820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4195065046045742823} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4195065046045742823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065046045742820} + 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: + - {fileID: 4195065044983066085} + m_Father: {fileID: 4195065046395519667} + m_RootOrder: 0 + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4195065046395519664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4195065046395519667} + - component: {fileID: 4195065046395519668} + - component: {fileID: 4195065046395519666} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &4195065046395519666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065046395519664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4195065044983066084} + m_HandleRect: {fileID: 4195065044983066085} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!224 &4195065046395519667 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065046395519664} + 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: + - {fileID: 4195065046045742823} + m_Father: {fileID: 4195065046457725746} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 5, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!222 &4195065046395519668 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065046395519664} + m_CullTransparentMesh: 0 +--- !u!224 &4195065046457725746 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065046457725747} + 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: + - {fileID: 4195065045459113048} + - {fileID: 4195065046395519667} + m_Father: {fileID: 6584140821722344271} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4195065046457725747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4195065046457725746} + - component: {fileID: 4195065046457725751} + - component: {fileID: 4195065046457725749} + - component: {fileID: 4195065046457725748} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &4195065046457725748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065046457725747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: 9999 + m_LayoutPriority: 1 +--- !u!222 &4195065046457725749 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065046457725747} + m_CullTransparentMesh: 0 +--- !u!114 &4195065046457725751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4195065046457725747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 4195065044884773788} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 10 + m_Viewport: {fileID: 4195065045459113048} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 4195065046395519666} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 1 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5198465805751224517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821494235352} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &6584140821494235352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6584140821494235353} + - component: {fileID: 6584140821494235359} + - component: {fileID: 6584140821494235358} + - component: {fileID: 5198465805751224517} + - component: {fileID: 6584140821494235354} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6584140821494235353 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821494235352} + 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_Father: {fileID: 6584140821722344271} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &6584140821494235354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821494235352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &6584140821494235358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821494235352} + 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: 'aetheria + + terminus' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294964185 + m_fontColor: {r: 0.85, g: 0.95199996, b: 1, 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: 90 + m_fontSizeBase: 80 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 90 + m_fontStyle: 16 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -20 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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: 1 + 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 &6584140821494235359 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821494235352} + m_CullTransparentMesh: 0 +--- !u!114 &6584140821722344256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821722344270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c2bf4a7080061d42a87046c37bf0c60, type: 3} + m_Name: + m_EditorClassIdentifier: + Dropdown: {fileID: 0} + Title: {fileID: 6584140821494235358} + Section: {fileID: 1026668114703092140, guid: 3a149ea40b43fbf47b51ec165cb04e5f, type: 3} + List: {fileID: 6914334813923144328, guid: 93e63e3a8b352a04897123288d70f04b, type: 3} + Property: {fileID: 9159917045172241898, guid: be88722a74d512d45a454fe91327a389, + type: 3} + PropertyLabel: {fileID: 279061376544739623, guid: 5b8c5126640066e4fabe6e65b7225b3b, + type: 3} + Attribute: {fileID: 4447025208748278043, guid: 5e3a258a5b91c8246b20962ba6eccb09, + type: 3} + InputField: {fileID: 6586910564433979167, guid: fb49ef180533e3e488fa39d80cc2423a, + type: 3} + RangedFloatField: {fileID: 1663396771457720812, guid: c214f62d8f2188140b96ed12798034c8, + type: 3} + ProgressField: {fileID: 256436433275418348, guid: e6524d59d9bc67545b0eb1304bfb9d4b, + type: 3} + EnumField: {fileID: 1444953514731475975, guid: f19a14cd178d48f49ace9ad217bea2ed, + type: 3} + BoolField: {fileID: 7661950293931311388, guid: 001ad6a15f0d582458d359c0ae4405ed, + type: 3} + PropertyButton: {fileID: 2983484326545269840, guid: c7113183a38d6f84b8ffe6fa7c342896, + type: 3} + ButtonField: {fileID: 6566784227922820057, guid: 6db1feb4cda7b8c419384cd42c85a5c4, + type: 3} + IncrementField: {fileID: 5486709585343280439, guid: 9c14c92a1a08b0a4fb4f6aa6f8504082, + type: 3} + Content: {fileID: 4195065044884773788} + SelectedChild: {fileID: 0} +--- !u!222 &6584140821722344258 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821722344270} + m_CullTransparentMesh: 0 +--- !u!1 &6584140821722344270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6584140821722344271} + - component: {fileID: 6584140821722344256} + - component: {fileID: 6584140821722344258} + - component: {fileID: 6584140821722344272} + - component: {fileID: 6584140821722344273} + - component: {fileID: 6584140821722344274} + m_Layer: 5 + m_Name: Properties + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6584140821722344271 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821722344270} + 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: + - {fileID: 6584140821494235353} + - {fileID: 4195065046457725746} + m_Father: {fileID: 991231192} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 64, y: 0} + m_SizeDelta: {x: 400, y: -128} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &6584140821722344272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821722344270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &6584140821722344273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821722344270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!225 &6584140821722344274 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6584140821722344270} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 262dc6d70..692ffe547 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -151,7 +151,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62236173} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1124877095} @@ -890,6 +890,115 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 162042368} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &240056260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 240056265} + - component: {fileID: 240056264} + - component: {fileID: 240056263} + - component: {fileID: 240056262} + - component: {fileID: 240056261} + m_Layer: 0 + m_Name: IconBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &240056261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240056260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!64 &240056262 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240056260} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &240056263 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240056260} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 76476d467e1cd844dacbcbe00105866e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &240056264 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240056260} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &240056265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240056260} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1} + m_LocalScale: {x: 0.044999998, y: 0.044999998, z: 3} + m_Children: [] + m_Father: {fileID: 820952285} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &302169896 GameObject: m_ObjectHideFlags: 0 @@ -2121,7 +2230,7 @@ Transform: m_LocalScale: {x: 0.015, y: 0.015, z: 1} m_Children: [] m_Father: {fileID: 820952285} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &801092330 MonoBehaviour: @@ -2212,6 +2321,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1124877095} + - {fileID: 240056265} - {fileID: 801092329} m_Father: {fileID: 2067021207} m_RootOrder: 0 @@ -2563,6 +2673,7 @@ MonoBehaviour: ZonePrototype: {fileID: 1124877096} LinkPrototype: {fileID: 1955533723} IconPrototype: {fileID: 801092330} + IconBackgroundPrototype: {fileID: 240056261} ZonePrimaryMaterial: {fileID: 2100000, guid: 6c332e6d0be83ac459c05a7cf5b90ed1, type: 2} ZoneSecondaryMaterial: {fileID: 2100000, guid: 76476d467e1cd844dacbcbe00105866e, type: 2} diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 1cdc824ef..039597855 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -23,6 +23,28 @@ using Random = UnityEngine.Random; public class ActionGameManager : MonoBehaviour { + public static DirectoryInfo GameDataDirectory + { + get => _gameDataDirectory ??= new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData"); + } + private static DirectoryInfo _gameDataDirectory; + + public static PlayerSettings PlayerSettings + { + get => _playerSettings ??= File.Exists(_playerSettingsFilePath) + ? MessagePackSerializer.Deserialize(File.ReadAllBytes(_playerSettingsFilePath)) + : new PlayerSettings {Name = Environment.UserName}; + } + private static PlayerSettings _playerSettings; + private static string _playerSettingsFilePath => Path.Combine(GameDataDirectory.FullName, "PlayerSettings.msgpack"); + public static void SavePlayerSettings() + { + File.WriteAllBytes(_playerSettingsFilePath, MessagePackSerializer.Serialize(_playerSettings)); + } + + public static SavedGame Save; + + public GameSettings Settings; public string StarterShipTemplate = "Longinus"; public float2 Sensitivity; @@ -67,8 +89,6 @@ public class ActionGameManager : MonoBehaviour // private CinemachineFramingTransposer _transposer; // private CinemachineComposer _composer; - public PlayerSettings PlayerSettings { get; private set; } - private DirectoryInfo _filePath; private DirectoryInfo _loadoutPath; private bool _editMode; private float _time; @@ -84,7 +104,6 @@ public class ActionGameManager : MonoBehaviour private Dictionary _visibleHostileIndicators = new Dictionary(); private List _shipSubscriptions = new List(); private float _severeHeatstrokePhase; - private MarkovNameGenerator _nameGenerator; public List PlayerEntities { get; } = new List(); public EquippedDockingBay DockingBay { get; private set; } @@ -119,37 +138,16 @@ public class ActionGameManager : MonoBehaviour AkSoundEngine.RegisterGameObj(gameObject); ConsoleController.MessageReceiver = this; - _filePath = new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData"); - _loadoutPath = _filePath.CreateSubdirectory("Loadouts"); + _loadoutPath = GameDataDirectory.CreateSubdirectory("Loadouts"); ItemData = new DatabaseCache(); - ItemData.Load(Path.Combine(_filePath.FullName, "AetherDB.msgpack")); + ItemData.Load(Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack")); ItemManager = new ItemManager(ItemData, Settings.GameplaySettings, Debug.Log); SectorRenderer.ItemManager = ItemManager; - FileInfo playerSettingsFile = new FileInfo(Path.Combine(_filePath.FullName, "PlayerSettings.msgpack")); - if (!playerSettingsFile.Exists) - { - File.WriteAllBytes(playerSettingsFile.FullName, MessagePackSerializer.Serialize(Settings.DefaultPlayerSettings)); - } - PlayerSettings = MessagePackSerializer.Deserialize( - File.ReadAllBytes(playerSettingsFile.FullName)); - Loadouts.AddRange(_loadoutPath.EnumerateFiles("*.loadout") .Select(fi => MessagePackSerializer.Deserialize(File.ReadAllBytes(fi.FullName)))); - var names = new HashSet(); - var lines = NameFile.text.Split('\n'); - foreach (var line in lines) - { - foreach(var word in line.ToUpperInvariant().Split(' ', ',', '.', '"')) - if (word.Length >= NameGeneratorMinLength && !names.Contains(word)) - names.Add(word); - } - - _nameGenerator = new MarkovNameGenerator(ref ItemManager.Random, names, NameGeneratorOrder, NameGeneratorMinLength, NameGeneratorMaxLength); - //var zoneFile = Path.Combine(_filePath.FullName, "Home.zone"); - #region Input Handling _input = new AetheriaInput(); @@ -525,7 +523,7 @@ public class ActionGameManager : MonoBehaviour var stationParentPos = Zone.GetOrbitPosition(stationParentOrbit); var stationPos = stationParentPos + ItemManager.Random.NextFloat2Direction() * stationParent.GravityWellRadius.Value * .1f; var stationOrbit = Zone.CreateOrbit(stationParentOrbit, stationPos); - var station = new OrbitalEntity(ItemManager, Zone, stationHull, stationOrbit.ID); + var station = new OrbitalEntity(ItemManager, Zone, stationHull, stationOrbit.ID, Settings.DefaultEntitySettings); Zone.Entities.Add(station); var dockingBayData = ItemData.GetAll().First(); var dockingBay = ItemManager.CreateInstance(dockingBayData) as EquippableItem; @@ -745,7 +743,7 @@ public class ActionGameManager : MonoBehaviour } public void SaveZone() => File.WriteAllBytes( - Path.Combine(_filePath.FullName, $"{Zone.Data.Name}.zone"), MessagePackSerializer.Serialize(Zone.Pack())); + Path.Combine(_gameDataDirectory.FullName, $"{Zone.Data.Name}.zone"), MessagePackSerializer.Serialize(Zone.Pack())); // public void ToggleEditMode() // { diff --git a/Assets/Scripts/Gameplay/GameSettings.cs b/Assets/Scripts/Gameplay/GameSettings.cs index aebb63cc4..ad085e9fd 100644 --- a/Assets/Scripts/Gameplay/GameSettings.cs +++ b/Assets/Scripts/Gameplay/GameSettings.cs @@ -27,7 +27,7 @@ public class GameSettings : ScriptableObject public PlanetSettings PlanetSettings; public ZoneGenerationSettings ZoneSettings; public GameplaySettings GameplaySettings; - public PlayerSettings DefaultPlayerSettings; + public EntitySettings DefaultEntitySettings; public Color HullHitColor; public Color ArmorHitColor; public Color HardpointHitColor; diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs index 64b2f3d06..24e7f1776 100644 --- a/Assets/Scripts/MainMenu.cs +++ b/Assets/Scripts/MainMenu.cs @@ -1,46 +1,192 @@ using System; using System.Collections; using System.Collections.Generic; +using System.IO; using TMPro; using UnityEngine; +using UnityEngine.SceneManagement; using UnityEngine.UI; +using static Unity.Mathematics.math; public class MainMenu : MonoBehaviour { - public TextMeshProUGUI Title; - public Prototype ButtonPrototype; + public bool InGame; + public Prototype PanelPrototype; + public float FadeTime = .5f; + public float FadeDistance = 512; + public float FadeAlphaExponent = 2; + public float FadePositionExponent = 2; - private List _contents = new List(); + private (PropertiesPanel panel, CanvasGroup group) _currentMenu, _nextMenu; + private bool _fadeFromRight; + private float _fadeLerp; + private bool _fading; + private Vector3 _panelPosition; + private DirectoryInfo _saveDirectory; void Start() { + RegisterResolver.Register(); + _panelPosition = PanelPrototype.transform.position; + + var panel1 = PanelPrototype.Instantiate(); + _currentMenu = (panel1, panel1.GetComponent()); + + var panel2 = PanelPrototype.Instantiate(); + _nextMenu = (panel2, panel2.GetComponent()); + + _currentMenu.panel.gameObject.SetActive(false); + _saveDirectory = ActionGameManager.GameDataDirectory.CreateSubdirectory("Saves"); + ShowMain(); + Fade(true); + } + + private void Update() + { + if (_fading) + { + _fadeLerp += Time.deltaTime / FadeTime; + + _currentMenu.panel.transform.position = + _panelPosition + (_fadeFromRight ? Vector3.left : Vector3.right) * (FadeDistance * pow(_fadeLerp, FadePositionExponent)); + _nextMenu.panel.transform.position = + _panelPosition + (_fadeFromRight ? Vector3.right : Vector3.left) * (FadeDistance * pow(1-_fadeLerp, FadePositionExponent)); + _currentMenu.group.alpha = pow(1 - _fadeLerp, FadeAlphaExponent); + _nextMenu.group.alpha = pow(_fadeLerp, FadeAlphaExponent); + + if (_fadeLerp > 1) + { + _fading = false; + _currentMenu.panel.gameObject.SetActive(false); + var temp = _currentMenu; + _currentMenu = _nextMenu; + _nextMenu = temp; + } + } + } + + private string TitleSubtitle(string title, string subtitle) => $"{title}\n{subtitle}"; + + private void Fade(bool fromRight) + { + _nextMenu.panel.gameObject.SetActive(true); + _nextMenu.group.alpha = 0; + _fading = true; + _fadeLerp = 0; + _fadeFromRight = fromRight; } private void ShowMain() { - Title.text = "aetheria\nterminus"; - Clear(); - AddButton("Continue", null); - AddButton("New Game", null); - AddButton("Load Game", null); - AddButton("Settings", null); - AddButton("Quit", Application.Quit); + _nextMenu.panel.Clear(); + _nextMenu.panel.Title.text = TitleSubtitle("aetheria", "terminus"); + if (!InGame) + { + if(ActionGameManager.PlayerSettings.CurrentRun != null) + _nextMenu.panel.AddButton("Continue", () => SceneManager.LoadScene("ARPG")); + else + _nextMenu.panel.AddButton("Continue", null); + } + _nextMenu.panel.AddButton("New Game", + () => + { + // TODO: Initialize Run + }); + _nextMenu.panel.AddButton("Settings", + () => + { + ShowSettings(); + Fade(true); + }); + _nextMenu.panel.AddButton("Quit", Application.Quit); } - private void Clear() + private void ShowSettings() { - foreach(var item in _contents) - item.ReturnToPool(); - _contents.Clear(); + _nextMenu.panel.Clear(); + _nextMenu.panel.Title.text = "settings"; + _nextMenu.panel.AddButton("Gameplay", + () => + { + ShowGameplaySettings(); + Fade(true); + }); + _nextMenu.panel.AddButton("Graphics", + () => + { + ShowGraphicsSettings(); + Fade(true); + }); + _nextMenu.panel.AddButton("Input", + () => + { + ShowInputSettings(); + Fade(true); + }); + _nextMenu.panel.AddButton("Audio", + () => + { + ShowAudioSettings(); + Fade(true); + }); + _nextMenu.panel.AddButton("Back", + () => + { + ShowMain(); + Fade(false); + }); + } + + private void ShowGameplaySettings() + { + _nextMenu.panel.Clear(); + _nextMenu.panel.Title.text = TitleSubtitle("gameplay", "settings"); + _nextMenu.panel.AddField("Name", + () => ActionGameManager.PlayerSettings.Name, + s => ActionGameManager.PlayerSettings.Name = s); + _nextMenu.panel.AddButton("Back", + () => + { + ActionGameManager.SavePlayerSettings(); + ShowSettings(); + Fade(false); + }); } - private void AddButton(string label, Action onPress) + private void ShowGraphicsSettings() { - var button = ButtonPrototype.Instantiate