Commit Graph

804 Commits

Author SHA1 Message Date
NguyenVanDat e46bcbb56a show dummy DlgSubSkill 2025-12-13 15:04:27 +07:00
NguyenVanDat cdb18dd691 Merge branch 'implement_task_UI' into feature/task-emote
# Conflicts:
#	Assets/PerfectWorld/Scene/TaskTest.unity
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Task/TaskTest.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
2025-12-13 14:19:19 +07:00
NguyenVanDat a228a5ce1f add action emote 2025-12-13 14:12:09 +07:00
MinhHai 0bd16fce24 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-12-12 15:47:14 +07:00
MinhHai ba94ec3416 add DlgTask into UI System 2025-12-12 15:46:38 +07:00
MinhHai 93698028d9 Merge remote-tracking branch 'origin/implement_task_UI' into feature/task-npc-give-award 2025-12-12 15:45:54 +07:00
Le Duc Anh 6c74fcf224 water and gfx 2025-12-12 11:17:55 +07:00
NguyenVanDat 3feced81fc Merge branch 'develop' into feature/task-emote 2025-12-12 10:54:44 +07:00
NguyenVanDat 95f7a12fb7 Merge branch 'develop' into implement_task_UI 2025-12-12 10:54:15 +07:00
MinhHai de05654bd1 Merge remote-tracking branch 'origin/implement_task_UI' into feature/task-npc-give-award
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
2025-12-11 13:45:44 +07:00
MinhHai 09c3b5de28 complete mockup for DlgAward, after npc deliver award -> update runtime in Inventory 2025-12-11 11:41:54 +07:00
MinhHai 175790f370 Merge remote-tracking branch 'origin/develop' into feature/task-npc-give-award 2025-12-11 11:37:16 +07:00
namth 0f5d8c0129 Merge pull request 'update detail color text item' (#75) from feature/color-text into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/75
2025-12-11 04:07:22 +00:00
Chomper9981 a7dcbd4e69 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-11 10:01:53 +07:00
tungdv a8c4edd9a9 Merge pull request 'Add rotation camera.' (#76) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/76
2025-12-10 10:22:30 +00:00
Tungdv 5ebf4fb49b Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/Scripts/CECGameRun.cs
2025-12-10 17:21:20 +07:00
Tungdv 21f41ecae1 feat: add rotation cam. 2025-12-10 17:18:38 +07:00
NguyenVanDat c454eba988 add auto team 2025-12-10 13:55:52 +07:00
Tungdv ebdb99865d fix: update move air. 2025-12-09 19:53:50 +07:00
NguyenVanDat c8a21a5a33 add auto team 2025-12-09 18:13:30 +07:00
Chomper9981 5d9dd1c3d9 Change some shop UI 2025-12-09 16:37:16 +07:00
NguyenVanDat 7cd12d5041 read dynamic task data 2025-12-09 11:33:18 +07:00
NguyenVanDat 3de0b5537d read dynamic task 2025-12-09 09:51:30 +07:00
Tungdv ead70ecfea fix: update move air. 2025-12-08 19:10:23 +07:00
VungochaiC7 aee25a18b5 update detail color text item 2025-12-08 17:45:12 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
NguyenVanDat 81701772dc dummy fix task 2025-12-08 16:07:16 +07:00
NguyenVanDat 157659d320 Merge branch 'develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
2025-12-08 15:40:11 +07:00
HungDK 892d0d3aef Merge branch 'develop' into feature/npc-shop 2025-12-08 10:37:03 +07:00
HungDK 9993297ab5 Update Tab_Button.prefab 2025-12-08 10:33:32 +07:00
HungDK f42e1d27de Update InventoryUI.prefab 2025-12-08 10:27:45 +07:00
HungDK 729bd4ce6e Add button and correct refresh detail item pannel size 2025-12-08 10:26:44 +07:00
NguyenVanDat 659253c3d2 temporary add vfx for weapon attack 2025-12-08 10:23:00 +07:00
HungDK 421bcfd6a6 Update EC_InventoryUI.cs 2025-12-08 10:12:35 +07:00
NguyenVanDat 6be2ef9a39 Merge branch 'develop' into feature/vfx 2025-12-08 10:12:32 +07:00
NguyenVanDat e973260dee fix addressable release asset 2025-12-08 09:48:37 +07:00
HungDK 66dc12ef4a Update item detail 2025-12-08 09:30:59 +07:00
HungDK d2fd5b2f0a Add missing id config of items description 2025-12-08 09:17:36 +07:00
Tungdv 4c863a8ee8 fix: update move fly and swim. 2025-12-06 18:49:21 +07:00
tungdv b0b16ef6a2 Merge pull request 'Update Jump for HP.' (#74) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/74
2025-12-06 07:45:50 +00:00
Tungdv 09322bcf41 fix: delete log. 2025-12-06 14:44:34 +07:00
Tungdv be85cf1d91 Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-06 14:41:00 +07:00
Tungdv c7c34b373c fix: update data info for HP.
fix: update move fly and swim.
2025-12-06 14:14:55 +07:00
MinhHai 9bc02e1fef add DlgAward 2025-12-05 22:00:00 +07:00
Tungdv 956fde82b4 feat: set ext prop for HP. 2025-12-05 21:59:35 +07:00
Tungdv f330d9606c fix: update logic jump move for HP. 2025-12-05 21:09:16 +07:00
NguyenVanDat 593d6374da fix object attack facing to target 2025-12-05 14:21:47 +07:00
Tungdv 1d7181c1fc fix: update logic jump move. 2025-12-04 20:06:02 +07:00
Tungdv b5aeba251d fix: update logic jump stand for HP. 2025-12-04 19:18:58 +07:00
HungDK 16094d04cf Fixing wrong command to send to server 2025-12-04 15:09:20 +07:00