Commit Graph

144 Commits

Author SHA1 Message Date
Chomper9981 5d9dd1c3d9 Change some shop UI 2025-12-09 16:37:16 +07:00
VungochaiC7 aee25a18b5 update detail color text item 2025-12-08 17:45:12 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
HungDK 66dc12ef4a Update item detail 2025-12-08 09:30:59 +07:00
HungDK 16094d04cf Fixing wrong command to send to server 2025-12-04 15:09:20 +07:00
HungDK d4bccfb9fc Merge branch 'develop' into feature/npc-shop 2025-12-04 14:46:08 +07:00
HungDK b051a86014 Add place holder item detail, buy option 2025-12-04 14:39:46 +07:00
HungDK d8d7502fe0 Integrate and asign prefab 2025-12-03 16:50:59 +07:00
HungDK 054026bc55 Load basic shop of npc 2025-12-03 16:43:52 +07:00
MinhHai 3ad0f7013b Merge branch 'implement_task_UI' into develop 2025-12-02 14:28:33 +07:00
MinhHai a73bacfa87 fix UIPlayer class 2025-12-02 14:28:00 +07:00
HungDK 4760ed3c29 Fix disconnect error when player death before entergame 2025-12-02 11:43:29 +07:00
MinhHai f827878785 Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
2025-12-02 10:25:35 +07:00
MinhHai 039d0a3ddc update logic get notify task from server 2025-12-02 10:22:02 +07:00
HungDK 636469a87f Push missing folder 2025-12-01 14:50:48 +07:00
HungDK 7ba4c0fed5 Update equipment preview show, hide 2025-12-01 14:49:41 +07:00
HungDK 1e37e357d9 Merge branch 'develop' into feature/joystick-fix 2025-11-26 10:00:17 +07:00
Le Duc Anh 28bdab60d8 load else player 2025-11-25 18:52:32 +07:00
Le Duc Anh 50812676ce setup for build 2025-11-25 17:41:10 +07:00
HungDK 31f4012bec done health bar 2025-11-25 16:20:55 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00
HungDK cf68b52f83 Update preview frame 2025-11-24 16:41:54 +07:00
HungDK adf642e027 Add inventory character preview logic 2025-11-24 16:32:11 +07:00
VDH 887b7d755c done 3 vfx 2025-11-24 14:22:02 +07:00
VDH 3450fd015f Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-11-24 10:16:07 +07:00
Tungdv 59976a4be5 fix: update dlgnpc. 2025-11-22 17:47:15 +07:00
Tungdv 9129784de0 Merge branch 'develop' into feature/hp_interact_npc 2025-11-21 17:07:50 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
Le Duc Anh 95f2386397 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-21 16:04:56 +07:00
Le Duc Anh 30e636267c udpate matter flow 2025-11-21 16:01:11 +07:00
NguyenVanDat d80f7f4f07 Merge branch 'develop' into feature/refactor-game-run 2025-11-21 11:50:36 +07:00
NguyenVanDat 8f5673c68e refactor game run and fix game flow 2025-11-21 11:48:39 +07:00
Tungdv 939b714ced Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
#	Assets/PerfectWorld/Scripts/Task/TaskInterface.cs
#	Assets/PerfectWorld/Scripts/Task/TaskProcess.cs
2025-11-21 11:45:16 +07:00
Tungdv 1951047c61 fix: update logic button back and close in dlgnpc. 2025-11-21 11:37:07 +07:00
MinhHai 0bcacf1599 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-21 11:31:09 +07:00
MinhHai e1bfd720e3 update logic receive Command.TASK_VER_DATA 2025-11-21 11:29:34 +07:00
VDH c37ec4d136 Push hoang current work 2025-11-21 10:18:08 +07:00
Tungdv 17edc61e60 Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-11-20 18:37:00 +07:00
Tungdv ceec82ffc5 fix: update logic select option in dlgnpc. 2025-11-20 18:18:06 +07:00
Le Duc Anh ca31090872 move all stuff into a61 scene 2025-11-20 15:33:30 +07:00
hungdk 5dd011df46 Refactor and fixing ref 2025-11-20 02:18:48 +07:00
Tungdv 0324dc909e fix: update logic select option dlg NPC. 2025-11-19 19:12:24 +07:00
Tungdv bb28c8505d fix: update logic select option in dlg npc. 2025-11-18 19:01:03 +07:00
Tungdv 4633e8278c fix: update logic send cmd accept task. 2025-11-18 16:40:04 +07:00
Tungdv c90e50eed9 feat: add base uimanger and dlg manager. 2025-11-18 14:10:29 +07:00
Tungdv 86c304f43a fix: update logic select option dialog npc. 2025-11-17 18:52:07 +07:00
Tungdv 1325a8df63 fix: update logic select option interact npc. 2025-11-17 14:31:20 +07:00
Tungdv e46fcf2ee5 fix: update show text mission in dlgnpc. 2025-11-13 18:14:49 +07:00
tung.do@monkey.edu.vn 8bf8f3716c fix: update text dlgnpc and fix bug merge. 2025-11-13 01:51:06 +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