Commit Graph

2940 Commits

Author SHA1 Message Date
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
vuong dinh hoang 1f86beee24 tool remove gfx in combineaction SO data 2026-05-29 10:02:16 +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
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
Tran Hai Nam ccba0e1991 Merge branch 'feature/add-SO-to-Prefab' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-05-27 18:08:24 +07:00
Tran Hai Nam 9a361247ef Add NPC animation behavior 2026-05-27 17:47:58 +07:00
vuong dinh hoang 9ea65fb20f add animancer 2026-05-27 17:06:09 +07:00
Tran Hai Nam 94b6ef8200 Merge branch 'feature/add-SO-to-Prefab' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-05-27 15:34:18 +07:00
vuong dinh hoang 03147ae054 setup npc 2026-05-27 15:25: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
vuong dinh hoang 01098d913c Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into develop 2026-05-27 14:11:37 +07:00
vuong dinh hoang fba6061757 remove missing scripts 2026-05-27 14:11:10 +07:00
Tran Hai Nam aaaf589ef7 Add more precise life time manager for gfx 2026-05-27 12:24:15 +07:00
hungdk c087d8c12b Merge pull request 'feature/storage' (#469) from feature/storage into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/469
2026-05-27 05:16:52 +00: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 be95b0b7a8 Merge branch 'develop' into feature/select-last-role 2026-05-27 10:08:58 +07:00
Le Duc Anh bcd9dade25 auto select last role 2026-05-27 10:06:47 +07:00
Le Duc Anh 5d302458e2 WIP NPC models and animation, CombinedActionSO 2026-05-27 10:00:52 +07:00
hungdk f93f7ac300 Merge pull request 'Account storage feature' (#467) from feature/storage into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/467
2026-05-27 02:51:08 +00: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 5a85e9fd90 Add ui of account storage, prefab 2026-05-27 09:23:59 +07:00
HungDK 7067f40a61 Add logic of account storage 2026-05-27 09:23:10 +07:00
Le Duc Anh e009e6d2f8 Merge branch 'feature/prepare-world-map' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature/prepare-world-map 2026-05-26 16:25:24 +07:00
Le Duc Anh 9590902fac WIP npc models 2026-05-26 16:11:24 +07:00
Le Duc Anh 83153a3207 WIP NPC CombinedActionSO 2026-05-26 16:06:32 +07:00
NguyenVanDat df3f4c2839 update logic select last role 2026-05-26 10:39:47 +07:00
hoangvd fa322512db Merge pull request 'feature/gfx-action' (#466) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/466
2026-05-25 02:49:12 +00:00
vuong dinh hoang 25a58241c3 add gfx 22/5 2026-05-25 09:18:50 +07:00
vuong dinh hoang 4d20d561cf add gfx 2026-05-25 09:12:56 +07:00
vuong dinh hoang c9f6a3c4a7 Merge branch 'develop' into feature/gfx-action 2026-05-22 09:40:08 +07:00
vuong dinh hoang ea332f7745 add gfx 2026-05-22 09:39:43 +07:00
Tungdv cb552b4f36 fix: update move for HP. 2026-05-21 20:17:34 +07:00
hungdk 3cfb66aaaf Merge pull request 'feature/storage' (#465) from feature/storage into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/465
2026-05-21 10:56:57 +00:00
HungDK e3a32c8780 Merge branch 'develop' into feature/storage 2026-05-21 17:56:21 +07:00
HungDK a4559f5d5f Add ui to uimanager, scriptable object 2026-05-21 17:45:03 +07:00
HungDK 8896d26b50 Add send storage request 2026-05-21 17:44:22 +07:00