From 10ff87c03c66d5283c28a40531ebaa50fbe64dce Mon Sep 17 00:00:00 2001 From: NguyenVanDat Date: Tue, 10 Mar 2026 10:54:06 +0700 Subject: [PATCH] update ui: inventory popup --- Assets/PerfectWorld/Prefab/UIManager.prefab | 56 ++----- .../Scripts/UI/HUDMainGamePlay.cs | 7 + Assets/Prefabs/UI/InventoryUI.prefab | 154 ++++++++++++++++-- 3 files changed, 161 insertions(+), 56 deletions(-) diff --git a/Assets/PerfectWorld/Prefab/UIManager.prefab b/Assets/PerfectWorld/Prefab/UIManager.prefab index dd3930a481..fd9c73fea0 100644 --- a/Assets/PerfectWorld/Prefab/UIManager.prefab +++ b/Assets/PerfectWorld/Prefab/UIManager.prefab @@ -2386,8 +2386,8 @@ GameObject: - component: {fileID: 6068541250920471714} - component: {fileID: 3725287594404594500} - component: {fileID: 912694359449913812} - - component: {fileID: 1089648670648462069} - component: {fileID: 1107161304816535553} + - component: {fileID: 7124460838393469068} m_Layer: 5 m_Name: IvtrBtn m_TagString: Untagged @@ -2453,7 +2453,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1089648670648462069 +--- !u!114 &1107161304816535553 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2462,7 +2462,19 @@ MonoBehaviour: m_GameObject: {fileID: 3187516571348395154} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Script: {fileID: 11500000, guid: 24000eb1448ca674888f256f5508cadd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7124460838393469068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3187516571348395154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -2494,37 +2506,9 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 912694359449913812} - toggleTransition: 1 - graphic: {fileID: 0} - m_Group: {fileID: 0} - onValueChanged: + m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 6872772365881961107} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_IsOn: 0 ---- !u!114 &1107161304816535553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3187516571348395154} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 24000eb1448ca674888f256f5508cadd, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Calls: [] --- !u!1 &3354064477598402131 GameObject: m_ObjectHideFlags: 0 @@ -5668,6 +5652,7 @@ MonoBehaviour: m_EditorClassIdentifier: _escapeBtn: {fileID: 2013061949432893537} _btnTask: {fileID: 8640845703001841192} + _btnInvntory: {fileID: 7124460838393469068} --- !u!1 &7352847439676120744 GameObject: m_ObjectHideFlags: 0 @@ -11414,11 +11399,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5834405183358786743, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3} m_PrefabInstance: {fileID: 965021017749137923} m_PrefabAsset: {fileID: 0} ---- !u!1 &6872772365881961107 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5910006447059157136, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3} - m_PrefabInstance: {fileID: 965021017749137923} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1014481099860472796 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/PerfectWorld/Scripts/UI/HUDMainGamePlay.cs b/Assets/PerfectWorld/Scripts/UI/HUDMainGamePlay.cs index 3ca1c7bfe0..f093266dfa 100644 --- a/Assets/PerfectWorld/Scripts/UI/HUDMainGamePlay.cs +++ b/Assets/PerfectWorld/Scripts/UI/HUDMainGamePlay.cs @@ -11,6 +11,7 @@ namespace BrewMonster [SerializeField]private Button _escapeBtn; [SerializeField]private Button _btnTask; + [SerializeField]private Button _btnInvntory; #endregion @@ -18,18 +19,24 @@ namespace BrewMonster { _escapeBtn.onClick.AddListener(OnEscapeClicked); _btnTask.onClick.AddListener(OnTaskClicked); + _btnInvntory.onClick.AddListener(OnInventoryClicked); } private void OnDisable() { _escapeBtn.onClick.RemoveListener(OnEscapeClicked); _btnTask.onClick.RemoveListener(OnTaskClicked); + _btnInvntory.onClick.RemoveListener(OnInventoryClicked); } private void OnTaskClicked() { CECUIManager.Instance.ShowUI("Win_Quest"); } + private void OnInventoryClicked() + { + CECUIManager.Instance.ShowUI("Win_Inventory"); + } private void OnEscapeClicked() { diff --git a/Assets/Prefabs/UI/InventoryUI.prefab b/Assets/Prefabs/UI/InventoryUI.prefab index f69f66e593..1147029a65 100644 --- a/Assets/Prefabs/UI/InventoryUI.prefab +++ b/Assets/Prefabs/UI/InventoryUI.prefab @@ -12436,12 +12436,13 @@ RectTransform: - {fileID: 4202523748155545876} - {fileID: 9128617693675511206} - {fileID: 4137397199301223842} + - {fileID: 6801399374756499883} - {fileID: 7205431771786927886} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 54, y: 318} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1633.0076, y: 911.9714} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6612065338353497036 @@ -12494,6 +12495,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12345678901234567890123456789012, type: 3} m_Name: m_EditorClassIdentifier: + skillNameText: {fileID: 0} + imageProgress: {fileID: 0} inventoryPackButtons: - {fileID: 8631960679953241981} - {fileID: 7087549554151292240} @@ -12562,15 +12565,9 @@ MonoBehaviour: detailPanelRoot: {fileID: 759109931263093524} detailPanelOffset: {x: 20, y: 0} hideDetailOnStart: 1 - nameText: - legacy: {fileID: 0} - tmp: {fileID: 0} descriptionText: legacy: {fileID: 0} tmp: {fileID: 6020258894941961325} - extendedDescText: - legacy: {fileID: 0} - tmp: {fileID: 37862130938576806} equipButton: {fileID: 472698755110594484} dropButton: {fileID: 540159372834342487} autoRefresh: 1 @@ -18947,6 +18944,138 @@ MonoBehaviour: m_Spacing: {x: 14, y: 20} m_Constraint: 1 m_ConstraintCount: 6 +--- !u!1 &8787503064864052193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6801399374756499883} + - component: {fileID: 5270996103556033049} + - component: {fileID: 4120547140605042893} + - component: {fileID: 1109591010129842418} + m_Layer: 0 + m_Name: btnCl (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6801399374756499883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8787503064864052193} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5834405183358786743} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -59.7, y: -71.978} + m_SizeDelta: {x: 82.972, y: 73.0151} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5270996103556033049 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8787503064864052193} + m_CullTransparentMesh: 1 +--- !u!114 &4120547140605042893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8787503064864052193} + 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: 21300000, guid: fb2f2f58be45f6e4890e85cc00b0bcc9, type: 3} + m_Type: 0 + 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 &1109591010129842418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8787503064864052193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4120547140605042893} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6001081573770107384} + m_TargetAssemblyTypeName: BrewMonster.Scripts.Managers.EC_InventoryUI, Assembly-CSharp + m_MethodName: CloseDialogue + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &8807704437484581490 GameObject: m_ObjectHideFlags: 0 @@ -19828,17 +19957,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3} ---- !u!114 &37862130938576806 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8506468441935914785, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3} - m_PrefabInstance: {fileID: 8542071282636773511} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &472698755110594484 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8071811253980610355, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}