Commit Graph

2015 Commits

Author SHA1 Message Date
CuongNV 06b4cd91ca Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-19 16:53:59 +07:00
CuongNV 221c6ad364 change prefab chatsystem and update logic button channel 2026-03-19 16:52:49 +07:00
hoangvd 2301700969 Merge pull request 'feature/refactor-SkillUI' (#258) from feature/refactor-SkillUI into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/258
2026-03-19 09:02:29 +00:00
VDH ae02046fc7 Merge branch 'develop' into feature/refactor-SkillUI 2026-03-19 16:01:05 +07:00
VDH 92852a28a0 add log for build 2026-03-19 16:00:31 +07:00
Le Duc Anh 4337001a2c add Tien Thu equipments 2026-03-19 15:46:52 +07:00
CuongNV 8b8653c1fa update prefix 2026-03-19 15:44:02 +07:00
CuongNV c484ade69b add prefix for chat 2026-03-19 15:24:13 +07:00
cuongnv 691fc88226 Merge pull request 'feature/chat' (#257) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/257
2026-03-19 07:25:11 +00:00
CuongNV 664e5b2f74 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-19 14:24:21 +07:00
CuongNV e2735a73f3 add scene bootstrap new prefab chat 2026-03-19 14:23:10 +07:00
cuongnv 4192582aad Merge pull request 'Change UI Chat' (#256) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/256
2026-03-19 07:19:07 +00:00
hoangvd 6d0557a60a Merge pull request 'feature/refactor-SkillUI' (#255) from feature/refactor-SkillUI into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/255
2026-03-19 06:57:41 +00:00
VDH dd36dde176 Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-19 13:57:04 +07:00
namth 8616fd1a65 Merge pull request 'feature/change-skill-feature' (#254) from feature/change-skill-feature into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/254
2026-03-19 06:55:41 +00:00
VDH a726ca23cb Merge branch 'develop' into feature/refactor-SkillUI 2026-03-19 13:54:21 +07:00
Chomper9981 4cf015f8e5 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-19 13:52:46 +07:00
VDH e99dcbb501 fix bug don't load skill 2026-03-19 13:52:45 +07:00
Chomper9981 9dd504d92e Change some UI, UX relate to Assign Skill 2026-03-19 13:52:26 +07:00
CuongNV 5708f72910 Change UI Chat 2026-03-19 13:41:38 +07:00
NguyenVanDat 82994a9c1c update dlg npc flow 2026-03-19 10:42:46 +07:00
MinhHai 147a3f0745 fix MiniMap: add into Main HUD 2026-03-19 10:24:11 +07:00
cuongnv 2f05140d4e Merge pull request 'feature/chat' (#253) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/253
2026-03-19 02:38:26 +00:00
CuongNV d57bbeb0df fix hide tilte show chat 2026-03-19 09:37:24 +07:00
CuongNV aa9007e1ba fix show UI 2026-03-19 09:28:55 +07:00
namth 6d7f322db2 Merge pull request 'feature/change-skill-feature' (#252) from feature/change-skill-feature into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/252
2026-03-18 11:28:55 +00:00
Chomper9981 34bd53b3a3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-18 18:02:14 +07:00
Chomper9981 3a3bdfa7b3 Cache skill change data and save skill change data to server 2026-03-18 17:59:36 +07:00
hainh 9b0ff9497d Merge pull request 'anh nao sua UIManager lam chet cai button team_list cua em vay' (#251) from feature/friend_ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/251
2026-03-18 10:57:21 +00:00
VuNgocHaiC7 ce4af3772c anh nao sua UIManager lam chet cai button team_list cua em vay 2026-03-18 17:56:30 +07:00
hainh ffacd4b3ac Merge pull request 'feature/friend_ui' (#250) from feature/friend_ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/250
2026-03-18 10:47:56 +00:00
VuNgocHaiC7 aec0394e79 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-18 17:45:39 +07:00
VuNgocHaiC7 e51674279d fix code for some dlg include one click item and fix detail info, value money 2026-03-18 17:43:25 +07:00
hoangvd 4ba722fbda Merge pull request 'feature/refactor-SkillUI' (#249) from feature/refactor-SkillUI into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/249
2026-03-18 10:40:37 +00:00
VDH dc589a8e8d Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-18 17:39:04 +07:00
VDH 322dcb8313 save prefab 2026-03-18 17:38:39 +07:00
VDH 4e24e1101c cheat 2026-03-18 17:35:52 +07:00
Le Duc Anh 2f11ff2787 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-18 17:19:47 +07:00
Le Duc Anh bd2fe1d4f3 add hair model TiT 2026-03-18 17:19:37 +07:00
VDH f28efd552f cheat UI 2026-03-18 17:19:10 +07:00
cuongnv 2e90de643d Merge pull request 'fix show ui chat' (#248) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/248
2026-03-18 09:45:47 +00:00
CuongNV 5a9119a752 fix show ui chat 2026-03-18 16:45:07 +07:00
Le Duc Anh a2b24be051 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-18 16:41:30 +07:00
Le Duc Anh 62ac1ad4da add Than Thu equipment 2026-03-18 16:39:56 +07:00
tungdv 9d53bd8e8b Merge pull request 'Update wing for HP.' (#247) from feature/elseplayer into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/247
2026-03-18 09:36:08 +00:00
Tungdv 40cddc645d Merge remote-tracking branch 'origin/develop' into feature/elseplayer 2026-03-18 16:35:33 +07:00
Tungdv 0ccc726e3d fix: update wing for HP. 2026-03-18 16:34:31 +07:00
cuongnv 40363870a0 Merge pull request 'feature/chat' (#246) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/246
2026-03-18 09:18:11 +00:00
CuongNV ecaed66c2f add chatUi in bootstrap scence 2026-03-18 16:16:40 +07:00
CuongNV 4c549c3f77 change prefab 2026-03-18 16:16:03 +07:00