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

..

C2SCommand

Merge remote-tracking branch 'origin/develop' into feature/hp_pet

2026-02-05 17:29:54 +07:00

Common

Integrate and asign prefab

2025-12-03 16:50:59 +07:00

Logger

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

obj

fix: update command cancel action.

2025-10-09 11:27:12 +07:00

Protocols

Update createrole protocols data

2026-01-22 10:06:51 +07:00

Security

Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang

2025-10-16 10:53:41 +07:00

AUICommon.cs

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

AUICommon.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

C2SCommand.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Common.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

EC_Manager.cs

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

EC_Manager.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

EC_ManMessage.cs

Merge branch 'develop' into implement_task_UI

2025-12-16 11:59:08 +07:00

EC_ManMessage.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

EC_MsgDef.cs

fix npc double

2025-12-23 17:33:09 +07:00

EC_MsgDef.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

EventBus.cs

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

EventBus.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

GameSession.cs

Merge remote-tracking branch 'origin/develop' into feature/hp_pet

2026-02-05 17:29:54 +07:00

GameSession.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

gnetdef.cs

get config

2025-11-18 18:54:56 +07:00

gnetdef.cs.meta

get config

2025-11-18 18:54:56 +07:00

GPDataType.cs

Merge remote-tracking branch 'origin/develop' into feature/hp_pet

2026-02-05 17:29:54 +07:00

GPDataType.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Helper.cs

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Helper.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Logger.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Manager.cs

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Manager.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

NetworkManager.cs

initial host skill

2025-10-20 09:37:18 +07:00

NetworkManager.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

obj.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Octets.cs

convert continue :)))

2025-11-03 17:34:39 +07:00

Octets.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

OctetsStream.cs

load player model

2025-11-13 16:12:12 +07:00

OctetsStream.cs.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Protocols.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00

Security.meta

Move all network code into Unity Project

2025-10-09 08:52:31 +07:00