Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 67 additions & 4 deletions Assets/Scenes/FinalLevel.unity
Original file line number Diff line number Diff line change
Expand Up @@ -19052,6 +19052,10 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6620393228509081177, guid: 5534fedc3a0f142a49161f5d0a7349b3, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
Expand Down Expand Up @@ -103513,6 +103517,7 @@ MonoBehaviour:
finalPoint: {fileID: 211002638}
boss: {fileID: 1897372550}
promptPanel: {fileID: 1767878934}
computer: {fileID: 1705653188}
--- !u!1 &1301092250
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -105815,6 +105820,63 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1870829757
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2823210428211693960, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_Name
value: UI
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalPosition.x
value: -1.99
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalPosition.y
value: 0.688
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalPosition.z
value: -0.06202958
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3660211807930178724, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9d51c1cda1c04d4b9baf19853c30cdd, type: 3}
--- !u!1 &1876374225
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -106301,7 +106363,7 @@ GameObject:
m_Component:
- component: {fileID: 1979710367}
m_Layer: 0
m_Name: Player & NPCs
m_Name: NPCs
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -106320,7 +106382,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2117536990}
- {fileID: 1897372557}
- {fileID: 795976848}
m_Father: {fileID: 0}
Expand Down Expand Up @@ -107140,11 +107201,11 @@ Transform:
m_GameObject: {fileID: 2117536984}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -14.450001, y: -24.8, z: 0}
m_LocalPosition: {x: -6.7000003, y: -4.699999, z: 0}
m_LocalScale: {x: 2, y: 2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1979710367}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2117536991
MonoBehaviour:
Expand Down Expand Up @@ -107272,3 +107333,5 @@ SceneRoots:
- {fileID: 319708158}
- {fileID: 1146507116}
- {fileID: 1979710367}
- {fileID: 1870829757}
- {fileID: 2117536990}
2 changes: 1 addition & 1 deletion Assets/Scenes/Level 1.unity
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 5
orthographic size: 6
m_Depth: -1
m_CullingMask:
serializedVersion: 2
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scenes/Main_Menu.unity
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.000023842, y: 0}
m_SizeDelta: {x: 1080, y: 110.83}
m_SizeDelta: {x: 1080, y: 110.25}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &330633062
MonoBehaviour:
Expand Down Expand Up @@ -1613,7 +1613,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 563.84}
m_SizeDelta: {x: 1080, y: 497.25}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1996541390
MonoBehaviour:
Expand Down
4 changes: 4 additions & 0 deletions Assets/Scripts/Computer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ void Update() {
if (pressEnterUI.activeSelf && Input.GetKeyDown(KeyCode.Return)) {
int nextScene = SceneManager.GetActiveScene().buildIndex + 1;
SceneManager.LoadScene(nextScene);
}
if (pressEnterUI.activeSelf && Input.GetKeyDown(KeyCode.P)) {
int nextScene = SceneManager.GetActiveScene().buildIndex + 2;
SceneManager.LoadScene(nextScene);
}
}
}
Loading