From ba94ec341686692fde320d98cd14319ade51fd0c Mon Sep 17 00:00:00 2001 From: MinhHai Date: Fri, 12 Dec 2025 15:46:38 +0700 Subject: [PATCH] add DlgTask into UI System --- .../Task/UI/{TaskWindow.prefab => DlgTask.prefab} | 8 ++++---- .../{TaskWindow.prefab.meta => DlgTask.prefab.meta} | 0 .../Resources/UI/DialogScriptTableObject.asset | 2 ++ Assets/PerfectWorld/Scene/TaskTest.unity | 4 ++-- Assets/PerfectWorld/Scripts/Task/TaskTest.cs | 12 ++++++++++-- 5 files changed, 18 insertions(+), 8 deletions(-) rename Assets/PerfectWorld/Prefab/Task/UI/{TaskWindow.prefab => DlgTask.prefab} (99%) rename Assets/PerfectWorld/Prefab/Task/UI/{TaskWindow.prefab.meta => DlgTask.prefab.meta} (100%) diff --git a/Assets/PerfectWorld/Prefab/Task/UI/TaskWindow.prefab b/Assets/PerfectWorld/Prefab/Task/UI/DlgTask.prefab similarity index 99% rename from Assets/PerfectWorld/Prefab/Task/UI/TaskWindow.prefab rename to Assets/PerfectWorld/Prefab/Task/UI/DlgTask.prefab index 9a7f272149..66ea57e014 100644 --- a/Assets/PerfectWorld/Prefab/Task/UI/TaskWindow.prefab +++ b/Assets/PerfectWorld/Prefab/Task/UI/DlgTask.prefab @@ -6483,8 +6483,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7392889747821849613} m_HandleRect: {fileID: 2343337405992641122} m_Direction: 2 - m_Value: 1 - m_Size: 1 + m_Value: 0 + m_Size: 0.9999435 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -7244,7 +7244,7 @@ GameObject: - component: {fileID: 5506476487848131018} - component: {fileID: 125385901698294646} m_Layer: 5 - m_Name: TaskWindow + m_Name: DlgTask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8731,7 +8731,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8395333742829132721, guid: 9456de25596014039bd4d0d3927b709a, type: 3} propertyPath: m_AnchoredPosition.y - value: 336.93002 + value: 336.93 objectReference: {fileID: 0} - target: {fileID: 8395333742829132721, guid: 9456de25596014039bd4d0d3927b709a, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/PerfectWorld/Prefab/Task/UI/TaskWindow.prefab.meta b/Assets/PerfectWorld/Prefab/Task/UI/DlgTask.prefab.meta similarity index 100% rename from Assets/PerfectWorld/Prefab/Task/UI/TaskWindow.prefab.meta rename to Assets/PerfectWorld/Prefab/Task/UI/DlgTask.prefab.meta diff --git a/Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset b/Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset index 294dfb24bf..58a0cfb272 100644 --- a/Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset +++ b/Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset @@ -19,3 +19,5 @@ MonoBehaviour: prefab: {fileID: 8237288432181259026, guid: eaeb778b6aab3d74299373b3a96b72c4, type: 3} - id: Win_Award prefab: {fileID: 903595479696773158, guid: cf26d96ae7d984ba8a5b6cef44adffeb, type: 3} + - id: Win_Task + prefab: {fileID: 6999114045547682248, guid: 8027cada0ef5e4a9f827001b4747174d, type: 3} diff --git a/Assets/PerfectWorld/Scene/TaskTest.unity b/Assets/PerfectWorld/Scene/TaskTest.unity index 79f0527a85..408ffe954c 100644 --- a/Assets/PerfectWorld/Scene/TaskTest.unity +++ b/Assets/PerfectWorld/Scene/TaskTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:013ea9a5ad664a8ed7ae162ffb1f16e0da6571fb6660ad5b4f1736197f8e3fd4 -size 41531 +oid sha256:3c180e1658dbb5bd3b438f36770253ae8e04dff1d86b8b22e2bc279b683134d8 +size 10732 diff --git a/Assets/PerfectWorld/Scripts/Task/TaskTest.cs b/Assets/PerfectWorld/Scripts/Task/TaskTest.cs index b10a8dc566..264ec208ac 100644 --- a/Assets/PerfectWorld/Scripts/Task/TaskTest.cs +++ b/Assets/PerfectWorld/Scripts/Task/TaskTest.cs @@ -16,7 +16,6 @@ namespace BrewMonster.Scripts.Task { public class TaskTest : MonoSingleton { - public GameObject m_pTaskDlg; public static ATaskTemplMan m_pTaskMan; // use static to store loaded data across instances public bool WasLoadTaskData = false; @@ -34,7 +33,16 @@ namespace BrewMonster.Scripts.Task #if UNITY_EDITOR if (Input.GetKeyDown(KeyCode.Q)) { - m_pTaskDlg.SetActive(!m_pTaskDlg.activeInHierarchy); + var dlgTaskGO = CECUIManager.Instance.GetInGameUIMan().GetDialog("Win_Task"); + var dlgTask = (dlgTaskGO) as DlgTask; + if (dlgTask && !dlgTask.gameObject.activeInHierarchy) + { + dlgTask.Show(true); + } + else + { + dlgTask.Show(false); + } } if (Input.GetKeyDown(_awardkey))