duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,994 Commits 13 Branches 0 Tags
147a3f0745f0bf94bc31efbb01de7ea9bfd2ec9c
Commit Graph

1994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 4d462c119d add GameSession and logic handle chat 2026-03-18 15:56:53 +07:00
CuongNV d0eed02f47 Add code UI and prefab chat system 2026-03-18 15:55:24 +07:00
CuongNV d329d825e7 add image to Art 2026-03-18 15:54:01 +07:00
hungdk 7dea9fa976 Merge pull request 'feature/friend' (#245) from feature/friend into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/245
 2026-03-18 07:51:43 +00: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
hoangvd 118f37a075 Merge pull request 'feature/ComboSkill' (#244) from feature/ComboSkill into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/244
 2026-03-18 06:53:49 +00: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 6d1b69784b Merge pull request 'Add load scene when teleport.' (#243) from feature/elseplayer into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/243
 2026-03-18 06:02:53 +00: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
NguyenVanDat 22d25631e5 add warning: choi game qua 180 phut la do roi 2026-03-18 10:20:33 +07:00
HungDK 9f31aa446a Merge branch 'develop' into feature/friend 2026-03-18 09:31:32 +07:00
Le Duc Anh bc7db7f58d get correct armor for elseplayer 2026-03-17 22:01:36 +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
Le Duc Anh 90eb4ff4ce Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-17 17:39:46 +07:00