Commit Graph

69 Commits

Author SHA1 Message Date
VDH 511a833967 send to server learn skill 2026-01-13 17:58:20 +07:00
NguyenVanDat 97804a8b01 else player mining 2026-01-07 14:33:20 +07:00
VDH 824f713c37 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-23 17:33:14 +07:00
VDH 2b12799546 fix npc double 2025-12-23 17:33:09 +07:00
NguyenVanDat 287480c640 clear not use code 2025-12-23 16:53:24 +07:00
NguyenVanDat d3c3f1ff50 finished fix else player emote 2025-12-23 16:45:55 +07:00
NguyenVanDat 09e7482889 update else player emote 2025-12-18 15:34:04 +07:00
NguyenVanDat 1bc54fa74a fix pose action 2025-12-17 17:16:55 +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
NguyenVanDat c454eba988 add auto team 2025-12-10 13:55:52 +07:00
NguyenVanDat c8a21a5a33 add auto team 2025-12-09 18:13:30 +07:00
VDH 80c40705d2 skill pos processing 2025-12-05 21:07:25 +07:00
VDH 47f4033dff Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/A3DTerrain2.cs
#	Assets/PerfectWorld/Scripts/Managers/CECManager.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
#	Assets/PerfectWorld/Scripts/Managers/aabbcd.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-12-04 17:58:10 +07:00
NguyenVanDat 8f47a03680 fix jump animation 2025-12-04 14:50:14 +07:00
VDH 5c42c9792b test buff skill 2025-12-02 16:46:47 +07:00
Le Duc Anh 28bdab60d8 load else player 2025-11-25 18:52:32 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +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
Le Duc Anh 45024b5761 turn off default equipments if needed 2025-11-18 22:04:56 +07:00
VDH 8ee2477681 get config 2025-11-18 18:54:56 +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
NguyenVanDat fe73a9b979 handle conflict 2025-11-13 17:53:31 +07:00
NguyenVanDat f7d0ee6b43 Merge branch 'develop' into feature/add-vfx
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
2025-11-13 17:22:47 +07:00
NguyenVanDat c6f24993b5 show selecting vfx and elase player enter vfx 2025-11-13 17:12:41 +07:00
Le Duc Anh ba9c97d3f6 fix the conflicts 2025-11-13 16:43:59 +07:00
Le Duc Anh 648d51ff3a Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-13 16:22:36 +07:00
Le Duc Anh c4a56218d8 load player model 2025-11-13 16:12:12 +07:00
VDH 62575718f6 server cast skill player processing 2025-11-12 17:59:50 +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
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
VDH d4af8e33f9 convert for test done 2025-11-07 18:01:47 +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
HungDK 18c1465b1e Merge branch 'feature/revive' into develop 2025-11-04 15:38:07 +07:00
HungDK 1f7c20069c Merge branch 'develop' into feature/revive 2025-11-04 14:51:15 +07:00
HungDK 05d952860b Add revive handle on host and else player 2025-11-04 14:36:59 +07:00
VDH 4f3edae50d setup for esle player 2025-11-04 14:32:03 +07:00
VDH 313a525700 fix bug 2025-11-04 11:31:10 +07:00
VDH 1eb39b8319 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
#	Assets/Prefabs/HostPlayer.prefab
#	Assets/Prefabs/MonsterPrefab.prefab
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2025-11-04 10:51:06 +07:00
Tungdv 73d3917bbe fix: delete log. 2025-11-04 10:09:27 +07:00
Tungdv cfc13087e4 fix:
- fix anim elseplayer.
- fix auto move to target of HP.
- fix postion wrong went use joystick after auto move of HP.
2025-11-03 19:59:00 +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
VDH 7fef48278f addressable ui 2025-10-25 17:28:46 +07:00
Tungdv 68d0cc4748 fix: update show anim attack for else player. 2025-10-22 17:14:36 +07:00
Tungdv 776ac0fa5d feat: add logic else player action normal attack. 2025-10-21 19:12:23 +07:00
Tungdv 3a05b94366 Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HostPlayer.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_Object.cs
#	Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
#	Assets/PerfectWorld/Scripts/NPC/CECMonster.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
#	Assets/PerfectWorld/Scripts/UI/pickupItem.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/EC_Utility.cs
#	Assets/Scripts/GameController.cs
#	Assets/Scripts/InitializePlayer.cs
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
2025-10-20 16:58:20 +07:00