1877 Commits

Author SHA1 Message Date
DESKTOP-244GPOT\Admin 0ae233cc6e Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature/review-npc 2026-05-31 18:22:18 +07:00
Tungdv ed0a405f7b Merge remote-tracking branch 'origin/develop' into feature/HP_move_check_bridge 2026-05-31 18:05:41 +07:00
vuong dinh hoang e071d08a46 Merge branch 'develop' into hotfix/skilltable
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/MiniMap/CDlgMiniMap.cs
2026-05-31 18:02:20 +07:00
Tungdv 51092862ed fix: update logic move. 2026-05-31 18:01:16 +07:00
vuong dinh hoang 0d18d36fbb remove log 2026-05-31 17:59:52 +07:00
Vũ Ngọc Hải 3343bc2299 fix button equip 2026-05-31 17:31:54 +07:00
NguyenVanDat 1850ef70a8 Merge branch 'hotfix/skilltable' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into hotfix/skilltable
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs
2026-05-31 17:18:39 +07:00
NguyenVanDat 1ae540c872 fix init list 2026-05-31 17:16:38 +07:00
vuong dinh hoang 263f7bfbc3 fix lable rank 2026-05-31 17:14:44 +07:00
vuong dinh hoang c4b9320b3c add more log 2026-05-31 16:21:47 +07:00
vuong dinh hoang 366a857a9e make sure list is init 2026-05-31 14:24:26 +07:00
vuong dinh hoang 87cea0adcb for log 2026-05-31 14:18:44 +07:00
CuongNV cfd4cabb1d remove all log chat 2026-05-31 11:14:13 +07:00
vuong dinh hoang e8b8153d91 update log 2026-05-30 17:54:23 +07:00
vuong dinh hoang 9752fbc0a9 hot fix add log 2026-05-30 17:35:19 +07:00
Tungdv 125d2c80b1 feat: add debug. 2026-05-29 20:53:36 +07:00
vuong dinh hoang c4156a4d6e fix follow feed back 2026-05-29 18:00:26 +07:00
vuong dinh hoang 05106a8669 Merge branch 'develop' into feature/gfx-action
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2026-05-29 11:06:44 +07:00
vuong dinh hoang d3650ef53a update show skill tool 2026-05-29 11:05:10 +07:00
vuong dinh hoang b05ac06b7e update Nam' low tech tool 2026-05-29 10:16:30 +07:00
CuongNV 4c168cd37f Merge remote-tracking branch 'origin/develop' into feature/Daylight_2
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2026-05-29 10:04:23 +07:00
CuongNV a681d15e26 update light 2026-05-29 10:02:52 +07:00
vuong dinh hoang 1f86beee24 tool remove gfx in combineaction SO data 2026-05-29 10:02:16 +07:00
CuongNV 130ead5f56 Merge branch 'feature/chat_rule_Cuong' into feature/Daylight_2
# Conflicts:
#	Assets/PerfectWorld/Scripts/World/CECSunMoon.cs
2026-05-29 08:51:17 +07:00
hoangvd 6dfbdb7658 Merge pull request 'fix ontarget but aoe skill' (#473) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/473
2026-05-28 10:56:35 +00:00
vuong dinh hoang c8bca5cb18 fix ontarget but aoe skill 2026-05-28 17:55:56 +07:00
CuongNV 42f0cded84 add new code controller color night 2026-05-28 17:47:13 +07:00
Vũ Ngọc Hải d0dbf7f46e Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/review-npc 2026-05-28 16:56:58 +07:00
Vũ Ngọc Hải a5e66f1bb6 unlock UI npc and fix scroll view inventory 2026-05-28 16:54:43 +07:00
vuong dinh hoang 7a8af285b3 add gfx 2026-05-28 16:26:06 +07:00
vuong dinh hoang 630ff8e097 Merge branch 'feature/gfx-action' into feature/add-SO-to-Prefab 2026-05-28 14:18:28 +07:00
vuong dinh hoang 6275683c71 add gfx 2026-05-28 14:09:20 +07:00
CuongNV 4e5c7aceff Merge branch 'develop' into feature/chat_rule_Cuong
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/models.asset
2026-05-28 10:11:57 +07:00
NguyenVanDat d7f971d8b5 Update file setup for addressable remote 2026-05-27 17:48:15 +07:00
Tran Hai Nam 9a361247ef Add NPC animation behavior 2026-05-27 17:47:58 +07:00
Tran Hai Nam 72e6cc1059 fix skill panel 2026-05-27 14:49:22 +07:00
Tran Hai Nam 7cdcabb29c Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-05-27 14:47:09 +07:00
Tran Hai Nam aaaf589ef7 Add more precise life time manager for gfx 2026-05-27 12:24:15 +07:00
Tran Hai Nam ef5689055e Add requirement for play skill
Merge from develop
2026-05-27 12:16:38 +07:00
HungDK c829ddeaea Merge branch 'develop' into feature/storage 2026-05-27 11:48:25 +07:00
HungDK 80a3a48abe Add storage password logic, ui 2026-05-27 10:55:35 +07:00
Le Duc Anh 27cc75e3b3 Merge remote-tracking branch 'origin/develop' into feature/prepare-world-map 2026-05-27 10:25:54 +07:00
Le Duc Anh 35c9bad469 Merge branch 'develop' into feature/Addessable_CDN 2026-05-27 10:09:58 +07:00
Le Duc Anh be95b0b7a8 Merge branch 'develop' into feature/select-last-role 2026-05-27 10:08:58 +07:00
Le Duc Anh a12a94ca41 Merge branch 'feature/select-last-role' into feature/Addessable_CDN 2026-05-27 10:07:40 +07:00
HungDK a8d3994226 Merge branch 'develop' into feature/storage 2026-05-27 09:28:29 +07:00
HungDK ea57bbd9df Add missing push 2026-05-27 09:25:53 +07:00
HungDK e7cecb98f9 Deposit, withdraw account money handler 2026-05-27 09:25:12 +07:00
HungDK 7067f40a61 Add logic of account storage 2026-05-27 09:23:10 +07:00
Le Duc Anh 9590902fac WIP npc models 2026-05-26 16:11:24 +07:00