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

..

AddressResourceConfig.cs

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

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

AddressResourceConfig.cs.meta

refactor game run and fix game flow

2025-11-21 11:48:39 +07:00

CECAssureMove.cs

done skill bless

2025-12-04 17:26:42 +07:00

CECAssureMove.cs.meta

done skill bless

2025-12-04 17:26:42 +07:00

DoubleTapButton.cs

done ui cap phep

2026-01-20 10:53:12 +07:00

DoubleTapButton.cs.meta

done ui cap phep

2026-01-20 10:53:12 +07:00