 HungDK
|
be3eb81d40
|
Update UI
|
2025-11-25 15:02:17 +07:00 |
|
|
VDH
|
3450fd015f
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Config.meta
# Assets/PerfectWorld/Editor.meta
# Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
# Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/NPCRender.unity
# Assets/Scenes/a61.unity
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.Task.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/CECPlayer_Inventory.cs
# Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
|
2025-11-24 10:16:07 +07:00 |
|
|
Tungdv
|
59976a4be5
|
fix: update dlgnpc.
|
2025-11-22 17:47:15 +07:00 |
|
|
Tungdv
|
9129784de0
|
Merge branch 'develop' into feature/hp_interact_npc
|
2025-11-21 17:07:50 +07:00 |
|
|
Tungdv
|
45ad9bc162
|
fix: Update logic select task in dlgnpc.
|
2025-11-21 17:03:39 +07:00 |
|
|
NguyenVanDat
|
d80f7f4f07
|
Merge branch 'develop' into feature/refactor-game-run
|
2025-11-21 11:50:36 +07:00 |
|
|
NguyenVanDat
|
8f5673c68e
|
refactor game run and fix game flow
|
2025-11-21 11:48:39 +07:00 |
|
|
Tungdv
|
1951047c61
|
fix: update logic button back and close in dlgnpc.
|
2025-11-21 11:37:07 +07:00 |
|
|
HungDK
|
a35cd6d0e7
|
Update EC_Invtr
|
2025-11-20 13:47:10 +07:00 |
|
|
VDH
|
151831d1dd
|
add prefab
|
2025-11-19 10:41:12 +07:00 |
|
|
VDH
|
2e2125f428
|
Merge remote-tracking branch 'origin/feature/skill-data' into feature/skill-data
|
2025-11-19 10:40:13 +07:00 |
|
|
HungDK
|
c216b59c75
|
Update SkillUI.prefab
|
2025-11-19 10:36:28 +07:00 |
|
|
VDH
|
a30427e3f5
|
Merge remote-tracking branch 'origin/bugfix/fix-character-animation' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/NPCRender.unity
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/CECHostPlayer_Inventory.cs
|
2025-11-19 10:35:54 +07:00 |
|
|
HungDK
|
af6a20f403
|
Add skill ui
|
2025-11-17 19:10:02 +07:00 |
|
|
Tungdv
|
fa1bd3d076
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/NPCRender.unity
|
2025-11-17 14:50:24 +07:00 |
|
|
Tungdv
|
e46fcf2ee5
|
fix: update show text mission in dlgnpc.
|
2025-11-13 18:14:49 +07:00 |
|
|
Le Duc Anh
|
648d51ff3a
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-13 16:22:36 +07:00 |
|
|
Le Duc Anh
|
c4a56218d8
|
load player model
|
2025-11-13 16:12:12 +07:00 |
|
|
tung.do@monkey.edu.vn
|
8bf8f3716c
|
fix: update text dlgnpc and fix bug merge.
|
2025-11-13 01:51:06 +07:00 |
|
|
Tungdv
|
9feb2b22e3
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
# Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs
# Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/Scenes/a61.unity
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/CECUIManager.cs
|
2025-11-12 19:39:19 +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 |
|
|
NguyenVanDat
|
629d419c57
|
WIP logic show vfx select target and level up
|
2025-11-12 10:21:09 +07:00 |
|
|
Tungdv
|
fabb286473
|
fix: update logic show dialog npc.
|
2025-11-11 19:04:49 +07:00 |
|
|
NguyenVanDat
|
b7bf20be75
|
show selecting vfx
|
2025-11-10 18:24:09 +07:00 |
|
|
HungDK
|
b287ff7902
|
Fix scroll
|
2025-11-10 10:52:21 +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
|
8278709a45
|
Add prefab and ui of revive system
|
2025-11-04 14:30:25 +07:00 |
|
|
NguyenVanDat
|
12617a8ea3
|
Merge branch 'develop' into feature/else-player
# Conflicts:
# Assets/Scenes/a61.unity
|
2025-11-04 13:51:24 +07:00 |
|
|
NguyenVanDat
|
814a151648
|
show dummy hit effect
|
2025-11-04 13:45:10 +07:00 |
|
|
VDH
|
313a525700
|
fix bug
|
2025-11-04 11:31:10 +07:00 |
|
|
VDH
|
42399c1a70
|
for merge
|
2025-11-04 10:43:29 +07:00 |
|
|
tung.do@monkey.edu.vn
|
d18d8b0b64
|
Merge branch 'develop' into feature/EP_normal_attack
|
2025-11-04 01:10:31 +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 |
|
|
PCBrew
|
61775198c6
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
|
2025-11-03 17:37:16 +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 |
|
|
HungDK
|
33c845cd3b
|
Merge branch 'develop' into feature/inventories
|
2025-10-30 10:10:16 +07:00 |
|
|
HungDK
|
915b11b387
|
Update login ui
|
2025-10-28 13:51:33 +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 |
|
|
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 |
|
|
VDH
|
7c88068369
|
npc server name
|
2025-10-24 10:18:56 +07:00 |
|
|
VDH
|
c0d4478b38
|
name npc
|
2025-10-23 17:33:12 +07:00 |
|