Commit Graph

90 Commits

Author SHA1 Message Date
VuNgocHaiC7 ca84a98d31 completed task icon head NPC 2026-01-23 14:10:56 +07:00
VuNgocHaiC7 0ca50d5475 update feature icon task on head NPC ( not yet completed ) 2026-01-21 14:12:23 +07:00
Le Duc Anh ba30b37c06 #if UNITY_EDITOR 2025-12-24 18:05:54 +07:00
VDH e5e3f35559 fix bug anim npc monster 2025-12-24 09:50:38 +07:00
VDH 4b75e854f3 Merge branch 'develop' into feature/loopanimation
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/Scenes/a61.unity
2025-12-23 17:55:21 +07:00
VDH 2b12799546 fix npc double 2025-12-23 17:33:09 +07:00
VDH 76e66cafdb debug 2025-12-23 14:19:04 +07:00
VDH b0c566bef5 fix distance stop npc 2025-12-22 15:12:20 +07:00
VDH d5fdcc73b3 fix anim 2025-12-22 13:58:58 +07:00
VDH ab7051b2ca done fix anim npc and hostplayer attack anim 2025-12-17 17:17:16 +07:00
VDH 438f560346 done fix animation npc move trans to stand 2025-12-16 11:01:27 +07:00
VDH 54b1cc7127 fix animation processing 2025-12-16 09:30:09 +07:00
VDH a48ac9baf8 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-06 16:41:34 +07:00
VDH 80c40705d2 skill pos processing 2025-12-05 21:07:25 +07:00
NguyenVanDat 593d6374da fix object attack facing to target 2025-12-05 14:21:47 +07:00
VDH 2d3f98bb2c fix after merge 2025-12-05 10:16:08 +07:00
VDH 5c42c9792b test buff skill 2025-12-02 16:46:47 +07:00
NguyenVanDat d36ef36915 refactor hit vfx 2025-11-25 16:37:26 +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
HungDK 15f2224d64 Merge branch 'feature/joystick-fix' into develop 2025-11-24 14:11:48 +07:00
HungDK da65d37674 Fix monster health ui, hud 2025-11-24 12:01:34 +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
Le Duc Anh 95f2386397 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-21 16:04:56 +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
Le Duc Anh c2e8829c85 PC build 2025-11-19 16:15:03 +07:00
Le Duc Anh b400ad1e68 load npc/monster 2025-11-19 13:38:20 +07:00
VDH a30427e3f5 Merge remote-tracking branch 'origin/bugfix/fix-character-animation' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECHostPlayer_Inventory.cs
2025-11-19 10:35:54 +07:00
Tungdv 4633e8278c fix: update logic send cmd accept task. 2025-11-18 16:40:04 +07:00
VDH e7d0da9bb9 load gfx done 2025-11-15 17:33:10 +07:00
VDH 690a8dd9de Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scripts/CECHostPlayer.cs
2025-11-14 11:32:54 +07:00
VDH ba0ed76ab7 convert processing 2025-11-14 10:37:08 +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
NguyenVanDat 142fabf108 Merge branch 'develop' into feature/add-vfx
# Conflicts:
#	Assets/PerfectWorld/Prefab/GameController.prefab
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/PlayerVisual.cs
2025-11-12 11:03:25 +07:00
NguyenVanDat 629d419c57 WIP logic show vfx select target and level up 2025-11-12 10:21:09 +07:00
Tungdv fabb286473 fix: update logic show dialog npc. 2025-11-11 19:04:49 +07:00
VDH ecbdf4c803 done skill 2025-11-11 17:12:51 +07:00
VDH 40f17dadab Merge remote-tracking branch 'origin/develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2025-11-11 13:44:45 +07:00
VDH cbf626fa28 skill processing 2025-11-11 13:33:27 +07:00
Tungdv ec4bb785b8 fix: update logic show dialog. 2025-11-10 19:50:39 +07:00
NguyenVanDat df07b1661d add gfx resource and vfx object base 2025-11-07 17:35:52 +07:00
VDH 38a2c0d46f covnert continue 2025-11-06 17:29:02 +07:00
Tungdv 60cd4236c1 feat: add manager dialog npc. 2025-11-05 18:13:46 +07:00
VDH 0ad91a5e1d InitAllSkillsOfCurProf done 2025-11-05 17:55:50 +07:00
HungDK 19b42000a0 Fix error update player distance to object 2025-11-05 16:37:32 +07:00
PCBrew 8d761b6d3d attack animatin with weapon type 2025-11-04 09:36:23 +07:00
PCBrew 5ee9a27ac8 fix bug 2025-11-03 18:56:26 +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