diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 7745123..4071a51 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -14,7 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup m_GroupName: Default Local Group m_GUID: 05b724f967e7d40e69a2f8086a7d78cd - m_SerializeEntries: [] + m_SerializeEntries: + - m_GUID: 15529a69a8231ac43b1108efbaad83b6 + m_Address: Assets/Prefabs/UI/CharacterCreationReference.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 7e98b357dd76a43e191428299c44eef2, type: 2} m_SchemaSet: diff --git a/Assets/Code/GameState/UI/CharacterCreationReference.cs b/Assets/Code/GameState/UI/CharacterCreationReference.cs index 2faf5c5..1fa4f1c 100644 --- a/Assets/Code/GameState/UI/CharacterCreationReference.cs +++ b/Assets/Code/GameState/UI/CharacterCreationReference.cs @@ -1,3 +1,4 @@ +using Jovian.InGameLogging.UI; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -20,6 +21,7 @@ namespace Nox.UI { //center public Button backButtonCenter; public Button acceptButton; + public GameLogView gameLogView; //right public Image portraitImage; diff --git a/Assets/Code/SplashMainMenuUI/MenuPrefabsContainer.cs b/Assets/Code/SplashMainMenuUI/MenuPrefabsContainer.cs index 36a79c7..8c30f43 100644 --- a/Assets/Code/SplashMainMenuUI/MenuPrefabsContainer.cs +++ b/Assets/Code/SplashMainMenuUI/MenuPrefabsContainer.cs @@ -6,6 +6,6 @@ namespace Nox.UI { [CreateAssetMenu(fileName = "MenuPrefabsContainer", menuName = "Nox/Database/UI/MenuPrefabContainer")] public class MenuPrefabsContainer : ScriptableObject { public AssetReference mainMenuReference; - public CharacterCreationReference characterCreationReference; + public AssetReference characterCreationReference; } } diff --git a/Assets/Database/UI/MenuPrefabsContainer.asset b/Assets/Database/UI/MenuPrefabsContainer.asset index 4ac9cd8..abc4a7d 100644 --- a/Assets/Database/UI/MenuPrefabsContainer.asset +++ b/Assets/Database/UI/MenuPrefabsContainer.asset @@ -18,3 +18,9 @@ MonoBehaviour: m_SubObjectType: m_SubObjectGUID: m_EditorAssetChanged: 0 + characterCreationReference: + m_AssetGUID: 15529a69a8231ac43b1108efbaad83b6 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 diff --git a/Assets/Prefabs/UI/CharacterCreationReference.prefab b/Assets/Prefabs/UI/CharacterCreationReference.prefab index 7df6685..c0f6764 100644 --- a/Assets/Prefabs/UI/CharacterCreationReference.prefab +++ b/Assets/Prefabs/UI/CharacterCreationReference.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4035499241225932785} - component: {fileID: 2003384534503018854} - component: {fileID: 1794153562930808578} - m_Layer: 0 + m_Layer: 5 m_Name: MenuContainer m_TagString: Untagged m_Icon: {fileID: 0} @@ -85,7 +85,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8410804869288043777} - m_Layer: 0 + m_Layer: 5 m_Name: Middle m_TagString: Untagged m_Icon: {fileID: 0} @@ -126,7 +126,7 @@ GameObject: - component: {fileID: 1588673216748120674} - component: {fileID: 8637058905552030684} - component: {fileID: 3979388574864997804} - m_Layer: 0 + m_Layer: 5 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -201,7 +201,7 @@ GameObject: - component: {fileID: 4565696304911325038} - component: {fileID: 1300259132258610346} - component: {fileID: 8491701616127531666} - m_Layer: 0 + m_Layer: 5 m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} @@ -460,6 +460,7 @@ MonoBehaviour: - {fileID: 7251588291007865171} backButtonCenter: {fileID: 6120097164833365244} acceptButton: {fileID: 5513732556710034245} + gameLogView: {fileID: 881295451940609132} portraitImage: {fileID: 660133137408537231} portraitSelectionLeftButton: {fileID: 4065133580310728738} portraitSelectionRightButton: {fileID: 6927888442274850470} @@ -476,7 +477,7 @@ GameObject: - component: {fileID: 2577996418906990456} - component: {fileID: 6761963333738881588} - component: {fileID: 5763047437150428796} - m_Layer: 0 + m_Layer: 5 m_Name: MainPageHolder m_TagString: Untagged m_Icon: {fileID: 0} @@ -550,7 +551,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8277464935197475459} - m_Layer: 0 + m_Layer: 5 m_Name: Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -592,7 +593,7 @@ GameObject: - component: {fileID: 6077105759258784757} - component: {fileID: 5136629953484355573} - component: {fileID: 3285600596222563336} - m_Layer: 0 + m_Layer: 5 m_Name: Top m_TagString: Untagged m_Icon: {fileID: 0} @@ -668,7 +669,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7261593209454219064} - m_Layer: 0 + m_Layer: 5 m_Name: Right m_TagString: Untagged m_Icon: {fileID: 0} @@ -831,10 +832,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3278238200687868940, guid: a8d55c7476350ee4781a74bec1ca7eb0, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6102994906958958451, guid: a8d55c7476350ee4781a74bec1ca7eb0, type: 3} propertyPath: m_Name value: BackButton objectReference: {fileID: 0} + - target: {fileID: 6102994906958958451, guid: a8d55c7476350ee4781a74bec1ca7eb0, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -944,10 +953,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 524667871046380250, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1305189752364064086, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_Name value: PerskDropdown objectReference: {fileID: 0} + - target: {fileID: 1305189752364064086, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1583371790765157583, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_text value: Option A @@ -960,6 +977,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -0.5 objectReference: {fileID: 0} + - target: {fileID: 2871218276889337564, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2871868780963084915, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2930526768627018299, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3067287290169351782, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3623607537562022604, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -968,10 +1001,34 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3626480577806248860, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4044868905302276019, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4497464438299507453, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4890989520183988651, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4927680112922053966, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5035176333225576794, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_AnchoredPosition.y value: 0.000030517578 objectReference: {fileID: 0} + - target: {fileID: 5519044561887573149, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6382068541787012351, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_text value: 'Perks Selection @@ -979,6 +1036,14 @@ PrefabInstance: ' objectReference: {fileID: 0} + - target: {fileID: 6549297144469639073, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6914788732231693321, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7662064777986989409, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_AnchoredPosition.y value: 0.00002670288 @@ -1092,14 +1157,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 524667871046380250, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1305189752364064086, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_Name value: RaceDropdown objectReference: {fileID: 0} + - target: {fileID: 1305189752364064086, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1583371790765157583, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_text value: Option A objectReference: {fileID: 0} + - target: {fileID: 2871218276889337564, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2871868780963084915, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2930526768627018299, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3067287290169351782, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3623607537562022604, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1108,10 +1197,34 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3626480577806248860, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4044868905302276019, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4497464438299507453, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4890989520183988651, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4927680112922053966, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5035176333225576794, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_AnchoredPosition.y value: 0.000030517578 objectReference: {fileID: 0} + - target: {fileID: 5519044561887573149, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6382068541787012351, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_text value: 'Race Selection @@ -1119,6 +1232,14 @@ PrefabInstance: ' objectReference: {fileID: 0} + - target: {fileID: 6549297144469639073, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6914788732231693321, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1228,14 +1349,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 524667871046380250, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1305189752364064086, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_Name value: ClassDropdown objectReference: {fileID: 0} + - target: {fileID: 1305189752364064086, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1583371790765157583, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_text value: Option A objectReference: {fileID: 0} + - target: {fileID: 2871218276889337564, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2871868780963084915, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2930526768627018299, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3067287290169351782, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3623607537562022604, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1244,10 +1389,42 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3626480577806248860, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4044868905302276019, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4497464438299507453, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4890989520183988651, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4927680112922053966, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5035176333225576794, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_AnchoredPosition.y value: 0.000030517578 objectReference: {fileID: 0} + - target: {fileID: 5519044561887573149, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6549297144469639073, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6914788732231693321, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7662064777986989409, guid: b29adb0c50694cb4a84a2cbdd1d105ba, type: 3} propertyPath: m_AnchoredPosition.y value: -0.0000076293945 @@ -1369,6 +1546,14 @@ PrefabInstance: propertyPath: m_Name value: PortraitSelectionRight objectReference: {fileID: 0} + - target: {fileID: 6246454854072547110, guid: fdfe972137f8acf48b03a4b93554236c, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6657106901729033741, guid: fdfe972137f8acf48b03a4b93554236c, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1398,6 +1583,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7261593209454219064} m_Modifications: + - target: {fileID: 3358410972635992606, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4353505352457658128, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1478,10 +1667,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4407535350906989840, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4551606768940722123, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} propertyPath: m_Name value: PortraitHolder objectReference: {fileID: 0} + - target: {fileID: 4551606768940722123, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5871244774622378730, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6078701992967096703, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8682950769795403552, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9119578429916138382, guid: 4778a14b7457e644ea23e45b40fc3391, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1530,10 +1743,18 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1447740470325782801, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1525412503934350410, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} propertyPath: m_Name value: LogContainer objectReference: {fileID: 0} + - target: {fileID: 1525412503934350410, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2251566621526024109, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1546,6 +1767,10 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2405629305058117087, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2417638750186197328, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1626,27 +1851,82 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7479392947244903680, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + - target: {fileID: 2688140319784364735, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2688140319784364735, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3952660362247579954, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4070132176653801724, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7479392947244903680, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} - propertyPath: m_AnchorMin.y + - target: {fileID: 4070132176653801724, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7479392947244903680, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} - propertyPath: m_AnchoredPosition.x + - target: {fileID: 5969083621566914297, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6050805973784497029, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6074956918412360435, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6286131802514671469, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7479392947244903680, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} - propertyPath: m_AnchoredPosition.y + - target: {fileID: 6286131802514671469, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6286131802514671469, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6286131802514671469, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6994548556054523628, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7187724186482890403, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7193882241213188023, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} +--- !u!114 &881295451940609132 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6899372841946195929, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} + m_PrefabInstance: {fileID: 6018359966710660021} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 786fb23f28122964cb30678ea785bd40, type: 3} + m_Name: + m_EditorClassIdentifier: Jovian.InGameLogging::Jovian.InGameLogging.UI.GameLogView --- !u!224 &8217010083354716901 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2417638750186197328, guid: 1b41f907ca960b644ae3af6e1942b9fb, type: 3} @@ -1740,10 +2020,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1439200117685736661, guid: bc3f4da6ad34b614980feec795328175, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5111719360928861360, guid: bc3f4da6ad34b614980feec795328175, type: 3} propertyPath: m_Name value: ButtonStart objectReference: {fileID: 0} + - target: {fileID: 5111719360928861360, guid: bc3f4da6ad34b614980feec795328175, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 8214541961241035705, guid: bc3f4da6ad34b614980feec795328175, type: 3} propertyPath: m_text value: Start Game @@ -1857,10 +2145,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1439200117685736661, guid: bc3f4da6ad34b614980feec795328175, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5111719360928861360, guid: bc3f4da6ad34b614980feec795328175, type: 3} propertyPath: m_Name value: ButtonBack objectReference: {fileID: 0} + - target: {fileID: 5111719360928861360, guid: bc3f4da6ad34b614980feec795328175, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2003,6 +2299,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8277464935197475459} m_Modifications: + - target: {fileID: 118775693100007006, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 391761576086302107, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2083,6 +2383,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 896593917115271051, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1278308078230983800, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2027137795896422998, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2048231674350985393, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2088606624702009608, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2099,10 +2415,66 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2403003956251687779, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2625827526580860030, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2773213190453400438, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2780712471981351354, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3101768738163558292, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3152110123861771547, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} propertyPath: m_Name value: AttributersHolder objectReference: {fileID: 0} + - target: {fileID: 3152110123861771547, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3226140996461501773, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3549294918451597637, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3931533567706205084, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5359590933719577744, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5597740766518406729, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5803019380200492918, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5946099424854976638, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6520235065577313194, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6551743829023187475, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2135,6 +2507,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6751664539290765683, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6947979246791549037, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7088825092945708901, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7326983594598505916, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7442602703165950072, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7467551264306690740, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7640393591643032840, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2151,6 +2547,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7681133317895044273, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7698286465205497430, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8597899490231640670, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8828549229519002507, guid: 3a970b9bece81ba4e9c3518edd20bc15, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2297,6 +2709,14 @@ PrefabInstance: propertyPath: m_Name value: PortraitSelectionLeft objectReference: {fileID: 0} + - target: {fileID: 6246454854072547110, guid: fdfe972137f8acf48b03a4b93554236c, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6657106901729033741, guid: fdfe972137f8acf48b03a4b93554236c, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2406,10 +2826,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1439200117685736661, guid: bc3f4da6ad34b614980feec795328175, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5111719360928861360, guid: bc3f4da6ad34b614980feec795328175, type: 3} propertyPath: m_Name value: ButtonAccept objectReference: {fileID: 0} + - target: {fileID: 5111719360928861360, guid: bc3f4da6ad34b614980feec795328175, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 8214541961241035705, guid: bc3f4da6ad34b614980feec795328175, type: 3} propertyPath: m_text value: Accept @@ -2443,6 +2871,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8277464935197475459} m_Modifications: + - target: {fileID: 1876648369162504278, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1884314136350165907, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2707776574463761880, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2475,6 +2911,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3515967003356298300, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3523615199834849273, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4995742142680764687, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5006081956433547978, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5386841602357123115, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2559,6 +3011,18 @@ PrefabInstance: propertyPath: m_Name value: StatsHolder objectReference: {fileID: 0} + - target: {fileID: 6031474304292407628, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9083701390868331663, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9088992264473345866, guid: 0e3ec9c120c21d0418fa821cb0d797e7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/UI/LogContainer.prefab b/Assets/Prefabs/UI/LogContainer.prefab index cbfb4c9..e1b2523 100644 --- a/Assets/Prefabs/UI/LogContainer.prefab +++ b/Assets/Prefabs/UI/LogContainer.prefab @@ -141,7 +141,7 @@ MonoBehaviour: m_EditorClassIdentifier: Jovian.InGameLogging::Jovian.InGameLogging.UI.GameLogView scrollRect: {fileID: 2554617498295089481} content: {fileID: 3059084814696477984} - entryPrefab: {fileID: 0} + entryPrefab: {fileID: 4832918257971952213, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} poolSize: 20 --- !u!1 &2405629305058117087 GameObject: @@ -171,8 +171,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7479392947244903680} + m_Children: [] m_Father: {fileID: 6286131802514671469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -789,105 +788,3 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1001 &7098424197235870041 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3059084814696477984} - m_Modifications: - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_SizeDelta.x - value: 720.42 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_SizeDelta.y - value: 108.565 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6501593483943143564, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - propertyPath: m_Name - value: LogEntry - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} ---- !u!224 &7479392947244903680 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 382400732949652569, guid: 9d1c7837b0b5a9f45baa84f326fc247c, type: 3} - m_PrefabInstance: {fileID: 7098424197235870041} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/UI/MainMenuReferenceView.prefab b/Assets/Prefabs/UI/MainMenuReferenceView.prefab index 185b101..d83413a 100644 --- a/Assets/Prefabs/UI/MainMenuReferenceView.prefab +++ b/Assets/Prefabs/UI/MainMenuReferenceView.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 1490218566039382188} - component: {fileID: 386276042863561764} - component: {fileID: 6262029377281805746} - m_Layer: 0 + m_Layer: 5 m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} @@ -316,7 +316,7 @@ GameObject: - component: {fileID: 1772545795218919498} - component: {fileID: 7298738886411858426} - component: {fileID: 1939838321122706235} - m_Layer: 0 + m_Layer: 5 m_Name: MenuContainer m_TagString: Untagged m_Icon: {fileID: 0} @@ -393,7 +393,7 @@ GameObject: - component: {fileID: 1813061874901401198} - component: {fileID: 6140709071237222314} - component: {fileID: 6860798698300940246} - m_Layer: 0 + m_Layer: 5 m_Name: MenuGrid m_TagString: Untagged m_Icon: {fileID: 0} @@ -468,7 +468,7 @@ GameObject: - component: {fileID: 1344629644101842586} - component: {fileID: 503938518615782969} - component: {fileID: 8963775395048948106} - m_Layer: 0 + m_Layer: 5 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -552,6 +552,10 @@ PrefabInstance: propertyPath: m_Color.r value: 0.42352942 objectReference: {fileID: 0} + - target: {fileID: 6081309967645305556, guid: d81557c8645f08346a3b50f26999e961, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6824195769074771924, guid: d81557c8645f08346a3b50f26999e961, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -656,6 +660,10 @@ PrefabInstance: propertyPath: m_Name value: Options objectReference: {fileID: 0} + - target: {fileID: 8954220249598401173, guid: d81557c8645f08346a3b50f26999e961, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -697,6 +705,10 @@ PrefabInstance: propertyPath: m_Color.r value: 0.4245283 objectReference: {fileID: 0} + - target: {fileID: 6081309967645305556, guid: d81557c8645f08346a3b50f26999e961, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6824195769074771924, guid: d81557c8645f08346a3b50f26999e961, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -797,6 +809,10 @@ PrefabInstance: propertyPath: m_Name value: Continue objectReference: {fileID: 0} + - target: {fileID: 8954220249598401173, guid: d81557c8645f08346a3b50f26999e961, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -838,6 +854,10 @@ PrefabInstance: propertyPath: m_Color.r value: 0.42352942 objectReference: {fileID: 0} + - target: {fileID: 6081309967645305556, guid: d81557c8645f08346a3b50f26999e961, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6824195769074771924, guid: d81557c8645f08346a3b50f26999e961, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -942,6 +962,10 @@ PrefabInstance: propertyPath: m_Name value: NewGame objectReference: {fileID: 0} + - target: {fileID: 8954220249598401173, guid: d81557c8645f08346a3b50f26999e961, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -983,6 +1007,10 @@ PrefabInstance: propertyPath: m_Color.r value: 0.42352942 objectReference: {fileID: 0} + - target: {fileID: 6081309967645305556, guid: d81557c8645f08346a3b50f26999e961, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6824195769074771924, guid: d81557c8645f08346a3b50f26999e961, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1087,6 +1115,10 @@ PrefabInstance: propertyPath: m_Name value: ExitGame objectReference: {fileID: 0} + - target: {fileID: 8954220249598401173, guid: d81557c8645f08346a3b50f26999e961, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index ee5ae35..3ee1d8a 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -381,107 +381,6 @@ MonoBehaviour: m_PointerBehavior: 0 m_CursorLockBehavior: 0 m_ScrollDeltaPerTick: 6 ---- !u!1001 &1124909908 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 615596001628442726, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2302926895912778325, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_Name - value: CharacterCreationView - objectReference: {fileID: 0} - - target: {fileID: 2302926895912778325, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 15529a69a8231ac43b1108efbaad83b6, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -489,4 +388,3 @@ SceneRoots: - {fileID: 274392136} - {fileID: 560509313} - {fileID: 1077231241} - - {fileID: 1124909908} diff --git a/Packages/com.jovian.ingame-logging/README.md b/Packages/com.jovian.ingame-logging/README.md index acde50e..9fb033e 100644 --- a/Packages/com.jovian.ingame-logging/README.md +++ b/Packages/com.jovian.ingame-logging/README.md @@ -135,6 +135,32 @@ var tradeLogger = new InGameLogger(logStore, MyLogChannels.Trading); tradeLogger.Log("Sold Iron Sword for 50 gold."); ``` +## Enable / Disable Channels + +Each logger can be toggled on or off. When disabled, calls to `Log` are silently dropped (no allocation, no entry added). All channels are enabled by default. + +```csharp +var combatLog = new InGameLogger(logStore, LogChannel.Combat); + +combatLog.Disable(); +combatLog.Log("This message is silently dropped."); + +combatLog.Enable(); +combatLog.Log("Back online."); + +if(combatLog.IsEnabled) { + // check state +} +``` + +The state lives in the `IGameLogStore`, so disabling a channel from one `InGameLogger` instance disables it for all instances using the same store and channel. You can also call the store directly: + +```csharp +logStore.DisableChannel(LogChannel.World); +logStore.EnableChannel(LogChannel.World); +bool enabled = logStore.IsChannelEnabled(LogChannel.World); +``` + ## Rich Text Log messages support TextMeshPro rich text tags. The `InGameLogger.Log(message, hexColor)` overload wraps the message in a `` tag automatically: @@ -194,13 +220,19 @@ logStore.RestoreFromSaveData(saveData); - `InGameLogger(IGameLogStore store, LogChannel channel)` -- constructor - `void Log(string message)` -- add an entry to the store - `void Log(string message, string hexColor)` -- add a color-wrapped entry +- `void Enable()` -- enable this logger's channel +- `void Disable()` -- disable this logger's channel (Log calls are silently dropped) +- `bool IsEnabled` -- whether this logger's channel is currently enabled ### IGameLogStore / GameLogStore - `GameLogStore(int capacity = 500)` -- constructor with ring buffer size - `int Count` -- current number of entries - `int Capacity` -- maximum entries before oldest are overwritten -- `void Add(LogChannel channel, string message)` -- add an entry +- `void Add(LogChannel channel, string message)` -- add an entry (silently dropped if channel is disabled) +- `void EnableChannel(LogChannel channel)` -- enable a channel +- `void DisableChannel(LogChannel channel)` -- disable a channel +- `bool IsChannelEnabled(LogChannel channel)` -- check if a channel is enabled - `void Clear()` -- remove all entries - `void Clear(LogChannel channel)` -- remove entries for a specific channel - `ReadOnlySpan GetEntries()` -- all entries in chronological order diff --git a/Packages/com.jovian.ingame-logging/Runtime/GameLogStore.cs b/Packages/com.jovian.ingame-logging/Runtime/GameLogStore.cs index 0dacdbe..6cc0004 100644 --- a/Packages/com.jovian.ingame-logging/Runtime/GameLogStore.cs +++ b/Packages/com.jovian.ingame-logging/Runtime/GameLogStore.cs @@ -5,6 +5,7 @@ using UnityEngine; namespace Jovian.InGameLogging { public sealed class GameLogStore : IGameLogStore { readonly LogEntry[] buffer; + readonly HashSet disabledChannels = new(); int head; int count; @@ -21,6 +22,9 @@ namespace Jovian.InGameLogging { } public void Add(LogChannel channel, string message) { + if(disabledChannels.Contains(channel)) { + return; + } var entry = new LogEntry(message, channel, Time.time); buffer[head] = entry; head = (head + 1) % buffer.Length; @@ -30,6 +34,18 @@ namespace Jovian.InGameLogging { OnEntryAdded?.Invoke(entry); } + public void EnableChannel(LogChannel channel) { + disabledChannels.Remove(channel); + } + + public void DisableChannel(LogChannel channel) { + disabledChannels.Add(channel); + } + + public bool IsChannelEnabled(LogChannel channel) { + return !disabledChannels.Contains(channel); + } + public void Clear() { head = 0; count = 0; diff --git a/Packages/com.jovian.ingame-logging/Runtime/IGameLogStore.cs b/Packages/com.jovian.ingame-logging/Runtime/IGameLogStore.cs index 487bca0..04b80ab 100644 --- a/Packages/com.jovian.ingame-logging/Runtime/IGameLogStore.cs +++ b/Packages/com.jovian.ingame-logging/Runtime/IGameLogStore.cs @@ -7,6 +7,9 @@ namespace Jovian.InGameLogging { int Capacity { get; } void Add(LogChannel channel, string message); + void EnableChannel(LogChannel channel); + void DisableChannel(LogChannel channel); + bool IsChannelEnabled(LogChannel channel); void Clear(); void Clear(LogChannel channel); diff --git a/Packages/com.jovian.ingame-logging/Runtime/InGameLogger.cs b/Packages/com.jovian.ingame-logging/Runtime/InGameLogger.cs index ffff2b1..4629dd8 100644 --- a/Packages/com.jovian.ingame-logging/Runtime/InGameLogger.cs +++ b/Packages/com.jovian.ingame-logging/Runtime/InGameLogger.cs @@ -19,5 +19,17 @@ namespace Jovian.InGameLogging { public void Log(string message, string hexColor) { store.Add(channel, $"{message}"); } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Enable() { + store.EnableChannel(channel); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public void Disable() { + store.DisableChannel(channel); + } + + public bool IsEnabled => store.IsChannelEnabled(channel); } } diff --git a/Packages/com.jovian.ingame-logging/Runtime/LogChannel.cs b/Packages/com.jovian.ingame-logging/Runtime/LogChannel.cs index f17d7df..a6a6079 100644 --- a/Packages/com.jovian.ingame-logging/Runtime/LogChannel.cs +++ b/Packages/com.jovian.ingame-logging/Runtime/LogChannel.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace Jovian.InGameLogging { [Serializable] public readonly struct LogChannel : IEquatable { - [SerializeField] readonly string id; + private readonly string id; public string Id => id;