Commit Graph

56 Commits

Author SHA1 Message Date
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
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 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 38a2c0d46f covnert continue 2025-11-06 17:29:02 +07:00
VDH 0ad91a5e1d InitAllSkillsOfCurProf done 2025-11-05 17:55:50 +07:00
HungDK 691b27b69f Fix duplicate init else player, duplicate model 2025-11-05 16:38:23 +07:00
HungDK 14ed8ac2e9 Update else player revive on host client 2025-11-05 09:37:55 +07:00
HungDK 61ce6be4fd Update EC_ManPlayer.cs 2025-11-04 15:36:43 +07:00
HungDK 53da747d56 Request and play anim revive 2025-11-04 14:36:40 +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 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 1c9d9b9ec2 UI health change fix bug 2025-10-30 18:50:02 +07:00
NguyenVanDat 51659d03cc fixx 2025-10-29 17:05:57 +07:00
Tungdv 776ac0fa5d feat: add logic else player action normal attack. 2025-10-21 19:12:23 +07:00
VDH 32e42d2db8 npc leave after die 2025-10-16 10:53:05 +07:00
VDH dd38edcdd5 change name file 2025-10-11 10:08:24 +07:00
VDH bcba39d951 reset 2025-10-11 10:02:52 +07:00
VDH 6a0125be95 else player and npc 2025-10-09 15:31:53 +07:00
VDH 7c5652ec2e m 2025-10-09 14:06:12 +07:00
Tungdv ff1e2dd89e fix: update normal atk. 2025-10-08 19:32:05 +07:00
VDH a995887904 done else player animation 2025-09-22 12:15:11 +07:00
VDH 0dd73da3c4 animation host done 2025-09-19 17:39:39 +07:00
VDH a9aa67cc2d add animation tool 2025-09-16 18:07:13 +07:00
tung.do@monkey.edu.vn 3b6c2bb4a3 fix: update logic show exist elseplayer (load word before spawn character). 2025-09-14 02:13:09 +07:00
tung.do@monkey.edu.vn a1bae06cba Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/GameController.cs
2025-09-14 01:15:24 +07:00
tung.do@monkey.edu.vn 48fef1008d fix: show exist elseplayer 2025-09-14 00:47:52 +07:00
Tungdv a5c7f53aa2 feat: show list elesplayer. 2025-09-13 19:02:20 +07:00
VDH aaab1e4007 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/PerfectWorld/Scripts/Common/AutoInitializer.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/GameController.cs
2025-09-13 17:52:34 +07:00
Tungdv 864dee7196 fix: update show elesplayer after merge from develop. 2025-09-13 16:48:27 +07:00
Tungdv 0252370c2b Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/GameController.cs
2025-09-13 16:36:09 +07:00
Tungdv d8869e6495 fix: update logic move and stop elesplayer. 2025-09-13 16:17:45 +07:00
VDH 3e3eb4b018 player move 2025-09-13 09:59:38 +07:00
VDH 74105e6aa2 debug fix time 2025-09-12 10:24:14 +07:00
Tungdv b30dffff1c fix: Update move elseplayer
ToDo: Need add Init data elesplayer.
2025-09-11 19:16:23 +07:00
VDH d4cec0a051 fix send cmd 2025-09-11 18:12:24 +07:00
VDH 68c8799242 adjust 2025-09-11 15:51:02 +07:00
VDH 032cd80b77 change type time 2025-09-11 09:36:24 +07:00
Tungdv 7233e732f7 fix: update move elseplayer. 2025-09-10 19:08:38 +07:00
VDH 4a9d07bc89 tesst send move 2025-09-10 14:23:25 +07:00
tung.do@monkey.edu.vn 5a58469e22 fix: fix logic show elseplayer. 2025-09-10 01:00:35 +07:00
Tungdv a33b81f858 fix: fix bug show else player. 2025-09-09 18:57:49 +07:00
VDH a4c4c4fa71 send move mand processing and testing correct pos player 2025-09-09 18:22:47 +07:00
Tungdv e6e95c6ede fix: Update show player after select role. 2025-09-09 13:08:15 +07:00
Tungdv b0e0bff66c Merge branch 'develop' into feature/elseplayer 2025-09-09 11:09:52 +07:00