Commit d052546b authored by 18강현모's avatar 18강현모

CameraController, GameState 등 코드 넣음. TetrisMap scale 동기화, UI 요소들 Canvas에 담음.

parent f7585de5
...@@ -52,7 +52,7 @@ Transform: ...@@ -52,7 +52,7 @@ Transform:
m_GameObject: {fileID: 1690644780631946} m_GameObject: {fileID: 1690644780631946}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.3699484, y: 1.660439, z: 0} m_LocalPosition: {x: -4.3699484, y: 1.660439, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 24, y: 24, z: 1}
m_Children: m_Children:
- {fileID: 4653007209432888} - {fileID: 4653007209432888}
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -82,7 +82,7 @@ MonoBehaviour: ...@@ -82,7 +82,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
......
...@@ -129,7 +129,7 @@ Transform: ...@@ -129,7 +129,7 @@ Transform:
m_GameObject: {fileID: 1986824515730090} m_GameObject: {fileID: 1986824515730090}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.85, y: 2.58, z: 0} m_LocalPosition: {x: 7.85, y: 2.58, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 24, y: 24, z: 1}
m_Children: m_Children:
- {fileID: 4959807369913172} - {fileID: 4959807369913172}
- {fileID: 4417427676875474} - {fileID: 4417427676875474}
...@@ -175,7 +175,7 @@ MonoBehaviour: ...@@ -175,7 +175,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -192,7 +192,7 @@ MonoBehaviour: ...@@ -192,7 +192,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -209,7 +209,7 @@ MonoBehaviour: ...@@ -209,7 +209,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -247,7 +247,7 @@ MonoBehaviour: ...@@ -247,7 +247,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
......
...@@ -155,7 +155,7 @@ Transform: ...@@ -155,7 +155,7 @@ Transform:
m_GameObject: {fileID: 1058256109692646} m_GameObject: {fileID: 1058256109692646}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.15, y: -0.97, z: 0} m_LocalPosition: {x: 2.15, y: -0.97, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 24, y: 24, z: 1}
m_Children: m_Children:
- {fileID: 4770256559059570} - {fileID: 4770256559059570}
- {fileID: 4403275080892776} - {fileID: 4403275080892776}
...@@ -175,7 +175,7 @@ MonoBehaviour: ...@@ -175,7 +175,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -192,7 +192,7 @@ MonoBehaviour: ...@@ -192,7 +192,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -209,7 +209,7 @@ MonoBehaviour: ...@@ -209,7 +209,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -226,7 +226,7 @@ MonoBehaviour: ...@@ -226,7 +226,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
......
...@@ -142,7 +142,7 @@ Transform: ...@@ -142,7 +142,7 @@ Transform:
m_GameObject: {fileID: 1409840693504816} m_GameObject: {fileID: 1409840693504816}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.77, y: 3.1, z: 0} m_LocalPosition: {x: 2.77, y: 3.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 24, y: 24, z: 1}
m_Children: m_Children:
- {fileID: 4480540641426352} - {fileID: 4480540641426352}
- {fileID: 4890462092246654} - {fileID: 4890462092246654}
...@@ -175,7 +175,7 @@ MonoBehaviour: ...@@ -175,7 +175,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -192,7 +192,7 @@ MonoBehaviour: ...@@ -192,7 +192,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -209,7 +209,7 @@ MonoBehaviour: ...@@ -209,7 +209,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -226,7 +226,7 @@ MonoBehaviour: ...@@ -226,7 +226,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
......
...@@ -103,7 +103,7 @@ Transform: ...@@ -103,7 +103,7 @@ Transform:
m_GameObject: {fileID: 1599875259397162} m_GameObject: {fileID: 1599875259397162}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5.6, y: -0.21, z: 0} m_LocalPosition: {x: 5.6, y: -0.21, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 24, y: 24, z: 1}
m_Children: m_Children:
- {fileID: 4959495535370206} - {fileID: 4959495535370206}
- {fileID: 4534782373203126} - {fileID: 4534782373203126}
...@@ -175,7 +175,7 @@ MonoBehaviour: ...@@ -175,7 +175,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -192,7 +192,7 @@ MonoBehaviour: ...@@ -192,7 +192,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -230,7 +230,7 @@ MonoBehaviour: ...@@ -230,7 +230,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -247,7 +247,7 @@ MonoBehaviour: ...@@ -247,7 +247,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
......
...@@ -142,7 +142,7 @@ Transform: ...@@ -142,7 +142,7 @@ Transform:
m_GameObject: {fileID: 1051411815441030} m_GameObject: {fileID: 1051411815441030}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10.24, y: 0.14, z: 0} m_LocalPosition: {x: 10.24, y: 0.14, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 24, y: 24, z: 1}
m_Children: m_Children:
- {fileID: 4996993573163862} - {fileID: 4996993573163862}
- {fileID: 4153319652066896} - {fileID: 4153319652066896}
...@@ -175,7 +175,7 @@ MonoBehaviour: ...@@ -175,7 +175,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -192,7 +192,7 @@ MonoBehaviour: ...@@ -192,7 +192,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -209,7 +209,7 @@ MonoBehaviour: ...@@ -209,7 +209,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -247,7 +247,7 @@ MonoBehaviour: ...@@ -247,7 +247,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
......
...@@ -142,7 +142,7 @@ Transform: ...@@ -142,7 +142,7 @@ Transform:
m_GameObject: {fileID: 1216064749225226} m_GameObject: {fileID: 1216064749225226}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 14.87, y: 0.76, z: 0} m_LocalPosition: {x: 14.87, y: 0.76, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 24, y: 24, z: 1}
m_Children: m_Children:
- {fileID: 4373465258801912} - {fileID: 4373465258801912}
- {fileID: 4268777523006110} - {fileID: 4268777523006110}
...@@ -175,7 +175,7 @@ MonoBehaviour: ...@@ -175,7 +175,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -192,7 +192,7 @@ MonoBehaviour: ...@@ -192,7 +192,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -209,7 +209,7 @@ MonoBehaviour: ...@@ -209,7 +209,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -226,7 +226,7 @@ MonoBehaviour: ...@@ -226,7 +226,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
......
...@@ -116,7 +116,7 @@ Transform: ...@@ -116,7 +116,7 @@ Transform:
m_GameObject: {fileID: 1597348377621660} m_GameObject: {fileID: 1597348377621660}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.8, y: 3.97, z: 0} m_LocalPosition: {x: 11.8, y: 3.97, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 24, y: 24, z: 1}
m_Children: m_Children:
- {fileID: 4665049468911534} - {fileID: 4665049468911534}
- {fileID: 4244611340582260} - {fileID: 4244611340582260}
...@@ -175,7 +175,7 @@ MonoBehaviour: ...@@ -175,7 +175,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -213,7 +213,7 @@ MonoBehaviour: ...@@ -213,7 +213,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -230,7 +230,7 @@ MonoBehaviour: ...@@ -230,7 +230,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
...@@ -247,7 +247,7 @@ MonoBehaviour: ...@@ -247,7 +247,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3} m_Script: {fileID: 11500000, guid: f935789f55ec07f4ca6b334fba78ddb1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapLocation: {x: 0, y: 0, z: 0} mapCoord: {x: 0, y: 0, z: 0}
doorInfo: doorInfo:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
......
...@@ -150,7 +150,7 @@ Prefab: ...@@ -150,7 +150,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4346731560192214, guid: f6ef1c586e7764c41ba8349325635589, type: 2} - target: {fileID: 4346731560192214, guid: f6ef1c586e7764c41ba8349325635589, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6ef1c586e7764c41ba8349325635589, type: 2} m_SourcePrefab: {fileID: 100100000, guid: f6ef1c586e7764c41ba8349325635589, type: 2}
...@@ -160,6 +160,11 @@ Transform: ...@@ -160,6 +160,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7, m_CorrespondingSourceObject: {fileID: 4861876781168000, guid: 279f5b34ed5c53545990e499c74cbbe7,
type: 2} type: 2}
m_PrefabInternal: {fileID: 1603410094} m_PrefabInternal: {fileID: 1603410094}
--- !u!4 &262016745 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a,
type: 2}
m_PrefabInternal: {fileID: 1025158475}
--- !u!1 &274491169 --- !u!1 &274491169
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -198,22 +203,22 @@ Transform: ...@@ -198,22 +203,22 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 14 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &408423940 --- !u!1001 &408423940
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 2088383385}
m_Modifications: m_Modifications:
- target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: -640
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -360
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
...@@ -221,15 +226,15 @@ Prefab: ...@@ -221,15 +226,15 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
...@@ -237,7 +242,7 @@ Prefab: ...@@ -237,7 +242,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} - target: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2} m_SourcePrefab: {fileID: 100100000, guid: bb0418f3d87626a4099787fe9e11a8ae, type: 2}
...@@ -251,11 +256,11 @@ Prefab: ...@@ -251,11 +256,11 @@ Prefab:
m_Modifications: m_Modifications:
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2} - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 4.5 value: 132
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2} - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 10 value: 253
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2} - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
...@@ -279,12 +284,20 @@ Prefab: ...@@ -279,12 +284,20 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2} - target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 12 value: 8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1922867542630168, guid: 668207ef06c134e40b24375977c2c930, type: 2} - target: {fileID: 1922867542630168, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalScale.x
value: 24
objectReference: {fileID: 0}
- target: {fileID: 4872207070014624, guid: 668207ef06c134e40b24375977c2c930, type: 2}
propertyPath: m_LocalScale.y
value: 24
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 668207ef06c134e40b24375977c2c930, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 668207ef06c134e40b24375977c2c930, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
...@@ -338,7 +351,9 @@ MonoBehaviour: ...@@ -338,7 +351,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f289cad4933d4bf42ae5c82c57bd88e4, type: 3} m_Script: {fileID: 11500000, guid: f289cad4933d4bf42ae5c82c57bd88e4, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 300 maxSpeed: 400
speed: 600
speedAir: 5
jumpSpeed: 400 jumpSpeed: 400
doubleJumpSpeed: 400 doubleJumpSpeed: 400
groundLayer: groundLayer:
...@@ -402,7 +417,7 @@ Transform: ...@@ -402,7 +417,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 15 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &489222438 --- !u!61 &489222438
BoxCollider2D: BoxCollider2D:
...@@ -439,6 +454,7 @@ GameObject: ...@@ -439,6 +454,7 @@ GameObject:
- component: {fileID: 519420032} - component: {fileID: 519420032}
- component: {fileID: 519420031} - component: {fileID: 519420031}
- component: {fileID: 519420029} - component: {fileID: 519420029}
- component: {fileID: 519420030}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
...@@ -453,6 +469,17 @@ AudioListener: ...@@ -453,6 +469,17 @@ AudioListener:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 519420028} m_GameObject: {fileID: 519420028}
m_Enabled: 1 m_Enabled: 1
--- !u!114 &519420030
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6ef4279cf32e10f4dbc71e2206514212, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!20 &519420031 --- !u!20 &519420031
Camera: Camera:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -511,15 +538,15 @@ Prefab: ...@@ -511,15 +538,15 @@ Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 2088383385}
m_Modifications: m_Modifications:
- target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: -640
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -360
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
...@@ -527,15 +554,15 @@ Prefab: ...@@ -527,15 +554,15 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
...@@ -543,7 +570,7 @@ Prefab: ...@@ -543,7 +570,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} - target: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2} m_SourcePrefab: {fileID: 100100000, guid: cba9c4d8180e52145ab0ab6ff0678c10, type: 2}
...@@ -585,7 +612,7 @@ Prefab: ...@@ -585,7 +612,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2} - target: {fileID: 4821016865928708, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 13 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2} m_SourcePrefab: {fileID: 100100000, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
...@@ -650,22 +677,22 @@ Transform: ...@@ -650,22 +677,22 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 10 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1025158475 --- !u!1001 &1025158475
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 2088383385}
m_Modifications: m_Modifications:
- target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: -640
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -360
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
...@@ -673,15 +700,15 @@ Prefab: ...@@ -673,15 +700,15 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
...@@ -689,7 +716,7 @@ Prefab: ...@@ -689,7 +716,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} - target: {fileID: 4388258417166718, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 7 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 48d5863f34621bc4abab84b742407e5a, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 48d5863f34621bc4abab84b742407e5a, type: 2}
...@@ -775,22 +802,22 @@ Transform: ...@@ -775,22 +802,22 @@ Transform:
m_Children: m_Children:
- {fileID: 172849437} - {fileID: 172849437}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1501222773 --- !u!1001 &1501222773
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 2088383385}
m_Modifications: m_Modifications:
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2} - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: -640
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2} - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -360
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2} - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
...@@ -798,15 +825,15 @@ Prefab: ...@@ -798,15 +825,15 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2} - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2} - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2} - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2} - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
...@@ -814,7 +841,7 @@ Prefab: ...@@ -814,7 +841,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2} - target: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dad6c9542288a924e88968593ef6cf26, type: 2} m_SourcePrefab: {fileID: 100100000, guid: dad6c9542288a924e88968593ef6cf26, type: 2}
...@@ -866,12 +893,17 @@ Prefab: ...@@ -866,12 +893,17 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
--- !u!4 &1743414573 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4993480467195818, guid: cba9c4d8180e52145ab0ab6ff0678c10,
type: 2}
m_PrefabInternal: {fileID: 695959412}
--- !u!1001 &1789545722 --- !u!1001 &1789545722
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 2088383385}
m_Modifications: m_Modifications:
- target: {fileID: 4731340437899790, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4, type: 2} - target: {fileID: 4731340437899790, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -905,23 +937,48 @@ Prefab: ...@@ -905,23 +937,48 @@ Prefab:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 224399520942126704, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4,
type: 2}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 224399520942126704, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4,
type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224399520942126704, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4,
type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224399520942126704, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4,
type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4, type: 2} m_SourcePrefab: {fileID: 100100000, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
--- !u!4 &1805780464 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633,
type: 2}
m_PrefabInternal: {fileID: 1957029582}
--- !u!1001 &1957029582 --- !u!1001 &1957029582
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 2088383385}
m_Modifications: m_Modifications:
- target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2} - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: -640
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2} - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -360
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2} - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
...@@ -929,15 +986,15 @@ Prefab: ...@@ -929,15 +986,15 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2} - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2} - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2} - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2} - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
...@@ -945,7 +1002,7 @@ Prefab: ...@@ -945,7 +1002,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2} - target: {fileID: 4984995512629892, guid: db8ba922663aef344b297c3c8755e633, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 8 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db8ba922663aef344b297c3c8755e633, type: 2} m_SourcePrefab: {fileID: 100100000, guid: db8ba922663aef344b297c3c8755e633, type: 2}
...@@ -987,8 +1044,122 @@ Prefab: ...@@ -987,8 +1044,122 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2} - target: {fileID: 4675487918418904, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 11 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 2e1b9fc1064aaf54487c99316fe18286, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
--- !u!4 &2065283645 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4205003563387642, guid: dad6c9542288a924e88968593ef6cf26,
type: 2}
m_PrefabInternal: {fileID: 1501222773}
--- !u!1 &2088383381
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2088383385}
- component: {fileID: 2088383384}
- component: {fileID: 2088383383}
- component: {fileID: 2088383382}
m_Layer: 5
m_Name: UI Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2088383382
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2088383381}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &2088383383
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2088383381}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &2088383384
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2088383381}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &2088383385
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2088383381}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 2065283645}
- {fileID: 1743414573}
- {fileID: 262016745}
- {fileID: 1805780464}
- {fileID: 2104541408}
- {fileID: 2147058209}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!224 &2104541408 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224399520942126704, guid: a68e01f0fb856c94ebb4cbd2fd3b04d4,
type: 2}
m_PrefabInternal: {fileID: 1789545722}
--- !u!4 &2147058209 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4256137545067384, guid: bb0418f3d87626a4099787fe9e11a8ae,
type: 2}
m_PrefabInternal: {fileID: 408423940}
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CameraController : MonoBehaviour {
GameManager.GameState lastGameState;
Vector3 destination;
// Use this for initialization
void Start()
{
lastGameState = GameManager.GameState.Ingame;
destination = transform.position;
}
// Update is called once per frame
void Update()
{
if (lastGameState != GameManager.gameState)
{
StartCoroutine("ChangeScene");
lastGameState = GameManager.gameState;
}
else if (lastGameState == GameManager.GameState.Ingame)
{
SetDestination();
}
GotoDestination();
}
IEnumerator ChangeScene()
{
yield return null;
}
void SetDestination()
{
}
void GotoDestination()
{
}
}
fileFormatVersion: 2
guid: 6ef4279cf32e10f4dbc71e2206514212
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -3,7 +3,7 @@ using System.Collections.Generic; ...@@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class Player : MonoBehaviour { public class Player : MonoBehaviour {
public LifeCrystalUI LCUI;
// Use this for initialization // Use this for initialization
void Start () { void Start () {
......
...@@ -7,18 +7,24 @@ public class PlayerController : MonoBehaviour { ...@@ -7,18 +7,24 @@ public class PlayerController : MonoBehaviour {
// Speeds of player // Speeds of player
[SerializeField] [SerializeField]
private float maxSpeed;
[SerializeField]
private float speed; private float speed;
[SerializeField] [SerializeField]
private float speedAir;
[SerializeField]
private float jumpSpeed; private float jumpSpeed;
[SerializeField] [SerializeField]
private float doubleJumpSpeed; private float doubleJumpSpeed;
// Bool values for jump & doublejump // Bool values for jump & doublejump
private bool isGrounded = true; private bool isGrounded = true;
private bool isJumpable = true; // Can player jump or doublejump? private bool isJumpable = true; // Can player jump or doublejump?
// Inputs // Inputs
private float horizontal = 0; private float horizontal = 0;
private float horizontalRaw = 0;
private bool jump = false; private bool jump = false;
// Variables for IsGrounded() // Variables for IsGrounded()
...@@ -35,6 +41,8 @@ public class PlayerController : MonoBehaviour { ...@@ -35,6 +41,8 @@ public class PlayerController : MonoBehaviour {
// Update is called once per frame // Update is called once per frame
void Update () { void Update () {
horizontal = Input.GetAxis("Horizontal"); horizontal = Input.GetAxis("Horizontal");
horizontalRaw = Input.GetAxisRaw("Horizontal");
if (Input.GetButtonDown("Jump")) if (Input.GetButtonDown("Jump"))
{ {
jump = true; jump = true;
...@@ -60,10 +68,21 @@ public class PlayerController : MonoBehaviour { ...@@ -60,10 +68,21 @@ public class PlayerController : MonoBehaviour {
isJumpable = false; isJumpable = false;
} }
} }
rb.velocity = new Vector2(horizontal * speed * Time.fixedDeltaTime, vertical);
//rb.velocity = new Vector2(horizontal * speed * Time.fixedDeltaTime, vertical);
// rb.velocity = new Vector2(rb.velocity.x, vertical);
rb.AddForce(horizontalRaw * speed * Time.fixedDeltaTime * Vector2.right);
if (((horizontalRaw==0) || (rb.velocity.x > 0 && horizontalRaw < 0)
|| (rb.velocity.x < 0 && horizontalRaw > 0)) &&(isGrounded))
{
rb.AddForce(rb.velocity.x * (-10f) * Vector2.right);
}
rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxSpeed*Time.fixedDeltaTime, maxSpeed * Time.fixedDeltaTime), vertical);
jump = false; jump = false;
} }
bool IsGrounded() // Is player grounded? bool IsGrounded() // Is player grounded?
{ {
RaycastHit2D hit = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, groundLayer); RaycastHit2D hit = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, groundLayer);
......
...@@ -4,10 +4,18 @@ using UnityEngine; ...@@ -4,10 +4,18 @@ using UnityEngine;
public class GameManager : MonoBehaviour { public class GameManager : MonoBehaviour {
// Use this for initialization public enum GameState { MainMenu, Ingame, Tetris, Pause, Inventory }
void Start () {
/// <summary>
} /// Which state this game is.
/// change later
/// </summary>
public static GameState gameState;
// Use this for initialization
void Start () {
gameState = GameState.Ingame;
}
// Update is called once per frame // Update is called once per frame
void Update () { void Update () {
......
...@@ -7,11 +7,7 @@ public class MapManager : MonoBehaviour { ...@@ -7,11 +7,7 @@ public class MapManager : MonoBehaviour {
/* /*
* variables * variables
* */ * */
/// <summary>
/// If camera is at tetris map, it is true.
/// If camera is at player, it is false.
/// </summary>
public bool inTetris;
/// <summary> /// <summary>
/// Tetris map's size. /// Tetris map's size.
/// </summary> /// </summary>
...@@ -206,14 +202,14 @@ public class MapManager : MonoBehaviour { ...@@ -206,14 +202,14 @@ public class MapManager : MonoBehaviour {
}*/ }*/
public void TetriminoMove(Tetrimino TE) public void TetriminoMove(Tetrimino TE)
{ {
if (Input.GetKeyDown(KeyCode.LeftArrow) && inTetris) if (Input.GetKeyDown(KeyCode.LeftArrow) && GameManager.gameState == GameManager.GameState.Tetris)
{ {
TE.mapCoord += new Vector3(-1, 0, 0); TE.mapCoord += new Vector3(-1, 0, 0);
SetRoomMapCoord(currentTetrimino); SetRoomMapCoord(currentTetrimino);
if (IsRightTetrimino(TE) != 0) if (IsRightTetrimino(TE) != 0)
TE.mapCoord += new Vector3(1, 0, 0); TE.mapCoord += new Vector3(1, 0, 0);
} }
else if (Input.GetKeyDown(KeyCode.RightArrow) && inTetris) else if (Input.GetKeyDown(KeyCode.RightArrow) && GameManager.gameState == GameManager.GameState.Tetris)
{ {
TE.mapCoord += new Vector3(1, 0, 0); TE.mapCoord += new Vector3(1, 0, 0);
SetRoomMapCoord(currentTetrimino); SetRoomMapCoord(currentTetrimino);
...@@ -244,7 +240,7 @@ public class MapManager : MonoBehaviour { ...@@ -244,7 +240,7 @@ public class MapManager : MonoBehaviour {
// Use this for initialization // Use this for initialization
void Start () { void Start () {
inTetris = true;
} }
// Update is called once per frame // Update is called once per frame
......
...@@ -228,7 +228,7 @@ public class LifeCrystalUI : MonoBehaviour ...@@ -228,7 +228,7 @@ public class LifeCrystalUI : MonoBehaviour
/// </summary> /// </summary>
void FixedUpdate () void FixedUpdate ()
{ {
textUI.text = "Life: " + lifeCount + ", Gold: " + goldCount; //textUI.text = "Life: " + lifeCount + ", Gold: " + goldCount;
} }
////////////////////////////////////////////////// Hidden functions ////////////////////////////////////////////////// Hidden functions
/// <summary> /// <summary>
......
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,7 @@ TextureImporter: ...@@ -63,7 +63,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
...@@ -74,7 +74,7 @@ TextureImporter: ...@@ -74,7 +74,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
...@@ -85,7 +85,7 @@ TextureImporter: ...@@ -85,7 +85,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -90,7 +90,7 @@ InputManager: ...@@ -90,7 +90,7 @@ InputManager:
descriptiveName: descriptiveName:
descriptiveNegativeName: descriptiveNegativeName:
negativeButton: negativeButton:
positiveButton: space positiveButton: up
altNegativeButton: altNegativeButton:
altPositiveButton: altPositiveButton:
gravity: 1000 gravity: 1000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment