Commit Graph

1871 Commits

Author SHA1 Message Date
Tungdv 51667e8867 feat: add config instance. 2026-03-09 19:28:45 +07:00
VDH dbb1cac4a6 Merge branch 'develop' into feature/skillBehavior
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-03-09 17:53:02 +07:00
VDH 574fc0c8c6 fix bug flash move skill 2026-03-09 17:50:32 +07:00
CuongNV e2536a2153 fix double chat 2026-03-09 17:17:28 +07:00
Chomper9981 b19ea07f49 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-09 17:10:56 +07:00
Chomper9981 f4ad63f525 change game object logic to using CECPlayer instead. fix dlgaward not gen enough data. fix wave hand invalid 2026-03-09 17:10:14 +07:00
CuongNV b744546442 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-09 16:58:49 +07:00
CuongNV e08939e5c6 change game session 2026-03-09 16:57:56 +07:00
CuongNV 530dab31ef add player name for chat in EC_Friend 2026-03-09 16:57:38 +07:00
CuongNV 476b1b623f add code ui chat 2026-03-09 16:55:47 +07:00
CuongNV ab012dc30b add else player for chat 2026-03-09 16:55:28 +07:00
CuongNV 13c907187f Show Canvas player for chat system 2026-03-09 16:54:38 +07:00
VuNgocHaiC7 65a8b2db51 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-09 15:29:29 +07:00
VuNgocHaiC7 564e27b6b8 fix show dlgTeamList continuous 2026-03-09 15:29:21 +07:00
hungdk 0303dd3916 Merge pull request 'Add CreateGetOtherEquipDetailCmd and update player option UI prefab' (#208) from feature/character_info into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/208
2026-03-09 07:56:11 +00:00
HungDK bc743a8e89 Add CreateGetOtherEquipDetailCmd and update player option UI prefab 2026-03-09 14:52:55 +07:00
NguyenVanDat 29ad5a723e update ui: update task 2026-03-09 11:39:30 +07:00
NguyenVanDat d7962c414b Merge branch 'develop' into feature/ui-system-update 2026-03-09 10:56:03 +07:00
NguyenVanDat 7d700d122e update ui: npc and award popup 2026-03-09 10:52:37 +07:00
Le Duc Anh 9a3355abd4 update terrain for a69 2026-03-09 10:52:03 +07:00
Le Duc Anh 91bbfb6679 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-09 10:03:29 +07:00
NguyenVanDat 950ea7370d Merge branch 'develop' into feature/ui-system-update 2026-03-09 09:58:12 +07:00
Le Duc Anh cfa6372001 add Bong Minh Dong a69 map 2026-03-07 20:11:25 +07:00
NguyenVanDat 25fff7a67d update npc dlg 2026-03-07 16:33:01 +07:00
Chomper9981 1ec660c957 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-07 15:22:46 +07:00
hoangvd 628a2407fc Merge pull request 'cmt skill' (#206) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/206
2026-03-07 08:04:45 +00:00
VDH 6a7e8f8be8 cmt skill 2026-03-07 15:03:49 +07:00
hoangvd 9b54746adf Merge pull request 'feature/skillBehavior' (#205) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/205
2026-03-07 08:01:46 +00:00
VDH 5c3969372e cmt skill 2026-03-07 15:00:41 +07:00
NguyenVanDat eef8e52436 finished refacor NPC shop UI 2026-03-07 14:57:55 +07:00
NguyenVanDat 13eabb99ed Merge branch 'develop' into feature/ui-system-update
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
2026-03-07 14:40:59 +07:00
NguyenVanDat 33dc5dc7b3 fix bug: can not end service when buy or create item in NPC shop 2026-03-07 14:38:50 +07:00
VDH 5228f357f1 done phap su gfx 2026-03-07 14:33:50 +07:00
NguyenVanDat 1e17b4108c update UI logic embed stone and clear stone 2026-03-07 13:47:29 +07:00
Chomper9981 b46907c460 fix act not synch with dmg. add loop for some "Than Thu" animation 2026-03-07 11:28:40 +07:00
CuongNV 4da68f5721 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/EC_GameRun.cs
2026-03-07 10:37:26 +07:00
NguyenVanDat bad2515394 Merge branch 'develop' into feature/ui-system-update
# Conflicts:
#	Assets/Scripts/CECUIManager.cs
2026-03-07 10:08:28 +07:00
CuongNV 85e138fdbc Add bug for chat 2026-03-07 10:05:46 +07:00
VDH 811712deae Merge branch 'develop' into feature/skillBehavior 2026-03-07 09:55:03 +07:00
VDH a184aa0ed5 fix use skill buff 2026-03-07 09:54:02 +07:00
VuNgocHaiC7 f289148269 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-06 18:03:44 +07:00
VuNgocHaiC7 1c7989159e fix UI dlgTeamList auto show true 2026-03-06 18:03:17 +07:00
MinhHai 7e5fd02e1f Merge remote-tracking branch 'origin/develop' into feature/update-logout-logic 2026-03-06 17:33:37 +07:00
Tungdv 2e03de644d fix: update fly with sword and wing. 2026-03-06 17:33:20 +07:00
MinhHai 56e385ab88 DONE: logout full and logout half login 2026-03-06 17:33:14 +07:00
HungDK bc49fefdcd Add close btn to player stats ui 2026-03-06 17:28:47 +07:00
VuNgocHaiC7 119ee2685a Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-06 16:55:40 +07:00
VuNgocHaiC7 2c0bbafb6f update code PetDetail 2026-03-06 16:55:00 +07:00
CuongNV 72299d0b71 Add base script for chat 2026-03-06 16:45:35 +07:00
VDH c8daa171ac add gfx 2026-03-06 16:15:33 +07:00