duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
792 Commits 13 Branches 0 Tags
09c3b5de281e172995df03b3e2d169d9b450af43
Commit Graph

101 Commits

Author SHA1 Message Date
MinhHai 09c3b5de28 complete mockup for DlgAward, after npc deliver award -> update runtime in Inventory 2025-12-11 11:41:54 +07:00
NguyenVanDat 81701772dc dummy fix task 2025-12-08 16:07:16 +07:00
HungDK 892d0d3aef Merge branch 'develop' into feature/npc-shop 2025-12-08 10:37:03 +07:00
Tungdv be85cf1d91 Merge branch 'develop' into feature/HP_jump 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-12-06 14:41:00 +07:00
Tungdv 956fde82b4 feat: set ext prop for HP. 2025-12-05 21:59:35 +07:00
Tungdv f330d9606c fix: update logic jump move for HP. 2025-12-05 21:09:16 +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
NguyenVanDat 632f6b3813 replace state machine by HPWork 2025-12-03 18:14:10 +07:00
Tungdv 015b441d88 Merge branch 'develop' into feature/HP_jump 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2025-12-03 10:03:22 +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
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +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
VDH f43f8a6e58 done spawn vfx 2025-11-22 11:21:50 +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
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 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 0324dc909e fix: update logic select option dlg NPC. 2025-11-19 19:12:24 +07:00
NguyenVanDat e5fdb874c1 dummy change SelectGfx prefab 2025-11-19 11:50:23 +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
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 afa9f882a9 Merge branch 'develop' into feature/hp_interact_npc 2025-11-17 19:06:14 +07:00
NguyenVanDat e59127a425 catch message start and stop attack 2025-11-17 18:24:12 +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
VDH 690a8dd9de Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-14 11:32:54 +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
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
VDH 752d2cd69e fix player don't play stand animation when cast skill 2025-11-12 15:24:36 +07:00
NguyenVanDat cfeebf3a15 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
 2025-11-12 11:04:43 +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 6d98f3d30f skill 1,2,3,4,5,6 2025-11-12 10:52:37 +07:00
NguyenVanDat 629d419c57 WIP logic show vfx select target and level up 2025-11-12 10:21:09 +07:00
VDH ecbdf4c803 done skill 2025-11-11 17:12:51 +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