Commit Graph

114 Commits

Author SHA1 Message Date
NguyenVanDat 51659d03cc fixx 2025-10-29 17:05:57 +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 0d41cbfe44 Merge branch 'develop' into feature/EP_normal_attack
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
#	Assets/Prefabs/MonsterPrefab.prefab
#	Assets/Scenes/WorldRender.unity
#	Assets/Scenes/a61.unity.meta
#	Assets/Scripts/CECHostPlayer.cs
2025-10-29 15:48:29 +07:00
Tungdv 4283029b1f fix: update auto move for HP. 2025-10-28 19:20:41 +07:00
NguyenVanDat 0d358f867d ui info hosst player and npc done 2025-10-28 17:22:03 +07:00
NguyenVanDat aca798172c testfast 2025-10-28 10:31:28 +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 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
Tungdv ef50c760fa fix: Update move HP. 2025-10-23 19:05:03 +07:00
VDH c0d4478b38 name npc 2025-10-23 17:33:12 +07:00
Le Duc Anh 9fa1c93e27 addressable intial commit 2025-10-22 16:34:56 +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
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
HungDK 9d5545199d Merge branch 'develop' into feature/inventory 2025-10-18 14:45:23 +07:00
HungDK c5122eb9f9 Add pickup money 2025-10-18 14:42:53 +07:00
HungDK e9c69ab511 Add buy cmd 2025-10-17 17:53:34 +07:00
VDH 8eafdb2ed2 npc die done 2025-10-16 16:28:29 +07:00
VDH 77a0825340 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-16 10:53:41 +07:00
VDH 32e42d2db8 npc leave after die 2025-10-16 10:53:05 +07:00
Le Duc Anh ed1a00932e reset the history pointer 2025-10-16 10:50:59 +07:00
VDH 36b17caa5a Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/NetworkManager.cs
2025-10-16 09:10:39 +07:00
VDH 432004b5b4 npcdie 2025-10-16 09:10:20 +07:00
NguyenVanDat 668f808883 fix the buffer issue 2025-10-15 18:45:26 +07:00
NguyenVanDat d757c3137b add decrypted buffer 2025-10-15 18:27:16 +07:00
NguyenVanDat c67d0e5c4c modify decompress algo 2025-10-15 16:01:48 +07:00
Le Duc Anh 793c8a370f add comments 2025-10-15 10:06:10 +07:00
Le Duc Anh 712c7211c1 add comments 2025-10-15 09:43:58 +07:00
Le Duc Anh 8552a7d99e Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-10-15 09:18:31 +07:00
Le Duc Anh 897ef1b093 atempt to fix decompress 2025-10-15 09:17:47 +07:00
Tungdv 001a16cf32 fix: update namespace.
feat: add new logic EC_World.
2025-10-14 18:34:16 +07:00
VDH dce34489ed Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-14 17:13:58 +07:00
NguyenVanDat 664f114e53 log 2025-10-14 17:10:18 +07:00
VDH 4f06139b2e fix bug animation wound npc 2025-10-14 14:57:19 +07:00
HungDK 0389950579 Merge branch 'develop' into feature/inventory 2025-10-14 11:17:32 +07:00
HungDK b3db7998ae Update GPDataType.cs 2025-10-14 10:51:52 +07:00
Le Duc Anh 5199df61f0 fix decompress algorithm 2025-10-14 10:35:43 +07:00
VDH 7bc5c65229 animation attack done 2025-10-13 16:58:06 +07:00
VDH 4a701aaa16 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-10-13 09:11:16 +07:00
VDH bd344fcff5 player animation 2025-10-11 16:09:00 +07:00
VDH 042b248368 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs.meta
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs.meta
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/Move/CECPlayer.cs
2025-10-11 10:09:59 +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
Tungdv 3af8d968f1 fix: Update atk normal. 2025-10-10 19:02:57 +07:00