Browse Source

block spawn, change block to not walkable

master
Claire Peta 5 years ago
parent
commit
d35aa05de3
21 changed files with 6627 additions and 2176 deletions
  1. +2
    -2
      Assets/Data/Networking/Server/Realtime/ClientList.asset
  2. +110
    -0
      Assets/Resources/Logic Block.prefab
  3. +2
    -3
      Assets/Resources/Logic Block.prefab.meta
  4. +598
    -1
      Assets/Scenes/Client Scenes/WaitScene.unity
  5. +34
    -0
      Assets/Scenes/ColourCollide_Smaller.unity
  6. +1239
    -1659
      Assets/Scenes/MainMenu Client.unity
  7. +4393
    -472
      Assets/Scenes/MainMenu Server.unity
  8. +1
    -1
      Assets/Scenes/TuteLevelFive.unity
  9. +3
    -3
      Assets/Scenes/TuteLevelOne.unity
  10. +2
    -2
      Assets/Scripts/Block.cs
  11. +17
    -0
      Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs
  12. +11
    -0
      Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs.meta
  13. +0
    -18
      Assets/Scripts/MainMenuControllerClient.cs
  14. +80
    -12
      Assets/Scripts/MainMenuControllerServer.cs
  15. +4
    -0
      Assets/Scripts/Managers/GameManager.cs
  16. +2
    -0
      Assets/Scripts/Networking/Server/ClientList.cs
  17. +1
    -1
      Assets/Scripts/UI/ScoreBoard.cs
  18. +111
    -0
      Assets/Scripts/blockSpawn.cs
  19. +11
    -0
      Assets/Scripts/blockSpawn.cs.meta
  20. +3
    -1
      Assets/Third Party Assets/KUBIKOS - World/Prefabs/Cubes/Cube_Ground.prefab
  21. +3
    -1
      Assets/Third Party Assets/KUBIKOS - World/Prefabs/Cubes/Cube_Water.prefab

+ 2
- 2
Assets/Data/Networking/Server/Realtime/ClientList.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62992d14bd767b284eb2d81373b7d6dfcbd2e4c394d1d359d53bc0b0edde5729
size 709
oid sha256:3841da06902843ac539419eada2ceba17e04e66d858edf200e41da10dd6ed967
size 585

+ 110
- 0
Assets/Resources/Logic Block.prefab View File

@ -0,0 +1,110 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4538891995790515198
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6178319609588269617}
- component: {fileID: 3706322175691020057}
- component: {fileID: 8851474976931435449}
- component: {fileID: 7341485423880191522}
- component: {fileID: 6594707672895095347}
m_Layer: 0
m_Name: Logic Block
m_TagString: New Block
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6178319609588269617
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4538891995790515198}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1, y: 1, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3706322175691020057
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4538891995790515198}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8851474976931435449
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4538891995790515198}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &7341485423880191522
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4538891995790515198}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &6594707672895095347
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4538891995790515198}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0222bd78b8e1367498517eb231637f78, type: 3}
m_Name:
m_EditorClassIdentifier:
Collectable:
element: {fileID: 0}
Count: 0
isInfinit: 0

Assets/Plugins/IngameDebugConsole/Sprites.meta → Assets/Resources/Logic Block.prefab.meta View File

@ -1,7 +1,6 @@
fileFormatVersion: 2
guid: 236e63e61281abf43b31a363bd1dbb3d
folderAsset: yes
DefaultImporter:
guid: c88aff40a0b820e40b1718f1bee040d1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:

+ 598
- 1
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.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -268,6 +268,242 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 165353638}
m_CullTransparentMesh: 0
--- !u!1 &590656418
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 590656419}
- component: {fileID: 590656421}
- component: {fileID: 590656420}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &590656419
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 590656418}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0}
m_Children: []
m_Father: {fileID: 2017732085}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &590656420
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 590656418}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.8509804}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 4f0ccff308fa1304cb38a1c665f1216c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!222 &590656421
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 590656418}
m_CullTransparentMesh: 0
--- !u!1 &803287942
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 803287943}
- component: {fileID: 803287945}
- component: {fileID: 803287944}
m_Layer: 5
m_Name: you colelcted a new logic block
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &803287943
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803287942}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2017732085}
m_RootOrder: 1
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: 100}
m_SizeDelta: {x: 900, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &803287944
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803287942}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'YOU COLLECTED A NEW
LOGIC BLOCK'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190335
m_fontColor: {r: 1, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 60
m_fontSizeBase: 60
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 803287944}
characterCount: 31
spriteCount: 0
spaceCount: 5
wordCount: 6
linkCount: 0
lineCount: 2
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &803287945
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803287942}
m_CullTransparentMesh: 0
--- !u!1 &839902839
GameObject:
m_ObjectHideFlags: 0
@ -426,6 +662,7 @@ RectTransform:
m_Children:
- {fileID: 165353639}
- {fileID: 1377133506}
- {fileID: 2017732085}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -669,6 +906,167 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1377133505}
m_CullTransparentMesh: 0
--- !u!1 &1487159130
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1487159131}
- component: {fileID: 1487159133}
- component: {fileID: 1487159132}
m_Layer: 5
m_Name: you collected__
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1487159131
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1487159130}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2017732085}
m_RootOrder: 2
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: -100}
m_SizeDelta: {x: 900, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1487159132
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1487159130}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: "You collected \t \nThis new block will be available to you
next move"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4285624689
m_fontColor: {r: 0.44313726, g: 0.44313726, b: 0.44313726, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 45
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1487159132}
characterCount: 79
spriteCount: 0
spaceCount: 27
wordCount: 12
linkCount: 0
lineCount: 3
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1487159133
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1487159130}
m_CullTransparentMesh: 0
--- !u!1 &1665905654
GameObject:
m_ObjectHideFlags: 0
@ -744,3 +1142,202 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1665905654}
m_CullTransparentMesh: 0
--- !u!1 &1789188684
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1789188685}
- component: {fileID: 1789188687}
- component: {fileID: 1789188686}
m_Layer: 5
m_Name: block
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1789188685
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789188684}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2017732085}
m_RootOrder: 3
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: 225, y: -50}
m_SizeDelta: {x: 450, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1789188686
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789188684}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Diagonal Left
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294904064
m_fontColor: {r: 0, g: 0.038576603, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 45
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 513
m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1789188686}
characterCount: 13
spriteCount: 0
spaceCount: 1
wordCount: 2
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1789188687
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1789188684}
m_CullTransparentMesh: 0
--- !u!1 &2017732084
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2017732085}
m_Layer: 0
m_Name: Block Collection
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2017732085
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2017732084}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 590656419}
- {fileID: 803287943}
- {fileID: 1487159131}
- {fileID: 1789188685}
m_Father: {fileID: 872212415}
m_RootOrder: 2
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: -73.9285}
m_SizeDelta: {x: 0, y: -147.857}
m_Pivot: {x: 0.5, y: 0.5}

+ 34
- 0
Assets/Scenes/ColourCollide_Smaller.unity View File

@ -2660,6 +2660,7 @@ GameObject:
- component: {fileID: 952972661}
- component: {fileID: 952972660}
- component: {fileID: 952972659}
- component: {fileID: 952972658}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
@ -2667,6 +2668,34 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &952972658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 952972657}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4bedcf540a02cd34886a443a80463285, type: 3}
m_Name:
m_EditorClassIdentifier:
spawnLogicList:
- element: {fileID: 11400000, guid: 8f19e10be0ee35345a97f600791a8747, type: 2}
Count: 1
isInfinit: 0
- element: {fileID: 11400000, guid: b5887451436a375419e538ef3706ecf9, type: 2}
Count: 1
isInfinit: 0
- element: {fileID: 11400000, guid: ba4f7785390953441913d0e6f419d9b7, type: 2}
Count: 1
isInfinit: 0
- element: {fileID: 11400000, guid: 0086f005a63e8404aaee25e4ae4734d7, type: 2}
Count: 1
isInfinit: 0
ConnectedClients: []
clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
SpawnBlocks: []
--- !u!114 &952972659
MonoBehaviour:
m_ObjectHideFlags: 0
@ -5648,6 +5677,11 @@ PrefabInstance:
propertyPath: levelInfo
value:
objectReference: {fileID: 460731873}
- target: {fileID: 1698745550996942698, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: bspawn
value:
objectReference: {fileID: 952972658}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3}
--- !u!1001 &2067209576

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


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


+ 1
- 1
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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

+ 3
- 3
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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -266,7 +266,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000038146973
value: -0.000013677857
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
@ -274,7 +274,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00005362805
value: 0.00006817545
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}

+ 2
- 2
Assets/Scripts/Block.cs View File

@ -16,7 +16,7 @@ public class Block : MonoBehaviour
[SerializeField]
[Tooltip("Can this type of block be walked on")]
private bool _isWalkable = true;
public bool is_Walkable = true;
[Tooltip("Can this block be spawned on")]
public bool isSpawnable = false;
@ -48,7 +48,7 @@ public class Block : MonoBehaviour
public bool isWalkable(LayerMask layerMask)
{
//checks if there is no block above this one and that this is tagged as walkable
return (_isWalkable && !isBlockAtPosition(position + Vector3.up, 1, layerMask));
return (is_Walkable && !isBlockAtPosition(position + Vector3.up, 1, layerMask));
}
#endregion Public Functions

+ 17
- 0
Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs View File

@ -0,0 +1,17 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class LogicCollectable_Multiplayer : Collectable
{
[SerializeField]
public Inventory.Data Collectable;
public override void OnCollect (Character character)
{
Destroy (gameObject);
}
}

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

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

+ 0
- 18
Assets/Scripts/MainMenuControllerClient.cs View File

@ -9,15 +9,9 @@ public class MainMenuControllerClient : MonoBehaviour
public GameObject MainMenu;
public GameObject HowToPlayMenu;
public Button SoundButton;
public Button MusicButton;
public Button DifficultyButton;
bool soundVolume = true;
bool musicVolume = true;
int difficulty = 1;
//On Awake
private void Awake ()
{
@ -58,18 +52,6 @@ public class MainMenuControllerClient : MonoBehaviour
MainMenu.SetActive (true);
}
//Settings menu
public void OnSoundVolumeClick ()
{
if (soundVolume == true) {
SoundButton.GetComponentInChildren<Text> ().text = "Sound Volume: OFF";
soundVolume = false;
} else {
SoundButton.GetComponentInChildren<Text> ().text = "Sound Volume: ON";
soundVolume = true;
}
}
public void OnMusicVolumeClick ()
{
if (musicVolume == true) {

+ 80
- 12
Assets/Scripts/MainMenuControllerServer.cs View File

@ -5,22 +5,28 @@ using UnityEngine;
public class MainMenuControllerServer : MonoBehaviour
{
// public GameObject SettingsMenu;
public GameObject MainMenu;
public GameObject MainMenu;
public GameObject SettingsMenu;
public GameObject AboutMenu;
public GameObject CreditsMenu;
//public Button SoundButton;
//public Button MusicButton;
//public Button DifficultyButton;
public Button SoundButton;
public Button MusicButton;
public Button DifficultyButton;
public Button playerMovesButton;
bool soundVolume = true;
bool musicVolume = true;
bool playerMoves = true;
int difficulty = 1;
//On Awake
private void Awake()
{
MainMenu.SetActive(true);
//SettingsMenu.SetActive(false);
SettingsMenu.SetActive(false);
AboutMenu.SetActive(false);
CreditsMenu.SetActive(false);
}
//Main Menu Options
@ -33,46 +39,108 @@ public class MainMenuControllerServer : MonoBehaviour
Application.Quit();
}
public void OnAboutClick()
{
//toggle which menu displays
MainMenu.SetActive(false);
AboutMenu.SetActive(true);
}
public void OnCreditClick()
{
//toggle which menu displays
MainMenu.SetActive(false);
CreditsMenu.SetActive(true);
}
public void OnSettingsClick()
{
//toggle which menu displays
MainMenu.SetActive(false);
//SettingsMenu.SetActive(true);
SettingsMenu.SetActive(true);
}
//Settings Menu
public void OnBackSettingsClick ()
{
//Settings menu
SettingsMenu.SetActive (false);
MainMenu.SetActive (true);
}
public void OnBackAboutClick ()
{
//about menu
AboutMenu.SetActive (false);
MainMenu.SetActive (true);
}
public void OnBackCreditClick ()
{
//about menu
CreditsMenu.SetActive (false);
MainMenu.SetActive (true);
}
//Settings menu
public void OnMusicVolumeClick()
{
if (musicVolume == true)
{
//backgroundMusic.Stop();
//MusicButton.GetComponentInChildren<Text>().text = "Music Volume: OFF";
MusicButton.GetComponentInChildren<Text>().text = "Music Volume: OFF";
musicVolume = false;
}
else
{
//backgroundMusic.Play();
//MusicButton.GetComponentInChildren<Text>().text = "Music Volume: ON";
MusicButton.GetComponentInChildren<Text>().text = "Music Volume: ON";
musicVolume = true;
}
}
//Settings menu
public void OnSoundVolumeClick ()
{
if (soundVolume == true) {
SoundButton.GetComponentInChildren<Text> ().text = "Sound Volume: OFF";
soundVolume = false;
} else {
SoundButton.GetComponentInChildren<Text> ().text = "Sound Volume: ON";
soundVolume = true;
}
}
public void OnDifficultyClick()
{
if (difficulty == 1)
{
//DifficultyButton.GetComponentInChildren<Text>().text = "Difficulty: MEDIUM";
DifficultyButton.GetComponentInChildren<Text>().text = "Difficulty: MEDIUM";
difficulty = 2;
}
else if (difficulty == 2)
{
//DifficultyButton.GetComponentInChildren<Text>().text = "Difficulty: HARD";
DifficultyButton.GetComponentInChildren<Text>().text = "Difficulty: HARD";
difficulty = 3;
}
else
{
//DifficultyButton.GetComponentInChildren<Text>().text = "Difficulty: EASY";
DifficultyButton.GetComponentInChildren<Text>().text = "Difficulty: EASY";
difficulty = 1;
}
}
public void OnDisplayPlayerMoves()
{
if (playerMoves == true)
{
playerMovesButton.GetComponentInChildren<Text>().text = "Display Player Moves: OFF";
playerMoves = false;
}
else
{
playerMovesButton.GetComponentInChildren<Text>().text = "Display Player Moves: ON";
playerMoves = true;
}
}
}

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

@ -42,6 +42,7 @@ public class GameManager : MonoBehaviour
#endregion Read Only
public GameObject levelInfo;
public blockSpawn bspawn;
public void Awake()
{
@ -143,6 +144,9 @@ public class GameManager : MonoBehaviour
player.client.ChangeScene("ClientScene");
}
Debug.Log("Finished Moving");
bspawn.getPlayerLocations();
StartRound();
}

+ 2
- 0
Assets/Scripts/Networking/Server/ClientList.cs View File

@ -191,6 +191,8 @@ namespace Networking.Server
/// </summary>
public Inventory Inventory;
public Character playerCharacter;
public void SendInventory()
{
Debug.Log("Sending inventory");

+ 1
- 1
Assets/Scripts/UI/ScoreBoard.cs View File

@ -27,7 +27,7 @@ public class ScoreBoard : MonoBehaviour
{
display.SetActive (true);
yield return new WaitForSeconds(time);
SceneManager.LoadScene("ServerTestScene");
SceneManager.LoadScene("MainMenu Server");
}
public void endGame()

+ 111
- 0
Assets/Scripts/blockSpawn.cs View File

@ -0,0 +1,111 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.Networking;
using Networking.Server;
using Networking;
using UnityEngine.SceneManagement;
public class blockSpawn : MonoBehaviour
{
[SerializeField]
public Inventory.Data[] spawnLogicList;
public List<ClientData> ConnectedClients;
public ClientList clientDataList;
public Block[] SpawnBlocks;
bool spawned = false;
// Start is called before the first frame update
void Start()
{
ConnectedClients = clientDataList.ConnectedClients;
SpawnBlocks = FindObjectsOfType<Block>().Where(p => p.is_Walkable).ToArray();
}
public void getPlayerScores()
{
ConnectedClients.Sort((b, a) => a.SceneScore.CompareTo(b.SceneScore));
}
public void checkValid(Vector3 spawnposition)
{
for(int i = 0; i < SpawnBlocks.Length; i++)
{
if(spawned == false){
if (SpawnBlocks[i].position.x == spawnposition.x && SpawnBlocks[i].position.z == spawnposition.z)
{
GameObject prefab = Resources.Load("Logic Block") as GameObject;
GameObject block = Instantiate(prefab);
int number = (int)Random.Range(1.0f, spawnLogicList.Length);
block.GetComponent<LogicCollectable_Multiplayer>().Collectable.element = spawnLogicList[number].element;
block.GetComponent<LogicCollectable_Multiplayer>().Collectable.Count = spawnLogicList[number].Count;
block.transform.position = spawnposition;
spawned = true;
break;
}
}
}
if(spawned == false){
spawnposition.z -= 1;
checkValid(spawnposition);
}
}
public void getPlayerLocations()
{
Vector3 spawnposition = new Vector3(0, 1, 0);
Vector2 playerOne = new Vector2(ConnectedClients[0].playerCharacter.CurrentBlock.VisualPosition.x, ConnectedClients[0].playerCharacter.CurrentBlock.VisualPosition.z);
Vector2 playerTwo = new Vector2(ConnectedClients[1].playerCharacter.CurrentBlock.VisualPosition.x, ConnectedClients[1].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) + playerOne.x;
}
}
else
{
if ((playerTwo.x - playerOne.x) <= 1)
{
spawnposition.x = playerTwo.x;
}
else
{
spawnposition.x = (playerTwo.x - playerOne.x) + playerTwo.x;
}
}
//z
if (playerOne.y > playerTwo.y)
{
if ((playerOne.y - playerTwo.y) <= 1)
{
spawnposition.z = playerOne.y;
}
else
{
spawnposition.z = (playerOne.y - playerTwo.y) + playerOne.y;
}
}
else
{
if ((playerTwo.y - playerOne.y) <= 1)
{
spawnposition.z = playerTwo.y;
}
else
{
spawnposition.z = (playerTwo.y - playerOne.y) + playerTwo.y;
}
}
checkValid(spawnposition);
}
}

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

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

+ 3
- 1
Assets/Third Party Assets/KUBIKOS - World/Prefabs/Cubes/Cube_Ground.prefab View File

@ -105,4 +105,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
VisualOffset: {x: 0, y: 0.5, z: 0}
_isWalkable: 0
is_Walkable: 0
isSpawnable: 0
SpawnDirection: 2

+ 3
- 1
Assets/Third Party Assets/KUBIKOS - World/Prefabs/Cubes/Cube_Water.prefab View File

@ -105,4 +105,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
VisualOffset: {x: 0, y: 0.5, z: 0}
_isWalkable: 0
is_Walkable: 0
isSpawnable: 0
SpawnDirection: 2

Loading…
Cancel
Save