duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,511 Commits 13 Branches 0 Tags
e7a940ff8cb039932fb565eb0377d8da59f9cd27
Commit Graph

987 Commits

Author SHA1 Message Date
Le Duc Anh e7a940ff8c WIP: load litmodel base on player pos 2026-02-15 23:59:34 +07:00
Le Duc Anh 3becfc3ab5 move all litmodel a61 into a61 asset group 2026-02-15 21:34:38 +07:00
VuNgocHaiC7 e5529a94e3 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-11 17:46:55 +07:00
Tungdv 7c132590f1 fix: update logic move when jump stand. 2026-02-11 17:37:27 +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
hoangvd cb18c63c87 Merge pull request 'adjust UI layout add logic disable UI for quickbar UI' (#159) from feature/skill-set-shortcut into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/159
 2026-02-11 09:57:56 +00:00
Le Duc Anh b5eb447688 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-02-11 16:44:20 +07:00
Le Duc Anh 00c0e1d88a fix some minor issues 2026-02-11 16:43:53 +07:00
Tungdv ca35caea4c Merge branch 'develop' into feature/hp_swim 2026-02-11 16:38:22 +07:00
Tungdv b98e81cab8 fix: update logic move with brush. 2026-02-11 16:34:31 +07:00
VDH c04b5b1f09 adjust UI layout add logic disable UI for quickbar UI 2026-02-11 15:31:37 +07:00
VDH 77deaf2e08 fix bug endless loop 2026-02-11 14:58:08 +07:00
VDH b5184947f2 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-11 10:50:17 +07:00
VDH 88d7bd550b fix bug after convert by tool 2026-02-11 10:43:08 +07: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
VDH d0914160b2 convert skill and add path 2026-02-10 19:28:15 +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
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
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
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
Chomper9981 5a959f562a fix bug quest "Chao hoi lay trang suc" 2026-02-07 16:12: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
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
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
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
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
Le Duc Anh 5ae8a9a51d combine SDK with login UI 2026-02-03 14:57:23 +07:00
NguyenVanDat d234076311 add clear emmbedded chip command 2026-02-03 11:00:07 +07:00
NguyenVanDat 4da6b16a8d Merge branch 'develop' into feature/clear-embedded-chip 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
 2026-02-03 10:55:33 +07:00
NguyenVanDat 20e53ed790 Merge branch 'feature/update-message-box' into develop 2026-02-03 10:44:59 +07:00
NguyenVanDat fbae7a277a Merge branch 'feature/update-message-box' into feature/clear-embedded-chip 2026-02-03 10:40:19 +07:00