diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/AUIListBox.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/AUIListBox.cs index 646a890f46..b6ecbb1457 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/AUIListBox.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/AUIListBox.cs @@ -31,6 +31,7 @@ namespace BrewMonster.UI { ItemUIListBox item = Instantiate(prefabItemUIListBox, content); item.SetText(pszString); + item.gameObject.SetActive(true); m_Item.Add(item); Vector2 size = content.sizeDelta; size.y = heightItem * m_Item.Count + m_Item.Count * paddingY; diff --git a/Assets/Prefabs/UI/DialogNPC.prefab b/Assets/Prefabs/UI/DialogNPC.prefab index 955a4691ba..6d1dd5897d 100644 --- a/Assets/Prefabs/UI/DialogNPC.prefab +++ b/Assets/Prefabs/UI/DialogNPC.prefab @@ -375,7 +375,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ce1dfcc5e6936e547a2a2b7d112ebea1, type: 3} m_Name: m_EditorClassIdentifier: - txtItem: {fileID: 0} + txtItem: {fileID: 478583687716476312} strDataName: - - @@ -962,7 +962,7 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1028,7 +1028,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6297753662624094075 diff --git a/Assets/Scripts/CECGameRun.cs b/Assets/Scripts/CECGameRun.cs index e39addf04e..4768602589 100644 --- a/Assets/Scripts/CECGameRun.cs +++ b/Assets/Scripts/CECGameRun.cs @@ -165,5 +165,12 @@ public partial class CECGameRun : MonoBehaviour, IMsgHandler // Get UI manager - public CECUIManager GetUIManager() { return m_pUIManager; } + public CECUIManager GetUIManager() + { + if(m_pUIManager == null) + { + m_pUIManager = CECUIManager.Instance; + } + return m_pUIManager; + } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 80e957ebe4..0b5a17407d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -773,7 +773,7 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 scriptingDefineSymbols: - Android: DOTWEEN;TESTFAST + Android: DOTWEEN;TESTFAST;_TASK_CLIENT EmbeddedLinux: DOTWEEN GameCoreScarlett: DOTWEEN GameCoreXboxOne: DOTWEEN