duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,031 Commits 13 Branches 0 Tags
cf02ddf4cfd0ad28bdbec5c66bd832b82f22fd71
Commit Graph

2031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CuongNV cf02ddf4cf Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 14:33:30 +07:00
namth 3178c8c7d4 Merge pull request 'fix null proplem in quickBar' (#263) from figbug/quick-bar-bug into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/263
 2026-03-20 07:17:54 +00:00
Chomper9981 eef47bd6b4 fix null proplem in quickBar 2026-03-20 14:16:04 +07:00
CuongNV 0021ce2ade Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 13:53:37 +07:00
CuongNV fad24cfdd8 add new logic chat Input 2026-03-20 13:52:55 +07:00
namth a91faac68f Merge pull request 'feature/task-trace-ui' (#262) from feature/task-trace-ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/262
 2026-03-20 03:19:00 +00:00
Chomper9981 265dea6ff3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into check-out-branch 2026-03-20 10:11:28 +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
Chomper9981 d986b11380 Fix UI after merge 2026-03-20 10:03:52 +07:00
Chomper9981 3a89f85d1f Merge origin/develop into current branch (resolve conflicts using develop) 
Made-with: Cursor
 2026-03-19 18:13:14 +07:00
hainh 3f3b3b0589 Merge pull request 'feature/friend_ui' (#260) from feature/friend_ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/260
 2026-03-19 10:55:46 +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 64571dcf84 Merge pull request 'feature/chat' (#259) from feature/chat into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/259
 2026-03-19 09:54:46 +00: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
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