Commit Graph

63 Commits

Author SHA1 Message Date
Chomper9981 e37fbefad4 Add Suite ("Noi dung bo trang bi") to show with item in inventory. Rename some Variant that have confuse name in hostplayer. 2026-01-16 13:35:51 +07:00
Chomper9981 a9157bac7c Merge branch 'develop' into update-in-game 2026-01-12 10:03:39 +07:00
HungDK de05bf76af Load coordinate data for every maps 2026-01-09 15:11:42 +07:00
NguyenVanDat d0d7346a72 Merge branch 'develop' into feature/mine-processing
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-09 11:04:53 +07:00
NguyenVanDat 88213f7649 finish mining task 2026-01-09 11:01:03 +07:00
VDH fb4b9b5d90 Merge branch 'develop' into feature/skill-data 2026-01-09 09:46:34 +07:00
VDH 892b273ea5 done ui load name and icon 2026-01-08 18:43:10 +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
NguyenVanDat 97804a8b01 else player mining 2026-01-07 14:33:20 +07:00
Chomper9981 b00af6cb70 add some data to UI 2025-12-30 17:32:22 +07:00
Chomper9981 7909a09617 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2025-12-30 10:21:49 +07:00
Chomper9981 e504a077c1 Add itemdataman basic 2025-12-30 10:19:18 +07:00
NguyenVanDat 668a2aacd1 Merge branch 'develop' into feature/mine-processing 2025-12-26 11:48:51 +07:00
NguyenVanDat 308c4c8b92 do logic host player mining 2025-12-26 11:47:55 +07:00
HungDK ce2d81a43f Change load addressable script 2025-12-26 10:10:17 +07:00
MinhHai 6c9388325f complete cache task into SO 2025-12-20 11:52:13 +07:00
MinhHai 807fbdf6b0 Merge remote-tracking branch 'origin/develop' into feature/pre-load-all-task-templ 2025-12-18 22:28:28 +07:00
MinhHai 9edb6682b8 complete cache 4 class_properties via ID 2025-12-18 22:27:05 +07:00
Le Duc Anh 949e815680 Merge remote-tracking branch 'origin/develop' into internal-testing-build 2025-12-17 15:51:49 +07:00
Le Duc Anh 7f145625fd temporary stop loading the data files 2025-12-17 15:50:26 +07:00
HungDK e2324c634d Add gametime 2025-12-17 10:01:03 +07:00
MinhHai ff50d807a7 fix load task on editor 2025-12-16 18:25:32 +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
VDH 9b0c3b3dc0 fix 2025-12-13 15:30:53 +07:00
HungDK a57e5b4f32 Update task, filtering all task can take 2025-12-11 17:41:20 +07:00
VDH 80c40705d2 skill pos processing 2025-12-05 21:07:25 +07:00
VDH 0529114779 done skill bless 2025-12-04 17:26:42 +07:00
VDH dd85fb1da6 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scene/TaskTest.unity
#	Assets/PerfectWorld/Scripts/UI/HUDPlayer.cs
2025-12-02 16:47:51 +07:00
VDH 8f8e7f010c continue with bless skill 2025-12-02 13:50:44 +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
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
MinhHai 62482e5a9e avoid Init EC_GameRun at EC_Game 2025-11-21 16:39:21 +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
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
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 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
NguyenVanDat c6f24993b5 show selecting vfx and elase player enter vfx 2025-11-13 17:12:41 +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
Tungdv fabb286473 fix: update logic show dialog npc. 2025-11-11 19:04:49 +07:00