Skip to content

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

인풋 좀 고치고 인벤토리 끄고 키는 기능 만듬

parent ba6bce1a
Hide whitespace changes
Inline Side-by-side
Showing with 526 additions and 240 deletions
Assets/Prefabs/Characters/Player.prefab
View file @ 890fb3b1
...@@ -91,7 +91,7 @@ Rigidbody2D: ...@@ -91,7 +91,7 @@ Rigidbody2D:
m_Mass: 1 m_Mass: 1
m_LinearDrag: 0 m_LinearDrag: 0
m_AngularDrag: 0.05 m_AngularDrag: 0.05
m_GravityScale: 5 m_GravityScale: 3
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Interpolate: 1 m_Interpolate: 1
m_SleepingMode: 1 m_SleepingMode: 1
...@@ -239,9 +239,9 @@ MonoBehaviour: ...@@ -239,9 +239,9 @@ MonoBehaviour:
comboTime: 1 comboTime: 1
time: {fileID: 0} time: {fileID: 0}
combo: {fileID: 0} combo: {fileID: 0}
comboArray: comboArray: AB
StartTime: 0 StartTime: 0
anim: {fileID: 0} anim: {fileID: 95992411616135034}
aoc: {fileID: 0} aoc: {fileID: 0}
normalAttack: normalAttack:
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2} - {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
...@@ -260,7 +260,7 @@ MonoBehaviour: ...@@ -260,7 +260,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
LCUI: {fileID: 0} LCUI: {fileID: 0}
ttx: 0 ttx: 8
tty: 0 tty: 0
--- !u!212 &212187280661781960 --- !u!212 &212187280661781960
SpriteRenderer: SpriteRenderer:
...@@ -297,7 +297,7 @@ SpriteRenderer: ...@@ -297,7 +297,7 @@ SpriteRenderer:
m_SortingLayerID: -2078941185 m_SortingLayerID: -2078941185
m_SortingLayer: 7 m_SortingLayer: 7
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: bae70a52c1619cd478cb9d32f0cb7083, type: 3} m_Sprite: {fileID: 21300000, guid: 92d166e0c2a85a14facee45f5a5a8444, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
......
Assets/Prefabs/GameManager.prefab
View file @ 890fb3b1
...@@ -51,5 +51,5 @@ MonoBehaviour: ...@@ -51,5 +51,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 97912f0a2214a8a4f8023ed30629bb30, type: 3} m_Script: {fileID: 11500000, guid: 97912f0a2214a8a4f8023ed30629bb30, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
gameOverScreen: {fileID: 223237664237935382, guid: 692aad2449e06054799ea4706578fb23, gameOverCanvas: {fileID: 0}
type: 2} inventoryCanvas: {fileID: 0}
Assets/Prefabs/TetrisMap/TestTools.prefab
View file @ 890fb3b1
...@@ -11,6 +11,23 @@ Prefab: ...@@ -11,6 +11,23 @@ Prefab:
m_SourcePrefab: {fileID: 0} m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1083421967201116} m_RootGameObject: {fileID: 1083421967201116}
m_IsPrefabAsset: 1 m_IsPrefabAsset: 1
--- !u!1 &1039579742201942
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224687987329766264}
- component: {fileID: 222926987001539654}
- component: {fileID: 114089210082657912}
m_Layer: 5
m_Name: comboString
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1083421967201116 --- !u!1 &1083421967201116
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -79,6 +96,23 @@ GameObject: ...@@ -79,6 +96,23 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1222494079920298
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224707923182581972}
- component: {fileID: 222126209999432066}
- component: {fileID: 114917269459606026}
m_Layer: 5
m_Name: comboTime
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1227515685001158 --- !u!1 &1227515685001158
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -330,6 +364,41 @@ MonoBehaviour: ...@@ -330,6 +364,41 @@ MonoBehaviour:
m_FillAmount: 1 m_FillAmount: 1
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
--- !u!114 &114089210082657912
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1039579742201942}
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: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'test
'
--- !u!114 &114197899296498466 --- !u!114 &114197899296498466
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -798,7 +867,7 @@ MonoBehaviour: ...@@ -798,7 +867,7 @@ MonoBehaviour:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 114213890665286158} - m_Target: {fileID: 114213890665286158}
m_MethodName: ClearRoom m_MethodName: UpgradeStage
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
...@@ -897,6 +966,46 @@ MonoBehaviour: ...@@ -897,6 +966,46 @@ MonoBehaviour:
m_FillAmount: 1 m_FillAmount: 1
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
--- !u!114 &114917269459606026
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1222494079920298}
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: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
--- !u!222 &222126209999432066
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1222494079920298}
m_CullTransparentMesh: 0
--- !u!222 &222204035592807254 --- !u!222 &222204035592807254
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -967,6 +1076,13 @@ CanvasRenderer: ...@@ -967,6 +1076,13 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1161693701796258} m_GameObject: {fileID: 1161693701796258}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!222 &222926987001539654
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1039579742201942}
m_CullTransparentMesh: 0
--- !u!222 &222977622312510518 --- !u!222 &222977622312510518
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -1065,6 +1181,8 @@ RectTransform: ...@@ -1065,6 +1181,8 @@ RectTransform:
- {fileID: 224071041299093070} - {fileID: 224071041299093070}
- {fileID: 224667404527337120} - {fileID: 224667404527337120}
- {fileID: 224008356030171754} - {fileID: 224008356030171754}
- {fileID: 224687987329766264}
- {fileID: 224707923182581972}
m_Father: {fileID: 4884929250924374} m_Father: {fileID: 4884929250924374}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -1184,6 +1302,42 @@ RectTransform: ...@@ -1184,6 +1302,42 @@ RectTransform:
m_AnchoredPosition: {x: 190, y: 210} m_AnchoredPosition: {x: 190, y: 210}
m_SizeDelta: {x: 200, y: 50} m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224687987329766264
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1039579742201942}
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: 224395958577644168}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 100, y: 100}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224707923182581972
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1222494079920298}
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: 224395958577644168}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 100, y: 120}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224747592117556546 --- !u!224 &224747592117556546
RectTransform: RectTransform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Prefabs/UI/GameOverScreen.prefab
View file @ 890fb3b1
...@@ -97,7 +97,7 @@ GameObject: ...@@ -97,7 +97,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!114 &114217847818790192 --- !u!114 &114217847818790192
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Scenes/PlayScene.unity
View file @ 890fb3b1
...@@ -152,9 +152,24 @@ Prefab: ...@@ -152,9 +152,24 @@ Prefab:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114561382838090706, guid: f6ef1c586e7764c41ba8349325635589,
type: 2}
propertyPath: gameOverCanvas
value:
objectReference: {fileID: 647962947}
- target: {fileID: 114561382838090706, guid: f6ef1c586e7764c41ba8349325635589,
type: 2}
propertyPath: inventoryCanvas
value:
objectReference: {fileID: 173423968}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6ef1c586e7764c41ba8349325635589, type: 2} m_SourcePrefab: {fileID: 100100000, guid: f6ef1c586e7764c41ba8349325635589, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
--- !u!223 &173423968 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 223008133952041092, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
m_PrefabInternal: {fileID: 1337079440}
--- !u!1001 &179350392 --- !u!1001 &179350392
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -260,31 +275,136 @@ RectTransform: ...@@ -260,31 +275,136 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 224174390332342308, guid: 378c41c0af7d4db41895ec01e1f50291, m_CorrespondingSourceObject: {fileID: 224174390332342308, guid: 378c41c0af7d4db41895ec01e1f50291,
type: 2} type: 2}
m_PrefabInternal: {fileID: 179350392} m_PrefabInternal: {fileID: 179350392}
--- !u!114 &342983528 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114561382838090706, guid: f6ef1c586e7764c41ba8349325635589,
type: 2}
m_PrefabInternal: {fileID: 50055403}
m_Script: {fileID: 11500000, guid: 97912f0a2214a8a4f8023ed30629bb30, type: 3}
--- !u!1001 &467942570
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224393982547383572, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742875678731534, guid: 692aad2449e06054799ea4706578fb23, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114630214332230992, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 342983528}
- target: {fileID: 114630214332230992, guid: 692aad2449e06054799ea4706578fb23,
type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: RestartGame
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 692aad2449e06054799ea4706578fb23, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &489222433 stripped --- !u!1 &489222433 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036, m_CorrespondingSourceObject: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2} type: 2}
m_PrefabInternal: {fileID: 1618052740} m_PrefabInternal: {fileID: 1618052740}
--- !u!114 &489222434 --- !u!223 &647962947 stripped
MonoBehaviour: Canvas:
m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 223237664237935382, guid: 692aad2449e06054799ea4706578fb23,
m_CorrespondingSourceObject: {fileID: 0} type: 2}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 467942570}
m_GameObject: {fileID: 489222433}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
m_Name:
m_EditorClassIdentifier:
state: 0
attackA: 0
attackB: 0
attackC: 0
cancel: 0
time: {fileID: 1333585343}
combo: {fileID: 1159748691}
keyCoolDown: 1
anim: {fileID: 0}
--- !u!1001 &677608594 --- !u!1001 &677608594
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -519,95 +639,12 @@ Transform: ...@@ -519,95 +639,12 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1159748689 --- !u!114 &1159748691 stripped
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1159748690}
- component: {fileID: 1159748692}
- component: {fileID: 1159748691}
- component: {fileID: 1159748693}
m_Layer: 5
m_Name: comboString
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1159748690
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1159748689}
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: 1708140759}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 100, y: 100}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1159748691
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 114089210082657912, guid: e6794ab8e2e4c6340a23b382e9497cbb,
m_CorrespondingSourceObject: {fileID: 0} type: 2}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 1708140758}
m_GameObject: {fileID: 1159748689}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} 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: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'test
'
--- !u!222 &1159748692
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1159748689}
m_CullTransparentMesh: 0
--- !u!114 &1159748693
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1159748689}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67f69504559e3ec4fbecc50b8f44c44a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1184292066 --- !u!1001 &1184292066
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -742,93 +779,121 @@ Prefab: ...@@ -742,93 +779,121 @@ Prefab:
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
--- !u!1 &1333585340 --- !u!114 &1333585343 stripped
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1333585341}
- component: {fileID: 1333585344}
- component: {fileID: 1333585343}
- component: {fileID: 1333585342}
m_Layer: 5
m_Name: comboTime
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1333585341
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1333585340}
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: 1708140759}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 100, y: 120}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1333585342
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1333585340}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cff5b06354e433c449df95b85dcc3fe9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1333585343
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 114917269459606026, guid: e6794ab8e2e4c6340a23b382e9497cbb,
m_CorrespondingSourceObject: {fileID: 0} type: 2}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 1708140758}
m_GameObject: {fileID: 1333585340}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name: --- !u!1001 &1337079440
m_EditorClassIdentifier: Prefab:
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: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
--- !u!222 &1333585344
CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} serializedVersion: 2
m_PrefabInternal: {fileID: 0} m_Modification:
m_GameObject: {fileID: 1333585340} m_TransformParent: {fileID: 0}
m_CullTransparentMesh: 0 m_Modifications:
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1560605499280558, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
m_IsPrefabAsset: 0
--- !u!4 &1604462410 stripped --- !u!4 &1604462410 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4884929250924374, guid: e6794ab8e2e4c6340a23b382e9497cbb, m_CorrespondingSourceObject: {fileID: 4884929250924374, guid: e6794ab8e2e4c6340a23b382e9497cbb,
...@@ -873,9 +938,66 @@ Prefab: ...@@ -873,9 +938,66 @@ Prefab:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: time
value:
objectReference: {fileID: 1333585343}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: combo
value:
objectReference: {fileID: 1159748691}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: inventoryManager
value:
objectReference: {fileID: 2035175000}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
--- !u!1001 &1705825740
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalPosition.x
value: 881.1023
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalPosition.y
value: 401.53445
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalPosition.z
value: 22.914007
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 62a83d11a7addc342ad436145784e698, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &1708140758 --- !u!1001 &1708140758
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -915,19 +1037,9 @@ Prefab: ...@@ -915,19 +1037,9 @@ Prefab:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114685218848006942, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: UpgradeStage
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2} m_SourcePrefab: {fileID: 100100000, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
--- !u!224 &1708140759 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224395958577644168, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 1708140758}
--- !u!1001 &1711972807 --- !u!1001 &1711972807
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1028,6 +1140,12 @@ Prefab: ...@@ -1028,6 +1140,12 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c179f0931cfabec428a868a6edc543b0, type: 2} m_SourcePrefab: {fileID: 100100000, guid: c179f0931cfabec428a868a6edc543b0, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
--- !u!114 &2035175000 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
type: 2}
m_PrefabInternal: {fileID: 1705825740}
m_Script: {fileID: 11500000, guid: 674793b622d7c184882dfeb8784bbf92, type: 3}
--- !u!1001 &2042136941 --- !u!1001 &2042136941
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Assets/Scripts/GameManager.cs
View file @ 890fb3b1
...@@ -11,11 +11,12 @@ public class GameManager : MonoBehaviour { ...@@ -11,11 +11,12 @@ public class GameManager : MonoBehaviour {
/// </summary> /// </summary>
public static GameState gameState; public static GameState gameState;
public Canvas gameOverScreen; public Canvas gameOverCanvas;
public Canvas inventoryCanvas;
public void RestartGame() public void RestartGame()
{ {
gameOverScreen.gameObject.SetActive(false); gameOverCanvas.gameObject.SetActive(false);
SceneManager.LoadScene(SceneManager.GetActiveScene().name); SceneManager.LoadScene(SceneManager.GetActiveScene().name);
} }
...@@ -45,7 +46,20 @@ public class GameManager : MonoBehaviour { ...@@ -45,7 +46,20 @@ public class GameManager : MonoBehaviour {
StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Ingame)); StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Ingame));
} }
} }
if (Input.GetKeyDown(KeyCode.F)) else if(Input.GetKeyDown(KeyCode.I))
{
if(gameState == GameState.Ingame)
{
inventoryCanvas.gameObject.SetActive(true);
gameState = GameState.Inventory;
}
else if(gameState == GameState.Inventory)
{
inventoryCanvas.gameObject.SetActive(false);
gameState = GameState.Ingame;
}
}
else if (Input.GetKeyDown(KeyCode.F))
{ {
if (gameState == GameState.Portal && MapManager.currentRoom != MapManager.mapGrid[(int)MapManager.portalDestination.x, (int)MapManager.portalDestination.y]) if (gameState == GameState.Portal && MapManager.currentRoom != MapManager.mapGrid[(int)MapManager.portalDestination.x, (int)MapManager.portalDestination.y])
{ {
...@@ -56,18 +70,26 @@ public class GameManager : MonoBehaviour { ...@@ -56,18 +70,26 @@ public class GameManager : MonoBehaviour {
StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Ingame)); StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Ingame));
} }
} }
if (Input.GetKeyDown(KeyCode.Escape)) else if(Input.GetButtonDown("Cancel"))
{ {
MapManager.mapGrid[(int)MapManager.currentRoom.mapCoord.x, (int)MapManager.currentRoom.mapCoord.y].portalSurface.GetComponent<SpriteRenderer>().sprite = if(gameState == GameState.Portal)
GameObject.Find("MapManager").GetComponent<MapManager>().portalExist; {
StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Ingame)); MapManager.mapGrid[(int)MapManager.currentRoom.mapCoord.x, (int)MapManager.currentRoom.mapCoord.y].portalSurface.GetComponent<SpriteRenderer>().sprite =
GameObject.Find("MapManager").GetComponent<MapManager>().portalExist;
StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Ingame));
}
else if(gameState == GameState.Inventory)
{
inventoryCanvas.gameObject.SetActive(false);
gameState = GameState.Ingame;
}
} }
} }
if(gameState == GameState.GameOver) if(gameState == GameState.GameOver)
{ {
if(gameOverScreen.isActiveAndEnabled == false) if(gameOverCanvas.isActiveAndEnabled == false)
Debug.Log("Game Over"); Debug.Log("Game Over");
gameOverScreen.gameObject.SetActive(true); gameOverCanvas.gameObject.SetActive(true);
} }
} }
} }
Assets/Scripts/TetrisMap/MapManager.cs
View file @ 890fb3b1
...@@ -699,19 +699,19 @@ public class MapManager : MonoBehaviour { ...@@ -699,19 +699,19 @@ public class MapManager : MonoBehaviour {
/// <param name="te">Tetrimino you want to move.</param> /// <param name="te">Tetrimino you want to move.</param>
public void TetriminoControl(Tetrimino te) public void TetriminoControl(Tetrimino te)
{ {
if((Input.GetKeyDown(KeyCode.Space) && GameManager.gameState == GameState.Tetris) || tetriminoWaitedTime > timeToFallTetrimino)
if ((Input.GetKeyDown(KeyCode.Space) && GameManager.gameState == GameState.Tetris) || tetriminoWaitedTime > timeToFallTetrimino)
{ {
isTetriminoFalling = true; isTetriminoFalling = true;
TetriminoMapCoordDown(currentTetrimino); TetriminoMapCoordDown(currentTetrimino);
} }
else if (Input.GetKeyDown(KeyCode.LeftArrow) && GameManager.gameState == GameState.Tetris) if(GameManager.gameState == GameState.Tetris)
MoveTetriminoHorizontal(currentTetrimino, new Vector3(-1, 0, 0)); {
else if (Input.GetKeyDown(KeyCode.RightArrow) && GameManager.gameState == GameState.Tetris) if (Input.GetButtonDown("Vertical"))
MoveTetriminoHorizontal(currentTetrimino, new Vector3(1, 0, 0)); TetriminoRotate(currentTetrimino, (int)Input.GetAxisRaw("Vertical"));
else if (Input.GetKeyDown(KeyCode.UpArrow) && GameManager.gameState == GameState.Tetris) else if (Input.GetButtonDown("Horizontal"))
TetriminoRotate(currentTetrimino, 1); MoveTetriminoHorizontal(currentTetrimino, new Vector3((int)Input.GetAxisRaw("Horizontal"), 0, 0));
else if (Input.GetKeyDown(KeyCode.DownArrow) && GameManager.gameState == GameState.Tetris) }
TetriminoRotate(currentTetrimino, -1);
} }
/// <summary> /// <summary>
/// Set rooms' mapCoord on this tetrimino. /// Set rooms' mapCoord on this tetrimino.
...@@ -889,7 +889,7 @@ public class MapManager : MonoBehaviour { ...@@ -889,7 +889,7 @@ public class MapManager : MonoBehaviour {
int minDifference = 100; int minDifference = 100;
int difference = 0; int difference = 0;
Vector2 tempDestination = new Vector2(0, 0); Vector2 tempDestination = new Vector2(0, 0);
if (Input.GetKeyDown(KeyCode.UpArrow)) if (Input.GetButtonDown("Vertical") && Input.GetAxisRaw("Vertical") > 0)
for (int i = (int)portalDestination.y + 1; i < realHeight + 1; i++) for (int i = (int)portalDestination.y + 1; i < realHeight + 1; i++)
{ {
if(portalDistributedVertical[i].Count != 0) if(portalDistributedVertical[i].Count != 0)
...@@ -909,7 +909,7 @@ public class MapManager : MonoBehaviour { ...@@ -909,7 +909,7 @@ public class MapManager : MonoBehaviour {
return; return;
} }
} }
else if (Input.GetKeyDown(KeyCode.DownArrow)) else if (Input.GetButtonDown("Vertical") && Input.GetAxisRaw("Vertical") < 0)
for (int i = (int)portalDestination.y - 1; i >= 0; i--) for (int i = (int)portalDestination.y - 1; i >= 0; i--)
{ {
if(portalDistributedVertical[i].Count != 0) if(portalDistributedVertical[i].Count != 0)
...@@ -929,7 +929,7 @@ public class MapManager : MonoBehaviour { ...@@ -929,7 +929,7 @@ public class MapManager : MonoBehaviour {
return; return;
} }
} }
else if (Input.GetKeyDown(KeyCode.LeftArrow)) else if (Input.GetButtonDown("Horizontal") && Input.GetAxisRaw("Horizontal") < 0)
for (int i = (int)portalDestination.x - 1; i >= 0; i--) for (int i = (int)portalDestination.x - 1; i >= 0; i--)
{ {
if(portalDistributedHorizontal[i].Count != 0) if(portalDistributedHorizontal[i].Count != 0)
...@@ -949,7 +949,7 @@ public class MapManager : MonoBehaviour { ...@@ -949,7 +949,7 @@ public class MapManager : MonoBehaviour {
return; return;
} }
} }
else if (Input.GetKeyDown(KeyCode.RightArrow)) else if (Input.GetButtonDown("Horizontal") && Input.GetAxisRaw("Horizontal") > 0)
for (int i = (int)portalDestination.x + 1; i < width; i++) for (int i = (int)portalDestination.x + 1; i < width; i++)
{ {
if(portalDistributedHorizontal[i].Count != 0) if(portalDistributedHorizontal[i].Count != 0)
......
Assets/Scripts/TetrisMap/Test.cs
View file @ 890fb3b1
...@@ -125,13 +125,5 @@ public class Test : MonoBehaviour { ...@@ -125,13 +125,5 @@ public class Test : MonoBehaviour {
SpawnBossTetrimino(); SpawnBossTetrimino();
if(!MapManager.isTetriminoFalling) if(!MapManager.isTetriminoFalling)
Timer(); Timer();
/*if (Input.GetKeyDown(KeyCode.Tab) && GameManager.gameState != GameManager.GameState.Tetris)
{
GameManager.gameState = GameManager.GameState.Tetris;
GameObject.Find("Main Camera").transform.position = tetrisCameraCoord;
GameObject.Find("Main Camera").GetComponent<Camera>().orthographicSize = tetrisMapSize;
}
else if (Input.GetKeyDown(KeyCode.Tab) && GameManager.gameState == GameManager.GameState.Tetris)
GameManager.gameState = GameManager.GameState.Ingame;*/
} }
} }
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