Commit Graph

2311 Commits

Author SHA1 Message Date
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
Chomper9981 ef15618895 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-02-10 17:01:00 +07:00
Chomper9981 d91d1ca9cd change tasktrace prefab 2026-02-10 17:00:37 +07:00
Le Duc Anh d0f0abed53 add missing icons main assset 2026-02-10 15:21:45 +07:00
Le Duc Anh b9b56bd047 WIP: Add more colliders 2026-02-10 14:59:57 +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
Le Duc Anh 1f0d38cfa4 WIP:add colliders for testing 2026-02-10 14:14:34 +07:00
Tungdv 411d70a496 fix: update logic move with brush. 2026-02-10 14:04:46 +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
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 a3c6ec9aa1 Add force attack 2026-02-09 18:08:49 +07:00
HungDK a295b3402e HUD and else player interact 2026-02-09 18:07:56 +07:00
HungDK 750e7b4ff8 Handle logic of Duel 2026-02-09 18:07:37 +07:00
Le Duc Anh 72c72bd8e5 modify login scene 2026-02-09 18:06:59 +07:00
HungDK 36b7591a98 Add DuelRequest 2026-02-09 18:06:21 +07:00
VDH 7458032777 spawn skill 5 2026-02-09 18:05:37 +07:00
HungDK 45ced15f27 Add show option dlg 2026-02-09 18:04:39 +07:00
HungDK 7b7d85e0ad Add other player interact options 2026-02-09 17:02:06 +07:00
VDH a9b154a0b8 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-09 15:15:58 +07:00
VDH 8bce2d6b06 tesst skill 2026-02-09 15:15:31 +07:00
MinhHai d160df064d Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
2026-02-09 14:44:12 +07:00
MinhHai 52bc9a583c WIP: add code logic send Combo_Save to server 2026-02-09 14:42:52 +07:00
Chomper9981 5a959f562a fix bug quest "Chao hoi lay trang suc" 2026-02-07 16:12:00 +07:00
Chomper9981 fc39addf5f Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-02-07 14:58:00 +07:00
Chomper9981 f9c7d0f04c Create UI for DlgQuest, fix the proplem with quest have deep not equal 3 2026-02-07 14:57:35 +07:00
VDH 781c5cd08d done passive skill UI 2026-02-06 15:13:42 +07:00
Le Duc Anh 0702571c04 WIP: demo CCDBrush Collider 2026-02-06 10:26:45 +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
VDH 79f0def3d0 save prefab 2026-02-05 17:34:00 +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
VuNgocHaiC7 9d5c07fb25 cancle btn show dlg on scene a61 beacase don't update 2026-02-05 13:56:52 +07:00
VuNgocHaiC7 2915e79288 setActive(false) DlgPetList 2026-02-05 13:49:15 +07:00
VuNgocHaiC7 9da8ac2a50 UI DlgPetList.prefab 2026-02-05 13:46:49 +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
MinhHai cd94781c51 Merge remote-tracking branch 'origin/feature/skill-set-shortcut' into feature/save-skill-combo 2026-02-04 15:17:53 +07:00
MinhHai 5dd3dcf48d WIP: add logic and UI 2026-02-04 15:17:39 +07:00
VDH 0462ddaadd fix bug create skill combo 2026-02-04 15:11:32 +07:00
VuNgocHaiC7 ca4e403513 fix UI DlgInstall.prefab and DlgUninstall.prefab 2026-02-04 14:00:31 +07:00
Tungdv 53f8829413 fix: update show pet rider. 2026-02-03 19:26:41 +07:00
VuNgocHaiC7 7fdce58713 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-03 17:39:51 +07:00
VuNgocHaiC7 bcb2f61348 update UI DlgUninstall.prefab 2026-02-03 17:38:50 +07:00
VDH 5ee2b68785 create skill combo 2026-02-03 17:26:53 +07:00
VDH b04695944b convert skill 2026-02-03 16:18:31 +07:00