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

533 Commits

Author SHA1 Message Date
CuongNV d21236aec7 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-24 14:34:49 +07:00
CuongNV 19820fcf2a Add filter ui chat 2026-03-24 10:58:19 +07:00
Chomper9981 281690316a Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace 2026-03-24 10:53:46 +07:00
Chomper9981 1f0da3b665 Add UI for Buff Icons. Refactor the UI Image Picture 2026-03-24 10:53:05 +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 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
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 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
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
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
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 f28efd552f cheat UI 2026-03-18 17:19:10 +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
CuongNV d0eed02f47 Add code UI and prefab chat system 2026-03-18 15:55:24 +07:00
HungDK 6faf18dc5e Merge branch 'develop' into feature/friend 2026-03-18 14:48:27 +07:00
HungDK e4f674a750 Update friend delete, handle server sending 2026-03-18 14:38:54 +07:00
VDH 3259d297d8 Merge branch 'develop' into feature/ComboSkill 
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
 2026-03-18 13:50:49 +07:00
VDH c6506ce6eb done combo includer normal attack and loop 2026-03-18 13:49:49 +07:00
Chomper9981 81f0824e1d Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-18 13:41:25 +07:00
Chomper9981 7f6395522f Modify skill quickbar 2026-03-18 13:40:27 +07:00
Tungdv c800b48d52 Merge branch 'develop' into feature/elseplayer 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
 2026-03-18 12:54:34 +07:00
Tungdv 8cf3144761 fix: update world when teleport. 2026-03-18 11:44:46 +07:00
HungDK 2adc3ede59 Add logic update friend UI, friend status 2026-03-18 11:39:26 +07:00
hungdk f5a822f2e6 Merge pull request 'feature/friend' (#242) from feature/friend into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/242
 2026-03-17 10:40:07 +00:00
VuNgocHaiC7 d33568d373 fix bug info item server return for dlgUninstall and use item for two dlg 2026-03-17 17:24:49 +07:00
NguyenVanDat 13a08c97b3 end service when close DlgNpc 2026-03-17 11:16:11 +07:00
CuongNV f4e6fa8579 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-17 10:28:59 +07:00
NguyenVanDat a960d7a5df finished refactor message box 2026-03-17 10:22:03 +07:00
CuongNV 2c5aeb1d08 add LoginScreenUI 2026-03-17 10:21:03 +07:00
HungDK 2870a5e309 Merge branch 'develop' into feature/friend 2026-03-16 17:40:12 +07:00
HungDK 8655b96353 Handle getfriend_re so the game didnt died and add friend request handle 2026-03-16 17:39:25 +07:00
CuongNV f58b6381d8 Merge remote-tracking branch 'origin/develop' into feature/chat 
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
 2026-03-16 11:28:14 +07:00
NguyenVanDat ab5eb93265 fix npc dialogue 2026-03-13 14:09:46 +07:00
NguyenVanDat 56c0098a26 fix npc close 2026-03-13 12:18:52 +07:00