Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop

2025-08-13 16:06:54 +09:00 · 2025-08-13 16:06:54 +09:00 · 88ac882f68
commit 88ac882f68
parent 338bb82114 df2623606c
20 changed files with 26574 additions and 26726 deletions
--- a/.gitignore
+++ b/.gitignore
@ -98,11 +98,7 @@ Packages/com.distantlands.cozy.core/Samples~/Legacy Integrations/*.unitypackage.
 Assets/_DDD/_Addressables/Sprites/*
 .autosave/

-Assets/AddressableAssetsData/AssetGroups/
-Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
-Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta
-Assets/AddressableAssetsData/AddressableAssetSettings.asset
-Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
+Assets/AddressableAssetsData/
 ProjectSettings/Packages/com.unity.probuilder/Settings.json
 *.DotSettings
 .vsconfig
--- a/Assets/AddressableAssetsData/AssetGroupTemplates.meta
+++ b/Assets/AddressableAssetsData/AssetGroupTemplates.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: aae35240a94dde0429e214ff4f327227
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed
+++ b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed
--- a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed
+++ b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f804fe78e7005554f9ba60273aade35b
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups.meta
+++ b/Assets/AddressableAssetsData/AssetGroups.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 012f657ef2322a6499255e9c9c78a5a3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/DataBuilders.meta
+++ b/Assets/AddressableAssetsData/DataBuilders.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bc395fca191c52b4ea851fe83a40f16a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
+++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
--- a/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
+++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 08e47763d1d3ddc49a7fcb10ebe3b33e
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
+++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
--- a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
+++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b90bfb60ccafb7e4cb8900f9a52b89d7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
+++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
--- a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
+++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3ee9e3ad901c06e43af50dbd33b132b1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/DefaultObject.asset
+++ b/Assets/AddressableAssetsData/DefaultObject.asset
--- a/Assets/AddressableAssetsData/DefaultObject.asset.meta
+++ b/Assets/AddressableAssetsData/DefaultObject.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8aedbecfee36f6f47b57e6359672a64f
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/OSX.meta
+++ b/Assets/AddressableAssetsData/OSX.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7ddc9a444b5824bcc9421fef5212845b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
+++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
--- a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
+++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d9a4d86327d0e384886ef63152a4778d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/Windows.meta
+++ b/Assets/AddressableAssetsData/Windows.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0b182ffdf506f3247a6c27b5196f69c6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/AllIn1SpriteShader/Shaders/AllIn1SpriteShaderLit.shader
+++ b/Assets/Plugins/AllIn1SpriteShader/Shaders/AllIn1SpriteShaderLit.shader
--- a/Assets/Plugins/AllIn1SpriteShader/Shaders/AllIn1SpriteShaderLitTransparent.shader
+++ b/Assets/Plugins/AllIn1SpriteShader/Shaders/AllIn1SpriteShaderLitTransparent.shader