Merge branch 'develop' into feature/project_asset_structure
# Conflicts: # Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset # Assets/_DDD/_Addressables/Items/Barrel.prefab.meta # Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta
This commit is contained in:
commit
f74b395efd
BIN
.gitignore
(Stored with Git LFS)
vendored
BIN
.gitignore
(Stored with Git LFS)
vendored
Binary file not shown.
BIN
Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset
(Stored with Git LFS)
BIN
Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs
(Stored with Git LFS)
BIN
Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in New Issue
Block a user