Commit Graph

295 Commits

Author SHA1 Message Date
HungDK 2b644ba5eb Add missing purchase item 2026-02-28 18:14:10 +07:00
Tungdv a397507c0a Merge remote-tracking branch 'origin/develop' into feature/hp_pet 2026-02-27 17:36:53 +07:00
Chomper9981 ed4adcfaa0 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-27 17:30:14 +07:00
Chomper9981 b73de9553e update UI. add more developed feature into UI 2026-02-27 17:27:26 +07:00
Tungdv 89b184f854 Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-02-27 17:27:16 +07:00
Tungdv 1210ff2c51 fix: update dlg pet list and dlg pet restore. 2026-02-27 17:24:26 +07:00
MinhHai cee2eb74f7 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-02-27 15:56:39 +07:00
MinhHai b342407c9f DONE: Fix compress method of AFILEPACKAGE 2026-02-27 15:50:32 +07:00
NguyenVanDat 98b92b8066 Merge branch 'develop' into feature/player-exit 2026-02-27 11:11:38 +07:00
NguyenVanDat 32cb522970 add logic player exit game 2026-02-27 11:09:47 +07:00
HungDK 0c2dff28a3 Add CommandID.EMPTY_ITEM_SLOT 2026-02-27 10:33:51 +07:00
Tungdv f85f1add54 fix: update logic hatch pet egg. 2026-02-26 20:22:07 +07:00
Tungdv 708f33bfe4 Merge branch 'develop' into feature/hp_pet
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/Players/EC_HostMsg.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-26 16:39:23 +07:00
Tungdv 72ef982527 fix: update UI Dialog Pet List. 2026-02-26 15:57:36 +07:00
VDH cfdd048415 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
#	Assets/PerfectWorld/Scripts/DebugCommandMenu.meta
2026-02-26 15:30:49 +07:00
VDH 7ee3394834 done cast skill move linear 2026-02-26 15:01:46 +07:00
MinhHai a9eb777799 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-02-25 16:11:52 +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
Le Duc Anh 0f6f06af6b DlgConsole 2026-02-24 16:30:43 +07:00
MinhHai aa53269f35 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-24 14:35:11 +07:00
HungDK d066a1a541 Merge remote-tracking branch 'origin/develop' into feature/character_info 2026-02-24 11:12:38 +07:00
VDH e9522193c6 plan 2026-02-24 09:50: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
Le Duc Anh acfd4bfdbe having the distance check running on separated thread 2026-02-18 23:20:15 +07:00
Le Duc Anh 3becfc3ab5 move all litmodel a61 into a61 asset group 2026-02-15 21:34:38 +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
MinhHai 125229cae5 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs
2026-02-11 14:56:21 +07:00
MinhHai 4df362fd16 add logic for SaveConfig, avoid Send to Server 2026-02-11 14:54:51 +07:00
HungDK 36b7591a98 Add DuelRequest 2026-02-09 18:06:21 +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
VDH 781c5cd08d done passive skill UI 2026-02-06 15:13:42 +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
Tungdv cda4e1343a fix: update logic rider pet. 2026-02-04 19:27:01 +07:00
MinhHai 5dd3dcf48d WIP: add logic and UI 2026-02-04 15:17:39 +07:00
Tungdv 53f8829413 fix: update show pet rider. 2026-02-03 19:26:41 +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
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 8b82734fcf Add logout cmd type 1 and type 0 2026-02-03 09:47:25 +07:00
NguyenVanDat 775bbd7c55 add ClearEmbedded command 2026-02-02 16:29:42 +07:00
VDH 7091fb8d41 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 10:28:42 +07:00
VDH 57c2f5fb9f FIX after merge 2026-02-02 10:23:49 +07:00
VDH 7aaed6d0d3 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 09:55:39 +07:00
HungDK 793eb7c030 Merge branch 'develop' into feature/character_info 2026-02-02 09:43:23 +07:00
HungDK 8adf717b41 Add invite, kick, join, leave, change lead, dismiss, new member, member leave for both client and server 2026-02-02 09:22:09 +07:00