Commit Graph

105 Commits

Author SHA1 Message Date
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
VDH a7666f9aa1 organize folder 2025-10-10 15:10:36 +07:00
hoangvd 38a12bd3fa revert 439722a8c4
revert Merge pull request 'feature/movement' (#22) from feature/movement into develop

Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/22

mất package
2025-10-09 11:06:44 +00:00
VDH 0f8823504f mer 2025-10-09 17:07:11 +07:00
VDH c961eea8e6 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
2025-10-09 17:00:48 +07:00
Tungdv 2dee89793d fix: Update attack normal HP. 2025-10-09 16:57:07 +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
VDH c71e943ab7 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/PerfectWorld/Scripts/Common/CECObject.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/Scripts/Move/CECHostMove.cs
2025-10-09 11:31:55 +07:00
Tungdv be959df162 fix: update command cancel action. 2025-10-09 11:27:12 +07:00
Tungdv ee2f337b26 Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs
2025-10-09 09:58:48 +07:00
VDH 85292064e6 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectVersion.txt
2025-10-09 09:15:43 +07:00
tung.do@monkey.edu.vn dd77543cdb fix: update normal attack. 2025-10-09 02:08:11 +07:00
Tungdv ff1e2dd89e fix: update normal atk. 2025-10-08 19:32:05 +07:00
VDH f0dca5bbdb npcAttack 2025-10-08 18:05:19 +07:00
HungDK fd3a269886 Merge branch 'develop' into feature/inventory 2025-10-08 13:49:30 +07:00
tung.do@monkey.edu.vn ddcc5c22d1 fix: Update normal attack. 2025-10-08 01:34:03 +07:00
Tungdv ee618bc38e fix: update attack normal. 2025-10-07 18:13:30 +07:00
Tungdv 9c2b5b87f3 Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Packages/manifest.json
2025-10-07 14:15:17 +07:00
Tungdv f66d9c694b fix: update struct a3dmatrix. 2025-10-07 14:11:28 +07:00
NguyenVanDat ed29158a25 adjust st 2025-10-07 10:34:50 +07:00
NguyenVanDat 7ebb4c602f Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
2025-10-07 09:31:01 +07:00
tung.do@monkey.edu.vn 597b9e1877 fix: Update normal atk. 2025-10-07 00:25:55 +07:00
Tungdv 7818ec70e3 fix: update normal attack. 2025-10-06 18:32:32 +07:00
Tungdv 83816419ae Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
2025-10-06 17:36:58 +07:00
Tungdv 38cb41ec5b fix: update struct a3dvecter. 2025-10-06 17:34:45 +07:00
HungDK 1aad852f1b Add all matter in world - havent enable yet because it too much 2025-10-06 16:26:50 +07:00
tung.do@monkey.edu.vn a6778f7ddf fix: update unity version and update struct A3D. 2025-10-06 02:02:52 +07:00
Tungdv 78e7d1babb feat: add struct for normal atk. 2025-10-03 19:10:14 +07:00
HungDK b7bccf994a Update EC_ManMatter.cs 2025-10-03 15:37:27 +07:00
HungDK 7bd276d4b8 Add man_mater msg 2025-10-02 18:06:16 +07:00
HungDK f72c3287cd Add Drop item cmd, default drop with quantity is 1 2025-10-02 14:16:00 +07:00
Tungdv 98ff6a50a8 fix: Update logic normal attack. 2025-10-01 17:42:43 +07:00
VDH 1c45b5c7e1 npc 2025-10-01 17:30:54 +07:00
VDH 4198c2f968 npc move procvess 2025-10-01 15:07:18 +07:00
Tungdv 4bad286d20 feat: add logic and struct class for normal atk. 2025-09-30 17:49:49 +07:00
HungDK 2cb9279a5d Update 2 ring of finger equip location 2025-09-30 15:52:40 +07:00
VDH 1b2de221b4 animation npc Process 2025-09-29 18:26:02 +07:00
hungdk ca193b1a5a Fix missing ivtr equipable item 2025-09-28 22:07:11 +07:00
VDH 586e2f834b npc animtion processing 2025-09-27 17:10:53 +07:00
VDH 7640efa9d7 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
2025-09-26 11:30:32 +07:00
VDH 78152af05d npc Process 2025-09-25 17:38:33 +07:00
HungDK 83843ce63e Fix missing parameter 2025-09-25 15:27:41 +07:00
HungDK 4243bab53f Merge branch 'develop' into feature/inventory 2025-09-25 14:18:51 +07:00
HungDK 1d348f3ac6 Update load icon from multi sprite file, default icon slot 2025-09-25 14:07:38 +07:00
VDH 82c5c721b1 npc man 2025-09-25 13:55:07 +07:00
HungDK b43b1c61c2 Add slide atlas tool 2025-09-24 18:17:49 +07:00