885 Commits

Author SHA1 Message Date
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
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
VDH 052817bdc9 fix can't cast skill need weapon 2026-03-02 14:56:13 +07:00
HungDK cb3c3531c0 Add send invite, respond of duel, team, ui handle 2026-03-02 14:38:56 +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
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 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 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 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
MinhHai 27883c07a1 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-02-27 11:07:23 +07:00
HungDK b4cc2717c9 Merge branch 'develop' into feature/hp_pet 2026-02-27 10:34:38 +07:00
HungDK 34f2dd5a2b Update CECHostPlayer.Inventory.cs 2026-02-27 10:06:24 +07:00
Tungdv f85f1add54 fix: update logic hatch pet egg. 2026-02-26 20:22:07 +07:00
HungDK dcd1aac3c7 Fixing missing msg handle 2026-02-26 17:28:37 +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
MinhHai 4b3b0c18e2 fix error _pFriendMan 2026-02-26 16:00:25 +07:00
Tungdv 72ef982527 fix: update UI Dialog Pet List. 2026-02-26 15:57:36 +07:00
MinhHai 41e227bcf4 Create new class CECHostPlayer for chat 2026-02-26 15:55:12 +07:00
MinhHai 2b88c03fcd add chat input chat handle 2026-02-26 15:54:18 +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
MinhHai 1f02909e3b Merge remote-tracking branch 'origin/develop' into feature/chat 2026-02-25 16:44:18 +07:00
MinhHai 65a7bce013 add input chat 2026-02-25 16:43:54 +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
MinhHai e8102b8266 WIP: change type field of struct in EC_CONFIG 2026-02-25 16:07:56 +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 6db18f3013 Merge branch 'develop' into feature/character_info 2026-02-25 13:39:56 +07:00
HungDK 34dbaa4c0a Fixing select target and id duel 2026-02-25 13:38:33 +07:00
NguyenVanDat d1c802586e Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-25 10:50:13 +07:00
NguyenVanDat b4b2f9ac96 finish clear tessera 2026-02-25 10:26:49 +07:00