 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 |
|
|
MinhHai
|
451555a1ba
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
|
2025-11-11 18:35:33 +07:00 |
|
|
Le Duc Anh
|
9d8e219f3c
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-11 15:59:38 +07:00 |
|
|
Le Duc Anh
|
9be43da2ae
|
load equipment skin
|
2025-11-11 15:59:26 +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 |
|
|
Tungdv
|
ec4bb785b8
|
fix: update logic show dialog.
|
2025-11-10 19:50:39 +07:00 |
|
|
Tungdv
|
920317683b
|
fix: update logic show dialog npc.
|
2025-11-07 18:32:49 +07:00 |
|
|
NguyenVanDat
|
df07b1661d
|
add gfx resource and vfx object base
|
2025-11-07 17:35:52 +07:00 |
|
|
MinhHai
|
10c5c0e306
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
|
2025-11-06 14:09:25 +07:00 |
|
|
MinhHai
|
82b9539f03
|
add data for task
|
2025-11-06 14:09:13 +07:00 |
|
|
Tungdv
|
9bf15bfb6f
|
feat: - add logic interact NPC.
|
2025-11-04 18:29:25 +07:00 |
|
|
HungDK
|
1f7c20069c
|
Merge branch 'develop' into feature/revive
|
2025-11-04 14:51:15 +07:00 |
|
|
HungDK
|
28aff4cd75
|
Add work dead
|
2025-11-04 14:37:15 +07:00 |
|
|
NguyenVanDat
|
acf01f0ba7
|
dummy fix showing weapon
|
2025-11-04 14:17:05 +07:00 |
|
|
NguyenVanDat
|
12617a8ea3
|
Merge branch 'develop' into feature/else-player
# Conflicts:
# Assets/Scenes/a61.unity
|
2025-11-04 13:51:24 +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 |
|
|
PCBrew
|
8d761b6d3d
|
attack animatin with weapon type
|
2025-11-04 09:36:23 +07:00 |
|
|
NguyenVanDat
|
19a1ecfb70
|
Merge branch 'develop' into feature/else-player
|
2025-11-04 09:07:39 +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 |
|
|
tung.do@monkey.edu.vn
|
76d12a1140
|
fix: update auto move attack normal HP (fix move underground).
|
2025-10-31 02:20:50 +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 |
|
|
NguyenVanDat
|
f1520169ab
|
fix attacxk animation
|
2025-10-30 12:24:50 +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 |
|
|
NguyenVanDat
|
1dd66a2b83
|
pj setting
|
2025-10-29 16:41:07 +07:00 |
|
|
Tungdv
|
fbd3110d05
|
fix: update pos server for HP and add layer for terrain.
|
2025-10-29 16:25:42 +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 |
|
|
NguyenVanDat
|
929f35bd3b
|
st
|
2025-10-29 13:30:02 +07:00 |
|
|
Tungdv
|
4283029b1f
|
fix: update auto move for HP.
|
2025-10-28 19:20:41 +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
|
254df2c428
|
ForTest
|
2025-10-28 10:55:52 +07:00 |
|
|
NguyenVanDat
|
aca798172c
|
testfast
|
2025-10-28 10:31:28 +07:00 |
|
|
Tungdv
|
b4f2e78def
|
fix: update logic move HP.
|
2025-10-24 18:53:46 +07:00 |
|
|
tung.do@monkey.edu.vn
|
63c566cdc7
|
feat: add package addresable.
fix: update logic auto move HP.
|
2025-10-24 00:33:55 +07:00 |
|
|
Tungdv
|
ef50c760fa
|
fix: Update move HP.
|
2025-10-23 19:05:03 +07:00 |
|
|
Tungdv
|
68d0cc4748
|
fix: update show anim attack for else player.
|
2025-10-22 17:14:36 +07:00 |
|
|
VDH
|
eaf07bd223
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
|
2025-10-22 09:26:38 +07:00 |
|
|
Tungdv
|
776ac0fa5d
|
feat: add logic else player action normal attack.
|
2025-10-21 19:12:23 +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
|
3be97c2381
|
add monster package
|
2025-10-20 14:14:51 +07:00 |
|