RMIT
/
Major_Project_A
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a 

# Conflicts:
#	Assets/Models.meta
#	Assets/Scenes/TuteLevelFour.unity
#	ProjectSettings/EditorBuildSettings.asset
Josh_Dev_branch
JoshuaReason 5 years ago
parent
05ef0cad45 2cfa6facba
commit
ab13483d31
19 changed files with 576 additions and 257 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -8
      Assets/Plugins.meta
  2. +0
    -8
      Assets/Plugins/IngameDebugConsole.meta
  3. +2
    -1
      Assets/Scenes/ColourCollide_Smaller.unity
  4. +7
    -7
      Assets/Scenes/MainMenu Client.unity
  5. +26
    -16
      Assets/Scenes/MainMenu Server.unity
  6. +1
    -1
      Assets/Scenes/Scoreboards.unity
  7. +229
    -31
      Assets/Scenes/Server Scenes/Lobby.unity
  8. +6
    -6
      Assets/Scenes/TuteLevelFive.unity
  9. +39
    -18
      Assets/Scenes/TuteLevelFour.unity
  10. +54
    -54
      Assets/Scenes/TuteLevelOne.unity
  11. +20
    -20
      Assets/Scenes/TuteLevelThree.unity
  12. +33
    -33
      Assets/Scenes/TuteLevelTwo.unity
  13. +2
    -2
      Assets/Scripts/Character.cs
  14. +1
    -1
      Assets/Scripts/Logic/Blocks/LogicBlock.cs
  15. +1
    -3
      Assets/Scripts/MainMenuControllerServer.cs
  16. +4
    -5
      Assets/Scripts/Managers/GameManager.cs
  17. +5
    -0
      Assets/Scripts/UI/Lobby/LobbyUIController.cs
  18. +145
    -42
      Assets/Scripts/blockSpawn.cs
  19. +1
    -1
      ProjectSettings/EditorBuildSettings.asset

+ 0
- 8
Assets/Plugins.meta View File

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

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

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

+ 2
- 1
Assets/Scenes/ColourCollide_Smaller.unity View File

@ -1043,7 +1043,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 0
m_IsActive: 1
--- !u!23 &200105990
MeshRenderer:
m_ObjectHideFlags: 0
@ -4390,6 +4390,7 @@ MonoBehaviour:
ConnectedClients: []
clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
SpawnBlocks: []
spawnedLocations: []
--- !u!114 &952972659
MonoBehaviour:
m_ObjectHideFlags: 0

+ 7
- 7
Assets/Scenes/MainMenu Client.unity View File

@ -1416,9 +1416,9 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'Drag and drop blocks into the tray press
m_text: 'Tap the screen to bring down the inventory. Drag and drop
play to watch your character move.'
blocks to the tray, press play to watch your character move'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -1464,7 +1464,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: 41
m_firstOverflowCharacterIndex: 59
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
@ -1487,10 +1487,10 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 670072610}
characterCount: 75
characterCount: 119
spriteCount: 0
spaceCount: 13
wordCount: 14
spaceCount: 23
wordCount: 22
linkCount: 0
lineCount: 2
pageCount: 1
@ -4887,7 +4887,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &2128700972
MonoBehaviour:
m_ObjectHideFlags: 0

+ 26
- 16
Assets/Scenes/MainMenu Server.unity View File

@ -510,7 +510,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 381263526}
m_RootOrder: 3
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}
@ -940,10 +940,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1027738788}
- {fileID: 895482692}
- {fileID: 2019972810}
- {fileID: 209870929}
- {fileID: 1027738788}
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1131,11 +1131,11 @@ RectTransform:
m_Children:
- {fileID: 1207094567}
- {fileID: 1502477522}
- {fileID: 1432221942}
- {fileID: 1784497421}
- {fileID: 751998597}
- {fileID: 500944089}
- {fileID: 957800960}
- {fileID: 1432221942}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1553,7 +1553,7 @@ RectTransform:
m_Children:
- {fileID: 1557758473}
m_Father: {fileID: 405258852}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1590,7 +1590,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1034326869}
m_RootOrder: 3
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}
@ -2070,7 +2070,7 @@ RectTransform:
m_Children:
- {fileID: 1777789507}
m_Father: {fileID: 405258852}
m_RootOrder: 4
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}
@ -2186,7 +2186,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 381263526}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2348,7 +2348,7 @@ RectTransform:
m_Children:
- {fileID: 1388208229}
m_Father: {fileID: 405258852}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2475,7 +2475,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1034326869}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2637,7 +2637,7 @@ RectTransform:
m_Children:
- {fileID: 1503009982}
m_Father: {fileID: 381263526}
m_RootOrder: 0
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}
@ -2824,10 +2824,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1632746109}
- {fileID: 1001866022}
- {fileID: 1833533259}
- {fileID: 542597635}
- {fileID: 1632746109}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3346,7 +3346,7 @@ RectTransform:
m_Children:
- {fileID: 221515901}
m_Father: {fileID: 405258852}
m_RootOrder: 2
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -3898,7 +3898,7 @@ RectTransform:
m_Children:
- {fileID: 469547961}
m_Father: {fileID: 1034326869}
m_RootOrder: 0
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}
@ -4325,7 +4325,7 @@ RectTransform:
m_Children:
- {fileID: 650352557}
m_Father: {fileID: 405258852}
m_RootOrder: 3
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}
@ -4457,7 +4457,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1034326869}
m_RootOrder: 2
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}
@ -4617,7 +4617,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 381263526}
m_RootOrder: 2
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}
@ -4943,5 +4943,15 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1625186047579908459, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1624186669684606712, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8949cac80f422db4b905533098fbfaec, type: 3}

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

@ -247,7 +247,7 @@ PrefabInstance:
- target: {fileID: 6715947279418743284, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279418743280, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}

+ 229
- 31
Assets/Scenes/Server Scenes/Lobby.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:
@ -381,7 +381,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 46.1
m_fontSize: 72
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -422,19 +422,19 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 263791919}
characterCount: 14
characterCount: 6
spriteCount: 0
spaceCount: 2
wordCount: 3
spaceCount: 0
wordCount: 1
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 1
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
@ -472,8 +472,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 800.00006, y: -250}
m_SizeDelta: {x: 300, y: 300}
m_AnchoredPosition: {x: 800, y: -323.56714}
m_SizeDelta: {x: 300, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &623206017
GameObject:
@ -628,6 +628,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 644276464}
m_CullTransparentMesh: 0
--- !u!1 &689060843
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 689060844}
- component: {fileID: 689060846}
- component: {fileID: 689060845}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &689060844
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 689060843}
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: 1431678305}
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 &689060845
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 689060843}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Back
--- !u!222 &689060846
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 689060843}
m_CullTransparentMesh: 0
--- !u!1 &872212410
GameObject:
m_ObjectHideFlags: 0
@ -665,16 +744,6 @@ MonoBehaviour:
IPText: {fileID: 910932172}
Content: {fileID: 1584683394}
ClientTag: {fileID: 263791918}
PlayerColors:
- {r: 0.06732824, g: 0.1707894, b: 0.8396226, a: 1}
- {r: 1, g: 0, b: 0.71488476, a: 1}
- {r: 1, g: 0.93624943, b: 0.023584902, a: 1}
- {r: 0, g: 0.9622642, b: 0.020812215, a: 1}
PlayerAnimals:
- Cat
- Pig
- Lion
- Turtle
--- !u!114 &872212412
MonoBehaviour:
m_ObjectHideFlags: 0
@ -751,6 +820,7 @@ RectTransform:
- {fileID: 1377133506}
- {fileID: 1584683394}
- {fileID: 90571881}
- {fileID: 1431678305}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1218,6 +1288,135 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1431678304
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1431678305}
- component: {fileID: 1431678308}
- component: {fileID: 1431678307}
- component: {fileID: 1431678306}
m_Layer: 0
m_Name: btn_Back
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1431678305
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1431678304}
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: 689060844}
m_Father: {fileID: 872212415}
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: 129.6, y: 74.3999}
m_SizeDelta: {x: 219.19995, y: 108.79999}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1431678306
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1431678304}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1431678307}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 872212411}
m_MethodName: OnClick_Back
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1431678307
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1431678304}
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: 0.93725497, g: 0.42352945, b: 0, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!222 &1431678308
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1431678304}
m_CullTransparentMesh: 0
--- !u!1 &1567704051
GameObject:
m_ObjectHideFlags: 0
@ -1372,21 +1571,20 @@ MonoBehaviour:
m_GameObject: {fileID: 1584683393}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 100
m_Right: 100
m_Top: 100
m_Bottom: 100
m_ChildAlignment: 1
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 300, y: 150}
m_Spacing: {x: 20, y: 20}
m_Constraint: 1
m_ConstraintCount: 1
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &1665905654
GameObject:
m_ObjectHideFlags: 0

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

@ -1408,11 +1408,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 222433593}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
@ -1438,8 +1433,13 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000015080629
value: 0.0000002119406
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 222433593}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory
value:

+ 39
- 18
Assets/Scenes/TuteLevelFour.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -2779,6 +2779,11 @@ 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
@ -2915,7 +2920,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000005286076
value: 0.0000122188385
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -3774,6 +3779,21 @@ PrefabInstance:
propertyPath: isTuteLevel
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: ClientLink.Color.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: ClientLink.Color.g
value: 0.9512801
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: ClientLink.Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_LocalPosition.x
@ -3829,16 +3849,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: characterSpeed
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5970776295824438666, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_IsActive
@ -7708,7 +7728,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0.54901963, g: 0.7019608, b: 0.8313726, a: 0}
m_BackGroundColor: {r: 0.54509807, g: 0.69803923, b: 0.82745105, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
@ -11643,8 +11663,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1653619343}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.2, y: 0.2, z: -2.35}
m_LocalScale: {x: 4.0426, y: 2.0213, z: 3.03195}
m_LocalPosition: {x: -1.9, y: 0.2, z: 22.2}
m_LocalScale: {x: 7, y: 1, z: 7}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
@ -12038,10 +12058,11 @@ PrefabInstance:
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_text
value: "In this level you will learn how to use the \nfor-loop block, a for-loop
block allows your character to repeat a number of actions a specified number
of times\ndrag and drop the for-loop block to the tray then\nclick play to
watch the character move"
value: In this level you will learn how to use the for-loop block, a for-loop
block allows your character to repeat a number of actions a number of times.
To use this block drag it into the tray and double click it to place blocks
inside, to exit click the pink up arrow, then click play to watch the character
move
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
@ -12056,17 +12077,17 @@ PrefabInstance:
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_textInfo.characterCount
value: 246
value: 308
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_textInfo.wordCount
value: 46
value: 60
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 46
value: 59
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
@ -12113,7 +12134,7 @@ PrefabInstance:
- target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
value: -20
objectReference: {fileID: 0}
- target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}

+ 54
- 54
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.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -244,16 +244,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
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
@ -271,7 +261,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0000028755978
value: 0.0000053478443
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
@ -281,11 +271,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
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
@ -296,6 +281,21 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 1208531385}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_PlaneDistance
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2479877184796883465, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 86
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
--- !u!1001 &19108096
@ -2017,8 +2017,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 771373465}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.42, y: 1, z: 1.41}
m_LocalScale: {x: 2.0398, y: 2.0398, z: 2.0398}
m_LocalPosition: {x: 4.5, y: 1, z: 1.41}
m_LocalScale: {x: 3, y: 2, z: 2}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
@ -4086,11 +4086,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 1208531385}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_havePropertiesChanged
@ -4116,6 +4111,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1425704337}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 1208531385}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3}
--- !u!1001 &6541614960476850314
@ -4270,36 +4270,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_MatchWidthOrHeight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7589238259672119554, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 111
objectReference: {fileID: 0}
- target: {fileID: 6379596649530639660, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -39
objectReference: {fileID: 0}
- target: {fileID: 6379596650567274008, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 11.000008
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -169
objectReference: {fileID: 0}
- target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
@ -4330,6 +4300,36 @@ PrefabInstance:
propertyPath: m_fontSizeBase
value: 60
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_MatchWidthOrHeight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7589238259672119554, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 111
objectReference: {fileID: 0}
- target: {fileID: 6379596649530639660, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -39
objectReference: {fileID: 0}
- target: {fileID: 6379596650567274008, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 11.000008
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -169
objectReference: {fileID: 0}
- target: {fileID: 7589238260184858646, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_Sprite

+ 20
- 20
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.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -234,16 +234,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 343624471}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_PlaneDistance
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_text
@ -339,6 +329,16 @@ PrefabInstance:
Level Three'
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 343624471}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_PlaneDistance
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3}
--- !u!1 &4947114 stripped
@ -1363,7 +1363,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0.54509807, g: 0.69411767, b: 0.82745105, a: 0}
m_BackGroundColor: {r: 0.54509807, g: 0.69803923, b: 0.82745105, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
@ -2484,8 +2484,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 647730074}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.6, y: 0.19, z: 1.8}
m_LocalScale: {x: 4.2278, y: 4.2278, z: 4.2278}
m_LocalPosition: {x: -35.9, y: 0.19, z: 42.4}
m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
@ -4111,11 +4111,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 343624471}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
@ -4137,7 +4132,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000010218018
value: 0.00000900157
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -4149,6 +4144,11 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 343624471}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
--- !u!1001 &1265836395

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

@ -484,11 +484,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 1433387488}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
@ -506,7 +501,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.0000044650105
value: 0.0000050811013
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
@ -516,6 +511,21 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
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}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 1433387488}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory
value:
@ -531,16 +541,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
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}
- target: {fileID: 7379606009448777834, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
@ -1428,16 +1428,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 1433387488}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_PlaneDistance
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_text
@ -1517,11 +1507,6 @@ 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
@ -1541,6 +1526,21 @@ PrefabInstance:
Level Two'
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 1433387488}
- target: {fileID: 7103365430685043226, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_PlaneDistance
value: 1
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
@ -2331,8 +2331,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1116978250}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.3, y: 0.6, z: 1.3}
m_LocalScale: {x: 2.5766, y: 2.5766, z: 2.5766}
m_LocalPosition: {x: -4.28, y: 0.6, z: 4.77}
m_LocalScale: {x: 4, y: 2, z: 4}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10

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

@ -80,10 +80,10 @@ public class Character : MonoBehaviour
if(isTuteLevel == false){
if (BlockTitlePrefab == null)
return;
TMPro.TextMeshPro temp = Instantiate(BlockTitlePrefab.gameObject).GetComponent<TMPro.TextMeshPro>();
temp.text = block.DisplayName;
temp.color = block.Color;
temp.color = ClientLink.Color;
temp.transform.position = transform.position + (Vector3.one * 0.25f);
temp.transform.rotation = Quaternion.LookRotation(temp.transform.position - Camera.main.transform.position);

+ 1
- 1
Assets/Scripts/Logic/Blocks/LogicBlock.cs View File

@ -206,7 +206,7 @@ public class BlockToken
{
LogicBlock retVal = (LogicBlock)ScriptableObject.CreateInstance(blockType);
Debug.Log("type: " + retVal.GetType());
//Debug.Log("type: " + retVal.GetType());
retVal.CopyToken(this);
return retVal;

+ 1
- 3
Assets/Scripts/MainMenuControllerServer.cs View File

@ -1,6 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine.UI;
using UnityEngine.UI;
using UnityEngine;
public class MainMenuControllerServer : MonoBehaviour

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

@ -96,8 +96,7 @@ public class GameManager : MonoBehaviour
{
gamemode.RoundStart(playerArray.ToArray());
LogicProtocols.FloatMsg RoundTime = new LogicProtocols.FloatMsg( gamemode.GetRoundTime());
//bspawn.getPlayerScores();
//bspawn.getPlayerLocations();
bspawn.Spawn();
playerArray.ForEach(p => p.client.conn.Send(LogicProtocols.SendRoundTime, RoundTime));
}
@ -105,11 +104,11 @@ public class GameManager : MonoBehaviour
{
playerArray.ForEach(p => p.recievedList = false);
Debug.Log("Doing Round Routine");
//Debug.Log("Doing Round Routine");
while (playerArray.Any(p => !p.blockReader.Finished))
{
Debug.Log("One Move");
//Debug.Log("One Move");
foreach (PlayerData player in playerArray)
StartCoroutine(RunOnce(player));
@ -181,7 +180,7 @@ public class GameManager : MonoBehaviour
blockFinished = data.blockReader.Read(data.character, AnimationTime,out waitTime);
Debug.Log("Waiting: " + waitTime);
//Debug.Log("Waiting: " + waitTime);
yield return new WaitForSeconds(waitTime);
gamemode.OnePlayerMoved(data);
}

+ 5
- 0
Assets/Scripts/UI/Lobby/LobbyUIController.cs View File

@ -59,6 +59,11 @@ public class LobbyUIController : MonoBehaviour
}
}
public void OnClick_Back()
{
UnityEngine.SceneManagement.SceneManager.LoadScene("MainMenu Server");
}
public void OnClick_StartGame()
{

+ 145
- 42
Assets/Scripts/blockSpawn.cs View File

@ -10,78 +10,181 @@ public class blockSpawn : MonoBehaviour
public List<ClientData> ConnectedClients;
public ClientList clientDataList;
public Block[] SpawnBlocks;
bool spawned = false;
public List<Vector3> spawnedLocations;
int scoreDifference = 0;
float average = 0;
void Awake()
{
ConnectedClients = clientDataList.ConnectedClients;
SpawnBlocks = FindObjectsOfType<Block>().Where(p => p.is_Walkable).ToArray();
spawnedLocations = new List<Vector3>();
}
public void getPlayerScores()
public void Spawn()
{
ConnectedClients.Sort((b, a) => a.SceneScore.CompareTo(b.SceneScore));
getPlayerScores();
getPlayerLocations(ConnectedClients.ToArray(), 0.75f);
//second spawning block only if needed
/* if (scoreDifference > average)
{
List<ClientData> lessClients = new List<ClientData>(ConnectedClients);
lessClients.RemoveAt(lessClients.Count - 1);
getPlayerLocations(lessClients.ToArray(), 0.6f);
}*/
}
public void checkValid(Vector3 spawnposition)
private void getPlayerScores()
{
for(int i = 0; i < SpawnBlocks.Length; i++)
ConnectedClients.Sort((b, a) => a.SceneScore.CompareTo(b.SceneScore));
int totalScores = 0;
scoreDifference = ConnectedClients[0].SceneScore + ConnectedClients[ConnectedClients.Count-1].SceneScore;
Debug.Log("score difference " + scoreDifference);
for(int i = 0; i < ConnectedClients.Count; 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;
Debug.Log("Instantiated new logic block: " + spawnLogicList[number].element + " at position: " + block.transform.position);
spawned = true;
break;
}
}
totalScores += ConnectedClients[i].SceneScore;
}
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)
average = totalScores / ConnectedClients.Count;
Debug.Log("score average " + average);
}
private bool checkDuplicatePosition(Vector3 spawnposition)
{
if (spawnedLocations.Count > 0)
{
for (int k = 0; k < spawnedLocations.Count; k++)
{
spawnposition.z += 1;
checkValid(spawnposition);
if (spawnedLocations[k].x == spawnposition.x && spawnedLocations[k].z == spawnposition.z)
{
return true;
}
}
else if (spawnposition.z >= 8 && spawnposition.z <= 12)
}
return false;
}
private bool checkValid(Vector3 spawnposition)
{
for (int i = 0; i < SpawnBlocks.Length; i++)
{
if (SpawnBlocks[i].position.x == spawnposition.x && SpawnBlocks[i].position.z == spawnposition.z)
{
spawnposition.z -= 1;
checkValid(spawnposition);
return true;
}
}
}
return false;
}
public void getPlayerLocations()
private void spawnBlock(Vector3 spawnposition)
{
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);
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;
Debug.Log("Instantiated new logic block: " + spawnLogicList[number].element + " at position: " + block.transform.position);
spawnedLocations.Add(spawnposition);
}
//x
if (playerOne.x > playerTwo.x)
private void checkLocation(Vector3 spawnposition)
{
bool duplicate = false;
if (duplicate == false)
{
spawnposition.x = ((playerOne.x - playerTwo.x)/2) + playerTwo.x;
bool valid = checkValid(spawnposition);
if (valid == true)
{
spawnBlock(spawnposition);
}
else
{
Block clostest = Utility.minBy(SpawnBlocks, p => Vector3.Distance(p.transform.position, spawnposition));
checkLocation(new Vector3(clostest.position.x, clostest.position.y + 1.5f, clostest.position.z));
}
}
else
{
spawnposition.x = ((playerTwo.x - playerOne.x)/2) + playerOne.x;
//this needs to be changed
Block clostest = Utility.minBy(SpawnBlocks, p => Vector3.Distance(p.transform.position, spawnposition));
checkLocation(new Vector3(clostest.position.x, clostest.position.y + 1.5f, clostest.position.z));
}
//z
if (playerOne.y > playerTwo.y)
}
private void getPlayerLocations(ClientData[] clients, float weightMultiplier)
{
float[] weightings = new float[clients.Length];
if(clients.Length > 1)
{
spawnposition.z = ((playerOne.y - playerTwo.y)/2) + playerTwo.y;
Vector3 spawnposition = new Vector3(0, 0, 0);
for (int i = 0; i < clients.Length; i++)
{
spawnposition += clients[i].playerCharacter.CurrentBlock.VisualPosition;
Debug.Log("currentBlock.VisualPosition " + clients[i].playerCharacter.CurrentBlock.VisualPosition);
}
spawnposition *= (1.0f / clients.Length);
Debug.Log("spawnposition " + spawnposition);
Vector3[] direction = new Vector3[clients.Length];
for (int i = 0; i < clients.Length; i++)
{
direction[i] = (spawnposition - clients[i].playerCharacter.CurrentBlock.VisualPosition);
Debug.Log("direction " + i + " " + direction[i]);
}
//weighting calculations
float[] difAvg = new float[clients.Length];
for (int i = 0; i < clients.Length; i++)
{
difAvg[i] = clients[i].SceneScore - average;
}
float[] ratio = new float[clients.Length];
Debug.Log("difAvg[0] " + difAvg[0]);
if (difAvg[0] == 0)
{
for (int i = 0; i < clients.Length; i++)
{
weightings[i] = 0.5f * weightMultiplier;
Debug.Log("weightings " + i + " " + weightings[i]);
}
}
else
{
for (int i = 0; i < clients.Length; i++)
{
ratio[i] = difAvg[i] / difAvg[0];
ratio[i] /= 2.0f;
ratio[i] += 0.5f;
weightings[i] = ratio[i] * weightMultiplier;
weightings[i] = Mathf.Clamp(weightings[i], 0, 1);
Debug.Log("weightings " + i + " " + weightings[i]);
}
}
//multiply weightings by the direction
//take average point and add directions
for (int i = 0; i < clients.Length; i++)
{
spawnposition += (weightings[i] * direction[i]);
Debug.Log("(weightings[i] * direction[i] " + (weightings[i] * direction[i]));
}
Debug.Log("spawnposition " + spawnposition);
//spawn first block
checkLocation(spawnposition);
}
else
{
spawnposition.z = ((playerTwo.y - playerOne.y)/2) + playerOne.y;
Vector2 playerOne = new Vector2(clients[0].playerCharacter.CurrentBlock.VisualPosition.x, clients[0].playerCharacter.CurrentBlock.VisualPosition.z);
int xVal = (int)Random.Range(-3.0f, 3.0f) + (int)playerOne.x;
int zVal = (int)Random.Range(-3.0f, 3.0f) + (int)playerOne.y;
checkLocation(new Vector3(xVal, 1.0f, zVal));
}
checkValid(spawnposition);
}
}

+ 1
- 1
ProjectSettings/EditorBuildSettings.asset View File

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

Write Preview
Loading…
Cancel
Save