 NguyenVanDat
|
cf984fa9ed
|
Merge branch 'develop' into feature/clear-embedded-chip
|
2026-02-11 11:08:32 +07:00 |
|
|
NguyenVanDat
|
ae658e7a2e
|
fix null button in message box
|
2026-02-11 11:04:20 +07:00 |
|
|
NguyenVanDat
|
efb1825422
|
Merge branch 'develop' into feature/clear-embedded-chip
|
2026-02-11 10:21:47 +07:00 |
|
|
tungdv
|
31e3dd24a8
|
Merge pull request 'update move with brush.' (#156) from feature/hp_swim into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/156
|
2026-02-10 12:45:50 +00: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 |
|
|
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 |
|
|
namth
|
65a20ae878
|
Merge pull request 'feature/ui-task-trace' (#155) from feature/ui-task-trace into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/155
|
2026-02-10 10:01:56 +00: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 |
|
|
Le Duc Anh
|
72c72bd8e5
|
modify login scene
|
2026-02-09 18:06:59 +07:00 |
|
|
hoangvd
|
6358d9cd05
|
Merge pull request 'feature/skill-set-shortcut' (#154) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/154
|
2026-02-09 08:17:33 +00: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 |
|
|
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 |
|
|
hoangvd
|
dfe70d4db9
|
Merge pull request 'feature/skill-set-shortcut' (#153) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/153
|
2026-02-06 02:31:33 +00:00 |
|
|
VDH
|
53c5a137f1
|
Merge branch 'develop' into feature/skill-set-shortcut
|
2026-02-06 09:30:57 +07:00 |
|
|
VDH
|
e4081a94c9
|
fix after merge
|
2026-02-06 09:30:08 +07:00 |
|
|
hoangvd
|
10790891c5
|
Merge pull request 'feature/skill-set-shortcut' (#152) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/152
|
2026-02-05 10:43:03 +00: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
|
fe62272a02
|
Merge pull request 'Add summon pet fight and pet mount.' (#151) from feature/hp_pet into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/151
|
2026-02-05 10:31:22 +00: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
|
5f8767d7df
|
setting
|
2026-02-05 17:27:07 +07:00 |
|
|
VDH
|
b3e5f2ae61
|
done skill ui execute
|
2026-02-05 17:26:58 +07:00 |
|
|
hainh
|
b1f1e5d332
|
Merge pull request 'feature/ui-dlgpetlist' (#150) from feature/ui-dlgpetlist into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/150
|
2026-02-05 07:01:34 +00: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
|
1edb9899b5
|
Merge branch 'develop' into feature/skill-set-shortcut
|
2026-02-05 13:40:46 +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 |
|
|
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 |
|