Commit Graph

462 Commits

Author SHA1 Message Date
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
NguyenVanDat d36ef36915 refactor hit vfx 2025-11-25 16:37:26 +07:00
HungDK 31f4012bec done health bar 2025-11-25 16:20:55 +07:00
Le Duc Anh ea5ab318c5 change camera angle. Add more monster 2025-11-25 15:48:33 +07:00
Le Duc Anh 686f16fc70 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 15:14:40 +07:00
Tungdv be5bc82c7c fix: update anim stop move when finish auto move to target. 2025-11-25 15:12:54 +07:00
Le Duc Anh a3eb81f8ac Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 14:02:28 +07:00
Le Duc Anh d016980696 fade out enemies 2025-11-25 14:02:07 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00
NguyenVanDat ae391ad0c5 make walk run is true as default 2025-11-24 17:05:04 +07:00
NguyenVanDat e7d61b4694 fix character animation 2025-11-24 16:50:13 +07:00
NguyenVanDat a809a98e27 fix work stand and character animation 2025-11-24 16:46:11 +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
Le Duc Anh 466e39d67c Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-24 14:27:45 +07:00
hoangvd 590ec18309 Merge pull request 'done 3 vfx' (#70) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/70
2025-11-24 07:25:04 +00:00
VDH 887b7d755c done 3 vfx 2025-11-24 14:22:02 +07:00
HungDK 15f2224d64 Merge branch 'feature/joystick-fix' into develop 2025-11-24 14:11:48 +07:00
VDH f68115eddf st 2025-11-24 14:04:27 +07:00
HungDK da65d37674 Fix monster health ui, hud 2025-11-24 12:01:34 +07:00
VDH 9418884c28 fix skill after merge 2025-11-24 11:36:21 +07:00
Le Duc Anh 22348242a4 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-24 10:40:10 +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
MinhHai 1b5617ef5d Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-22 18:59:56 +07:00
MinhHai beb12c8723 update logic NotifyServer of class TaskClient 2025-11-22 18:58:40 +07:00
Tungdv 59976a4be5 fix: update dlgnpc. 2025-11-22 17:47:15 +07:00
VDH f43f8a6e58 done spawn vfx 2025-11-22 11:21:50 +07:00
Le Duc Anh 32f9216a42 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-22 10:05:47 +07:00
MinhHai 7ba8ca49ba fix EC_Game: get GameRun, cache TaskData before playmode 2025-11-22 10:04:50 +07:00
Le Duc Anh edff7723d8 Load the elementdata for Android 2025-11-21 23:22:07 +07:00
Tungdv 9129784de0 Merge branch 'develop' into feature/hp_interact_npc 2025-11-21 17:07:50 +07:00
MinhHai aa797c8865 Merge branch 'implement_task_UI' into develop 2025-11-21 17:07:01 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
MinhHai 62482e5a9e avoid Init EC_GameRun at EC_Game 2025-11-21 16:39:21 +07:00
Le Duc Anh f46b917dd8 fix the missing addressable objects 2025-11-21 16:18:19 +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