Commit Graph

45 Commits

Author SHA1 Message Date
VDH 53dbf0ede0 t 2026-02-03 16:29:19 +07:00
Le Duc Anh 5ae8a9a51d combine SDK with login UI 2026-02-03 14:57:23 +07:00
Le Duc Anh ccd6564772 update game UI 2026-02-01 15:02:43 +07:00
Le Duc Anh d31149e69c update water shader 2026-01-08 15:09:53 +07:00
Tungdv 8508ad873f fix: update logic swim. 2025-12-31 15:09:10 +07:00
Le Duc Anh 93d0cbd634 show UI task 2025-12-17 17:32:01 +07:00
Le Duc Anh a7186f3d37 move tasks file to persistent path 2025-12-17 13:53:51 +07:00
Tungdv c43eac8599 Merge remote-tracking branch 'origin/develop' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-13 19:17:18 +07:00
Tungdv d1d59c6d04 fix: fix bug move on ground. 2025-12-13 19:11:38 +07:00
VDH 972104970d copnvert 2025-12-09 19:53:32 +07:00
Le Duc Anh 50812676ce setup for build 2025-11-25 17:41:10 +07:00
VDH 6b7537ca3e fix bug mege 2025-11-24 11:10:38 +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 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
VDH f86cce30e9 11/14 2025-11-14 19:03:42 +07:00
NguyenVanDat ba784b7f77 add standalone TASK_CLIENT 2025-11-13 09:24:19 +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
PCBrew 1c9d9b9ec2 UI health change fix bug 2025-10-30 18:50:02 +07:00
PCBrew 49518212c9 pjsetting 2025-10-30 09:45:24 +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 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 aca798172c testfast 2025-10-28 10:31:28 +07:00
Tungdv ef50c760fa fix: Update move HP. 2025-10-23 19:05:03 +07:00
Le Duc Anh 220b222013 update subfix of addressable also 2025-10-22 16:43:10 +07:00
Le Duc Anh 9fa1c93e27 addressable intial commit 2025-10-22 16:34:56 +07:00
VDH 755638c5f8 st 2025-10-16 16:29:02 +07:00
VDH bd384699dc st 2025-10-09 18:16:02 +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
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
Le Duc Anh c4215ca095 increase project version 2025-10-08 10:12:49 +07:00
VDH 7566b71a36 st 2025-10-08 09:39:01 +07:00
VDH 53013d7887 aniamtion processs 2025-09-18 18:07:23 +07:00
VDH 68eb9bd928 change state move and idle 2025-09-15 18:01:08 +07:00
VDH 755f5bca26 ignore 2025-09-12 10:24:41 +07:00
HungDK c4764f7bae Merge branch 'develop' into feature/inventory 2025-09-11 10:33:24 +07:00
HungDK 64f2da2963 Rebuild, add scene 2025-09-11 09:36:02 +07:00
HungDK ae43dd5623 Merge branch 'develop' into feature/inventory 2025-09-11 09:17:03 +07:00
VDH a4c4c4fa71 send move mand processing and testing correct pos player 2025-09-09 18:22:47 +07:00
Tungdv b0e0bff66c Merge branch 'develop' into feature/elseplayer 2025-09-09 11:09:52 +07:00
Tungdv 6f9716da3e fix: show scene word and character.
feat: add script NPCmanager.
2025-09-09 11:00:42 +07:00
VDH f1ca00030d adjust 2025-09-08 18:04:40 +07:00
VDH 41016480af adjust setting 2025-09-08 09:57:23 +07:00
Tungdv 4e17ba954e feat: Init project PW. 2025-08-27 15:27:24 +07:00