Merge branch 'develop' into feature/#107/Jinu219

pknu-wap · Nov 28, 2024 · 77b92a5 · 77b92a5
2 parents b777000 + 1c12496
commit 77b92a5
Show file tree

Hide file tree

Showing 1,009 changed files with 77,164 additions and 3,754 deletions.
diff --git a/Assets/Resources/Player1.prefab b/Assets/Resources/Player1.prefab
@@ -80,7 +80,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Sprite: {fileID: 21300000, guid: fb36100ad0e6095488e52f517117fac1, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

diff --git a/Assets/Resources/Player2.prefab b/Assets/Resources/Player2.prefab
@@ -124,7 +124,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Sprite: {fileID: 21300000, guid: 26dc1e9ffd87206409dc8637f39ec1b5, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0