Commit 3c490b9a authored by 18손재민's avatar 18손재민

포탈 wip(80%)

parent 5e806fe3
...@@ -73,6 +73,8 @@ MonoBehaviour: ...@@ -73,6 +73,8 @@ MonoBehaviour:
type: 2} type: 2}
inGameDoorRight: {fileID: 1668375270989012, guid: fa868e0924825b54896b61a69e93391f, inGameDoorRight: {fileID: 1668375270989012, guid: fa868e0924825b54896b61a69e93391f,
type: 2} type: 2}
portalSelected: {fileID: 1272210399781394, guid: 94f4bf6088d377c4780a5bc55baaabe0,
type: 2}
normalRoomList1: normalRoomList1:
- {fileID: 114452746530220676, guid: 3c35322ac2c308d49aadf20738b69c8b, type: 2} - {fileID: 114452746530220676, guid: 3c35322ac2c308d49aadf20738b69c8b, type: 2}
- {fileID: 114071400998216906, guid: 7fd2833846bb116479bd74d2a5b75487, type: 2} - {fileID: 114071400998216906, guid: 7fd2833846bb116479bd74d2a5b75487, type: 2}
......
...@@ -104,6 +104,24 @@ GameObject: ...@@ -104,6 +104,24 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1525016305441846
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4575350320837604}
- component: {fileID: 212768689355208068}
- component: {fileID: 61668305355584418}
- component: {fileID: 114935644534703058}
m_Layer: 0
m_Name: Portal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!1 &1753108517261202 --- !u!1 &1753108517261202
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -152,9 +170,23 @@ Transform: ...@@ -152,9 +170,23 @@ Transform:
- {fileID: 4197938564761256} - {fileID: 4197938564761256}
- {fileID: 4795876627866968} - {fileID: 4795876627866968}
- {fileID: 4715693331349536} - {fileID: 4715693331349536}
- {fileID: 4575350320837604}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4575350320837604
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1525016305441846}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4454870439102388}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4601220793744944 --- !u!4 &4601220793744944
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -287,6 +319,31 @@ Rigidbody2D: ...@@ -287,6 +319,31 @@ Rigidbody2D:
m_SleepingMode: 1 m_SleepingMode: 1
m_CollisionDetection: 0 m_CollisionDetection: 0
m_Constraints: 0 m_Constraints: 0
--- !u!61 &61668305355584418
BoxCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1525016305441846}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 2, y: 1.25}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 4, y: 4}
newSize: {x: 4, y: 4}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 2.5}
m_EdgeRadius: 0
--- !u!66 &66171440051359288 --- !u!66 &66171440051359288
CompositeCollider2D: CompositeCollider2D:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -306,74 +363,20 @@ CompositeCollider2D: ...@@ -306,74 +363,20 @@ CompositeCollider2D:
m_ColliderPaths: m_ColliderPaths:
- m_Collider: {fileID: 2113883505377406812} - m_Collider: {fileID: 2113883505377406812}
m_ColliderPaths: m_ColliderPaths:
- - X: 10000000 - - X: 5000000
Y: 230000000 Y: 5000000
- X: 110000000 - X: -5000000
Y: 230000000 Y: 5000000
- X: 110000000 - X: -5000000
Y: 240000000 Y: -5000000
- X: 0 - X: 5000000
Y: 240000000 Y: -5000000
- X: 0
Y: 30000000
- X: 10000000
Y: 30000000
- - X: 240000000
Y: 240000000
- X: 130000000
Y: 240000000
- X: 130000000
Y: 230000000
- X: 230000000
Y: 230000000
- X: 230000000
Y: 190000000
- X: 240000000
Y: 190000000
- - X: 240000000
Y: 170000000
- X: 230000000
Y: 170000000
- X: 230000000
Y: 10000000
- X: 130000000
Y: 10000000
- X: 130000000
Y: 0
- X: 240000000
Y: 0
- - X: 110000000
Y: 10000000
- X: 0
Y: 10000000
- X: 0
Y: 0
- X: 110000000
Y: 0
m_CompositePaths: m_CompositePaths:
m_Paths: m_Paths:
- - {x: 1, y: 23} - - {x: 0.5, y: 0.5}
- {x: 11, y: 23} - {x: -0.5, y: 0.5}
- {x: 11, y: 24} - {x: -0.5, y: -0.5}
- {x: 0, y: 24} - {x: 0.5, y: -0.5}
- {x: 0, y: 3}
- {x: 1, y: 3}
- - {x: 24, y: 24}
- {x: 13, y: 24}
- {x: 13, y: 23}
- {x: 23, y: 23}
- {x: 23, y: 19}
- {x: 24, y: 19}
- - {x: 24, y: 17}
- {x: 23, y: 17}
- {x: 23, y: 1}
- {x: 13, y: 1}
- {x: 13, y: 0}
- {x: 24, y: 0}
- - {x: 11, y: 1}
- {x: 0, y: 1}
- {x: 0, y: 0}
- {x: 11, y: 0}
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
--- !u!66 &66323588981509868 --- !u!66 &66323588981509868
CompositeCollider2D: CompositeCollider2D:
...@@ -394,158 +397,20 @@ CompositeCollider2D: ...@@ -394,158 +397,20 @@ CompositeCollider2D:
m_ColliderPaths: m_ColliderPaths:
- m_Collider: {fileID: 2113883507225684802} - m_Collider: {fileID: 2113883507225684802}
m_ColliderPaths: m_ColliderPaths:
- - X: 70000000 - - X: 5000000
Y: 220000000 Y: 5000000
- X: 80000000 - X: -5000000
Y: 220000000 Y: 5000000
- X: 80000000 - X: -5000000
Y: 230000000 Y: -5000000
- X: 10000000 - X: 5000000
Y: 230000000 Y: -5000000
- X: 10000000
Y: 210000000
- X: 70000000
Y: 210000000
- - X: 120000000
Y: 210000000
- X: 100000000
Y: 210000000
- X: 100000000
Y: 200000000
- X: 120000000
Y: 200000000
- - X: 230000000
Y: 170000000
- X: 210000000
Y: 170000000
- X: 210000000
Y: 180000000
- X: 70000000
Y: 180000000
- X: 70000000
Y: 170000000
- X: 60000000
Y: 170000000
- X: 60000000
Y: 150000000
- X: 160000000
Y: 150000000
- X: 160000000
Y: 140000000
- X: 190000000
Y: 140000000
- X: 190000000
Y: 130000000
- X: 230000000
Y: 130000000
- - X: 20000000
Y: 50000000
- X: 40000000
Y: 50000000
- X: 40000000
Y: 60000000
- X: 170000000
Y: 60000000
- X: 170000000
Y: 70000000
- X: 180000000
Y: 70000000
- X: 180000000
Y: 80000000
- X: 160000000
Y: 80000000
- X: 160000000
Y: 90000000
- X: 80000000
Y: 90000000
- X: 80000000
Y: 100000000
- X: 50000000
Y: 100000000
- X: 50000000
Y: 110000000
- X: 40000000
Y: 110000000
- X: 40000000
Y: 130000000
- X: 20000000
Y: 130000000
- X: 20000000
Y: 150000000
- X: 10000000
Y: 150000000
- X: 10000000
Y: 40000000
- X: 20000000
Y: 40000000
- - X: 230000000
Y: 60000000
- X: 210000000
Y: 60000000
- X: 210000000
Y: 50000000
- X: 200000000
Y: 50000000
- X: 200000000
Y: 30000000
- X: 170000000
Y: 30000000
- X: 170000000
Y: 10000000
- X: 230000000
Y: 10000000
m_CompositePaths: m_CompositePaths:
m_Paths: m_Paths:
- - {x: 7, y: 22} - - {x: 0.5, y: 0.5}
- {x: 8, y: 22} - {x: -0.5, y: 0.5}
- {x: 8, y: 23} - {x: -0.5, y: -0.5}
- {x: 1, y: 23} - {x: 0.5, y: -0.5}
- {x: 1, y: 21}
- {x: 7, y: 21}
- - {x: 12, y: 21}
- {x: 10, y: 21}
- {x: 10, y: 20}
- {x: 12, y: 20}
- - {x: 23, y: 17}
- {x: 21, y: 17}
- {x: 21, y: 18}
- {x: 7, y: 18}
- {x: 7, y: 17}
- {x: 6, y: 17}
- {x: 6, y: 15}
- {x: 16, y: 15}
- {x: 16, y: 14}
- {x: 19, y: 14}
- {x: 19, y: 13}
- {x: 23, y: 13}
- - {x: 2, y: 5}
- {x: 4, y: 5}
- {x: 4, y: 6}
- {x: 17, y: 6}
- {x: 17, y: 7}
- {x: 18, y: 7}
- {x: 18, y: 8}
- {x: 16, y: 8}
- {x: 16, y: 9}
- {x: 8, y: 9}
- {x: 8, y: 10}
- {x: 5, y: 10}
- {x: 5, y: 11}
- {x: 4, y: 11}
- {x: 4, y: 13}
- {x: 2, y: 13}
- {x: 2, y: 15}
- {x: 1, y: 15}
- {x: 1, y: 4}
- {x: 2, y: 4}
- - {x: 23, y: 6}
- {x: 21, y: 6}
- {x: 21, y: 5}
- {x: 20, y: 5}
- {x: 20, y: 3}
- {x: 17, y: 3}
- {x: 17, y: 1}
- {x: 23, y: 1}
m_VertexDistance: 0.0005 m_VertexDistance: 0.0005
--- !u!66 &66810827941649802 --- !u!66 &66810827941649802
CompositeCollider2D: CompositeCollider2D:
...@@ -583,6 +448,63 @@ MonoBehaviour: ...@@ -583,6 +448,63 @@ MonoBehaviour:
leftDoorInfo: 000001 leftDoorInfo: 000001
rightDoorInfo: 010000 rightDoorInfo: 010000
concept: 00010100 concept: 00010100
--- !u!114 &114935644534703058
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1525016305441846}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b5ed2c384310eb6408bb42c91b195e15, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &212768689355208068
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1525016305441846}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 6147483bafc37034d91c2afaff57cad1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 4, y: 4}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!251 &251089008813703296 --- !u!251 &251089008813703296
PlatformEffector2D: PlatformEffector2D:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: 93ba58b5e24488741a018d983b59c580
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 94f4bf6088d377c4780a5bc55baaabe0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
This diff is collapsed.
...@@ -51,7 +51,7 @@ public class Door : MonoBehaviour { ...@@ -51,7 +51,7 @@ public class Door : MonoBehaviour {
break; break;
} }
MapManager.isDoorClosing = true; MapManager.isDoorClosing = true;
GameObject.Find("MapManager").GetComponent<MapManager>().ChangeRoom(); GameObject.Find("MapManager").GetComponent<MapManager>().ChangeRoom(MapManager.tempRoom);
if (MapManager.currentRoom.isRoomCleared != true) if (MapManager.currentRoom.isRoomCleared != true)
{ {
animatorThisRoom.SetBool("isPlayerTouchEnded", true); animatorThisRoom.SetBool("isPlayerTouchEnded", true);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -74,3 +74,6 @@ TagManager: ...@@ -74,3 +74,6 @@ TagManager:
- name: TetrisSurface - name: TetrisSurface
uniqueID: 3165498901 uniqueID: 3165498901
locked: 0 locked: 0
- name: PortalSelected
uniqueID: 3732261229
locked: 0
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