MinhHai d160df064d Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo ...

# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset

2026-02-09 14:44:12 +07:00

..

Config

refactor game run and fix game flow

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

Data

task addresable

2025-12-25 17:50:40 +07:00

Editor

11/13

2025-11-13 18:57:24 +07:00

Prefab

Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo

2026-02-09 14:44:12 +07:00

Resources

WIP: add code logic send Combo_Save to server

2026-02-09 14:42:52 +07:00

Scene

Update LoginScene.unity

2026-01-22 16:14:14 +07:00

Scripts

Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo

2026-02-09 14:44:12 +07:00

SO

task addresable

2025-12-25 17:50:40 +07:00

UI

UI DlgPetList.prefab

2026-02-05 13:46:49 +07:00

Config.meta

fix merge

2025-11-24 11:09:11 +07:00

Data.meta

task addreasble

2025-12-25 16:35:28 +07:00

Editor.meta

Merge branch 'develop' into feature/skill-data

2025-11-24 10:16:07 +07:00

icon1-4.png

move water to other folder

2026-01-09 22:14:17 +07:00

icon1-4.png.meta

move water to other folder

2026-01-09 22:14:17 +07:00

Prefab.meta

ui info hosst player and npc done

2025-10-28 17:22:03 +07:00

Resources.meta

…

Scene.meta

…

Scripts.meta

…

SO.meta

cache TaskTempl Data into SO

2025-12-17 10:49:19 +07:00

UI.meta

npc

2025-10-27 10:23:44 +07:00