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

..

ActionIcon

add emote icon

2025-12-17 11:38:01 +07:00

Monster

done learned skill UI

2026-01-19 16:15:17 +07:00

NPC

update UI of DlgProduce and DlgInstall, chage iconTask

2026-01-29 17:39:16 +07:00

Pet

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

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

Player

done learned skill UI

2026-01-19 16:15:17 +07:00

ActionIcon.meta

add emote icon

2025-12-17 11:38:01 +07:00

actions_npc.txt

npc animtion processing

2025-09-27 17:10:53 +07:00

actions_npc.txt.meta

npc animtion processing

2025-09-27 17:10:53 +07:00

actions_player.txt

aniamtion processs

2025-09-18 18:07:23 +07:00

actions_player.txt.meta

aniamtion processs

2025-09-18 18:07:23 +07:00

icon1-4.png

add surfaces textures and icons

2026-01-20 15:52:47 +07:00

icon1-4.png.meta

add surfaces textures and icons

2026-01-20 15:52:47 +07:00

iconlist_action.dds

add emote icon

2025-12-17 11:38:01 +07:00

iconlist_action.dds.meta

add emote icon

2025-12-17 11:38:01 +07:00

iconlist_action.txt

add emote icon

2025-12-17 11:38:01 +07:00

iconlist_action.txt.meta

add emote icon

2025-12-17 11:38:01 +07:00

iconlist_pet.txt

fix: update logic dlg pet

2026-01-23 19:49:40 +07:00

iconlist_pet.txt.meta

fix: update logic dlg pet

2026-01-23 19:49:40 +07:00

iconlist_skill_multisprite.png

Push hoang current work

2025-11-21 10:18:08 +07:00

iconlist_skill_multisprite.png.meta

Push hoang current work

2025-11-21 10:18:08 +07:00

Monster.meta

done learned skill UI

2026-01-19 16:15:17 +07:00

NPC.meta

done learned skill UI

2026-01-19 16:15:17 +07:00

Pet.meta

fix: update logic dlg pet

2026-01-23 19:49:40 +07:00

Player.meta

done learned skill UI

2026-01-19 16:15:17 +07:00

skillstr.txt

ui and flow gfx

2025-11-17 18:04:31 +07:00

skillstr.txt.meta

ui and flow gfx

2025-11-17 18:04:31 +07:00