 VDH
|
c239660cd6
|
Merge branch 'develop' into feature/skill-data
|
2025-12-08 17:51:18 +07:00 |
|
|
NguyenVanDat
|
81701772dc
|
dummy fix task
|
2025-12-08 16:07:16 +07:00 |
|
|
NguyenVanDat
|
157659d320
|
Merge branch 'develop' into implement_task_UI
# Conflicts:
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
|
2025-12-08 15:40:11 +07:00 |
|
|
HungDK
|
892d0d3aef
|
Merge branch 'develop' into feature/npc-shop
|
2025-12-08 10:37:03 +07:00 |
|
|
NguyenVanDat
|
e973260dee
|
fix addressable release asset
|
2025-12-08 09:48:37 +07:00 |
|
|
VDH
|
a48ac9baf8
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-12-06 16:41:34 +07:00 |
|
|
VDH
|
e19be27a1a
|
skill
|
2025-12-06 16:35:34 +07:00 |
|
|
Tungdv
|
be85cf1d91
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-12-06 14:41:00 +07:00 |
|
|
Tungdv
|
c7c34b373c
|
fix: update data info for HP.
fix: update move fly and swim.
|
2025-12-06 14:14:55 +07:00 |
|
|
MinhHai
|
9bc02e1fef
|
add DlgAward
|
2025-12-05 22:00:00 +07:00 |
|
|
Tungdv
|
956fde82b4
|
feat: set ext prop for HP.
|
2025-12-05 21:59:35 +07:00 |
|
|
Tungdv
|
f330d9606c
|
fix: update logic jump move for HP.
|
2025-12-05 21:09:16 +07:00 |
|
|
VDH
|
80c40705d2
|
skill pos processing
|
2025-12-05 21:07:25 +07:00 |
|
|
VDH
|
47f4033dff
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/A3DTerrain2.cs
# Assets/PerfectWorld/Scripts/Managers/CECManager.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
# Assets/PerfectWorld/Scripts/Managers/aabbcd.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
# Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
# Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
|
2025-12-04 17:58:10 +07:00 |
|
|
VDH
|
0529114779
|
done skill bless
|
2025-12-04 17:26:42 +07:00 |
|
|
HungDK
|
16094d04cf
|
Fixing wrong command to send to server
|
2025-12-04 15:09:20 +07:00 |
|
|
HungDK
|
d4bccfb9fc
|
Merge branch 'develop' into feature/npc-shop
|
2025-12-04 14:46:08 +07:00 |
|
|
HungDK
|
b051a86014
|
Add place holder item detail, buy option
|
2025-12-04 14:39:46 +07:00 |
|
|
NguyenVanDat
|
632f6b3813
|
replace state machine by HPWork
|
2025-12-03 18:14:10 +07:00 |
|
|
HungDK
|
d8d7502fe0
|
Integrate and asign prefab
|
2025-12-03 16:50:59 +07:00 |
|
|
Tungdv
|
015b441d88
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/Scripts/CECHostPlayer.cs
|
2025-12-03 10:03:22 +07:00 |
|
|
VDH
|
dd85fb1da6
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scene/TaskTest.unity
# Assets/PerfectWorld/Scripts/UI/HUDPlayer.cs
|
2025-12-02 16:47:51 +07:00 |
|
|
VDH
|
5c42c9792b
|
test buff skill
|
2025-12-02 16:46:47 +07:00 |
|
|
VDH
|
8f8e7f010c
|
continue with bless skill
|
2025-12-02 13:50:44 +07:00 |
|
|
MinhHai
|
f827878785
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
# Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
|
2025-12-02 10:25:35 +07:00 |
|
|
MinhHai
|
039d0a3ddc
|
update logic get notify task from server
|
2025-12-02 10:22:02 +07:00 |
|
|
Tungdv
|
d80f3109e4
|
feat: add logic jump for HP.
|
2025-12-01 17:20:11 +07:00 |
|
|
Le Duc Anh
|
28bdab60d8
|
load else player
|
2025-11-25 18:52:32 +07:00 |
|
|
Le Duc Anh
|
50812676ce
|
setup for build
|
2025-11-25 17:41:10 +07:00 |
|
|
Le Duc Anh
|
a3eb81f8ac
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop
|
2025-11-25 14:02:28 +07:00 |
|
|
Le Duc Anh
|
d016980696
|
fade out enemies
|
2025-11-25 14:02:07 +07:00 |
|
|
VDH
|
d092605651
|
done skill don't move after cast
|
2025-11-25 12:10:43 +07:00 |
|
|
MinhHai
|
6591b1b41c
|
Merge branch 'develop' into implement_task_UI
|
2025-11-25 11:56:11 +07:00 |
|
|
MinhHai
|
c3ea7b7851
|
update logic send cmd TASK_NOTIFY from Client to Server
|
2025-11-25 11:25:53 +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 |
|
|
MinhHai
|
beb12c8723
|
update logic NotifyServer of class TaskClient
|
2025-11-22 18:58:40 +07:00 |
|
|
VDH
|
f43f8a6e58
|
done spawn vfx
|
2025-11-22 11:21:50 +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 |
|
|
Le Duc Anh
|
95f2386397
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-21 16:04:56 +07:00 |
|
|
Le Duc Anh
|
30e636267c
|
udpate matter flow
|
2025-11-21 16:01:11 +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
|
939b714ced
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
# Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
# Assets/PerfectWorld/Scripts/Task/TaskInterface.cs
# Assets/PerfectWorld/Scripts/Task/TaskProcess.cs
|
2025-11-21 11:45:16 +07:00 |
|
|
MinhHai
|
e1bfd720e3
|
update logic receive Command.TASK_VER_DATA
|
2025-11-21 11:29:34 +07:00 |
|
|
VDH
|
c37ec4d136
|
Push hoang current work
|
2025-11-21 10:18:08 +07:00 |
|
|
Tungdv
|
17edc61e60
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-20 18:37:00 +07:00 |
|
|
Le Duc Anh
|
ca31090872
|
move all stuff into a61 scene
|
2025-11-20 15:33:30 +07:00 |
|
|
Tungdv
|
0324dc909e
|
fix: update logic select option dlg NPC.
|
2025-11-19 19:12:24 +07:00 |
|
|
Le Duc Anh
|
c2e8829c85
|
PC build
|
2025-11-19 16:15:03 +07:00 |
|