Commit Graph

112 Commits

Author SHA1 Message Date
VuNgocHaiC7 2dea3a8f02 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
2026-01-29 14:04:49 +07:00
VuNgocHaiC7 8f916ee88c use item but cooldown don't active 2026-01-29 13:58:15 +07:00
HungDK c3a925cd6c Add c2s_SendCmdSetStatusPts to modify character potential point 2026-01-27 17:38:47 +07:00
HungDK c9ba22823d Add CreateRoleAsync 2026-01-22 10:07:09 +07:00
NguyenVanDat b14bb3db0f update command embed stone 2026-01-20 16:49:56 +07:00
NguyenVanDat b461d0b151 add embed stone protocol 2026-01-20 10:09:09 +07:00
Tungdv 15f9bd2a86 Merge branch 'develop' into feature/hp_swim
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-16 19:16:40 +07:00
Tungdv 0b23be64a2 fix: update logic cmd cache. 2026-01-16 18:02:39 +07:00
HungDK ef362d6017 Merge branch 'develop' into feature/produce-equipment 2026-01-16 17:40:20 +07:00
HungDK 3aca254fd4 Fix wrong cmd method name 2026-01-16 17:24:01 +07:00
Tungdv 017d26b64f feat: add command cache. 2026-01-15 19:22:30 +07:00
HungDK dd96ccd0ed Add request server to produce item 2026-01-15 15:05:22 +07:00
VDH 1624864487 Merge branch 'develop' into feature/skill-data 2026-01-15 13:33:42 +07:00
Chomper9981 5246829473 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-14 15:22:43 +07:00
VDH f5a9227cc7 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Prefabs/BoostrapForTest.prefab
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-01-13 18:04:28 +07:00
VDH 511a833967 send to server learn skill 2026-01-13 17:58:20 +07:00
VDH 6066e851a4 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-01-13 11:04:28 +07:00
VDH 61f4660dba done flow learn skill 2026-01-12 19:07:37 +07:00
Chomper9981 22bf1bddcb add armor dialog for quest "chao hoi" 2026-01-12 15:52:09 +07:00
Tungdv e279eeb540 fix: update logic fly HP. 2026-01-12 15:07:18 +07:00
MinhHai 219c87f469 add new pack: Editor Attributes, complete GoTo cmd 2026-01-09 15:01:29 +07:00
HungDK 4b4c544898 Merge branch 'develop' into feature/life-skill 2025-12-23 14:27:14 +07:00
HungDK da055c5ece Add c2s_CmdGatherMaterial 2025-12-22 17:51:08 +07:00
MinhHai 6c9388325f complete cache task into SO 2025-12-20 11:52:13 +07:00
NguyenVanDat 58b3c3640a update log 2025-12-17 17:30:27 +07:00
NguyenVanDat 5a0ad3ad4f loading task ui 2025-12-16 15:39:18 +07:00
NguyenVanDat a786ee236e Merge branch 'develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/EC_GPDataType.cs
2025-12-16 11:59:08 +07:00
NguyenVanDat a228a5ce1f add action emote 2025-12-13 14:12:09 +07:00
NguyenVanDat c454eba988 add auto team 2025-12-10 13:55:52 +07:00
NguyenVanDat c8a21a5a33 add auto team 2025-12-09 18:13:30 +07:00
VDH c239660cd6 Merge branch 'develop' into feature/skill-data 2025-12-08 17:51:18 +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
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 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
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
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
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