duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
650 Commits 13 Branches 0 Tags
6b7537ca3ead5a0532cf93d08d2eb5829c76caa3
Commit Graph

264 Commits

Author SHA1 Message Date
VDH 6b7537ca3e fix bug mege 2025-11-24 11:10:38 +07:00
VDH 1e34f48215 fix merge 2025-11-24 11:09:11 +07:00
VDH ae94300b0f st 2025-11-24 10:21:08 +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
MinhHai beb12c8723 update logic NotifyServer of class TaskClient 2025-11-22 18:58:40 +07:00
VDH f43f8a6e58 done spawn vfx 2025-11-22 11:21:50 +07:00
MinhHai 7ba8ca49ba fix EC_Game: get GameRun, cache TaskData before playmode 2025-11-22 10:04:50 +07:00
Tungdv 9129784de0 Merge branch 'develop' into feature/hp_interact_npc 2025-11-21 17:07:50 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +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
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
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
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 65b7e8b947 Merge branch 'develop' into bugfix/fix-character-animation 2025-11-19 10:44:08 +07:00
NguyenVanDat e8a76c0c58 fix character animation config name 2025-11-19 10:42:24 +07:00
VDH a4905d111f fix 2025-11-19 10:39:57 +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 542780ed10 restore text 2025-11-19 10:31:25 +07:00
Le Duc Anh f907e404c4 use default equipments if needed 2025-11-18 22:26:40 +07:00
Le Duc Anh 45024b5761 turn off default equipments if needed 2025-11-18 22:04:56 +07:00
VDH 8ee2477681 get config 2025-11-18 18:54:56 +07:00
Tungdv 4633e8278c fix: update logic send cmd accept task. 2025-11-18 16:40:04 +07:00
Tungdv 42845aef94 fix: update logic init CECGameUIMan. 2025-11-18 14:33:13 +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
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
Le Duc Anh d2c9a12929 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-15 17:05:07 +07:00
Le Duc Anh 9f664ffd9f add all human male armor 2025-11-15 17:00:59 +07:00
NguyenVanDat 16fadfe2a4 fix play animation 2025-11-15 13:54:29 +07:00
VDH f86cce30e9 11/14 2025-11-14 19:03:42 +07:00
NguyenVanDat faaa843ef3 play animation with fade time 2025-11-14 16:05:52 +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
VDH 621c833793 11/13 2025-11-13 18:57:24 +07:00