 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 |
|