Browse Source

Fix alignment issues

Tutorial scenes Complete
Menu Client/Server Complete
Add second how to video
Josh_Dev_branch
Claire Peta 5 years ago
parent
commit
317836aa12
28 changed files with 15336 additions and 6921 deletions
  1. +2
    -2
      Assets/Data/Logic Blocks/Diagonal_Left.asset
  2. +2
    -2
      Assets/Data/Logic Blocks/Diagonal_Right.asset
  3. +1661
    -86
      Assets/Prefabs/Menu Background.prefab
  4. +8
    -8
      Assets/Prefabs/UI/MainScoreboard.prefab
  5. +4
    -4
      Assets/Prefabs/UI/Single_Player Canvas.prefab
  6. +49
    -1767
      Assets/Prefabs/UI/levelScoreboard.prefab
  7. +58
    -58
      Assets/Scenes/Client Scenes/LoginScreen.unity
  8. +6081
    -2175
      Assets/Scenes/ColourCollide_Smaller.unity
  9. +5568
    -0
      Assets/Scenes/ColourCollide_testsmall.unity
  10. +1
    -2
      Assets/Scenes/ColourCollide_testsmall.unity.meta
  11. +1450
    -1951
      Assets/Scenes/MainMenu Client.unity
  12. +125
    -650
      Assets/Scenes/MainMenu Server.unity
  13. +76
    -12
      Assets/Scenes/Scoreboards.unity
  14. +39
    -39
      Assets/Scenes/TuteLevelFive.unity
  15. +131
    -22
      Assets/Scenes/TuteLevelFour.unity
  16. +7
    -2
      Assets/Scenes/TuteLevelOne.unity
  17. +8
    -49
      Assets/Scenes/TuteLevelThree.unity
  18. +1
    -1
      Assets/Scenes/TuteLevelTwo.unity
  19. +0
    -8
      Assets/Scripts/Components.meta
  20. +12
    -21
      Assets/Scripts/MainMenuControllerClient.cs
  21. +0
    -8
      Assets/Scripts/Managers/GameManager.cs
  22. +20
    -47
      Assets/Scripts/blockSpawn.cs
  23. +4
    -2
      Assets/Third Party Assets/KUBIKOS - World/Materials/Cloud_Mat.mat
  24. +3
    -0
      Assets/Videos/dragdrop.mp4
  25. +21
    -0
      Assets/Videos/dragdrop.mp4.meta
  26. +2
    -2
      Assets/Videos/toportal.mp4
  27. +1
    -1
      ProjectSettings/EditorBuildSettings.asset
  28. +2
    -2
      ProjectSettings/ProjectSettings.asset

+ 2
- 2
Assets/Data/Logic Blocks/Diagonal_Left.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4b24647a05219fd731efda5701040c3bac58a2fa65fd558031bffbd860d6874
size 866
oid sha256:5671a1a7b9e5f4f0a3fee67ebf92615af4279d9edfce79d28823f279d009e22a
size 872

+ 2
- 2
Assets/Data/Logic Blocks/Diagonal_Right.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:486b7cf8e212847d03db6319adc7980e2720314e6671f8005056550c15b99bce
size 867
oid sha256:33d9e2ccd3a3a69112bfc9e679471d717af1102f0cb6223791a9a2624557d982
size 873

+ 1661
- 86
Assets/Prefabs/Menu Background.prefab
File diff suppressed because it is too large
View File


+ 8
- 8
Assets/Prefabs/UI/MainScoreboard.prefab View File

@ -34,7 +34,7 @@ RectTransform:
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: 264, y: -250}
m_AnchoredPosition: {x: 265.92798, y: -234.90306}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5370225792356624807
@ -268,7 +268,7 @@ RectTransform:
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: 264.00006, y: -85}
m_AnchoredPosition: {x: 265.92798, y: -79.7784}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &763696200295960340
@ -428,7 +428,7 @@ RectTransform:
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: 264.00006, y: -170}
m_AnchoredPosition: {x: 265.92798, y: -159.5568}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5530482550460664304
@ -588,7 +588,7 @@ RectTransform:
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: 264.00006, y: 1}
m_AnchoredPosition: {x: 265.92798, y: 0}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3112500336326340757
@ -748,7 +748,7 @@ RectTransform:
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: -130, y: -85}
m_AnchoredPosition: {x: -130.74792, y: -79.7784}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6715947278990241992
@ -908,7 +908,7 @@ RectTransform:
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: -130, y: -250}
m_AnchoredPosition: {x: -130.74792, y: -234.90306}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6715947279057449064
@ -1068,7 +1068,7 @@ RectTransform:
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: -130, y: -170}
m_AnchoredPosition: {x: -130.74792, y: -159.5568}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6715947279265788346
@ -1335,7 +1335,7 @@ RectTransform:
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: -130, y: 1}
m_AnchoredPosition: {x: -130.74792, y: 0}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6715947280046279522

+ 4
- 4
Assets/Prefabs/UI/Single_Player Canvas.prefab View File

@ -92,7 +92,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_AspectMode: 0
m_AspectRatio: 8.548341
m_AspectRatio: 8.54834
--- !u!114 &1324620581
MonoBehaviour:
m_ObjectHideFlags: 0
@ -932,7 +932,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 36cc4df775c8e8b46a89972d8008d56d, type: 3}
m_Name:
m_EditorClassIdentifier:
inventory: {fileID: 11400000, guid: 808f6e35b72adbf47a19927d1f3efd35, type: 2}
inventory: {fileID: 11400000, guid: 26baa66216f4923448239677997ac13d, type: 2}
ItemPrefab: {fileID: 1021368708357542995, guid: f846db1cf36a645479ce131a2e0cf72f,
type: 3}
Parent: {fileID: 5903294975835654680}
@ -990,7 +990,7 @@ Canvas:
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 0}
m_PlaneDistance: 4
m_PlaneDistance: 2
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
@ -1392,7 +1392,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0.00001303082, y: 0.0000076293945}
m_AnchoredPosition: {x: -0.000045554032, y: -0.00005340576}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &5716221044664382828

+ 49
- 1767
Assets/Prefabs/UI/levelScoreboard.prefab
File diff suppressed because it is too large
View File


+ 58
- 58
Assets/Scenes/Client Scenes/LoginScreen.unity View File

@ -920,10 +920,10 @@ RectTransform:
m_Father: {fileID: 1065132349}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &195337270
MonoBehaviour:
@ -1053,10 +1053,10 @@ RectTransform:
m_Father: {fileID: 1490570091}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 383.95, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &240721845
MonoBehaviour:
@ -1385,7 +1385,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &425791971
RectTransform:
m_ObjectHideFlags: 0
@ -1517,10 +1517,10 @@ RectTransform:
m_Father: {fileID: 1065132349}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 830, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &560892413
MonoBehaviour:
@ -1840,10 +1840,10 @@ RectTransform:
m_Father: {fileID: 1490570091}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 383.95, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &666970021
MonoBehaviour:
@ -2867,10 +2867,10 @@ RectTransform:
m_Father: {fileID: 1065132349}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 830, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &855649912
MonoBehaviour:
@ -3271,10 +3271,10 @@ RectTransform:
m_Father: {fileID: 1065132349}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 370, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &898002912
MonoBehaviour:
@ -4661,10 +4661,10 @@ RectTransform:
m_Father: {fileID: 1490570091}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 613.95, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1239738594
MonoBehaviour:
@ -4903,10 +4903,10 @@ RectTransform:
m_Father: {fileID: 1490570091}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 613.95, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1298967953
MonoBehaviour:
@ -5268,10 +5268,10 @@ RectTransform:
m_Father: {fileID: 1065132349}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 600, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1377053472
MonoBehaviour:
@ -6501,7 +6501,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1584683394
RectTransform:
m_ObjectHideFlags: 0
@ -6595,10 +6595,10 @@ RectTransform:
m_Father: {fileID: 1065132349}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 600, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1611512230
MonoBehaviour:
@ -6872,10 +6872,10 @@ RectTransform:
m_Father: {fileID: 1490570091}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 153.95001, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1639010721
MonoBehaviour:
@ -7312,10 +7312,10 @@ RectTransform:
m_Father: {fileID: 1065132349}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 370, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1802975491
MonoBehaviour:
@ -7445,10 +7445,10 @@ RectTransform:
m_Father: {fileID: 1490570091}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 153.95001, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1885492954
MonoBehaviour:
@ -7981,10 +7981,10 @@ RectTransform:
m_Father: {fileID: 1065132349}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2094861236
MonoBehaviour:

+ 6081
- 2175
Assets/Scenes/ColourCollide_Smaller.unity
File diff suppressed because it is too large
View File


+ 5568
- 0
Assets/Scenes/ColourCollide_testsmall.unity
File diff suppressed because it is too large
View File


Assets/Plugins/IngameDebugConsole.meta → Assets/Scenes/ColourCollide_testsmall.unity.meta View File

@ -1,6 +1,5 @@
fileFormatVersion: 2
guid: 5f8eae876be4b03438375a82d2c69b4d
folderAsset: yes
guid: 091088c1c5a584a48bc65e49dfb0052b
DefaultImporter:
externalObjects: {}
userData:

+ 1450
- 1951
Assets/Scenes/MainMenu Client.unity
File diff suppressed because it is too large
View File


+ 125
- 650
Assets/Scenes/MainMenu Server.unity
File diff suppressed because it is too large
View File


+ 76
- 12
Assets/Scenes/Scoreboards.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -230,7 +230,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &247796230
PrefabInstance:
@ -247,7 +247,7 @@ PrefabInstance:
- target: {fileID: 6715947279418743284, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279418743280, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
@ -287,7 +287,7 @@ PrefabInstance:
- target: {fileID: 6715947279418743280, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6715947279418743280, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
@ -541,7 +541,7 @@ Camera:
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
field of view: 50
orthographic: 0
orthographic size: 5
m_Depth: -1
@ -567,7 +567,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 343314996}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 965.6, y: 523.15, z: -4.83}
m_LocalPosition: {x: 5.5, y: 2.66, z: -4.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -597,11 +597,6 @@ PrefabInstance:
propertyPath: m_Name
value: levelScoreboard
objectReference: {fileID: 0}
- target: {fileID: 4166744806657786151, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4166744806657786144, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_LocalPosition.x
@ -640,7 +635,7 @@ PrefabInstance:
- target: {fileID: 4166744806657786144, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4166744806657786144, guid: a475835665805f14892abc694728c976,
type: 3}
@ -853,6 +848,75 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1703320141}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1815326432
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1623985465130001500, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_Name
value: Menu Background
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8949cac80f422db4b905533098fbfaec, type: 3}
--- !u!1 &2074594311
GameObject:
m_ObjectHideFlags: 0

+ 39
- 39
Assets/Scenes/TuteLevelFive.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -1291,7 +1291,7 @@ PrefabInstance:
- target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -1430,7 +1430,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: -101.69998
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1438,7 +1438,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.0000076293945
value: -0.000037730482
objectReference: {fileID: 0}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory
@ -13202,6 +13202,41 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.characterCount
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_LocalPosition.x
@ -13342,41 +13377,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.characterCount
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3}
--- !u!1 &1792455936 stripped

+ 131
- 22
Assets/Scenes/TuteLevelFour.unity View File

@ -677,6 +677,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_LocalPosition.x
@ -817,16 +827,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
@ -2904,6 +2904,11 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 1147783794}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_PlaneDistance
value: 3
objectReference: {fileID: 0}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
@ -2921,16 +2926,20 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.00008392334
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.0000044933727
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory
value:
@ -2946,6 +2955,110 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1324620581, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: playButton
value:
objectReference: {fileID: 1687365505}
- target: {fileID: 4063344330312728798, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 4063344330312728798, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 5903294975835654680, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 5903294975835654680, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 2479877184796883465, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 2479877184796883465, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 882135482377070034, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 882135482377070034, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 6675265639106554679, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 6675265639106554679, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 7283875959267635394, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 7283875959267635394, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 8372508250093611510, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 8372508250093611510, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 7813366713799345557, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 7813366713799345557, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 8140460517834347054, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 8140460517834347054, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 8145629469272994069, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 8145629469272994069, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 7379606009448777834, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
@ -2964,10 +3077,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1324620581, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: playButton
value:
objectReference: {fileID: 1687365505}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
--- !u!1001 &378945308
@ -3773,6 +3882,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Name
value: Character
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: nextScene
@ -3810,11 +3924,6 @@ PrefabInstance:
propertyPath: isTuteLevel
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Name
value: Character
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_LocalPosition.x
@ -10915,7 +11024,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Collectable:
element: {fileID: 11400000, guid: 194f051bd7d3e7d4fb5b96a8e1d5b162, type: 2}
element: {fileID: 0}
Count: 2
isInfinit: 0
BlockMenu: {fileID: 1724137008}

+ 7
- 2
Assets/Scenes/TuteLevelOne.unity View File

@ -271,7 +271,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.00002031883
value: 0.000030329977
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
@ -3976,6 +3976,11 @@ PrefabInstance:
propertyPath: m_Name
value: Welcome Menu
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043221, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_LocalPosition.x
@ -4128,7 +4133,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}

+ 8
- 49
Assets/Scenes/TuteLevelThree.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -4001,11 +4001,6 @@ PrefabInstance:
propertyPath: m_Name
value: Single_Player Canvas
objectReference: {fileID: 0}
- target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: character
@ -4129,67 +4124,31 @@ PrefabInstance:
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
value: 10.91417
value: 22.587385
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000045776367
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.000015472826
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory
value:
objectReference: {fileID: 11400000, guid: 26baa66216f4923448239677997ac13d,
type: 2}
- target: {fileID: 5147304212338809448, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7379606009448777834, guid: 47297317c21fe8a4c91caa79d00cc9a6,
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7379606009448777834, guid: 47297317c21fe8a4c91caa79d00cc9a6,
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1363815578, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_havePropertiesChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1363815578, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5195354181466942484, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.199997
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}

+ 1
- 1
Assets/Scenes/TuteLevelTwo.unity View File

@ -506,7 +506,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.00005336916
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x

+ 0
- 8
Assets/Scripts/Components.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 8d7394d70ec233849a60a26da5f23b75
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 12
- 21
Assets/Scripts/MainMenuControllerClient.cs View File

@ -5,16 +5,16 @@ using UnityEngine;
public class MainMenuControllerClient : MonoBehaviour
{
public GameObject SettingsMenu;
public GameObject MainMenu;
public GameObject HowToPlayMenu_aim;
public GameObject HowToPlayMenu;
public GameObject HowToPlayMenu_aim;
public GameObject HowToPlayMenu_inventory;
//On Awake
private void Awake ()
{
MainMenu.SetActive (true);
SettingsMenu.SetActive (false);
HowToPlayMenu.SetActive(false);
HowToPlayMenu_aim.SetActive (false);
HowToPlayMenu_inventory.SetActive(false);
}
@ -25,20 +25,19 @@ public class MainMenuControllerClient : MonoBehaviour
UnityEngine.SceneManagement.SceneManager.LoadScene ("LoginScreen");
}
public void OnSettingsClick ()
{
//toggle which menu displays
MainMenu.SetActive (false);
SettingsMenu.SetActive (true);
}
public void OnTutorialClick ()
{
MainMenu.SetActive (false);
HowToPlayMenu_aim.SetActive (true);
HowToPlayMenu.SetActive (true);
}
public void OnTutorialContinueAimClick ()
public void OnTutorialContinueClick()
{
HowToPlayMenu.SetActive(false);
HowToPlayMenu_aim.SetActive(true);
}
public void OnTutorialContinueAimClick ()
{
HowToPlayMenu_aim.SetActive(false);
HowToPlayMenu_inventory.SetActive(true);
@ -49,17 +48,9 @@ public class MainMenuControllerClient : MonoBehaviour
UnityEngine.SceneManagement.SceneManager.LoadScene("TuteLevelOne");
}
//Settings Menu
public void OnBackClick ()
{
//Settings menu
SettingsMenu.SetActive (false);
MainMenu.SetActive (true);
}
//Settings Menu
public void OnBacktomainmenuClick()
{
HowToPlayMenu.SetActive(false);
HowToPlayMenu_aim.SetActive(false);
HowToPlayMenu_inventory.SetActive(false);
MainMenu.SetActive(true);

+ 0
- 8
Assets/Scripts/Managers/GameManager.cs View File

@ -144,7 +144,6 @@ public class GameManager : MonoBehaviour
yield return new WaitUntil(() => playerArray.All(p => p.waiting));
gamemode.FinishedMove(playerArray.ToArray());
}
if (gamemode.isGameOver(playerArray.ToArray()))
@ -164,8 +163,6 @@ public class GameManager : MonoBehaviour
}
Debug.Log("Finished Moving");
StartRound();
}
@ -194,8 +191,6 @@ public class GameManager : MonoBehaviour
private IEnumerator RunOnce(PlayerData data)
{
data.waiting = false;
bool blockFinished = false;
float waitTime;
@ -214,11 +209,8 @@ public class GameManager : MonoBehaviour
Debug.Log("Waiting: " + waitTime);
yield return new WaitForSeconds(waitTime);
}
data.waiting = true;
}
}
public class PlayerData

+ 20
- 47
Assets/Scripts/blockSpawn.cs View File

@ -1,11 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.Networking;
using Networking.Server;
using Networking;
using UnityEngine.SceneManagement;
public class blockSpawn : MonoBehaviour
{
@ -16,7 +12,6 @@ public class blockSpawn : MonoBehaviour
public Block[] SpawnBlocks;
bool spawned = false;
// Start is called before the first frame update
void Awake()
{
ConnectedClients = clientDataList.ConnectedClients;
@ -48,11 +43,19 @@ public class blockSpawn : MonoBehaviour
}
}
}
if(spawned == false){
//needs to be changed, can get caught in an infinite loop in negatives
spawnposition.z -= 1;
checkValid(spawnposition);
}
if (spawned == false){
//needs to be changed, can get caught in an infinite loop when z is 7/8
if (spawnposition.z >= 2 && spawnposition.z <= 8)
{
spawnposition.z += 1;
checkValid(spawnposition);
}
else if (spawnposition.z >= 8 && spawnposition.z <= 12)
{
spawnposition.z -= 1;
checkValid(spawnposition);
}
}
}
public void getPlayerLocations()
@ -60,55 +63,25 @@ public class blockSpawn : MonoBehaviour
Vector3 spawnposition = new Vector3(0, 1, 0);
Vector2 playerTwo = new Vector2(ConnectedClients[1].playerCharacter.CurrentBlock.VisualPosition.x, ConnectedClients[1].playerCharacter.CurrentBlock.VisualPosition.z);
Vector2 playerOne = new Vector2(ConnectedClients[0].playerCharacter.CurrentBlock.VisualPosition.x, ConnectedClients[0].playerCharacter.CurrentBlock.VisualPosition.z);
//x
if (playerOne.x > playerTwo.x)
{
if ((playerOne.x - playerTwo.x) <= 1)
{
spawnposition.x = playerOne.x;
}
else
{
spawnposition.x = ((playerOne.x - playerTwo.x)/2) + playerOne.x;
}
spawnposition.x = ((playerOne.x - playerTwo.x)/2) + playerTwo.x;
}
else
{
if ((playerTwo.x - playerOne.x) <= 1)
{
spawnposition.x = playerTwo.x;
}
else
{
spawnposition.x = ((playerTwo.x - playerOne.x)/2) + playerTwo.x;
}
spawnposition.x = ((playerTwo.x - playerOne.x)/2) + playerOne.x;
}
//z
if (playerOne.y > playerTwo.y)
{
if ((playerOne.y - playerTwo.y) <= 1)
{
spawnposition.z = playerOne.y;
}
else
{
spawnposition.z = ((playerOne.y - playerTwo.y)/2) + playerOne.y;
}
spawnposition.z = ((playerOne.y - playerTwo.y)/2) + playerTwo.y;
}
else
{
if ((playerTwo.y - playerOne.y) <= 1)
{
spawnposition.z = playerTwo.y;
}
else
{
spawnposition.z = ((playerTwo.y - playerOne.y)/2) + playerTwo.y;
}
spawnposition.z = ((playerTwo.y - playerOne.y)/2) + playerOne.y;
}
checkValid(spawnposition);
}
}
}

+ 4
- 2
Assets/Third Party Assets/KUBIKOS - World/Materials/Cloud_Mat.mat View File

@ -4,13 +4,15 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Cloud_Mat
m_Shader: {fileID: 4800000, guid: 36b3cd32ccf658445a39a541bb6a1e6a, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []

+ 3
- 0
Assets/Videos/dragdrop.mp4 View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b6bb88a11ba54fc9414fbefa0536db2a805d72296dacfdd002d5839d5c29bf54
size 222075

+ 21
- 0
Assets/Videos/dragdrop.mp4.meta View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 65420f7b43d20414cbbf61f112d43353
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
useLegacyImporter: 0
quality: 0.5
isColorLinear: 0
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

+ 2
- 2
Assets/Videos/toportal.mp4 View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:452661521514581fa64c601af09c13d881b0d0e3e5bc2d81d2173fa9df65cee5
size 285914
oid sha256:41c22dabb1585ffd092be58eacff46696c354a08d01f5e0d33a3e3232e7c61a7
size 367501

+ 1
- 1
ProjectSettings/EditorBuildSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c4723dc3a09139620a6b72fea1f04c72967c27cf726a578a3d779cd4455043c
oid sha256:40161240910626c8e801b5f99059825241f74c1641968ffcf7447136c21075dc
size 1650

+ 2
- 2
ProjectSettings/ProjectSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da82a2cc01a0e8391315901370f5a0744378ed01382396eada70ae3afc8df204
size 19549
oid sha256:45555b93e6e1b3667258c30533eaa4d4888438fda1d1d8df0f3acaa19ed9aebc
size 19545

Loading…
Cancel
Save