Commit Graph

95 Commits

Author SHA1 Message Date
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
VDH 9fed589a9e cool down skill ui 2026-01-06 13:35:43 +07:00
VDH 7e83b578fe coool down ui 2026-01-05 18:25:27 +07:00
NguyenVanDat 38348f8e10 add and show mining progress run with real time 2026-01-05 09:27:00 +07:00
HungDK e6aeaad00f Bind attack, interact btn 2025-12-29 16:56:42 +07:00
Le Duc Anh 93d0cbd634 show UI task 2025-12-17 17:32:01 +07:00
NguyenVanDat c118781f85 add logic to wave hand button 2025-12-17 14:18:10 +07:00
NguyenVanDat c91b2347cf add emote icon 2025-12-17 11:38:01 +07:00
HungDK fa7b374442 Add task icon, correct show logic, dlg ui feature 2025-12-17 11:07:50 +07:00
NguyenVanDat a786ee236e Merge branch 'develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.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/Task/CECTaskInterface.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/EC_GPDataType.cs
2025-12-16 11:59:08 +07:00
MinhHai 5646c3be62 add DlgTask into UIManager, fix load DynTask logic 2025-12-15 10:01:00 +07:00
VDH 972104970d copnvert 2025-12-09 19:53:32 +07:00
HungDK d8d7502fe0 Integrate and asign prefab 2025-12-03 16:50:59 +07:00
VDH c37ec4d136 Push hoang current work 2025-11-21 10:18:08 +07:00
Tungdv 42845aef94 fix: update logic init CECGameUIMan. 2025-11-18 14:33:13 +07:00
Tungdv c90e50eed9 feat: add base uimanger and dlg manager. 2025-11-18 14:10:29 +07:00
Tungdv 9feb2b22e3 Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
2025-11-12 19:39:19 +07:00
Tungdv 020058d9da fix: update logic show dialog NPC. 2025-11-12 17:20:15 +07:00
Tungdv fabb286473 fix: update logic show dialog npc. 2025-11-11 19:04:49 +07:00
tungdv 551a6dd576 fix: update show dialog npc. 2025-11-07 13:38:33 +07:00
Tungdv 3bd29134b9 fix: update dialog NPC. 2025-11-06 18:58:05 +07:00
Tungdv 60cd4236c1 feat: add manager dialog npc. 2025-11-05 18:13:46 +07:00
VDH 4f3edae50d setup for esle player 2025-11-04 14:32:03 +07:00
PCBrew 1c9d9b9ec2 UI health change fix bug 2025-10-30 18:50:02 +07:00
NguyenVanDat 0d358f867d ui info hosst player and npc done 2025-10-28 17:22:03 +07:00
VDH 7918cac983 use event bus 2025-09-16 11:00:28 +07:00