3000 Commits

Author SHA1 Message Date
hainh 243c2e51dd Merge pull request 'feature/review-npc' (#480) from feature/review-npc into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/480
2026-05-31 11:25:02 +00:00
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 4be5677b51 Merge pull request 'Update HP move at bridge' (#479) from feature/HP_move_check_bridge into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/479
2026-05-31 11:13:31 +00:00
Tungdv ed0a405f7b Merge remote-tracking branch 'origin/develop' into feature/HP_move_check_bridge 2026-05-31 18:05:41 +07:00
hoangvd 799de51cd8 Merge pull request 'hotfix/skilltable' (#478) from hotfix/skilltable into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/478
2026-05-31 11:03:37 +00: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 40849047b5 disable log 2026-05-31 18:00:32 +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 28092ce6c8 log in build 2026-05-31 15:45:52 +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 e888745ce3 Merge pull request 'remove all log chat' (#477) from feature/Daylight_2 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/477
2026-05-31 04:15:18 +00: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
hoangvd 8fcdcddc4c Merge pull request 'feature/gfx-action' (#476) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/476
2026-05-30 08:46:18 +00:00
vuong dinh hoang ad788a1f3e fix gfx 2026-05-30 15:45:40 +07:00
vuong dinh hoang 745c034c2a fix gfx 2026-05-30 15:44:54 +07:00
Tungdv 125d2c80b1 feat: add debug. 2026-05-29 20:53:36 +07:00
hoangvd 6f931db92d Merge pull request 'feature/gfx-action' (#475) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/475
2026-05-29 11:01:31 +00:00
vuong dinh hoang c4156a4d6e fix follow feed back 2026-05-29 18:00:26 +07:00
vuong dinh hoang 91c544e013 add gfx 2026-05-29 11:21:58 +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 7cf9403523 add gfx 2026-05-29 11:03:50 +07:00
vuong dinh hoang b05ac06b7e update Nam' low tech tool 2026-05-29 10:16:30 +07:00
cuongnv aabbd166ba Merge pull request 'feature/Daylight_2' (#474) from feature/Daylight_2 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/474
2026-05-29 03:12:11 +00: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 4662e1a089 update setting 2026-05-29 09:52:02 +07:00
CuongNV af17d6d97e change addressable to local 2026-05-29 09:51:46 +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
NguyenVanDat cb6c6f5fa7 add label for addressable 2026-05-28 17:37:24 +07:00
hainh dfda059258 Merge pull request 'feature/review-npc' (#472) from feature/review-npc into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/472
2026-05-28 10:00:56 +00: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
hoangvd 0d1ce5e957 Merge pull request 'feature/add-SO-to-Prefab' (#471) from feature/add-SO-to-Prefab into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/471
2026-05-28 09:30:10 +00: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