Commit Graph

557 Commits

Author SHA1 Message Date
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
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
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
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
HungDK 1f1832fa6f Merge branch 'develop' into feature/character_info 2026-02-24 17:04:41 +07:00
HungDK 7996bed176 Fix PvP conflict 2026-02-24 16:59:51 +07:00
HungDK cab2c0af45 Merge branch 'develop' into feature/character_info 2026-02-24 15:33:53 +07:00
Chomper9981 36bf74b527 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-24 15:27:33 +07:00
VDH b56718d56b Merge branch 'develop' into feature/skill-set-shortcut 2026-02-24 15:02: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
Chomper9981 837fc4973b fix bug task not update update in runtime. 2026-02-24 11:22:26 +07:00
HungDK d066a1a541 Merge remote-tracking branch 'origin/develop' into feature/character_info 2026-02-24 11:12:38 +07:00
NguyenVanDat bb0054a1cc Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-02-24 10:57:32 +07:00
NguyenVanDat 2d85773f0e REFACTOR CECHostPlayer
separate class to partial class
2026-02-24 10:57:12 +07:00
Chomper9981 7050243d98 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-24 10:02:19 +07:00
Chomper9981 6bd0b92038 Fix bug task trace not working on mobile devide, make task trace update in runtime. 2026-02-24 10:01:49 +07:00
VDH e9522193c6 plan 2026-02-24 09:50:08 +07:00
VuNgocHaiC7 4226a0bf02 fix onDestroy ins addressableManager 2026-02-23 17:49:55 +07:00
NguyenVanDat cc04ace9e1 Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs
2026-02-23 15:05:51 +07:00
Le Duc Anh 050bf5e9c8 v 2026-02-21 23:33:08 +07:00
Le Duc Anh 0e6ceaf6f3 Play from Bootstrap scene. Move heavy logic to other Thread 2026-02-20 01:20:05 +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
MinhHai 125229cae5 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs
2026-02-11 14:56:21 +07:00
MinhHai 4df362fd16 add logic for SaveConfig, avoid Send to Server 2026-02-11 14:54:51 +07:00
MinhHai e6b0256382 WIP: add partial class for CECHostPplayer -> CECHostPlayer.ConfigData 2026-02-11 14:48:36 +07:00
NguyenVanDat a66bffd9d8 fix clear slot index 2026-02-11 11:32:11 +07:00
VDH b5184947f2 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-11 10:50:17 +07:00
NguyenVanDat efb1825422 Merge branch 'develop' into feature/clear-embedded-chip 2026-02-11 10:21:47 +07:00
Tungdv 5787b1b088 fix: fix bug swim HP. 2026-02-10 18:36:33 +07:00
Tungdv 20f0812254 fix: fix bug logic swim HP. 2026-02-10 18:35:25 +07:00