Skip to content

Commit

Permalink
Merge pull request #165 from 2024FALL-SWPP/fix/level-one
Browse files Browse the repository at this point in the history
레벨 1 오류 수정
  • Loading branch information
gyusang authored Dec 16, 2024
2 parents a0f0a58 + 78b06cf commit 9934f6b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Assets/Prefabs/BlueBin.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7478167284961174924}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3285235475121113410}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &3034644667815063209
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
20 changes: 15 additions & 5 deletions Assets/Scenes/LevelOneScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -39320,7 +39320,7 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 12, y: 3, z: 0}
- first: {x: 11, y: 3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
Expand Down Expand Up @@ -40500,6 +40500,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 7, y: 46, z: 0}
second:
serializedVersion: 2
m_TileIndex: 6
m_TileSpriteIndex: 3
m_TileMatrixIndex: 2
m_TileColorIndex: 4
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 15, y: 46, z: 0}
second:
serializedVersion: 2
Expand Down Expand Up @@ -40834,7 +40844,7 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 3
- m_RefCount: 4
m_Data: {fileID: 11400000, guid: 6c5d16e9e50ef7847b62914babb2fdef, type: 2}
- m_RefCount: 3
m_Data: {fileID: 11400000, guid: 1093be7cd4e565448b4eafb5454ba337, type: 2}
Expand All @@ -40855,7 +40865,7 @@ Tilemap:
m_Data: {fileID: 21300000, guid: 2696737250a06474ebbf14b358ee4282, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 10
- m_RefCount: 11
m_Data: {fileID: 21300000, guid: 313ae4b57a2d56442867fc32c5db6981, type: 3}
- m_RefCount: 9
m_Data: {fileID: 21300000, guid: f81a3d094874647478c5f8e22ffbb50b, type: 3}
Expand Down Expand Up @@ -40900,7 +40910,7 @@ Tilemap:
e31: 7.34684e-40
e32: 1.61e-43
e33: 1
- m_RefCount: 178
- m_RefCount: 179
m_Data:
e00: 1
e01: 0
Expand All @@ -40927,7 +40937,7 @@ Tilemap:
m_Data: {r: 3.6619e-41, g: 3.6619e-41, b: 3.6619e-41, a: 3.6619e-41}
- m_RefCount: 0
m_Data: {r: 3.661e-41, g: 3.661e-41, b: 3.661e-41, a: 3.661e-41}
- m_RefCount: 3
- m_RefCount: 4
m_Data: {r: 0.052236557, g: 1, b: 0, a: 1}
- m_RefCount: 3
m_Data: {r: 1, g: 0.0990566, b: 0.0990566, a: 1}
Expand Down

0 comments on commit 9934f6b

Please sign in to comment.