 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
|
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
|
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
|
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
|
32e42d2db8
|
npc leave after die
|
2025-10-16 10:53:05 +07:00 |
|
|
VDH
|
432004b5b4
|
npcdie
|
2025-10-16 09:10:20 +07:00 |
|
|
Tungdv
|
001a16cf32
|
fix: update namespace.
feat: add new logic EC_World.
|
2025-10-14 18:34:16 +07:00 |
|
|
VDH
|
4f06139b2e
|
fix bug animation wound npc
|
2025-10-14 14:57:19 +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
|
bcba39d951
|
reset
|
2025-10-11 10:02:52 +07:00 |
|
|
Tungdv
|
3af8d968f1
|
fix: Update atk normal.
|
2025-10-10 19:02:57 +07:00 |
|
|
VDH
|
a7666f9aa1
|
organize folder
|
2025-10-10 15:10:36 +07:00 |
|
|
VDH
|
3de4b27bb9
|
fixx
|
2025-10-09 18:32:18 +07:00 |
|
|
VDH
|
7d1dd88ff3
|
Merge branch 'feature/movement' into develop
|
2025-10-09 18:27:54 +07:00 |
|
|
VDH
|
febe6f8b00
|
st
|
2025-10-09 18:23:53 +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
|
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
|
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 |
|
|
Le Duc Anh
|
fde06bbfaf
|
Move all network code into Unity Project
|
2025-10-09 08:52:31 +07:00 |
|