 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 |
|
|
Le Duc Anh
|
95f2386397
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-21 16:04:56 +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
|
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 |
|
|
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 |
|
|
VDH
|
8ee2477681
|
get config
|
2025-11-18 18:54:56 +07:00 |
|
|
Tungdv
|
6f3a509534
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
|
2025-11-18 16:46:24 +07:00 |
|
|
Tungdv
|
4633e8278c
|
fix: update logic send cmd accept task.
|
2025-11-18 16:40:04 +07:00 |
|
|
Le Duc Anh
|
ba1e532e6d
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-18 16:36:32 +07:00 |
|
|
Le Duc Anh
|
3174cd28d1
|
send npc accept task cmd
|
2025-11-18 16:36:15 +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 |
|
|
Le Duc Anh
|
c4a56218d8
|
load player model
|
2025-11-13 16:12:12 +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 |
|
|
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
|
f643998dda
|
ifx: update logic show dialog npc.
|
2025-11-08 18:51:00 +07:00 |
|
|
VDH
|
d4af8e33f9
|
convert for test done
|
2025-11-07 18:01:47 +07:00 |
|
|
Tungdv
|
60cd4236c1
|
feat: add manager dialog npc.
|
2025-11-05 18:13:46 +07:00 |
|
|
HungDK
|
53da747d56
|
Request and play anim revive
|
2025-11-04 14:36:40 +07:00 |
|
|
NguyenVanDat
|
0d358f867d
|
ui info hosst player and npc done
|
2025-10-28 17:22:03 +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
|
7fef48278f
|
addressable ui
|
2025-10-25 17:28:46 +07:00 |
|
|
HungDK
|
bd34b294f9
|
Add player currency
|
2025-10-25 17:07:54 +07:00 |
|
|
HungDK
|
9d5545199d
|
Merge branch 'develop' into feature/inventory
|
2025-10-18 14:45:23 +07:00 |
|
|
HungDK
|
e9c69ab511
|
Add buy cmd
|
2025-10-17 17:53:34 +07:00 |
|
|
VDH
|
32e42d2db8
|
npc leave after die
|
2025-10-16 10:53:05 +07:00 |
|
|
HungDK
|
0389950579
|
Merge branch 'develop' into feature/inventory
|
2025-10-14 11:17:32 +07:00 |
|
|
Tungdv
|
3af8d968f1
|
fix: Update atk normal.
|
2025-10-10 19:02:57 +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 |
|
|
HungDK
|
7a000797ec
|
Update place holder item drop object
|
2025-10-09 17:04:07 +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
|
f2a8975b1a
|
Merge remote-tracking branch 'origin/develop' into feature/movement
|
2025-10-09 09:22:53 +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 |
|
|
HungDK
|
51eeb4e642
|
Update UnityGameSession.cs
|
2025-10-09 09:14:35 +07:00 |
|
|
Le Duc Anh
|
fde06bbfaf
|
Move all network code into Unity Project
|
2025-10-09 08:52:31 +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 |
|
|
Le Duc Anh
|
af784bf761
|
set log file path
|
2025-10-07 17:20:08 +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 |
|
|
Le Duc Anh
|
62c7417c74
|
change Logger to BMLogger
|
2025-10-01 15:14:38 +07:00 |
|
|
VDH
|
586e2f834b
|
npc animtion processing
|
2025-09-27 17:10:53 +07:00 |
|
|
NguyenVanDat
|
dd73b4944a
|
Merge branch 'develop' into feature/quest_sytem
# Conflicts:
# Assets/Scripts/CECHostPlayer.cs
|
2025-09-25 17:20:07 +07:00 |
|
|
HungDK
|
4243bab53f
|
Merge branch 'develop' into feature/inventory
|
2025-09-25 14:18:51 +07:00 |
|
|
NguyenVanDat
|
ba9ab810d6
|
Merge branch 'develop' into feature/quest_sytem
# Conflicts:
# Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
# Assets/Scripts/CECHostPlayer.cs
|
2025-09-24 14:41:24 +07:00 |
|