Commit Graph

1671 Commits

Author SHA1 Message Date
anhld 22b97e3321 Merge pull request 'Update Terrain system and add more npc models' (#190) from feature/dynamic-terrain into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/190
2026-03-02 13:40:03 +00:00
Le Duc Anh 224bd75b47 update more npc models 2026-03-02 20:38:51 +07:00
Le Duc Anh fbe3e92462 Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain 2026-03-02 20:15:20 +07:00
namth 12a30fb9b2 Merge pull request 'Update UI' (#189) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/189
2026-03-02 11:06:38 +00:00
Chomper9981 d5adc1542c Update UI 2026-03-02 18:02:23 +07:00
hainh 73c4664251 Merge pull request 'feature/fix-ui' (#188) from feature/fix-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/188
2026-03-02 08:01:43 +00:00
VuNgocHaiC7 84d495ee71 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 2026-03-02 15:00:48 +07:00
VuNgocHaiC7 61125bf8e1 BtnOpenCharacter of HUDPlayer 2026-03-02 14:59:58 +07:00
hoangvd 7dd17062ae Merge pull request 'feature/skillBehavior' (#187) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/187
2026-03-02 07:58:30 +00:00
VDH bf63593b15 Merge branch 'develop' into feature/skillBehavior
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-02 14:57:53 +07:00
VDH 052817bdc9 fix can't cast skill need weapon 2026-03-02 14:56:13 +07:00
hainh 6aca646b58 Merge pull request 'feature/fix-ui' (#185) from feature/fix-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/185
2026-03-02 07:44:51 +00:00
VuNgocHaiC7 8c781a5261 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 2026-03-02 14:42:38 +07:00
hungdk d3e847b8d4 Merge pull request 'Team and duel conversation' (#184) from feature/hp_pet into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/184
2026-03-02 07:41:12 +00:00
HungDK 10bf15490a Merge branch 'develop' into feature/hp_pet 2026-03-02 14:39:59 +07:00
HungDK cb3c3531c0 Add send invite, respond of duel, team, ui handle 2026-03-02 14:38:56 +07:00
HungDK cdd86f2a8d Update Teamate.prefab 2026-03-02 14:36:47 +07:00
HungDK a3177a79fd Create team btn, dlg show 2026-03-02 14:36:36 +07:00
VuNgocHaiC7 46191105b4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 2026-03-02 14:30:27 +07:00
VuNgocHaiC7 92bbee64c3 Done DlgInstall 2026-03-02 14:30:18 +07:00
VDH cf6303afad Merge branch 'develop' into feature/skillBehavior
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2026-03-02 11:35:31 +07:00
VDH eb9d8cdd5f fix learn skill 2026-03-02 11:31:43 +07:00
haimh bdec614302 Merge pull request 'DONE: add Dlg Exit (Win_Message2) into SO file' (#183) from feature/add-dialog-exit into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/183
2026-03-02 02:59:59 +00:00
MinhHai 00da0448a6 DONE: add Dlg Exit (Win_Message2) into SO file 2026-03-02 09:58:00 +07:00
tungdv 8570fb63e9 Merge pull request 'Update dlg pet rec and fix bug restore egg from NPC.' (#182) from feature/hp_pet into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/182
2026-02-28 11:36:10 +00:00
Tungdv 01ae1463f4 fix: remove debug and "using" not use. 2026-02-28 18:34:39 +07:00
HungDK c848b54211 Clean code, refactor function 2026-02-28 18:14:46 +07:00
HungDK 2b644ba5eb Add missing purchase item 2026-02-28 18:14:10 +07:00
Le Duc Anh 76183faa47 unload world scene when logout 2026-02-27 20:46:21 +07:00
tungdv ec825ba969 Merge pull request 'fix: update dlg pet restore.' (#181) from feature/hp_pet into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/181
2026-02-27 11:24:48 +00:00
Tungdv 8199d01929 fix: update dlg pet restore. 2026-02-27 18:24:11 +07:00
VDH 5de380fd05 update check condition 2026-02-27 18:18:51 +07:00
Le Duc Anh 7abe98a4b1 Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain 2026-02-27 18:08:59 +07:00
tungdv 408506c285 Merge pull request 'Update loigic dlg pet list, dlg pet hatch and dlg pet restore.' (#180) from feature/hp_pet into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/180
2026-02-27 10:48:36 +00:00
Le Duc Anh 469e3f0204 fix the issue with terrain holder and TickTask 2026-02-27 17:47:26 +07:00
Tungdv a64111b1b6 fix: fix bug dlg pet hatch. 2026-02-27 17:47:10 +07:00
Tungdv a397507c0a Merge remote-tracking branch 'origin/develop' into feature/hp_pet 2026-02-27 17:36:53 +07:00
namth 631329c7bc Merge pull request 'fixbug/task-bug-resolve' (#179) from fixbug/task-bug-resolve into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/179
2026-02-27 10:33:04 +00:00
Chomper9981 ed4adcfaa0 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-27 17:30:14 +07:00
Chomper9981 b73de9553e update UI. add more developed feature into UI 2026-02-27 17:27:26 +07:00
Tungdv 89b184f854 Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-02-27 17:27:16 +07:00
Tungdv 1210ff2c51 fix: update dlg pet list and dlg pet restore. 2026-02-27 17:24:26 +07:00
haimh 06722238a2 Merge pull request 'feature/save-skill-combo' (#177) from feature/save-skill-combo into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/177
2026-02-27 09:11:00 +00:00
MinhHai cee2eb74f7 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-02-27 15:56:39 +07:00
MinhHai b342407c9f DONE: Fix compress method of AFILEPACKAGE 2026-02-27 15:50:32 +07:00
hainh 737894bf60 Merge pull request 'feature/fix-ui' (#176) from feature/fix-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/176
2026-02-27 08:35:49 +00:00
VuNgocHaiC7 b60fe6fa6f update code DlgPetRec 2026-02-27 15:34:12 +07:00
Le Duc Anh 17633d74c6 Merge branch 'feature/dynamic-terrain' of https://git.pthub.vn/Unity/perfect-world-unity into feature/dynamic-terrain 2026-02-27 14:16:56 +07:00
Le Duc Anh 47f9540424 update terrain holder 2026-02-27 14:12:18 +07:00
VuNgocHaiC7 8f8607ece6 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 2026-02-27 13:33:08 +07:00