Commit Graph

531 Commits

Author SHA1 Message Date
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
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
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
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
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
NguyenVanDat e4909c1658 update logic clear chip 2026-02-10 11:51:26 +07:00
Tungdv 077a76f77e fix: test move with brush. 2026-02-10 11:12:12 +07:00
HungDK 750e7b4ff8 Handle logic of Duel 2026-02-09 18:07:37 +07:00
VDH 7458032777 spawn skill 5 2026-02-09 18:05:37 +07:00
VDH 8bce2d6b06 tesst skill 2026-02-09 15:15:31 +07:00
VDH 781c5cd08d done passive skill UI 2026-02-06 15:13:42 +07:00
VDH e4081a94c9 fix after merge 2026-02-06 09:30:08 +07:00
VDH b70f68fe81 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-02-05 17:41:50 +07:00
Tungdv 7a96c7e252 Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs.meta
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
2026-02-05 17:29:54 +07:00
VDH b3e5f2ae61 done skill ui execute 2026-02-05 17:26:58 +07:00
VDH 414562f221 done excute skill bar 2026-02-05 11:21:49 +07:00
Tungdv cda4e1343a fix: update logic rider pet. 2026-02-04 19:27:01 +07:00
Tungdv 53f8829413 fix: update show pet rider. 2026-02-03 19:26:41 +07:00
VDH ef1804f967 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
2026-02-03 15:09:55 +07:00
VDH eca33817e8 done ui info 2026-02-03 15:01:57 +07:00
hainh af0afcb367 Merge pull request 'fix UI DlgInstall.prefab' (#147) from feature/useItem into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/147
2026-02-02 11:19:29 +00:00
NguyenVanDat 2235beea6e Merge branch 'develop' into feature/update-message-box 2026-02-02 18:18:33 +07:00
VuNgocHaiC7 bca7fd1c6a fix UI DlgInstall.prefab 2026-02-02 18:18:01 +07:00
VDH e57899226d infoskill done data 2026-02-02 18:16:11 +07:00
NguyenVanDat a33ef33062 update box message 2026-02-02 17:59:33 +07:00
VuNgocHaiC7 f23d7126a7 fix CECHostPlayer 2026-02-02 16:19:02 +07:00