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

# Conflicts: # .gitignore
sbs file added
2025-07-31 19:14:40 +09:00 · 2025-07-31 19:12:31 +09:00 · 2025-07-31 19:11:58 +09:00 · 2025-07-31 18:12:31 +09:00
6 changed files with 29 additions and 2 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,6 +1,5 @@
 # --- 기본 텍스트 파일 정규화 ---
 * text=auto
-
 # --- C# 및 스크립트 파일 ---
 *.cs text diff=csharp
 *.shader text
@ -71,3 +70,4 @@
 *.sln text eol=crlf
 *.csproj text
 *.asmdef text
+*.sbs filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@ -98,4 +98,5 @@ packages-lock.json

 # 특정 atlas 파일 무시
 # Unity SpriteAtlas auto-generated files
-Assets/_DDD/_Addressables/Sprites/
+Assets/_DDD/_Addressables/Sprites/
+.autosave/
--- a/Assets/ExternalResources.meta
+++ b/Assets/ExternalResources.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d6b6e0b91d0d49e9bcb6e6be066ee9e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ExternalResources/Substance.meta
+++ b/Assets/ExternalResources/Substance.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7223f0a1d441b43e4a878b026a328e20
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ExternalResources/Substance/sprite_to_pbr.sbs
+++ b/Assets/ExternalResources/Substance/sprite_to_pbr.sbs
--- a/Assets/ExternalResources/Substance/sprite_to_pbr.sbs.meta
+++ b/Assets/ExternalResources/Substance/sprite_to_pbr.sbs.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e320bde0dc9de4010b5e7778fd620e7a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant:
Author	SHA1	Message	Date
Jeonghyeon Ha	2ed9f00844	Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop # Conflicts: # .gitignore	2025-07-31 19:14:40 +09:00
Jeonghyeon Ha	f95bd2f169	sbs file added	2025-07-31 19:12:31 +09:00
Jeonghyeon Ha	12f83a1428	Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop	2025-07-31 19:11:58 +09:00
Jeonghyeon Ha	44420181ba	sprite to pbr sbs file added	2025-07-31 18:12:31 +09:00