Commit Graph

75 Commits

Author SHA1 Message Date
Chomper9981 34e5b569ed Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-13 10:36:48 +07:00
Chomper9981 febcaa74b2 add quick change skill for dev only 2026-03-13 10:35:13 +07:00
Le Duc Anh 67220287db move EDITOR scripts to proper tag 2026-03-12 18:11:00 +07:00
VuNgocHaiC7 66fb5b7263 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-12 14:55:19 +07:00
VuNgocHaiC7 fad41e507b fix code some ui and teamlist 2026-03-12 14:54:21 +07:00
VDH 18b32f6d5f Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/skillBehavior 2026-03-11 11:09:40 +07:00
VDH 3fc7106e76 switch skill shortcut 2026-03-10 18:01:47 +07:00
VuNgocHaiC7 3ab1b23ca4 fix UI dlgTeamMain 2026-03-10 16:00:39 +07:00
VuNgocHaiC7 d2d4845b79 fix some UI of dialog 2026-03-10 15:15:23 +07:00
NguyenVanDat 1e17b4108c update UI logic embed stone and clear stone 2026-03-07 13:47:29 +07:00
NguyenVanDat bad2515394 Merge branch 'develop' into feature/ui-system-update
# Conflicts:
#	Assets/Scripts/CECUIManager.cs
2026-03-07 10:08:28 +07:00
MinhHai 56e385ab88 DONE: logout full and logout half login 2026-03-06 17:33:14 +07:00
NguyenVanDat 78d29bc8cf update stack logic and document 2026-03-05 10:26:21 +07:00
NguyenVanDat 8cfab19cf6 add stack ui logic 2026-03-05 09:48:47 +07:00
NguyenVanDat 9c19d0d680 remove ui layer 2026-03-03 11:15:38 +07:00
NguyenVanDat beaa50b9d7 add dialogue type 2026-03-03 10:59:00 +07:00
Le Duc Anh fbe3e92462 Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain 2026-03-02 20:15:20 +07:00
Chomper9981 d5adc1542c Update UI 2026-03-02 18:02:23 +07:00
Le Duc Anh 76183faa47 unload world scene when logout 2026-02-27 20:46:21 +07:00
Chomper9981 b73de9553e update UI. add more developed feature into UI 2026-02-27 17:27:26 +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
HungDK 34dbaa4c0a Fixing select target and id duel 2026-02-25 13:38:33 +07:00
HungDK 1f1832fa6f Merge branch 'develop' into feature/character_info 2026-02-24 17:04:41 +07:00
Chomper9981 837fc4973b fix bug task not update update in runtime. 2026-02-24 11:22:26 +07:00
HungDK d066a1a541 Merge remote-tracking branch 'origin/develop' into feature/character_info 2026-02-24 11:12:38 +07:00
Chomper9981 7050243d98 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-24 10:02:19 +07:00
Chomper9981 6bd0b92038 Fix bug task trace not working on mobile devide, make task trace update in runtime. 2026-02-24 10:01:49 +07:00
NguyenVanDat cc04ace9e1 Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs
2026-02-23 15:05:51 +07:00
Le Duc Anh 050bf5e9c8 v 2026-02-21 23:33: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
NguyenVanDat a66bffd9d8 fix clear slot index 2026-02-11 11:32:11 +07:00
NguyenVanDat efb1825422 Merge branch 'develop' into feature/clear-embedded-chip 2026-02-11 10:21:47 +07:00
NguyenVanDat e4909c1658 update logic clear chip 2026-02-10 11:51:26 +07:00
HungDK 750e7b4ff8 Handle logic of Duel 2026-02-09 18:07:37 +07:00
VDH 8bce2d6b06 tesst skill 2026-02-09 15:15:31 +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 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
NguyenVanDat a33ef33062 update box message 2026-02-02 17:59:33 +07:00
VDH 6dbc543188 done create new skill combo 2026-01-28 16:40:29 +07:00
Tungdv 0ce6bc8c82 fix: update popup pet. 2026-01-26 19:11:15 +07:00
Tungdv d950c5a9c3 fix: add controller pet. 2026-01-21 19:17:41 +07:00
Chomper9981 e903de108a Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-20 16:32:36 +07:00
Chomper9981 273f353ddc add more item detail in inventory. Create some place holder for pet item so that those item can be shown 2026-01-20 16:31:57 +07:00
VDH 5d0f69ab34 done ui cap phep 2026-01-20 10:53:12 +07:00
VDH 57b5195c36 done learn and upgrade skill 2026-01-14 18:00:30 +07:00
VDH 511a833967 send to server learn skill 2026-01-13 17:58:20 +07:00
VDH 436df8d820 for tesst 2026-01-13 10:55:51 +07:00
VDH 61f4660dba done flow learn skill 2026-01-12 19:07:37 +07:00