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:
Jeonghyeon Ha 2025-07-07 19:28:54 +09:00
commit f74b395efd
3 changed files with 6 additions and 6 deletions

BIN
.gitignore (Stored with Git LFS) vendored

Binary file not shown.

Binary file not shown.