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

86 Commits

Author SHA1 Message Date
Tungdv e6c2981ebb Merge remote-tracking branch 'origin/develop' into feature/elseplayer 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
 2026-03-13 11:27:06 +07:00
Tungdv 9788d29219 fix: update logic show wing and sword. 2026-03-13 10:40:04 +07:00
Le Duc Anh 4ebf4cf169 update equipement data 2026-03-12 21:14:07 +07:00
HungDK bc743a8e89 Add CreateGetOtherEquipDetailCmd and update player option UI prefab 2026-03-09 14:52:55 +07:00
MinhHai 7e5fd02e1f Merge remote-tracking branch 'origin/develop' into feature/update-logout-logic 2026-03-06 17:33:37 +07:00
VDH 3df4ce90de fix cast skill while flashing move 2026-03-05 17:39:11 +07:00
MinhHai c637c164f9 WIP: wait SERVER response PROTOCOL_PLAYERLOGOUT then client execute logout logic 2026-03-04 16:04:28 +07:00
HungDK cb3c3531c0 Add send invite, respond of duel, team, ui handle 2026-03-02 14:38:56 +07:00
Tungdv 1210ff2c51 fix: update dlg pet list and dlg pet restore. 2026-02-27 17:24:26 +07:00
Tungdv f85f1add54 fix: update logic hatch pet egg. 2026-02-26 20:22:07 +07:00
HungDK 34dbaa4c0a Fixing select target and id duel 2026-02-25 13:38:33 +07:00
HungDK 1f1832fa6f Merge branch 'develop' into feature/character_info 2026-02-24 17:04:41 +07:00
Le Duc Anh 0f6f06af6b DlgConsole 2026-02-24 16:30:43 +07:00
HungDK 36b7591a98 Add DuelRequest 2026-02-09 18:06:21 +07:00
Tungdv 7a96c7e252 Merge remote-tracking branch 'origin/develop' into feature/hp_pet 
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.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/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs.meta
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
 2026-02-05 17:29:54 +07:00
NguyenVanDat 4da6b16a8d Merge branch 'develop' into feature/clear-embedded-chip 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
 2026-02-03 10:55:33 +07:00
HungDK 9cc0ffce45 Merge remote-tracking branch 'origin/develop' into feature/character_info 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
 2026-02-03 10:10:05 +07:00
HungDK 8b82734fcf Add logout cmd type 1 and type 0 2026-02-03 09:47:25 +07:00
NguyenVanDat 775bbd7c55 add ClearEmbedded command 2026-02-02 16:29:42 +07:00
VDH 7091fb8d41 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-02 10:28:42 +07:00
VDH 7aaed6d0d3 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-02 09:55:39 +07:00
HungDK 793eb7c030 Merge branch 'develop' into feature/character_info 2026-02-02 09:43:23 +07:00
HungDK 8adf717b41 Add invite, kick, join, leave, change lead, dismiss, new member, member leave for both client and server 2026-02-02 09:22:09 +07:00
NguyenVanDat d9c3333dc9 Merge branch 'develop' into feature/embed-stone 2026-01-30 15:07:20 +07:00
NguyenVanDat 14b5a6f780 do embed stone 2026-01-30 15:06:37 +07:00
VuNgocHaiC7 2dea3a8f02 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
 2026-01-29 14:04:49 +07:00
VuNgocHaiC7 8f916ee88c use item but cooldown don't active 2026-01-29 13:58:15 +07:00
Tungdv ef07a39964 fix: update logic dlg pet. 2026-01-28 19:31:14 +07:00
VDH a3b5a72b9c Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
 2026-01-28 16:47:35 +07:00
Tungdv 4c51d6bf19 fix: update logic dlg pet. 2026-01-27 19:47:15 +07:00
HungDK c3a925cd6c Add c2s_SendCmdSetStatusPts to modify character potential point 2026-01-27 17:38:47 +07:00
VDH ef366cfc32 convert skill combo' 2026-01-22 19:23:32 +07:00
NguyenVanDat b14bb3db0f update command embed stone 2026-01-20 16:49:56 +07:00
NguyenVanDat b461d0b151 add embed stone protocol 2026-01-20 10:09:09 +07:00
Tungdv 15f9bd2a86 Merge branch 'develop' into feature/hp_swim 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-16 19:16:40 +07:00
Tungdv 0b23be64a2 fix: update logic cmd cache. 2026-01-16 18:02:39 +07:00
HungDK ef362d6017 Merge branch 'develop' into feature/produce-equipment 2026-01-16 17:40:20 +07:00
HungDK 3aca254fd4 Fix wrong cmd method name 2026-01-16 17:24:01 +07:00
Tungdv 017d26b64f feat: add command cache. 2026-01-15 19:22:30 +07:00
HungDK dd96ccd0ed Add request server to produce item 2026-01-15 15:05:22 +07:00
VDH 57b5195c36 done learn and upgrade skill 2026-01-14 18:00:30 +07:00
VDH f5a9227cc7 Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Prefabs/BoostrapForTest.prefab
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-13 18:04:28 +07:00
VDH 6066e851a4 Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-13 11:04:28 +07:00
VDH 61f4660dba done flow learn skill 2026-01-12 19:07:37 +07:00
Tungdv e279eeb540 fix: update logic fly HP. 2026-01-12 15:07:18 +07:00
MinhHai 219c87f469 add new pack: Editor Attributes, complete GoTo cmd 2026-01-09 15:01:29 +07:00
HungDK a4e9e85bed Add c2s_CmdGatherMaterial and struct cmd_gather_material 2025-12-22 17:53:48 +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
NguyenVanDat cdb18dd691 Merge branch 'implement_task_UI' into feature/task-emote 
# Conflicts:
#	Assets/PerfectWorld/Scene/TaskTest.unity
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Task/TaskTest.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
 2025-12-13 14:19:19 +07:00
NguyenVanDat a228a5ce1f add action emote 2025-12-13 14:12:09 +07:00