Commit Graph

40 Commits

Author SHA1 Message Date
VDH 0de2995ab6 done ui action 2026-01-30 11:37:10 +07:00
VDH 6dbc543188 done create new skill combo 2026-01-28 16:40:29 +07:00
VDH 3de0850a2b push convert flow use skill combo 2026-01-23 18:01:15 +07:00
VDH ef366cfc32 convert skill combo' 2026-01-22 19:23:32 +07:00
VDH 1d03572b73 done learned skill UI 2026-01-19 16:15:17 +07:00
VDH 5fc98befea skill ui Process 2026-01-16 18:01:33 +07:00
Chomper9981 97b763f655 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-08 15:07:35 +07:00
Chomper9981 4c7217929d Complete add feature "Load weapon data" and show it in the "Quest Chao Hoi Lay Item" 2026-01-08 15:02:20 +07:00
HungDK e5c09167fb Fix unstable reach site task completion 2026-01-06 16:59:14 +07:00
VDH cc1f4a9556 ui skill for tesst 2025-12-29 17:32:48 +07:00
NguyenVanDat 1bc54fa74a fix pose action 2025-12-17 17:16:55 +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
HungDK ad72ea5106 Merge branch 'implement_task_UI' into feature/skill-hung 2025-12-15 10:32:12 +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 9b0c3b3dc0 fix 2025-12-13 15:30:53 +07:00
NguyenVanDat e46bcbb56a show dummy DlgSubSkill 2025-12-13 15:04:27 +07:00
NguyenVanDat a228a5ce1f add action emote 2025-12-13 14:12:09 +07:00
HungDK a57e5b4f32 Update task, filtering all task can take 2025-12-11 17:41:20 +07:00
Tungdv 5ebf4fb49b Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/Scripts/CECGameRun.cs
2025-12-10 17:21:20 +07:00
Tungdv ead70ecfea fix: update move air. 2025-12-08 19:10:23 +07:00
NguyenVanDat e973260dee fix addressable release asset 2025-12-08 09:48:37 +07:00
Tungdv b5aeba251d fix: update logic jump stand for HP. 2025-12-04 19:18:58 +07:00
NguyenVanDat d36ef36915 refactor hit vfx 2025-11-25 16:37:26 +07:00
VDH 9418884c28 fix skill after merge 2025-11-24 11:36:21 +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
NguyenVanDat 8f5673c68e refactor game run and fix game flow 2025-11-21 11:48:39 +07:00
VDH c37ec4d136 Push hoang current work 2025-11-21 10:18:08 +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 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 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
MinhHai bb01bbb6f1 Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-11-12 16:57:45 +07:00
MinhHai 2c3c44de4e update Task: complete read task templ, log task name and description on UI, add sprites asset 2025-11-12 16:56:35 +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
VDH eed08c2b13 bug skill data not received 2025-11-08 16:41:19 +07:00
VDH 38a2c0d46f covnert continue 2025-11-06 17:29:02 +07:00