duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,000 Commits 13 Branches 0 Tags
develop
Commit Graph

1877 Commits

Author SHA1 Message Date
MinhHai aa797c8865 Merge branch 'implement_task_UI' into develop 2025-11-21 17:07:01 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
MinhHai 62482e5a9e avoid Init EC_GameRun at EC_Game 2025-11-21 16:39:21 +07:00
Le Duc Anh f46b917dd8 fix the missing addressable objects 2025-11-21 16:18:19 +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
Tungdv 1951047c61 fix: update logic button back and close in dlgnpc. 2025-11-21 11:37:07 +07:00
MinhHai 0bcacf1599 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-21 11:31:09 +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
Tungdv ceec82ffc5 fix: update logic select option in dlgnpc. 2025-11-20 18:18:06 +07:00
Le Duc Anh ca31090872 move all stuff into a61 scene 2025-11-20 15:33:30 +07:00
HungDK a35cd6d0e7 Update EC_Invtr 2025-11-20 13:47:10 +07:00
hungdk 5dd011df46 Refactor and fixing ref 2025-11-20 02:18:48 +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
anhld 35ab182862 Merge pull request 'load npc/monster' (#63) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/63
 2025-11-19 06:38:52 +00:00
Le Duc Anh b400ad1e68 load npc/monster 2025-11-19 13:38:20 +07:00
NguyenVanDat 4e236c1c32 Merge branch 'develop' into bugfix/fix-character-animation 2025-11-19 11:51:34 +07:00
NguyenVanDat e5fdb874c1 dummy change SelectGfx prefab 2025-11-19 11:50:23 +07:00
Le Duc Anh b1fb758ce3 disable default equipments 2025-11-19 11:04:21 +07:00
NguyenVanDat e8a76c0c58 fix character animation config name 2025-11-19 10:42:24 +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
Le Duc Anh 45024b5761 turn off default equipments if needed 2025-11-18 22:04:56 +07:00
Tungdv bb28c8505d fix: update logic select option in dlg npc. 2025-11-18 19:01:03 +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
MinhHai c2cbd6919c Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-18 14:20:16 +07:00
Tungdv 2094f5d36d Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
 2025-11-18 14:14:47 +07:00
Tungdv c90e50eed9 feat: add base uimanger and dlg manager. 2025-11-18 14:10:29 +07:00
anhld 7610493367 Merge pull request 'Add all sword man armors. Load armor and weapon on game init.' (#56) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/56
 2025-11-18 05:01:10 +00:00
VDH de738b8f16 Merge branch 'feature/skillui' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
 2025-11-18 09:44:10 +07:00
MinhHai d992dcbc5f Merge remote-tracking branch 'origin/feature/hp_interact_npc_merge' into implement_task_UI 2025-11-17 19:14:26 +07:00
Tungdv fdb9ebed34 fix: update code for merge dev. 2025-11-17 19:10:44 +07:00
HungDK af6a20f403 Add skill ui 2025-11-17 19:10:02 +07:00
MinhHai 884a0274af fix Search Task feature 2025-11-17 19:07:15 +07:00
MinhHai 3826311391 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-17 19:06:35 +07:00
Tungdv afa9f882a9 Merge branch 'develop' into feature/hp_interact_npc 2025-11-17 19:06:14 +07:00
Tungdv 86c304f43a fix: update logic select option dialog npc. 2025-11-17 18:52:07 +07:00
NguyenVanDat e59127a425 catch message start and stop attack 2025-11-17 18:24:12 +07:00
VDH 1d5025ab46 ui and flow gfx 2025-11-17 18:04:31 +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
Tungdv 1325a8df63 fix: update logic select option interact npc. 2025-11-17 14:31:20 +07:00