Commit Graph

2777 Commits

Author SHA1 Message Date
Tran Hai Nam 936dbb7839 Change animation logic to using channer act 2026-05-06 17:46:38 +07:00
Tran Hai Nam 96e835d8eb Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-06 17:45:17 +07:00
Tran Hai Nam 764f228ad8 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-06 17:44:26 +07:00
Tran Hai Nam d0ce925ae0 fix Charater SO proplem 2026-05-06 17:43:11 +07:00
cuongnv 679f955654 Merge pull request 'feature/UpdateAvatar' (#406) from feature/UpdateAvatar into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/406
2026-05-06 09:52:39 +00:00
CuongNV 53c334edf8 Merge remote-tracking branch 'origin/develop' into feature/UpdateAvatar 2026-05-06 16:51:51 +07:00
CuongNV 3b435161d0 add new prefab Hub 2026-05-06 16:51:15 +07:00
cuongnv 0345077ef2 Merge pull request 'feature/UpdateAvatar' (#405) from feature/UpdateAvatar into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/405
2026-05-06 08:56:49 +00:00
CuongNV ab71187d00 update scene boostrap for avatar 2026-05-06 15:56:01 +07:00
CuongNV cf8038f46b Merge remote-tracking branch 'origin/develop' into feature/UpdateAvatar
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-05-06 15:50:15 +07:00
CuongNV 2bc153e510 add prefabs GO Portrait elsePlayer and hostPlayer 2026-05-06 15:48:18 +07:00
CuongNV 52925c000e update pos icon avatar in prefabs and update logic elsePlayerPortrait like hostPlayerPortrait 2026-05-06 15:46:11 +07:00
hoangvd ae21b1a995 Merge pull request 'feature/gfx-action' (#404) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/404
2026-05-06 08:45:09 +00:00
vuong dinh hoang 92b384db2a Merge branch 'develop' into feature/gfx-action 2026-05-06 15:44:27 +07:00
vuong dinh hoang ba5b47c324 TiT 2026-05-06 15:43:56 +07:00
Tungdv 9c8677240c Merge remote-tracking branch 'origin/develop' into feature/pooling_system
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-05-06 15:36:34 +07:00
Tungdv df23868b40 feat: Add prefabs pooling manager.
fix: update spawn NPC.
2026-05-06 15:33:28 +07:00
hoangvd d1b11c58fb Merge pull request 'feature/gfx-action' (#403) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/403
2026-05-06 08:16:55 +00:00
vuong dinh hoang 5070c1b010 Merge branch 'develop' into feature/gfx-action 2026-05-06 15:16:06 +07:00
vuong dinh hoang 8ba1f5fa6c for TiT 2026-05-06 15:15:45 +07:00
CuongNV a34993f531 Update code, sence bootrap and prefab hub for avatar hostplayer 2026-05-06 15:13:34 +07:00
hoangvd fad9ad2387 Merge pull request 'feature/gfx-action' (#402) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/402
2026-05-06 04:37:01 +00:00
vuong dinh hoang 752a8e1d30 Merge branch 'develop' into feature/gfx-action 2026-05-06 11:35:24 +07:00
vuong dinh hoang 1ce524d306 done state gfx 2026-05-06 11:34:58 +07:00
NguyenVanDat e4b5ce7e1b fix show progress bar 2026-05-06 11:16:52 +07:00
vuong dinh hoang 2b5379b14e Merge branch 'develop' into feature/gfx-action 2026-05-06 09:26:26 +07:00
vuong dinh hoang b022532be1 add vfx 2026-05-05 18:02:34 +07:00
namth c205cdacb2 Merge pull request 'feature/animation-channelact' (#401) from feature/animation-channelact into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/401
2026-05-05 10:49:58 +00:00
Tran Hai Nam 7e8d6dbef1 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-05 17:49:19 +07:00
Tran Hai Nam a5d162f398 modify some code of channel act 2026-05-05 17:47:39 +07:00
anhld 9577420633 Merge pull request 'mini map load the coresponding map after player enter world.' (#400) from feature/update-minimap into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/400
2026-05-05 10:01:21 +00:00
Le Duc Anh 6d53dcee91 mini map load the coresponding map after player enter world. 2026-05-05 17:00:17 +07:00
Tran Hai Nam c52b3f445f Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-05 16:10:37 +07:00
Tran Hai Nam 4e99c4f842 add chanelact logic 2026-05-05 16:09:25 +07:00
hainh 87617102ec Merge pull request 'feature/optimate' (#399) from feature/optimate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/399
2026-05-05 07:54:43 +00:00
VuNgocHaiC7 e317908b62 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/optimate 2026-05-05 14:53:49 +07:00
VuNgocHaiC7 b6a59b3127 fix code update equip thing character 2026-05-05 14:53:40 +07:00
vuong dinh hoang 2b4ae4928d flow code gfx action done 2026-05-05 14:38:10 +07:00
hainh a540a53919 Merge pull request 'feature/optimate' (#398) from feature/optimate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/398
2026-05-05 06:46:34 +00:00
VuNgocHaiC7 802a748033 update code for logout 2026-05-05 11:37:26 +07:00
VuNgocHaiC7 6396a4e162 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/optimate 2026-05-04 17:43:05 +07:00
VuNgocHaiC7 3eadd532cc update test logout 2026-05-04 17:42:57 +07:00
hoangvd 05d1810120 Merge pull request 'feature/loganimation-and-stun-effect' (#397) from feature/loganimation-and-stun-effect into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/397
2026-05-04 10:14:05 +00:00
vuong dinh hoang 86d4884b75 Merge branch 'develop' into feature/loganimation-and-stun-effect 2026-05-04 17:12:07 +07:00
vuong dinh hoang 1e4b749e58 for create gfx 2026-05-04 17:11:44 +07:00
tungdv 44a913889e Merge pull request 'add btn cancel in skill progress.' (#396) from feature/pooling_system into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/396
2026-05-04 09:39:08 +00:00
Tungdv f9eb2c04c4 feat: add btn cancel in skill progress. 2026-05-04 16:38:22 +07:00
tungdv 040942016d Merge pull request 'add pooling system' (#395) from feature/pooling_system into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/395
2026-05-04 09:18:37 +00:00
Tungdv 9f470c31d2 Merge remote-tracking branch 'origin/develop' into feature/pooling_system 2026-05-04 16:17:24 +07:00
Tungdv 46e3154db9 fix: update pooling manager. 2026-05-04 16:16:58 +07:00