Commit Graph

1348 Commits

Author SHA1 Message Date
VuNgocHaiC7 de0fc2b0ee Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-23 18:00:14 +07:00
VuNgocHaiC7 1004d64457 fix again some UI and update money when buy item 2026-03-23 17:59:11 +07:00
HungDK d962c70801 fix bug fly gfx don't be destroyed 2026-03-23 16:26:40 +07:00
NguyenVanDat 83f339bd70 upate filter logic 2026-03-23 15:51:22 +07:00
NguyenVanDat 93519b7f2e add tool test badword 2026-03-23 11:03:47 +07:00
NguyenVanDat b034c0b19e Merge branch 'develop' into feature/world-filter 2026-03-23 10:50:32 +07:00
NguyenVanDat f87dcbd7f8 add badword filter version 1 2026-03-23 10:46:10 +07:00
VuNgocHaiC7 0ff167624b Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-20 16:47:23 +07:00
VuNgocHaiC7 65afe04918 update money in inventory when pickup money and button confirm dlgAwarld for item_info setActive false 2026-03-20 16:47:14 +07:00
Chomper9981 ee75334b1d fix task trace position 2026-03-20 16:16:17 +07:00
Le Duc Anh f627c5e6a7 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-20 15:08:41 +07:00
Le Duc Anh ca49c2b1c5 camera controller option 2 2026-03-20 15:07:59 +07:00
Tungdv b6defe44c6 Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
2026-03-20 14:49:48 +07:00
Tungdv 3a8507c15b fix: update rotation camera. 2026-03-20 14:40:50 +07:00
Chomper9981 eef47bd6b4 fix null proplem in quickBar 2026-03-20 14:16:04 +07:00
namth b0e3aa4b43 Merge pull request 'feature/task-trace-ui' (#261) from feature/task-trace-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/261
2026-03-20 03:07:06 +00:00
VuNgocHaiC7 f290d44d13 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-19 17:54:21 +07:00
Chomper9981 8e4117e139 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-19 17:53:54 +07:00
VuNgocHaiC7 f9dbdc1c3c fix ui for dlg FriendList 2026-03-19 17:50:49 +07:00
Chomper9981 bb107503ab Change UI for TaskTrace. Add side bar for MainUI 2026-03-19 17:48:02 +07:00
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
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
CuongNV c484ade69b add prefix for chat 2026-03-19 15:24:13 +07: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
VDH dd36dde176 Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-19 13:57:04 +07: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 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
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
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
VDH dc589a8e8d Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-18 17:39:04 +07:00
VDH 4e24e1101c cheat 2026-03-18 17:35:52 +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
CuongNV ee6d880333 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
#	Assets/Scripts/EC_GameRun.cs
2026-03-18 16:05:54 +07:00