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

1973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Le Duc Anh 2c5b9a9104 load equipment async 2026-03-17 17:39:28 +07:00
HungDK eae2eb16d5 Merge branch 'develop' into feature/friend 2026-03-17 17:38:59 +07:00
hainh 13c48e7f31 Merge pull request 'fix bug info item server return for dlgUninstall and use item for two dlg' (#241) from feature/friend_ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/241
 2026-03-17 10:25:59 +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
HungDK ad505e37b9 Fixing metadata handle after getfriend re cause game dead 2026-03-17 13:59:12 +07:00
hainh d2fd3db327 Merge pull request 'override UIManager' (#240) from feature/friend_ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/240
 2026-03-17 06:55:20 +00:00
VuNgocHaiC7 8a728cc45b override UIManager 2026-03-17 13:54:16 +07:00
NguyenVanDat 13a08c97b3 end service when close DlgNpc 2026-03-17 11:16:11 +07:00
cuongnv b37e29b06d Merge pull request 'feature/chat' (#239) from feature/chat into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/239
 2026-03-17 03:29:44 +00:00
CuongNV f4e6fa8579 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-17 10:28:59 +07:00
hoangvd e552179a08 Merge pull request 'feature/skillBehavior' (#238) from feature/skillBehavior into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/238
 2026-03-17 03:28:24 +00:00
CuongNV e298030709 Change prefab chat 2026-03-17 10:28:15 +07:00
VDH 4bb8306661 Merge branch 'develop' into feature/skillBehavior 2026-03-17 10:24:49 +07:00
VDH 0f55a32f97 adjust skill find the issue cause logic handle remove gfx faild 2026-03-17 10:24:30 +07:00
NguyenVanDat a960d7a5df finished refactor message box 2026-03-17 10:22:03 +07:00
CuongNV 3166c91471 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-17 10:21:23 +07:00
CuongNV 2c5aeb1d08 add LoginScreenUI 2026-03-17 10:21:03 +07:00
CuongNV a40d126d63 add AUI_ConvertChatString 2026-03-16 17:44:16 +07:00
HungDK 2870a5e309 Merge branch 'develop' into feature/friend 2026-03-16 17:40:12 +07:00
HungDK 5dfab238fa Update UnityGameSession.cs 2026-03-16 17:39:30 +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