3000 Commits

Author SHA1 Message Date
VuNgocHaiC7 9ff77591f7 update code and prefabs dlg teamList 2026-03-03 16:45:57 +07:00
VDH 2c51af9c95 Merge branch 'develop' into feature/skillBehavior 2026-03-03 15:27:42 +07:00
VDH d5e854eef7 hook system convert plan 2026-03-03 15:27:03 +07:00
VDH b2d49f8c65 covnert skill 1 2026-03-03 15:26:21 +07:00
anhld 0821bf3252 Merge pull request 'add wip flying sword' (#191) from feature/dynamic-terrain into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/191
2026-03-03 07:24:07 +00:00
Le Duc Anh d44886a7bf Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain 2026-03-03 14:23:04 +07:00
Le Duc Anh aa4b887d1c WIP flying sword 2026-03-03 14:22:50 +07:00
MinhHai c407a6ded7 Merge remote-tracking branch 'origin/develop' into feature/update-logout-logic 2026-03-03 14:18:09 +07:00
MinhHai 9c10751894 WIP: remove singleton of CECWorld, rename CECGameRun's file 2026-03-03 14:15:00 +07:00
NguyenVanDat 9c19d0d680 remove ui layer 2026-03-03 11:15:38 +07:00
NguyenVanDat beaa50b9d7 add dialogue type 2026-03-03 10:59:00 +07:00
CuongNV eac516259c Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-03 10:03:07 +07:00
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
VDH c9848d443b hook system process 2026-03-02 19:22:44 +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
VDH 85ee1de172 Merge branch 'develop' into feature/skillBehavior 2026-03-02 17:15:26 +07:00
VDH 176e4d0b69 convert method move of skills 2026-03-02 17:14:59 +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
CuongNV 32fd667212 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-03-02 09:42:54 +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
MinhHai 69dad89897 udpate chat in gamesession 2026-02-27 18:14:01 +07:00
Le Duc Anh 7abe98a4b1 Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain 2026-02-27 18:08:59 +07:00