duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,000 Commits 13 Branches 0 Tags
develop
Commit Graph

773 Commits

Author SHA1 Message Date
NguyenVanDat 8cfab19cf6 add stack ui logic 2026-03-05 09:48:47 +07:00
NguyenVanDat 46bf9156ae Merge branch 'develop' into feature/ui-system-update 2026-03-05 09:21:25 +07:00
VuNgocHaiC7 e33adda85f change UI DlgPetList and code test for dlg 2026-03-04 17:35:19 +07:00
VuNgocHaiC7 c8976e6d4d fix dlg TeamList, dlg PetList, dlg Install 2026-03-04 16:39:09 +07:00
MinhHai c637c164f9 WIP: wait SERVER response PROTOCOL_PLAYERLOGOUT then client execute logout logic 2026-03-04 16:04:28 +07:00
VuNgocHaiC7 21f2d712c4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-03 16:46:20 +07:00
VuNgocHaiC7 9ff77591f7 update code and prefabs dlg teamList 2026-03-03 16:45:57 +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
Le Duc Anh fbe3e92462 Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain 2026-03-02 20:15:20 +07:00
Chomper9981 d5adc1542c Update UI 2026-03-02 18:02:23 +07:00
VDH bf63593b15 Merge branch 'develop' into feature/skillBehavior 
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
 2026-03-02 14:57:53 +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
Tungdv 01ae1463f4 fix: remove debug and "using" not use. 2026-02-28 18:34:39 +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 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
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
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
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
VuNgocHaiC7 b60fe6fa6f update code DlgPetRec 2026-02-27 15:34:12 +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
VuNgocHaiC7 1af61057e0 update code DlgPetRec 2026-02-27 13:32:18 +07:00
HungDK b4cc2717c9 Merge branch 'develop' into feature/hp_pet 2026-02-27 10:34:38 +07:00
Tungdv f85f1add54 fix: update logic hatch pet egg. 2026-02-26 20:22:07 +07:00
GiGiDreamsQuest 02be4f4656 currently working prefab dlgpetRec 2026-02-26 18:11:33 +07:00
Chomper9981 07cee60bf1 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-26 17:33:50 +07:00
Chomper9981 2b869e5285 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-26 17:33:31 +07:00
Chomper9981 10e4cfa1d3 fix bug "dance" quest not working(workaround). Trigger action via action skill table. fix bug some matter object dont have collider(workaround) 2026-02-26 17:28:53 +07:00
HungDK 9592a83a37 Merge branch 'develop' into feature/character_info 2026-02-26 17:05:23 +07:00
Tungdv 708f33bfe4 Merge branch 'develop' into feature/hp_pet 
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/Players/EC_HostMsg.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-26 16:39:23 +07:00
Tungdv 72ef982527 fix: update UI Dialog Pet List. 2026-02-26 15:57:36 +07:00
VDH cfdd048415 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
#	Assets/PerfectWorld/Scripts/DebugCommandMenu.meta
 2026-02-26 15:30:49 +07:00
VDH abcf251e77 fix micro bug 2026-02-26 15:27:18 +07:00
VuNgocHaiC7 fbfeefd4b9 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
 2026-02-26 14:26:29 +07:00
VuNgocHaiC7 8df945151d update prefab DlgPetHatch 2026-02-26 14:24:30 +07:00
HungDK 22a8254328 Merge branch 'develop' into feature/character_info 2026-02-26 09:21:28 +07:00