Commit Graph

643 Commits

Author SHA1 Message Date
VDH eb9d8cdd5f fix learn skill 2026-03-02 11:31:43 +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 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
VDH 5de380fd05 update check condition 2026-02-27 18:18:51 +07:00
Tungdv a64111b1b6 fix: fix bug dlg pet hatch. 2026-02-27 17:47:10 +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
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
NguyenVanDat 98b92b8066 Merge branch 'develop' into feature/player-exit 2026-02-27 11:11:38 +07:00
NguyenVanDat 32cb522970 add logic player exit game 2026-02-27 11:09:47 +07:00
MinhHai 27883c07a1 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-02-27 11:07:23 +07:00
Tungdv f85f1add54 fix: update logic hatch pet egg. 2026-02-26 20:22:07 +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
VDH a10cbb23b6 fix bug can't cast skill 2026-02-26 16:25:52 +07:00
Tungdv 72ef982527 fix: update UI Dialog Pet List. 2026-02-26 15:57:36 +07:00
MinhHai 859ecb1315 Create Faction_Mem_Info for Fation and create CECFriendMan 2026-02-26 15:56:22 +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 7ee3394834 done cast skill move linear 2026-02-26 15:01:46 +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
MinhHai a9eb777799 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-25 16:11:52 +07:00
Chomper9981 7ddd60e7e1 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-25 14:41:37 +07:00
Chomper9981 cad727b814 Fix the nav bug(work around). fix the major map quest's npc load proplem. 2026-02-25 14:41:15 +07:00
HungDK 34dbaa4c0a Fixing select target and id duel 2026-02-25 13:38:33 +07:00
VDH 9d4dfbc6ba fix skill can't move linear 2026-02-24 18:45:24 +07:00
HungDK 7996bed176 Fix PvP conflict 2026-02-24 16:59:51 +07:00
MinhHai aa53269f35 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-24 14:35:11 +07:00
MinhHai f183544b4d WIP: prepare config before send to Server 2026-02-24 14:29:09 +07:00
HungDK d066a1a541 Merge remote-tracking branch 'origin/develop' into feature/character_info 2026-02-24 11:12:38 +07:00
VDH 335d44f496 adust plan 2026-02-24 10:32:25 +07:00
VDH af44545093 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-23 14:47:53 +07:00
Le Duc Anh 0e6ceaf6f3 Play from Bootstrap scene. Move heavy logic to other Thread 2026-02-20 01:20:05 +07:00
Le Duc Anh 3becfc3ab5 move all litmodel a61 into a61 asset group 2026-02-15 21:34:38 +07:00
VDH 592a2f01db convert skill 2026-02-12 14:39:26 +07:00
VuNgocHaiC7 e5529a94e3 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-11 17:46:55 +07:00
Tungdv 7c132590f1 fix: update logic move when jump stand. 2026-02-11 17:37:27 +07:00
VuNgocHaiC7 366001be85 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-11 17:37:06 +07:00
VuNgocHaiC7 363520be53 update info item for dlgInstall after the merge 2026-02-11 17:36:16 +07:00
VDH 77deaf2e08 fix bug endless loop 2026-02-11 14:58:08 +07:00
VDH b5184947f2 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-11 10:50:17 +07:00
VDH 88d7bd550b fix bug after convert by tool 2026-02-11 10:43:08 +07:00
Tungdv e252649f7f Merge branch 'develop' into feature/hp_swim 2026-02-10 19:44:32 +07:00
Tungdv 5f943f4c32 feat: delete log. 2026-02-10 19:41:20 +07:00
VDH d0914160b2 convert skill and add path 2026-02-10 19:28:15 +07:00
Tungdv ea437dca63 fix: update logic move with brush. 2026-02-10 17:58:13 +07:00
Tungdv 1f4671ee46 Merge branch 'develop' into feature/hp_swim
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
2026-02-10 14:25:14 +07:00
Chomper9981 2e04507aa6 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-02-10 12:16:25 +07:00
Chomper9981 a86e15e48a Fix bug cant get "Lan xi ki di" in main quest progress 2026-02-10 12:14:47 +07:00
Tungdv 077a76f77e fix: test move with brush. 2026-02-10 11:12:12 +07:00