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

..

SkillUI

Merge branch 'develop' into feature/skill-set-shortcut

2026-02-02 09:55:39 +07:00

AUIImagePicture.cs

Merge branch 'develop' into feature/skill-set-shortcut

2026-02-02 09:55:39 +07:00

AUIImagePicture.cs.meta

Push hoang current work

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

CdlgQuickBar.cs

Merge branch 'develop' into feature/skill-set-shortcut

2026-02-02 09:55:39 +07:00

CdlgQuickBar.cs.meta

Push hoang current work

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

EC_GameUIMan.cs

Merge branch 'develop' into feature/skill-set-shortcut

2026-02-02 09:55:39 +07:00

EC_GameUIMan.cs.meta

feat: add manager dialog npc.

2025-11-05 18:13:46 +07:00

LearnedSkillUI.cs

done ui cap phep

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

LearnedSkillUI.cs.meta

done learned skill UI

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

SkillUI.meta

skill ui

2025-12-10 18:17:34 +07:00

UINPC.cs

update UI of DlgProduce and DlgInstall, chage iconTask

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

UINPC.cs.meta

name npc

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