vuong dinh hoang e0cbc4c302 Merge branch 'develop' into hotfix/Can't-Learn-and-Upgrade-Skill ...

# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/music_BundledAssetGroupSchema.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/music_BundledAssetGroupSchema.asset.meta
#	Assets/AddressableAssetsData/AssetGroups/Schemas/music_ContentUpdateGroupSchema.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/music_ContentUpdateGroupSchema.asset.meta
#	Assets/AddressableAssetsData/AssetGroups/music.asset
#	Assets/AddressableAssetsData/AssetGroups/music.asset.meta

2026-04-21 17:35:08 +07:00

..

Art

Merge branch 'develop' into hotfix/Can't-Learn-and-Upgrade-Skill

2026-04-21 17:35:08 +07:00

Resources

…

Scripts

Add sfx to skill trigger

2026-04-17 16:55:36 +07:00

Art.meta

…

Resources.meta

…

Scripts.meta

new character and weapon prefabs

2025-11-13 09:31:26 +07:00