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

1281 Commits

Author SHA1 Message Date
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
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
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 4d216f3d9f fix lost ref 2026-02-03 15:05:07 +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
NguyenVanDat df5e889a67 update message box 2026-02-03 10:38:59 +07:00
NguyenVanDat ef3edb750c Merge branch 'feature/update-message-box' into feature/clear-embedded-chip 2026-02-03 10:30:51 +07:00
HungDK 4e857e9367 Fix use old login sdk first 2026-02-03 10:24:23 +07:00
HungDK 9cc0ffce45 Merge remote-tracking branch 'origin/develop' into feature/character_info 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
 2026-02-03 10:10:05 +07:00
HungDK 647edc29dc Logout, ConsumeNextLoginEntry, select new role ui handler 2026-02-03 09:50:51 +07:00
HungDK 024c8e5307 Add button to prefabs 2026-02-03 09:48:15 +07:00
HungDK 55f73c3f2b Add logout, back to select role button handler 2026-02-03 09:47:55 +07:00
HungDK 8b82734fcf Add logout cmd type 1 and type 0 2026-02-03 09:47:25 +07:00
Le Duc Anh 13c6cec217 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-02-02 19:22:02 +07:00
Le Duc Anh 689f8a45b6 add Tech3CSDK 2026-02-02 19:21:45 +07:00
Tungdv daeadd01cc fix: update logic pet rider. 2026-02-02 19:15:23 +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
NguyenVanDat 775bbd7c55 add ClearEmbedded command 2026-02-02 16:29:42 +07:00
VuNgocHaiC7 f9774293de Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem 2026-02-02 16:19:10 +07:00
VuNgocHaiC7 f23d7126a7 fix CECHostPlayer 2026-02-02 16:19:02 +07:00
NguyenVanDat fef0ef4921 update logic show Install Dialogue 2026-02-02 15:31:03 +07:00
NguyenVanDat b808bda60c fix embed stone 2026-02-02 15:22:15 +07:00
VuNgocHaiC7 9e0d1a284d Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-02 14:17:20 +07:00