Skip to content

tetra-tower
tetra-tower
Commit 4864e6a7 authored by 18손재민's avatar 18손재민
Browse files
Options

Merge branch 'tetris' into LifeStone

parents 80dcda1e 5c170031
Expand all Show whitespace changes
Inline Side-by-side
Showing with 12131 additions and 1269 deletions
Assets/Palettes/1-1.prefab
View file @ 4864e6a7
......@@ -90,7 +90,7 @@ Grid:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1775427552092404}
m_Enabled: 1
m_CellSize: {x: 1, y: 1, z: 0}
m_CellSize: {x: 2, y: 1, z: 0}
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
......@@ -147,7 +147,7 @@ Tilemap:
- first: {x: -3, y: 0, z: 0}
second:
m_TileIndex: 5
m_TileSpriteIndex: 5
m_TileSpriteIndex: 8
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -174,7 +174,7 @@ Tilemap:
- first: {x: -2, y: 1, z: 0}
second:
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileSpriteIndex: 5
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -192,7 +192,7 @@ Tilemap:
- first: {x: -2, y: 2, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
......@@ -234,11 +234,13 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 3c532ce77a13dca448f232a5f07b30b0, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d997dfdb0cb62384d8353109397daee0, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 8d51b9bc567a640429923a2c09665640, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: d17f08c78e4eeee4d9720ba726b4944a, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e, type: 3}
- m_RefCount: 1
......@@ -246,11 +248,15 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 59bbc71eb892afa47b6fc1e759d4fc7c, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 1dc99e87a8067f8448534cae9c4f6de9, type: 3}
m_Data: {fileID: 21300000, guid: d17f08c78e4eeee4d9720ba726b4944a, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 57dcdd6fd2364b24ea278d98c99953f8, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: db578da6fc6e200489330b72213b3118, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 1dc99e87a8067f8448534cae9c4f6de9, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
- m_RefCount: 8
m_Data:
......@@ -273,10 +279,12 @@ Tilemap:
m_TileColorArray:
- m_RefCount: 8
m_Data: {r: 1, g: 1, b: 1, a: 1}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -3, y: 0, z: 0}
m_Size: {x: 3, y: 4, z: 1}
m_Origin: {x: -3, y: -2, z: 0}
m_Size: {x: 3, y: 7, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
......
Assets/Prefabs/MapManager.prefab
View file @ 4864e6a7
......@@ -52,8 +52,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
grid: {fileID: 0}
tetrisMapSize: 24
tetrisMapCoord: {x: 0, y: 0, z: 0}
initialFallSpeed: -0.1
gravity: 0.98
timeToFallTetrimino: 100
......@@ -64,10 +62,19 @@ MonoBehaviour:
isTetriminoFalling: 0
spawnBossTetrimino: 0
press: {fileID: 114990664041074520, guid: 8e750fd197a05d84c9fb8557eb95c666, type: 2}
leftDoor: {fileID: 1309596820948456, guid: 80ed5bfe62ba3034592296b6e27526bc, type: 2}
rightDoor: {fileID: 1614071394812404, guid: ac9e1e28c8413e54f939bc255268fabd, type: 2}
currentTetrimino: {fileID: 0}
currentGhost: {fileID: 0}
fog: {fileID: 1100171732424598, guid: b8ab69a93ba618c47b27cc04eb431b3f, type: 2}
leftDoor: {fileID: 1309596820948456, guid: 80ed5bfe62ba3034592296b6e27526bc, type: 2}
rightDoor: {fileID: 1614071394812404, guid: ac9e1e28c8413e54f939bc255268fabd, type: 2}
inGameDoorUp: {fileID: 1390552800332292, guid: a4b66f2ca843159489a98c82bcfca85a,
type: 2}
inGameDoorDown: {fileID: 1065314290117232, guid: 66c1939853547324782fc3cd699433f0,
type: 2}
inGameDoorLeft: {fileID: 1219203643804288, guid: 317e92149cc8b26459748888a6dd121a,
type: 2}
inGameDoorRight: {fileID: 1561964545190330, guid: 2dc82009f5315a440b94abfb6b359926,
type: 2}
normalRoomList:
- {fileID: 114452746530220676, guid: 3c35322ac2c308d49aadf20738b69c8b, type: 2}
- {fileID: 114071400998216906, guid: 7fd2833846bb116479bd74d2a5b75487, type: 2}
......@@ -97,4 +104,3 @@ MonoBehaviour:
- {fileID: 114834209009617488, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
- {fileID: 114261393134231884, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
- {fileID: 114631435503427844, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
startRoom: {fileID: 0}
Assets/Prefabs/Rooms/SpecialRoom/Room BothSide.prefab
View file @ 4864e6a7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Prefabs/Rooms/SpecialRoom/Room Gold.prefab
View file @ 4864e6a7
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Scripts/Functions.cs.meta → Assets/Prefabs/TetrisMap/InGameDoor.meta
View file @ 4864e6a7
fileFormatVersion: 2
guid: 614be83888154ca42a847ded3f4ae655
MonoImporter:
guid: 38d305cda4c76164f81c92c1f75f48eb
folderAsset: yes
DefaultImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/TetrisMap/InGameDoor/InGameDoorDown.prefab 0 → 100644
View file @ 4864e6a7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1065314290117232}
m_IsPrefabAsset: 1
--- !u!1 &1009376507085606
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4615026383534904}
- component: {fileID: 212795912100998200}
- component: {fileID: 60148348438400404}
m_Layer: 8
m_Name: DoorInGameUpRight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1065314290117232
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4127149759747334}
m_Layer: 0
m_Name: InGameDoorDown
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1400635603789194
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4153287694637896}
- component: {fileID: 212517313193582512}
- component: {fileID: 60683636211047256}
m_Layer: 8
m_Name: DoorInGameUpLeft
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4127149759747334
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1065314290117232}
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_Children:
- {fileID: 4153287694637896}
- {fileID: 4615026383534904}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4153287694637896
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1400635603789194}
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_Children: []
m_Father: {fileID: 4127149759747334}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4615026383534904
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1009376507085606}
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_Children: []
m_Father: {fileID: 4127149759747334}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &60148348438400404
PolygonCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1009376507085606}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 2, y: 1}
newSize: {x: 2, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 1.25, y: 0}
- {x: 1.25, y: 0.25}
- {x: 1.5, y: 0.25}
- {x: 1.5, y: 0.5}
- {x: 2, y: 0.5}
- {x: 2, y: 0}
--- !u!60 &60683636211047256
PolygonCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1400635603789194}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 2, y: 1}
newSize: {x: 2, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0, y: 0}
- {x: 0, y: 0.5}
- {x: 0.5, y: 0.5}
- {x: 0.5, y: 0.25}
- {x: 1.25, y: 0.25}
- {x: 1.25, y: 0}
--- !u!212 &212517313193582512
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1400635603789194}
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: -1
m_Sprite: {fileID: 21300000, guid: 525f8cf45d8440844b5590b671e5aee0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!212 &212795912100998200
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1009376507085606}
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: -1
m_Sprite: {fileID: 21300000, guid: 277506629a47ebf48a57a3e9a42fdfef, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
Assets/Prefabs/TetrisMap/InGameDoor/InGameDoorDown.prefab.meta 0 → 100644
View file @ 4864e6a7
fileFormatVersion: 2
guid: 66c1939853547324782fc3cd699433f0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/TetrisMap/InGameDoor/InGameDoorLeft.prefab 0 → 100644
View file @ 4864e6a7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1219203643804288}
m_IsPrefabAsset: 1
--- !u!1 &1039064904380928
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4949940912603058}
- component: {fileID: 212935703355504770}
- component: {fileID: 60918174952032016}
m_Layer: 8
m_Name: DoorInGameRightUp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1219203643804288
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4997978145989500}
m_Layer: 0
m_Name: InGameDoorLeft
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1889835387189768
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4471575278560890}
- component: {fileID: 212981974106828086}
- component: {fileID: 60845672042696578}
m_Layer: 8
m_Name: DoorInGameRightDown
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4471575278560890
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1889835387189768}
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_Children: []
m_Father: {fileID: 4997978145989500}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4949940912603058
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1039064904380928}
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_Children: []
m_Father: {fileID: 4997978145989500}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4997978145989500
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1219203643804288}
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_Children:
- {fileID: 4949940912603058}
- {fileID: 4471575278560890}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &60845672042696578
PolygonCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1889835387189768}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 1, y: 2}
newSize: {x: 1, y: 2}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0, y: 0}
- {x: 0, y: 0.75}
- {x: 0.25, y: 0.75}
- {x: 0.25, y: 0.5}
- {x: 0.5, y: 0.5}
- {x: 0.5, y: 0}
--- !u!60 &60918174952032016
PolygonCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1039064904380928}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 1, y: 2}
newSize: {x: 1, y: 2}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0, y: 2}
- {x: 0, y: 0.75}
- {x: 0.25, y: 0.75}
- {x: 0.25, y: 1.5}
- {x: 0.5, y: 1.5}
- {x: 0.5, y: 2}
--- !u!212 &212935703355504770
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1039064904380928}
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: -1
m_Sprite: {fileID: 21300000, guid: 0873ca945e5d8e546864c4b710a0e072, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!212 &212981974106828086
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1889835387189768}
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: -1
m_Sprite: {fileID: 21300000, guid: 3a8d7db7d43c3d94a91e2b594be1f127, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
Assets/Prefabs/TetrisMap/InGameDoor/InGameDoorLeft.prefab.meta 0 → 100644
View file @ 4864e6a7
fileFormatVersion: 2
guid: 317e92149cc8b26459748888a6dd121a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/TetrisMap/InGameDoor/InGameDoorRight.prefab 0 → 100644
View file @ 4864e6a7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1561964545190330}
m_IsPrefabAsset: 1
--- !u!1 &1561964545190330
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4866097270252654}
m_Layer: 0
m_Name: InGameDoorRight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1674591032993440
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4530528006906130}
- component: {fileID: 212412865982337692}
- component: {fileID: 60022920941837996}
m_Layer: 8
m_Name: DoorInGameLeftDown
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1888518636687026
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4461168422441188}
- component: {fileID: 212254546772919600}
- component: {fileID: 60481513620262454}
m_Layer: 8
m_Name: DoorInGameLeftUp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4461168422441188
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1888518636687026}
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_Children: []
m_Father: {fileID: 4866097270252654}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4530528006906130
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1674591032993440}
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_Children: []
m_Father: {fileID: 4866097270252654}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4866097270252654
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1561964545190330}
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_Children:
- {fileID: 4530528006906130}
- {fileID: 4461168422441188}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &60022920941837996
PolygonCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1674591032993440}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 1, y: 2}
newSize: {x: 1, y: 2}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0.5, y: 0}
- {x: 0.5, y: 0.5}
- {x: 0.75, y: 0.5}
- {x: 0.75, y: 1.25}
- {x: 1, y: 1.25}
- {x: 1, y: 0}
--- !u!60 &60481513620262454
PolygonCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1888518636687026}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 1, y: 2}
newSize: {x: 1, y: 2}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0.5, y: 2}
- {x: 0.5, y: 1.5}
- {x: 0.75, y: 1.5}
- {x: 0.75, y: 1.25}
- {x: 1, y: 1.25}
- {x: 1, y: 2}
--- !u!212 &212254546772919600
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1888518636687026}
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: -1
m_Sprite: {fileID: 21300000, guid: e84874edf3a68bf4fadddf0f8c59a43a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!212 &212412865982337692
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1674591032993440}
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: -1
m_Sprite: {fileID: 21300000, guid: 4607f18c1700b854795cf2f291aff26e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
Assets/Prefabs/TetrisMap/InGameDoor/InGameDoorRight.prefab.meta 0 → 100644
View file @ 4864e6a7
fileFormatVersion: 2
guid: 2dc82009f5315a440b94abfb6b359926
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/TetrisMap/InGameDoor/InGameDoorUp.prefab 0 → 100644
View file @ 4864e6a7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1390552800332292}
m_IsPrefabAsset: 1
--- !u!1 &1390552800332292
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4208587970014550}
m_Layer: 0
m_Name: InGameDoorUp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1470659690925574
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4993501695940688}
- component: {fileID: 212284062741515830}
- component: {fileID: 60019856436566566}
m_Layer: 8
m_Name: DoorInGameDownLeft
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1768120881889640
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4251072497352230}
- component: {fileID: 212561358190078284}
- component: {fileID: 60709945114522268}
m_Layer: 8
m_Name: DoorInGameDownRight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4208587970014550
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1390552800332292}
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_Children:
- {fileID: 4251072497352230}
- {fileID: 4993501695940688}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4251072497352230
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1768120881889640}
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_Children: []
m_Father: {fileID: 4208587970014550}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4993501695940688
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1470659690925574}
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_Children: []
m_Father: {fileID: 4208587970014550}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &60019856436566566
PolygonCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1470659690925574}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 2, y: 1}
newSize: {x: 2, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0, y: 1}
- {x: 0, y: 0.5}
- {x: 0.5, y: 0.5}
- {x: 0.5, y: 0.75}
- {x: 0.75, y: 0.75}
- {x: 0.75, y: 1}
--- !u!60 &60709945114522268
PolygonCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1768120881889640}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 2, y: 1}
newSize: {x: 2, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 0.75, y: 1}
- {x: 0.75, y: 0.75}
- {x: 1.5, y: 0.75}
- {x: 1.5, y: 0.5}
- {x: 2, y: 0.5}
- {x: 2, y: 1}
--- !u!212 &212284062741515830
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1470659690925574}
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: -1
m_Sprite: {fileID: 21300000, guid: 2cd69b77624c2e240a7ceb14ce7596c2, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!212 &212561358190078284
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1768120881889640}
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: -1
m_Sprite: {fileID: 21300000, guid: 478bb3663f8ec48488bdc7f10342dbcf, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
Assets/Prefabs/TetrisMap/InGameDoor/InGameDoorUp.prefab.meta 0 → 100644
View file @ 4864e6a7
fileFormatVersion: 2
guid: a4b66f2ca843159489a98c82bcfca85a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/TetrisMap/LeftDoor.prefab
View file @ 4864e6a7
......@@ -34,7 +34,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1309596820948456}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -14.111404, y: 57.627617, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......
Assets/Prefabs/TetrisMap/RightDoor.prefab
View file @ 4864e6a7
......@@ -34,7 +34,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1614071394812404}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 17.722244, y: 26.218426, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......
Assets/Prefabs/TetrisMap/TestTools.prefab
View file @ 4864e6a7
......@@ -132,6 +132,24 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1501351517308982
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224667404527337120}
- component: {fileID: 222231136650734454}
- component: {fileID: 114573939713302164}
- component: {fileID: 114685218848006942}
m_Layer: 5
m_Name: Clear Room
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1553155786573832
GameObject:
m_ObjectHideFlags: 1
......@@ -167,6 +185,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1944793276666558
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224543215425431206}
- component: {fileID: 222419263267172472}
- component: {fileID: 114605948540917444}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4884929250924374
Transform:
m_ObjectHideFlags: 1
......@@ -390,7 +425,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 0.15886325, g: 0.6132076, b: 0.118592024, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -523,6 +558,66 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114573939713302164
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1501351517308982}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114605948540917444
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1944793276666558}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Clear Room
--- !u!114 &114675872005536432
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -539,6 +634,58 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &114685218848006942
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1501351517308982}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 114573939713302164}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 114213890665286158}
m_MethodName: ClearRoom
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &114822233863517066
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -599,6 +746,13 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &222231136650734454
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1501351517308982}
m_CullTransparentMesh: 0
--- !u!222 &222315919489052834
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -613,6 +767,13 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1202478807913418}
m_CullTransparentMesh: 0
--- !u!222 &222419263267172472
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1944793276666558}
m_CullTransparentMesh: 0
--- !u!222 &222439362392855658
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -679,7 +840,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224395958577644168}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -717,6 +878,7 @@ RectTransform:
- {fileID: 224851610276147026}
- {fileID: 224472859903882328}
- {fileID: 224612213790397690}
- {fileID: 224667404527337120}
- {fileID: 224008356030171754}
m_Father: {fileID: 4884929250924374}
m_RootOrder: 0
......@@ -745,6 +907,24 @@ RectTransform:
m_AnchoredPosition: {x: -450, y: 0}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224543215425431206
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1944793276666558}
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_Children: []
m_Father: {fileID: 224667404527337120}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224612213790397690
RectTransform:
m_ObjectHideFlags: 1
......@@ -782,6 +962,25 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224667404527337120
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1501351517308982}
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_Children:
- {fileID: 224543215425431206}
m_Father: {fileID: 224395958577644168}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 190, y: 140}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224747592117556546
RectTransform:
m_ObjectHideFlags: 1
......
Assets/Prefabs/TetrisMap/fog.prefab 0 → 100644
View file @ 4864e6a7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1100171732424598}
m_IsPrefabAsset: 1
--- !u!1 &1100171732424598
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4921126351507724}
- component: {fileID: 212944448011839934}
m_Layer: 0
m_Name: Fog
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4921126351507724
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1100171732424598}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &212944448011839934
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1100171732424598}
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: 0b1a1d7eab61fa947a49ebf55e99a281, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 22.499992, y: 22.499992}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
Assets/Prefabs/TetrisMap/fog.prefab.meta 0 → 100644
View file @ 4864e6a7
fileFormatVersion: 2
guid: b8ab69a93ba618c47b27cc04eb431b3f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/PlayScene.unity
View file @ 4864e6a7
......@@ -253,20 +253,34 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f289cad4933d4bf42ae5c82c57bd88e4, type: 3}
m_Name:
m_EditorClassIdentifier:
maxSpeed: 400
speed: 600
speedAir: 5
jumpSpeed: 400
ropeSpeed: 200
doubleJumpSpeed: 400
maxSpeed: 5
maxDashSpeed: 10
accerlation: 600
jumpSpeed: 10
ropeSpeed: 3
doubleJumpSpeed: 10
dashAccerlation: 1000
isDashing: 0
platformArray: []
horizontal: 0
horizontalRaw: 0
dashStart: 0
groundLayer:
serializedVersion: 2
m_Bits: 256
ropeLayer:
serializedVersion: 2
m_Bits: 512
platformLayer:
serializedVersion: 2
m_Bits: 2048
outerwallLayer:
serializedVersion: 2
m_Bits: 4096
ropeDistance: 0.3
rayDistance: 1
ropeUp: 0.6
ropeDown: 0.7
--- !u!212 &489222436
SpriteRenderer:
m_ObjectHideFlags: 0
......@@ -364,6 +378,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
LCUI: {fileID: 0}
ttx: 0
tty: 0
--- !u!1001 &695959412
Prefab:
m_ObjectHideFlags: 0
......
Assets/Scripts/CameraController.cs
View file @ 4864e6a7
......@@ -3,23 +3,35 @@ using System.Collections.Generic;
using UnityEngine;
public class CameraController : MonoBehaviour {
public MapManager mapManager;
public LayerMask roomLayer;
public GameObject player;
/// <summary>
/// Coroutine controls scene changing.
/// </summary>
public static Coroutine sceneChanger;
public static bool isSceneChanging = false;
Coroutine fadeIn;
Coroutine fadeOut;
/*
* If camera is in Tetris view, ideal position is (108, 240, -1)
* size 300
* */
readonly float camX = 9.5f;
readonly float camY = 4f;
private Vector3 tetrisCameraCoord = new Vector3(108, 240, -1);
private float tetrisCameraSize = 300f;
private float inGameCameraSize = 4.5f;
public Vector3 tetrisCameraCoord = new Vector3(108, 240, -1);
public const float tetrisCameraSize = 300f;
public const float inGameCameraSize = 4.5f;
GameManager.GameState lastGameState;
Vector3 destination;
private void Awake()
{
mapManager = GameObject.Find("MapManager").GetComponent<MapManager>();
}
// Use this for initialization
void Start()
......@@ -31,30 +43,43 @@ public class CameraController : MonoBehaviour {
// Update is called once per frame
void Update()
{
/*if (lastGameState != GameManager.gameState)
{
StartCoroutine("ChangeScene");
lastGameState = GameManager.gameState;
}
else if (lastGameState == GameManager.GameState.Ingame)
{
SetDestination();
}*/
ChangeState();
GotoDestination();
if(GameManager.gameState == GameManager.GameState.Ingame)
{
MapManager.originPos = transform.position;
}
}
IEnumerator ChangeScene()
IEnumerator ChangeScene(Vector3 cameraDestination, float sizeDestination, GameManager.GameState _gameState)
{
yield return null;
GameObject grid = GameObject.Find("Grid");
isSceneChanging = true;
if (fadeIn != null)
StopCoroutine(fadeIn);
if (fadeOut != null)
StopCoroutine(fadeOut);
if(GameManager.gameState == GameManager.GameState.Ingame)
{
fadeIn = StartCoroutine(MapManager.RoomFadeIn(MapManager.currentRoom));
grid.transform.position = new Vector3(0, 0, 0);
}
void SetDestination()
else if(GameManager.gameState == GameManager.GameState.Tetris)
{
fadeOut = StartCoroutine(MapManager.RoomFadeOut(MapManager.currentRoom));
grid.transform.position = new Vector3(0, 0, 2);
}
while((_gameState == GameManager.GameState.Tetris && GetComponent<Camera>().orthographicSize < sizeDestination - 1) || (_gameState == GameManager.GameState.Ingame && GetComponent<Camera>().orthographicSize > sizeDestination + 0.0001))
{
yield return new WaitForSeconds(0.01f);
Vector2 coord = Vector2.Lerp(transform.position, cameraDestination, Mathf.Sqrt(Time.deltaTime));
transform.position = new Vector3(coord.x, coord.y, -1);
GetComponent<Camera>().orthographicSize = Mathf.Lerp(GetComponent<Camera>().orthographicSize, sizeDestination, Mathf.Sqrt(Time.deltaTime));
MapManager.originPos = transform.position;
}
transform.position = cameraDestination;
GetComponent<Camera>().orthographicSize = sizeDestination;
isSceneChanging = false;
}
void GotoDestination()
......@@ -64,10 +89,16 @@ public class CameraController : MonoBehaviour {
pos.z = -1;
transform.position = pos;*/
if (GameManager.gameState == GameManager.GameState.Ingame)
if (GameManager.gameState == GameManager.GameState.Ingame && sceneChanger != null)
{
if(MapManager.isRoomFalling != true)
{
float posx = player.transform.position.x;
float posy = player.transform.position.y;
if (!MapManager.currentRoom.isRoomCleared)
{
if (RoomCol(1) != -1)
{
posy = RoomCol(1) - camY;
......@@ -84,6 +115,7 @@ public class CameraController : MonoBehaviour {
{
posx = RoomCol(4) - camX;
}
if (RoomCol(3) != -1 && RoomCol(4) != -1)
{
float middle = Player.tx * 24f + 12f;
......@@ -99,17 +131,19 @@ public class CameraController : MonoBehaviour {
{
posx = player.transform.position.x;
}
//방의 중심과 비교하여 어느게 더 가까운가
}
transform.position = Vector3.Lerp(transform.position, new Vector3(posx, posy, 0), 2f * Time.deltaTime);
}
transform.position = Vector3.Lerp(transform.position, new Vector3(posx, posy, -1), 2f * Time.deltaTime);
transform.position = new Vector3(transform.position.x, transform.position.y, -1); //카메라를 원래 z축으로 이동
}
else if(MapManager.isRoomFalling == true)
{
transform.position = player.transform.position + new Vector3(0, 0.2f, -1);
}
}
// Camera.main.transform.position = new Vector3(posx, posy, -10);
}
float RoomCol(int dir)
......@@ -155,22 +189,28 @@ public class CameraController : MonoBehaviour {
return -1;
}
public void ChangeState()
{
GameObject grid = GameObject.Find("Grid");
if (Input.GetKeyDown(KeyCode.Tab) && GameManager.gameState == GameManager.GameState.Ingame)
if (Input.GetKeyDown(KeyCode.Tab))
{
Vector3 cameraDestination = new Vector3(0, 0, 0);
float sizeDestination = 0f;
if (GameManager.gameState == GameManager.GameState.Ingame)
{
cameraDestination = tetrisCameraCoord;
sizeDestination = tetrisCameraSize;
GameManager.gameState = GameManager.GameState.Tetris;
transform.position = tetrisCameraCoord;
GetComponent<Camera>().orthographicSize = tetrisCameraSize;
//grid.transform.position = new Vector3(0, 0, 2);
}
else if (Input.GetKeyDown(KeyCode.Tab) && GameManager.gameState == GameManager.GameState.Tetris)
else if (GameManager.gameState == GameManager.GameState.Tetris)
{
cameraDestination = player.transform.position;
sizeDestination = inGameCameraSize;
GameManager.gameState = GameManager.GameState.Ingame;
GetComponent<Camera>().orthographicSize = inGameCameraSize;
//grid.transform.position = new Vector3(0, 0, 0);
GotoDestination();
}
if (sceneChanger != null)
StopCoroutine(sceneChanger);
sceneChanger = StartCoroutine(ChangeScene(cameraDestination, sizeDestination, GameManager.gameState));
}
}
}
\ No newline at end of file
Assets/Scripts/Characters/Player.cs
View file @ 4864e6a7
......@@ -6,15 +6,31 @@ public class Player : MonoBehaviour {
public LifeStoneManager LCUI;
public static int tx, ty;
public int ttx;
public int tty;
Coroutine roomEnterFadeIn;
Coroutine roomExitFadeOut;
// Use this for initialization
void Start () {
ttx = (int)(transform.position.x / 24f);
tty = (int)(transform.position.y / 24f);
}
// Update is called once per frame
void Update () {
tx = (int)(transform.position.x / 24f);
ty = (int)(transform.position.y / 24f);
if ((ttx != tx || tty != ty) && MapManager.isRoomFalling != true)
{
MapManager.currentRoom = MapManager.mapGrid[tx, ty];
if (roomEnterFadeIn != null)
StopCoroutine(roomEnterFadeIn);
if (roomExitFadeOut != null)
StopCoroutine(roomExitFadeOut);
roomEnterFadeIn = StartCoroutine(MapManager.RoomFadeIn(MapManager.currentRoom));
roomExitFadeOut = StartCoroutine(MapManager.RoomFadeOut(MapManager.mapGrid[ttx, tty]));
}
ttx = tx;
tty = ty;
}
}
Assets/Scripts/Characters/PlayerController.cs
View file @ 4864e6a7
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Tilemaps;
public class PlayerController : MonoBehaviour
{
......@@ -10,36 +11,50 @@ public class PlayerController : MonoBehaviour
[SerializeField]
private float maxSpeed;
[SerializeField]
private float speed;
private float maxDashSpeed;
[SerializeField]
private float speedAir;
private float accerlation;
[SerializeField]
private float jumpSpeed;
[SerializeField]
private float ropeSpeed;
[SerializeField]
private float doubleJumpSpeed;
[SerializeField]
private float dashAccerlation;
[SerializeField]
private bool isDashing = false;
public TilemapCollider2D[] platformArray;
// Bool values for jump & doublejump
private bool isGrounded = true;
private bool isJumpable = true; // Can player jump or doublejump?
private bool isInRope = false;
private bool isDownPlatform = false;
private bool ropeEnabled = true;
// Inputs
[SerializeField]
private float horizontal = 0;
[SerializeField]
private float horizontalRaw = 0;
private float verticalRaw = 0;
private bool jump = false;
[SerializeField]
private int dashStart = 0;
// Variables for IsGrounded()
[SerializeField]
private LayerMask groundLayer;
[SerializeField]
private LayerMask ropeLayer;
[SerializeField]
private LayerMask platformLayer;
[SerializeField]
private LayerMask outerwallLayer;
[SerializeField]
private float ropeDistance = 0.3f;
[SerializeField]
private float rayDistance;
[SerializeField]
private float ropeUp, ropeDown;
// Use this for initialization
void Start()
{
......@@ -52,6 +67,7 @@ public class PlayerController : MonoBehaviour
horizontal = Input.GetAxis("Horizontal");
horizontalRaw = Input.GetAxisRaw("Horizontal");
verticalRaw = Input.GetAxisRaw("Vertical");
if (Input.GetButtonDown("Jump"))
{
jump = true;
......@@ -63,6 +79,13 @@ public class PlayerController : MonoBehaviour
isGrounded = IsGrounded();
if (isGrounded)
isJumpable = true;
if(isGrounded)
{
if (horizontalRaw == 1f) transform.localScale = new Vector3(1f, transform.localScale.y, transform.localScale.z);
else if (horizontalRaw == -1f) transform.localScale = new Vector3(-1f, transform.localScale.y, transform.localScale.z);
}
if (IsInRope())
{
......@@ -72,11 +95,13 @@ public class PlayerController : MonoBehaviour
{
isInRope = false;
rb.gravityScale = 2f;
}
rb.velocity = new Vector2(0f, verticalRaw * Time.smoothDeltaTime * ropeSpeed);
StartCoroutine(RopeDelay());
}
rb.velocity = new Vector2(0f, verticalRaw * ropeSpeed);
}
else if (jump)
else if (verticalRaw != 0 && ropeEnabled && horizontalRaw == 0)
{
isInRope = true;
rb.gravityScale = 0f;
......@@ -96,41 +121,109 @@ public class PlayerController : MonoBehaviour
{
if (isGrounded)
{
vertical = jumpSpeed * Time.smoothDeltaTime;
vertical = jumpSpeed;
}
else if (isJumpable)
{
vertical = doubleJumpSpeed * Time.smoothDeltaTime;
vertical = doubleJumpSpeed;
isJumpable = false;
}
}
if(verticalRaw == -1 && !isDownPlatform)
{
RaycastHit2D hit = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, platformLayer);
if (hit.collider != null && rb.velocity.y == 0)
{
Room curRoom = MapManager.mapGrid[Player.tx, Player.ty];
platformArray = curRoom.GetComponentsInChildren<TilemapCollider2D>();
isDownPlatform = true;
StartCoroutine(DownPlatform());
}
}
//rb.velocity = new Vector2(horizontal * speed * Time.smoothDeltaTime, vertical);
// rb.velocity = new Vector2(rb.velocity.x, vertical);
rb.AddForce(horizontalRaw * speed * Time.smoothDeltaTime * Vector2.right);
if(horizontalRaw != 0)
{
if(horizontal != 1 && horizontal != -1 && dashStart == 0)
{
//짧게 눌렀을 때
dashStart = 1;
}
}
if(horizontalRaw == 0 && horizontal != 0 && dashStart == 1)
{
//방금 뗐을때
dashStart = 2;
//이제 빠르게 켜면 됨
}
if(dashStart == 2 && horizontalRaw != 0)
{
isDashing = true;
}
if(horizontalRaw == 0 && horizontal == 0)
{
dashStart = 0;
isDashing = false;
}
if(isDashing)
rb.AddForce(horizontalRaw * dashAccerlation * Time.smoothDeltaTime * Vector2.right);
else
rb.AddForce(horizontalRaw * accerlation * Time.smoothDeltaTime * 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.AddForce(rb.velocity.x * (-10f) * Vector2.right * Time.smoothDeltaTime);
}
rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxSpeed * Time.smoothDeltaTime, maxSpeed * Time.smoothDeltaTime), vertical);
if(isDashing) rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxDashSpeed, maxDashSpeed), vertical);
else
rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxSpeed , maxSpeed ), vertical);
}
jump = false;
}
bool IsGrounded() // Is player grounded?
{
RaycastHit2D hit = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, groundLayer);
RaycastHit2D hit1 = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, groundLayer);
RaycastHit2D hit2 = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, platformLayer);
RaycastHit2D hit3 = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, outerwallLayer);
Debug.DrawRay(transform.position, rayDistance * Vector2.down, Color.white);
return hit.collider != null;
return (hit1.collider != null || hit2.collider != null || hit3.collider != null) && rb.velocity.y == 0 ;//플랫폼 점프 버그 방지
}
bool IsInRope() // Is player in rope?
{
RaycastHit2D hit1 = Physics2D.Raycast(transform.position, Vector2.right, ropeDistance, ropeLayer);
RaycastHit2D hit2 = Physics2D.Raycast(transform.position, Vector2.left, ropeDistance, ropeLayer);
Debug.DrawRay(transform.position, ropeDistance * Vector2.right, Color.red);
Debug.DrawRay(transform.position, ropeDistance * Vector2.left, Color.red);
return hit1.collider != null || hit2.collider != null;
RaycastHit2D hit1 = Physics2D.Raycast(transform.position + ropeUp*Vector3.up, Vector2.right, ropeDistance, ropeLayer);
RaycastHit2D hit2 = Physics2D.Raycast(transform.position + ropeUp*Vector3.up, Vector2.left, ropeDistance, ropeLayer);
RaycastHit2D hit3 = Physics2D.Raycast(transform.position - ropeDown * Vector3.up, Vector2.right, ropeDistance, ropeLayer);
RaycastHit2D hit4 = Physics2D.Raycast(transform.position - ropeDown * Vector3.up, Vector2.left, ropeDistance, ropeLayer);
Debug.DrawRay(transform.position + ropeUp * Vector3.up, ropeDistance * Vector2.right, Color.red);
Debug.DrawRay(transform.position + ropeUp * Vector3.up, ropeDistance * Vector2.left, Color.red);
Debug.DrawRay(transform.position - ropeDown * Vector3.up, ropeDistance * Vector2.right, Color.red);
Debug.DrawRay(transform.position - ropeDown * Vector3.up, ropeDistance * Vector2.left, Color.red);
return hit1.collider != null || hit2.collider != null || hit3.collider != null || hit4.collider != null;
}
public IEnumerator DownPlatform()
{
foreach (TilemapCollider2D element in platformArray)
{
if (element.name == "platform")
{
element.enabled = false;
yield return new WaitForSeconds(0.3f);
element.enabled = true;
isDownPlatform = false;
}
}
}
public IEnumerator RopeDelay()
{
ropeEnabled = false;
isJumpable = true;
yield return new WaitForSeconds(0.5f);
ropeEnabled = true;
}
}
Assets/Scripts/Functions.cs deleted 100644 → 0
View file @ 80dcda1e
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Functions : MonoBehaviour {
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
}
Assets/Scripts/GameManager.cs
View file @ 4864e6a7
......@@ -17,7 +17,7 @@ public class GameManager : MonoBehaviour {
var TS = GameObject.Find("TetriminoSpawner").GetComponent<TetriminoSpawner>();
gameState = GameState.Ingame;
TS.MakeInitialTetrimino();
Vector2 coord = GameObject.Find("MapManager").GetComponent<MapManager>().startRoom.transform.position;
Vector2 coord = MapManager.currentRoom.transform.position;
GameObject.Find("Player").transform.position = new Vector2(coord.x, coord.y) + new Vector2(3, 3);
......
Assets/Scripts/TetrisMap/MapManager.cs
View file @ 4864e6a7
This diff is collapsed.
Assets/Scripts/TetrisMap/Room.cs
View file @ 4864e6a7
This diff is collapsed.
Assets/Scripts/TetrisMap/RoomInGame.cs
View file @ 4864e6a7
......@@ -14,9 +14,4 @@ public class RoomInGame : MonoBehaviour {
/// The enum for door information.
/// </summary>
public enum DoorInfo { Up, Down, Left, Right };
/// <summary>
/// Check if room is clear and escapable.
/// </summary>
public bool isRoomClear;
}
Assets/Scripts/TetrisMap/Test.cs
View file @ 4864e6a7
......@@ -41,6 +41,11 @@ public class Test : MonoBehaviour {
{
timer.text = (mapManager.timeToFallTetrimino - mapManager.tetriminoWaitedTime).ToString();
}
public void ClearRoom()
{
MapManager.currentRoom.ClearRoom();
}
private void Awake()
{
......@@ -58,7 +63,7 @@ public class Test : MonoBehaviour {
ChangeTetrimino();
if (Input.GetKeyDown(KeyCode.Alpha2))
SpawnBossTetrimino();
if(!mapManager.isTetriminoFalling)
if(!MapManager.isTetriminoFalling)
Timer();
/*if (Input.GetKeyDown(KeyCode.Tab) && GameManager.gameState != GameManager.GameState.Tetris)
{
......
Assets/Scripts/TetrisMap/TetriminoSpawner.cs
View file @ 4864e6a7
......@@ -41,8 +41,8 @@ public class TetriminoSpawner : MonoBehaviour {
else
randomTetrimino = TetriminoRandomizer();
mapManager.currentTetrimino = Instantiate(tetriminoes[randomTetrimino],
mapManager.tetrisMapCoord + mapManager.tetrisMapSize * new Vector3(randomPosition, MapManager.realHeight + 1, mapManager.tetrisMapCoord.z), Quaternion.identity);
mapManager.currentTetrimino.mapCoord = (mapManager.currentTetrimino.transform.position - mapManager.tetrisMapCoord) / mapManager.tetrisMapSize;
MapManager.tetrisMapCoord + MapManager.tetrisMapSize * new Vector3(randomPosition, MapManager.realHeight + 1, MapManager.tetrisMapCoord.z), Quaternion.identity);
mapManager.currentTetrimino.mapCoord = (mapManager.currentTetrimino.transform.position - MapManager.tetrisMapCoord) / MapManager.tetrisMapSize;
mapManager.SetRoomMapCoord(mapManager.currentTetrimino);
mapManager.MakeTetriminoRightPlace(mapManager.currentTetrimino);
for(int i = 0; i < mapManager.currentTetrimino.rotatedPosition.Length; i++)
......@@ -53,7 +53,7 @@ public class TetriminoSpawner : MonoBehaviour {
mapManager.currentTetrimino.rotatedPosition[i] = (int)mapManager.currentTetrimino.mapCoord.x;
}
MakeGhost(mapManager.currentTetrimino, randomTetrimino);
mapManager.isTetriminoFalling = false;
MapManager.isTetriminoFalling = false;
while (mapManager.roomsWaiting.Count != 0 && mapManager.currentTetrimino.notNormalRoomCount < 4)
{
mapManager.UpgradeRoom(mapManager.roomsWaiting.Dequeue());
......@@ -71,18 +71,19 @@ public class TetriminoSpawner : MonoBehaviour {
{
int randomPosition = Random.Range(0, MapManager.width);
int randomTetrimino = TetriminoRandomizer();
mapManager.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], mapManager.tetrisMapCoord + mapManager.tetrisMapSize * new Vector3(randomPosition, 0, mapManager.tetrisMapCoord.z), Quaternion.identity);
mapManager.startRoom = mapManager.currentTetrimino.rooms[Random.Range(0, mapManager.currentTetrimino.rooms.Length)];
mapManager.startRoom.specialRoomType = MapManager.SpecialRoomType.Start;
mapManager.currentTetrimino.mapCoord = (mapManager.currentTetrimino.transform.position - mapManager.tetrisMapCoord) / mapManager.tetrisMapSize;
mapManager.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], MapManager.tetrisMapCoord + MapManager.tetrisMapSize * new Vector3(randomPosition, 0, MapManager.tetrisMapCoord.z), Quaternion.identity);
MapManager.currentRoom = mapManager.currentTetrimino.rooms[Random.Range(0, mapManager.currentTetrimino.rooms.Length)];
MapManager.currentRoom.specialRoomType = MapManager.SpecialRoomType.Start;
mapManager.currentTetrimino.mapCoord = (mapManager.currentTetrimino.transform.position - MapManager.tetrisMapCoord) / MapManager.tetrisMapSize;
mapManager.SetRoomMapCoord(mapManager.currentTetrimino);
mapManager.MakeTetriminoRightPlace(mapManager.currentTetrimino);
for (int i = 0; i < mapManager.currentTetrimino.rooms.Length; i++)
{
mapManager.currentTetrimino.transform.position = mapManager.currentTetrimino.mapCoord * mapManager.tetrisMapSize + mapManager.tetrisMapCoord;
mapManager.currentTetrimino.transform.position = mapManager.currentTetrimino.mapCoord * MapManager.tetrisMapSize + MapManager.tetrisMapCoord;
}
mapManager.UpdateMap(mapManager.currentTetrimino);
mapManager.CreateRoom(mapManager.currentTetrimino);
MapManager.currentRoom.fog.GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0);
MakeTetrimino();
}
}
......
Assets/Sprites/DoorInGameDown.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/DoorInGameLeft.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/DoorInGameRight.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/DoorInGameUp.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Doors.meta 0 → 100644
View file @ 4864e6a7
fileFormatVersion: 2
guid: 620da30d8b72f0746850541f35391105
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Doors/DoorInGameDownLeft.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Doors/DoorInGameDownRight.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Doors/DoorInGameLeftDown.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Doors/DoorInGameLeftUp.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Doors/DoorInGameRightDown.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Doors/DoorInGameRightUp.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Doors/DoorInGameUpLeft.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Doors/DoorInGameUpRight.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
Assets/Sprites/Press.png.meta
View file @ 4864e6a7
......@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
......
Assets/Sprites/fog.png.meta 0 → 100644
View file @ 4864e6a7
This diff is collapsed.
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