Browse Source

Link client to character, Add instructions for how to play with video slots, new simpler background design scene (need to finish and screenshot for bg image)

Switching from laptop to desktop for bg scene
master
Claire Peta 5 years ago
parent
commit
3a7ba7d8b9
35 changed files with 18309 additions and 47141 deletions
  1. +1
    -1
      Assets/Data/Logic Blocks/Diagonal_Left.asset
  2. +1
    -1
      Assets/Data/Logic Blocks/Diagonal_Right.asset
  3. +1
    -1
      Assets/Data/Logic Blocks/Horse_Left.asset
  4. +1
    -1
      Assets/Data/Logic Blocks/Horse_Right.asset
  5. +0
    -8
      Assets/Plugins/IngameDebugConsole/Android.meta
  6. +0
    -8
      Assets/Plugins/IngameDebugConsole/Prefabs.meta
  7. +0
    -8
      Assets/Plugins/IngameDebugConsole/Scripts.meta
  8. +1
    -1
      Assets/Plugins/IngameDebugConsole/Sprites.meta
  9. +0
    -8
      Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta
  10. +2
    -2
      Assets/Prefabs/UI/Block Menu.prefab
  11. +6
    -6
      Assets/Prefabs/UI/MainScoreboard.prefab
  12. +1
    -1
      Assets/Prefabs/UI/Single_Player Canvas.prefab
  13. +7
    -7
      Assets/Prefabs/UI/Welcome Menu.prefab
  14. +1
    -1
      Assets/Prefabs/UI/levelScoreboard.prefab
  15. +62
    -62
      Assets/Scenes/Client Scenes/LoginScreen.unity
  16. +8
    -8
      Assets/Scenes/Client Scenes/WaitScene.unity
  17. +3339
    -1074
      Assets/Scenes/MainMenu Client.unity
  18. +20
    -20
      Assets/Scenes/MainMenu Server.unity
  19. +14709
    -237
      Assets/Scenes/MenuBackground.unity
  20. +1
    -232
      Assets/Scenes/Scoreboards.unity
  21. +27
    -82
      Assets/Scenes/TuteLevelOne.unity
  22. +20
    -52
      Assets/Scenes/TuteLevelTwo.unity
  23. +0
    -45274
      Assets/Scenes/abctest.unity
  24. +0
    -7
      Assets/Scenes/abctest.unity.meta
  25. +4
    -0
      Assets/Scripts/Character.cs
  26. +1
    -1
      Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs
  27. +0
    -8
      Assets/Scripts/LogicBlocks.meta
  28. +26
    -25
      Assets/Scripts/MainMenuControllerClient.cs
  29. +1
    -0
      Assets/Scripts/Managers/GameManager.cs
  30. +5
    -4
      Assets/Scripts/blockSpawn.cs
  31. +28
    -0
      Assets/Scripts/videoToUI.cs
  32. +11
    -0
      Assets/Scripts/videoToUI.cs.meta
  33. +1
    -1
      Assets/Videos.meta
  34. +3
    -0
      Assets/Videos/toportal.mp4
  35. +21
    -0
      Assets/Videos/toportal.mp4.meta

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

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

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

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

+ 1
- 1
Assets/Data/Logic Blocks/Horse_Left.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eee3ed3568097e1a75aa06ff39d7b10bf138950ecdb5be4d4fb9839d1ddd776a
oid sha256:c4d50f633ddd57df6f4b6359b1b011f3e7583ed8a3ce21d5b16eef2ad67c4976
size 937

+ 1
- 1
Assets/Data/Logic Blocks/Horse_Right.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a3dc4770101e834b8855eda337bec0b3301863bb381d806efe607c4e5a5a57db
oid sha256:4b95d04c44c4fc43111e2a60e1dc623051d0ead45c8dd94a56669844ad895b57
size 938

+ 0
- 8
Assets/Plugins/IngameDebugConsole/Android.meta View File

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

+ 0
- 8
Assets/Plugins/IngameDebugConsole/Prefabs.meta View File

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

+ 0
- 8
Assets/Plugins/IngameDebugConsole/Scripts.meta View File

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

+ 1
- 1
Assets/Plugins/IngameDebugConsole/Sprites.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cb5d7b23a9e684a41a6a5d4f300eb1e6
guid: a754109b775978346b385618b853df2a
folderAsset: yes
DefaultImporter:
externalObjects: {}

+ 0
- 8
Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta View File

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

+ 2
- 2
Assets/Prefabs/UI/Block Menu.prefab View File

@ -539,7 +539,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: 0, y: -166}
m_AnchoredPosition: {x: 0, y: -150}
m_SizeDelta: {x: 200, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7589238259402917143
@ -666,7 +666,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: 0, y: 119}
m_AnchoredPosition: {x: 0, y: 110}
m_SizeDelta: {x: 900, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7589238259672119676

+ 6
- 6
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: -301.99997}
m_AnchoredPosition: {x: 264, y: -250}
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: -103}
m_AnchoredPosition: {x: 264.00006, y: -85}
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: -196.00002}
m_AnchoredPosition: {x: 264.00006, y: -170}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5530482550460664304
@ -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: -103}
m_AnchoredPosition: {x: -130, y: -85}
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: -302}
m_AnchoredPosition: {x: -130, y: -250}
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: -196}
m_AnchoredPosition: {x: -130, y: -170}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6715947279265788346

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

@ -990,7 +990,7 @@ Canvas:
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 0}
m_PlaneDistance: 2
m_PlaneDistance: 4
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0

+ 7
- 7
Assets/Prefabs/UI/Welcome Menu.prefab View File

@ -34,7 +34,7 @@ RectTransform:
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_AnchoredPosition: {x: 0, y: -4.434082}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2238377503192027846
@ -110,7 +110,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: 0, y: -166}
m_AnchoredPosition: {x: 0, y: -155}
m_SizeDelta: {x: 150, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3718319460935249714
@ -237,8 +237,8 @@ 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: 0, y: 151}
m_SizeDelta: {x: 750, y: 50}
m_AnchoredPosition: {x: 0, y: 125}
m_SizeDelta: {x: 750, y: 125}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3718319461203907417
CanvasRenderer:
@ -316,7 +316,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: 0
m_firstOverflowCharacterIndex: 20
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
@ -399,7 +399,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: 0, y: -23}
m_AnchoredPosition: {x: 0, y: -20}
m_SizeDelta: {x: 900, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7103365430021195165
@ -581,7 +581,7 @@ Canvas:
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 0}
m_PlaneDistance: 95
m_PlaneDistance: 1
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0

+ 1
- 1
Assets/Prefabs/UI/levelScoreboard.prefab View File

@ -412,7 +412,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4166744806657786144
RectTransform:
m_ObjectHideFlags: 0

+ 62
- 62
Assets/Scenes/Client Scenes/LoginScreen.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:
@ -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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 383.95, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
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_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: 0
m_IsActive: 1
--- !u!224 &425791971
RectTransform:
m_ObjectHideFlags: 0
@ -1456,12 +1456,12 @@ GameObject:
m_Component:
- component: {fileID: 495082932}
m_Layer: 0
m_Name: Block Collection
m_Name: Too many players
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &495082932
RectTransform:
m_ObjectHideFlags: 0
@ -1480,7 +1480,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.0018920898, y: 73.92697}
m_AnchoredPosition: {x: -0.0018310547, y: 73.92697}
m_SizeDelta: {x: 0.19995117, y: 147.85999}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &560892411
@ -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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 830, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 383.95, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 830, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 370, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 613.95, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 613.95, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 600, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
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_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: 1
m_IsActive: 0
--- !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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 600, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 153.95001, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 370, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 153.95001, y: -148.95001}
m_SizeDelta: {x: 220, y: 220}
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_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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -378.95}
m_SizeDelta: {x: 220, y: 220}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2094861236
MonoBehaviour:

+ 8
- 8
Assets/Scenes/Client Scenes/WaitScene.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1}
m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -1199,7 +1199,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Diagonal Left
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -1268,13 +1268,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1789188686}
characterCount: 13
characterCount: 0
spriteCount: 0
spaceCount: 1
wordCount: 2
spaceCount: 0
wordCount: 0
linkCount: 0
lineCount: 1
pageCount: 1
lineCount: 0
pageCount: 0
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -1317,7 +1317,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2017732085
RectTransform:
m_ObjectHideFlags: 0

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


+ 20
- 20
Assets/Scenes/MainMenu Server.unity View File

@ -589,7 +589,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 750, y: 200}
m_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &209870930
MonoBehaviour:
@ -611,9 +611,9 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'Assets:
m_text: 'Assets: ANIMMAL KUBIKOS
Music:'
Music: currently n/a'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -641,8 +641,8 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 25
m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -682,10 +682,10 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 209870930}
characterCount: 14
characterCount: 44
spriteCount: 0
spaceCount: 1
wordCount: 2
spaceCount: 5
wordCount: 7
linkCount: 0
lineCount: 2
pageCount: 1
@ -1281,7 +1281,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &405258849
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1821,7 +1821,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 750, y: 200}
m_SizeDelta: {x: 750, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &542597636
MonoBehaviour:
@ -1872,8 +1872,8 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 25
m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -2490,7 +2490,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: 0, y: 150}
m_AnchoredPosition: {x: 0, y: 115}
m_SizeDelta: {x: 500, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &895482693
@ -2853,7 +2853,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: 0, y: 150}
m_AnchoredPosition: {x: 0, y: 115}
m_SizeDelta: {x: 500, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1001866023
@ -3015,7 +3015,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: 0, y: 200}
m_AnchoredPosition: {x: 0, y: 165}
m_SizeDelta: {x: 60, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1027738789
@ -3126,7 +3126,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1034326866
MonoBehaviour:
m_ObjectHideFlags: 0
@ -3808,7 +3808,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: 0, y: 200}
m_AnchoredPosition: {x: 0, y: 165}
m_SizeDelta: {x: 60, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1432221943
@ -4361,7 +4361,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: 0, y: 200}
m_AnchoredPosition: {x: 0, y: 165}
m_SizeDelta: {x: 60, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1632746110
@ -4899,7 +4899,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: 0, y: 75}
m_AnchoredPosition: {x: 0, y: 25}
m_SizeDelta: {x: 500, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1833533260
@ -5133,7 +5133,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: 0, y: 75}
m_AnchoredPosition: {x: 0, y: 25}
m_SizeDelta: {x: 500, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2019972811

+ 14709
- 237
Assets/Scenes/MenuBackground.unity
File diff suppressed because it is too large
View File


+ 1
- 232
Assets/Scenes/Scoreboards.unity View File

@ -244,11 +244,6 @@ PrefabInstance:
propertyPath: m_Name
value: MainScoreboard
objectReference: {fileID: 0}
- target: {fileID: 6715947279418743284, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279418743280, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_LocalPosition.x
@ -354,11 +349,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2405198234457668279, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_havePropertiesChanged
@ -369,31 +359,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_havePropertiesChanged
@ -404,31 +369,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_havePropertiesChanged
@ -439,31 +379,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_havePropertiesChanged
@ -474,31 +389,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_havePropertiesChanged
@ -509,36 +399,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_havePropertiesChanged
@ -549,36 +409,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_havePropertiesChanged
@ -589,36 +419,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_havePropertiesChanged
@ -629,38 +429,7 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 8897488140307869662, guid: bfffca149e6d42947a4de37af2b35d12, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bfffca149e6d42947a4de37af2b35d12, type: 3}
--- !u!1 &247796231 stripped
GameObject:

+ 27
- 82
Assets/Scenes/TuteLevelOne.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:
@ -177,7 +177,7 @@ PrefabInstance:
- target: {fileID: 6538870453604659611, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6538870453604659611, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -249,10 +249,15 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 1208531385}
- 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
value: 21.157137
value: 8.548341
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -266,7 +271,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000019548917
value: -0.00002031883
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
@ -274,7 +279,22 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.00006817545
value: 0.0000134155825
objectReference: {fileID: 0}
- target: {fileID: 2479877184796883465, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 86
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
@ -3956,11 +3976,6 @@ 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
@ -4071,16 +4086,6 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 1208531385}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_PlaneDistance
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_RenderMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_havePropertiesChanged
@ -4101,71 +4106,11 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_fontSize
value: 60
objectReference: {fileID: 0}
- target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_fontSizeBase
value: 60
objectReference: {fileID: 0}
- target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_firstOverflowCharacterIndex
value: -1
objectReference: {fileID: 0}
- target: {fileID: 3718319460935249712, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1425704337}
- target: {fileID: 8682979901053099699, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -4.434082
objectReference: {fileID: 0}
- target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -20
objectReference: {fileID: 0}
- target: {fileID: 3718319460935249713, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
objectReference: {fileID: 0}
- target: {fileID: 3718319460935249713, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_SizeDelta.x
value: 150
objectReference: {fileID: 0}
- target: {fileID: 3718319460935249713, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -171
objectReference: {fileID: 0}
- target: {fileID: 3718319460935249726, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Name
value: Play
objectReference: {fileID: 0}
- target: {fileID: 3718319460691159601, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4687107587237763965, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -249.99994
objectReference: {fileID: 0}
- target: {fileID: 5974870367232616169, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 672ae95e18ccfc14cba3e9ddcef36fab, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3}
--- !u!1001 &6541614960476850314
@ -4183,7 +4128,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
@ -4223,7 +4168,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 8
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}

+ 20
- 52
Assets/Scenes/TuteLevelTwo.unity View File

@ -492,25 +492,25 @@ PrefabInstance:
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
value: 25.485533
value: 16.580997
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.00001533499
value: -0.00005336916
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00008177165
value: 0.00004025721
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
@ -531,6 +531,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7379606009448777834, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
@ -1512,6 +1522,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnPlayClick
objectReference: {fileID: 0}
- target: {fileID: 3718319460935249726, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Name
value: Play
objectReference: {fileID: 0}
- target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@ -1531,11 +1546,6 @@ PrefabInstance:
Level Two'
objectReference: {fileID: 0}
- target: {fileID: 3718319460935249726, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Name
value: Play
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3}
--- !u!114 &722747776 stripped
@ -3483,11 +3493,6 @@ PrefabInstance:
propertyPath: m_Name
value: Block Menu
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_LocalPosition.x
@ -3598,36 +3603,11 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 1433387488}
- target: {fileID: 6379596649083080721, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_RenderMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080721, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_PlaneDistance
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917141, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_TargetGraphic
value:
objectReference: {fileID: 1530669373}
- target: {fileID: 7589238259402917141, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1826484083}
- target: {fileID: 7589238259402917141, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick
objectReference: {fileID: 0}
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1826484083}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
@ -3672,18 +3652,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1530669373 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7589238259402917142, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
m_PrefabInstance: {fileID: 1530669371}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1568314004
PrefabInstance:
m_ObjectHideFlags: 0

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


+ 0
- 7
Assets/Scenes/abctest.unity.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: f5b218984aa17a247be499298bca70c1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 4
- 0
Assets/Scripts/Character.cs View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
using Networking.Server;
public class Character : MonoBehaviour
{
@ -28,6 +29,9 @@ public class Character : MonoBehaviour
[Tooltip("Character to display")]
private string CharacterModel = "Bear";
[SerializeField]
public ClientData ClientLink;
[SerializeField]
private TMPro.TextMeshPro BlockTitlePrefab;

+ 1
- 1
Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs View File

@ -13,7 +13,7 @@ public class LogicCollectable_Multiplayer : Collectable
Destroy (gameObject);
//reference to client to send the message to the mobile of what block it picked up
//send the message to the mobile of what block it picked up
}

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

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

+ 26
- 25
Assets/Scripts/MainMenuControllerClient.cs View File

@ -7,18 +7,17 @@ public class MainMenuControllerClient : MonoBehaviour
{
public GameObject SettingsMenu;
public GameObject MainMenu;
public GameObject HowToPlayMenu;
public Button MusicButton;
bool musicVolume = true;
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);
}
//Main Menu Options
public void OnPlayClick ()
@ -36,32 +35,34 @@ public class MainMenuControllerClient : MonoBehaviour
public void OnTutorialClick ()
{
MainMenu.SetActive (false);
HowToPlayMenu.SetActive (true);
HowToPlayMenu_aim.SetActive (true);
}
public void OnTutorialContinueClick ()
public void OnTutorialContinueAimClick ()
{
UnityEngine.SceneManagement.SceneManager.LoadScene ("TuteLevelOne");
}
//Settings Menu
public void OnBackClick ()
HowToPlayMenu_aim.SetActive(false);
HowToPlayMenu_inventory.SetActive(true);
}
public void OnTutorialContinueInventroyClick()
{
UnityEngine.SceneManagement.SceneManager.LoadScene("TuteLevelOne");
}
//Settings Menu
public void OnBackClick ()
{
//Settings menu
SettingsMenu.SetActive (false);
MainMenu.SetActive (true);
}
public void OnMusicVolumeClick ()
{
if (musicVolume == true) {
//backgroundMusic.Stop();
MusicButton.GetComponentInChildren<Text> ().text = "Music Volume: OFF";
musicVolume = false;
} else {
//backgroundMusic.Play();
MusicButton.GetComponentInChildren<Text> ().text = "Music Volume: ON";
musicVolume = true;
}
}
//Settings Menu
public void OnBacktomainmenuClick()
{
HowToPlayMenu_aim.SetActive(false);
HowToPlayMenu_inventory.SetActive(false);
MainMenu.SetActive(true);
}
}

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

@ -167,6 +167,7 @@ public class GameManager : MonoBehaviour
newChar.Initialise(startingBlock, client.Inventory, client.characterAnimal);
newChar.transform.forward = startingBlock.SpawnDirection.ToVector();
playerData.Add(client.ID, new PlayerData(newChar,client));
newChar.ClientLink = client;
client.playerCharacter = newChar;
}
}

+ 5
- 4
Assets/Scripts/blockSpawn.cs View File

@ -49,6 +49,7 @@ 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);
}
@ -68,7 +69,7 @@ public class blockSpawn : MonoBehaviour
}
else
{
spawnposition.x = (playerOne.x - playerTwo.x) + playerOne.x;
spawnposition.x = ((playerOne.x - playerTwo.x)/2) + playerOne.x;
}
}
else
@ -79,7 +80,7 @@ public class blockSpawn : MonoBehaviour
}
else
{
spawnposition.x = (playerTwo.x - playerOne.x) + playerTwo.x;
spawnposition.x = ((playerTwo.x - playerOne.x)/2) + playerTwo.x;
}
}
@ -92,7 +93,7 @@ public class blockSpawn : MonoBehaviour
}
else
{
spawnposition.z = (playerOne.y - playerTwo.y) + playerOne.y;
spawnposition.z = ((playerOne.y - playerTwo.y)/2) + playerOne.y;
}
}
else
@ -103,7 +104,7 @@ public class blockSpawn : MonoBehaviour
}
else
{
spawnposition.z = (playerTwo.y - playerOne.y) + playerTwo.y;
spawnposition.z = ((playerTwo.y - playerOne.y)/2) + playerTwo.y;
}
}

+ 28
- 0
Assets/Scripts/videoToUI.cs View File

@ -0,0 +1,28 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.Video;
public class videoToUI : MonoBehaviour
{
public RawImage rawImage;
public VideoPlayer videoPlayer;
// Use this for initialization
void Start()
{
StartCoroutine(PlayVideo());
}
IEnumerator PlayVideo()
{
videoPlayer.Prepare();
WaitForSeconds waitForSeconds = new WaitForSeconds(1);
while (!videoPlayer.isPrepared)
{
yield return waitForSeconds;
break;
}
rawImage.texture = videoPlayer.texture;
videoPlayer.Play();
}
}

+ 11
- 0
Assets/Scripts/videoToUI.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2c59fb533848082408dd14670056bca5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

Assets/Models.meta → Assets/Videos.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 296bd90e667df1f4697823a0aa45acf0
guid: 6b55c06040c6f174897fce339f494f45
folderAsset: yes
DefaultImporter:
externalObjects: {}

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

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

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

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 619d5c66ef745a54e863e90cd22d0dcf
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:

Loading…
Cancel
Save