Commit Graph

133 Commits

Author SHA1 Message Date
NguyenVanDat cfeebf3a15 Merge branch 'develop' into feature/add-vfx
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2025-11-12 11:04:43 +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
VDH 6d98f3d30f skill 1,2,3,4,5,6 2025-11-12 10:52:37 +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 e01c923e16 ref 2025-11-11 14:13:14 +07:00
VDH a13e931bc1 fix bug after merge 2025-11-11 13:44:55 +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
NguyenVanDat b7bf20be75 show selecting vfx 2025-11-10 18:24:09 +07:00
VDH eed08c2b13 bug skill data not received 2025-11-08 16:41:19 +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
VDH 0ad91a5e1d InitAllSkillsOfCurProf done 2025-11-05 17:55:50 +07:00
Le Duc Anh f338899f76 initial load all equipments 2025-11-05 16:08:51 +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 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
Tungdv 25f717dc00 fix: update auto move HP. 2025-10-31 19:27:10 +07:00
Tungdv 4be95aec7a fix: update logic auto move HP. 2025-10-30 19:41:39 +07:00
PCBrew 1c9d9b9ec2 UI health change fix bug 2025-10-30 18:50:02 +07:00
Tungdv 94b6927422 fix: update logic auto move to target of HP. 2025-10-29 19:14:52 +07:00
NguyenVanDat cc32356d10 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2025-10-29 17:01:15 +07:00
Tungdv fbd3110d05 fix: update pos server for HP and add layer for terrain. 2025-10-29 16:25:42 +07:00
NguyenVanDat 929f35bd3b st 2025-10-29 13:30:02 +07:00
NguyenVanDat 59e06cc5f3 fix bug 2025-10-28 17:56:33 +07:00
NguyenVanDat 777bda9cd9 inffo 2025-10-28 17:51:50 +07:00
NguyenVanDat 0d358f867d ui info hosst player and npc done 2025-10-28 17:22:03 +07:00
NguyenVanDat 46eb3afe2b Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
#	Assets/Scenes/NPCRender.unity
2025-10-28 11:05:11 +07:00
NguyenVanDat aca798172c testfast 2025-10-28 10:31:28 +07:00
HungDK 0ae982ae80 Merge branch 'feature/inventories' into develop 2025-10-27 15:45:29 +07:00
HungDK 13d1283d6e Fix money and cash loader 2025-10-27 15:39:45 +07:00
NguyenVanDat d72d4cd967 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-10-27 13:41:59 +07:00
VDH 6b91faae68 npc 2025-10-27 11:47:33 +07:00
HungDK 0eed221f16 Fix merge conflict 2025-10-27 11:28:22 +07:00
HungDK a2469d0259 Merge branch 'develop' into feature/inventories 2025-10-27 10:33:38 +07:00
VDH f537fc0551 npc 2025-10-27 10:23:44 +07:00
VDH 7fef48278f addressable ui 2025-10-25 17:28:46 +07:00
HungDK bd34b294f9 Add player currency 2025-10-25 17:07:54 +07:00
VDH eaf07bd223 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-22 09:26:38 +07:00
VDH 02df4f3c6f monster attack 2025-10-21 18:34:45 +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
VDH 87fdebe6f4 anim 2025-10-20 16:37:36 +07:00
VDH 3be97c2381 add monster package 2025-10-20 14:14:51 +07:00
VDH 9a744151ee 2010 2025-10-20 09:50:23 +07:00