Commit Graph

60 Commits

Author SHA1 Message Date
CuongNV d21236aec7 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-24 14:34:49 +07:00
CuongNV 19820fcf2a Add filter ui chat 2026-03-24 10:58:19 +07:00
Chomper9981 1f0da3b665 Add UI for Buff Icons. Refactor the UI Image Picture 2026-03-24 10:53:05 +07:00
cuongnv 4192582aad Merge pull request 'Change UI Chat' (#256) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/256
2026-03-19 07:19:07 +00:00
CuongNV 5708f72910 Change UI Chat 2026-03-19 13:41:38 +07:00
MinhHai 147a3f0745 fix MiniMap: add into Main HUD 2026-03-19 10:24:11 +07:00
CuongNV ee6d880333 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
#	Assets/Scripts/EC_GameRun.cs
2026-03-18 16:05:54 +07:00
CuongNV d0eed02f47 Add code UI and prefab chat system 2026-03-18 15:55:24 +07:00
Tungdv c800b48d52 Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
2026-03-18 12:54:34 +07:00
Tungdv 8cf3144761 fix: update world when teleport. 2026-03-18 11:44:46 +07:00
CuongNV 72310e9a42 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-12 17:29:11 +07:00
MinhHai b487798110 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-12 13:53:54 +07:00
MinhHai f8a8d3d9d4 DONE: save skill combo 2026-03-12 13:50:41 +07:00
VuNgocHaiC7 c0b879d804 update dlg DlgFriendList.prefab 2026-03-11 17:36:16 +07:00
MinhHai af23389192 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo 2026-03-11 16:43:26 +07:00
MinhHai 0af8844948 WIP: open comment Save User Layout 2026-03-11 16:43:10 +07:00
Chomper9981 ee40c62f64 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-10 15:56:31 +07:00
Chomper9981 af987f5c3e fix task trace behavior 2026-03-10 13:58:03 +07:00
NguyenVanDat 1e17b4108c update UI logic embed stone and clear stone 2026-03-07 13:47:29 +07:00
CuongNV 72299d0b71 Add base script for chat 2026-03-06 16:45:35 +07:00
Le Duc Anh 7abe98a4b1 Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain 2026-02-27 18:08:59 +07:00
Le Duc Anh 469e3f0204 fix the issue with terrain holder and TickTask 2026-02-27 17:47:26 +07:00
MinhHai cee2eb74f7 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-02-27 15:56:39 +07:00
Tungdv 72ef982527 fix: update UI Dialog Pet List. 2026-02-26 15:57:36 +07:00
MinhHai f183544b4d WIP: prepare config before send to Server 2026-02-24 14:29:09 +07:00
MinhHai 5dd3dcf48d WIP: add logic and UI 2026-02-04 15:17:39 +07:00
VDH e57899226d infoskill done data 2026-02-02 18:16:11 +07:00
VDH 7091fb8d41 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 10:28:42 +07:00
VDH 57c2f5fb9f FIX after merge 2026-02-02 10:23:49 +07:00
VDH 7aaed6d0d3 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 09:55:39 +07:00
HungDK 793eb7c030 Merge branch 'develop' into feature/character_info 2026-02-02 09:43:23 +07:00
VDH e91a491444 get description skill 2026-02-02 09:40:39 +07:00
HungDK 00296336f9 Show dialog "Win_ArrangeTeam" 2026-02-02 09:15:39 +07:00
VDH 0de2995ab6 done ui action 2026-01-30 11:37:10 +07:00
VDH e2e63b83f2 convert ui code 2026-01-29 19:24:42 +07:00
Chomper9981 5aff603a47 Add task trace Feature. Modify task UI. 2026-01-29 17:42:34 +07:00
VDH 6dbc543188 done create new skill combo 2026-01-28 16:40:29 +07:00
VDH 53190f3f61 convert skill bombo 2026-01-21 17:40:10 +07:00
VDH 5d0f69ab34 done ui cap phep 2026-01-20 10:53:12 +07:00
VDH 5fc98befea skill ui Process 2026-01-16 18:01:33 +07:00
HungDK e5c09167fb Fix unstable reach site task completion 2026-01-06 16:59:14 +07:00
VDH cc1f4a9556 ui skill for tesst 2025-12-29 17:32:48 +07:00
MinhHai 8dee1d3541 fix DlgTask prefab: change name 2025-12-17 11:23:10 +07:00
MinhHai 5646c3be62 add DlgTask into UIManager, fix load DynTask logic 2025-12-15 10:01:00 +07:00
HungDK d4bccfb9fc Merge branch 'develop' into feature/npc-shop 2025-12-04 14:46:08 +07:00
HungDK d8d7502fe0 Integrate and asign prefab 2025-12-03 16:50:59 +07:00
MinhHai 039d0a3ddc update logic get notify task from server 2025-12-02 10:22:02 +07:00
VDH 3450fd015f Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-11-24 10:16:07 +07:00
VDH c37ec4d136 Push hoang current work 2025-11-21 10:18:08 +07:00
Tungdv 0324dc909e fix: update logic select option dlg NPC. 2025-11-19 19:12:24 +07:00