diff --git a/Assets/Data/GameModes/ColorCollide.asset b/Assets/Data/GameModes/ColorCollide.asset index 3bd63a4..079d843 100644 --- a/Assets/Data/GameModes/ColorCollide.asset +++ b/Assets/Data/GameModes/ColorCollide.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25df2a78a63b91d5d6e0cd99283ff0e03bf82505fe6c3a31a840a43725e367e4 -size 582 +oid sha256:4f5665ff7e33e7b3f67d2bc4fd81bb71ff3410c4eec43e0cad8ea965c43b0a1d +size 589 diff --git a/Assets/Data/Logic Blocks/ForLoop.asset b/Assets/Data/Logic Blocks/ForLoop.asset index 598bf3b..dcbbfbf 100644 --- a/Assets/Data/Logic Blocks/ForLoop.asset +++ b/Assets/Data/Logic Blocks/ForLoop.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bedf21a36efd57e309566f8720c0ef1f348713ed8aca032e51b42634e368fb4a -size 712 +oid sha256:f6712f10315d70ca4180ef96202f61cc5350369d0f8ca8a441e9401d88dd531c +size 572 diff --git a/Assets/Models.meta b/Assets/Models.meta deleted file mode 100644 index 5346456..0000000 --- a/Assets/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 296bd90e667df1f4697823a0aa45acf0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/IngameDebugConsole/Android.meta b/Assets/Plugins/IngameDebugConsole/Android.meta deleted file mode 100644 index 12049b6..0000000 --- a/Assets/Plugins/IngameDebugConsole/Android.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3d7d7a61a5341904eb3c65af025b1d86 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/IngameDebugConsole/Prefabs.meta b/Assets/Plugins/IngameDebugConsole/Prefabs.meta deleted file mode 100644 index 6aa8bf2..0000000 --- a/Assets/Plugins/IngameDebugConsole/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7dbc36665bc0d684db9a4447e27a7a4b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/IngameDebugConsole/Scripts.meta b/Assets/Plugins/IngameDebugConsole/Scripts.meta deleted file mode 100644 index 72dcaac..0000000 --- a/Assets/Plugins/IngameDebugConsole/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 860c08388401a6d4e858fe4910ea9337 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta b/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta deleted file mode 100644 index f3769b1..0000000 --- a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f6caae32d463529478f2186f47c2e3fe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/UI/Player Canvas.prefab b/Assets/Prefabs/UI/Player Canvas.prefab index 425e539..645ca59 100644 --- a/Assets/Prefabs/UI/Player Canvas.prefab +++ b/Assets/Prefabs/UI/Player Canvas.prefab @@ -1473,6 +1473,7 @@ GameObject: - component: {fileID: 5195354183101525348} - component: {fileID: 5195354183101525349} - component: {fileID: 5195354183101525346} + - component: {fileID: 3185526843783068320} m_Layer: 5 m_Name: Logic Trough m_TagString: Untagged @@ -1553,6 +1554,29 @@ MonoBehaviour: m_EditorClassIdentifier: m_AspectMode: 0 m_AspectRatio: 8.548341 +--- !u!114 &3185526843783068320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5195354183101525344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 140e56929e1450a48b2f7716511bb327, type: 3} + m_Name: + m_EditorClassIdentifier: + Priority: 0 + Prefab: {fileID: 6973439230367005604, guid: f1daf3f500b22a048bbbad4287c2fcb2, type: 3} + insertIndex: -1 + content: {fileID: 5195354181806561359} + playButton: {fileID: 5195354181250555041} + returnButton: {fileID: 4080157917815310858} + border: {fileID: 5195354183101525349} + maxLength: 6 + reader: + LogicChain: [] + readerQueue: [] --- !u!1 &5195354183134146557 GameObject: m_ObjectHideFlags: 0 @@ -1768,6 +1792,7 @@ MonoBehaviour: maxLength: 6 reader: LogicChain: [] + readerQueue: [] --- !u!114 &5195354183157824121 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/Single_Player Canvas.prefab b/Assets/Prefabs/UI/Single_Player Canvas.prefab index 868771b..491898e 100644 --- a/Assets/Prefabs/UI/Single_Player Canvas.prefab +++ b/Assets/Prefabs/UI/Single_Player Canvas.prefab @@ -33,6 +33,7 @@ RectTransform: m_Children: - {fileID: 882135482377070034} - {fileID: 6675265639106554679} + - {fileID: 7283875959267635394} m_Father: {fileID: 6538870453604659611} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -104,11 +105,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 140e56929e1450a48b2f7716511bb327, type: 3} m_Name: m_EditorClassIdentifier: + Priority: 0 Prefab: {fileID: 6973439230367005604, guid: f1daf3f500b22a048bbbad4287c2fcb2, type: 3} insertIndex: -1 content: {fileID: 1704581577} + playButton: {fileID: 6977535679819254998} + returnButton: {fileID: 1577115897171824958} + border: {fileID: 1185103757933431843} + maxLength: 6 reader: LogicChain: [] + readerQueue: [] --- !u!1 &1319348998275902331 GameObject: m_ObjectHideFlags: 0 @@ -199,6 +206,135 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 0 +--- !u!1 &1577115897171824958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7283875959267635394} + - component: {fileID: 7574343917195153429} + - component: {fileID: 3920032035348858867} + - component: {fileID: 7875735305356820556} + m_Layer: 5 + m_Name: Return Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7283875959267635394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577115897171824958} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8145629469272994069} + m_Father: {fileID: 2479877184796883465} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -70, y: 0} + m_SizeDelta: {x: 100, y: -40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7574343917195153429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577115897171824958} + m_CullTransparentMesh: 0 +--- !u!114 &3920032035348858867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577115897171824958} + 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.972549, g: 0, b: 0.7979467, 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: 10905, guid: 0000000000000000f000000000000000, type: 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!114 &7875735305356820556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577115897171824958} + 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: 3920032035348858867} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1324620581} + m_MethodName: OnClick_Return + 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!1 &2324393282867721745 GameObject: m_ObjectHideFlags: 0 @@ -1062,6 +1198,166 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &7255158951507391129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8145629469272994069} + - component: {fileID: 6001699933647495552} + - component: {fileID: 4043978199840302704} + m_Layer: 5 + m_Name: TextMeshPro Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8145629469272994069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7255158951507391129} + 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: 7283875959267635394} + 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!222 &6001699933647495552 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7255158951507391129} + m_CullTransparentMesh: 0 +--- !u!114 &4043978199840302704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7255158951507391129} + 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: '>' + 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: 4278190080 + m_fontColor: {r: 0, 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: 72 + m_fontSizeBase: 24.98 + m_fontWeight: 400 + m_enableAutoSizing: 1 + 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: 4043978199840302704} + characterCount: 1 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + 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!1 &7648386990230027358 GameObject: m_ObjectHideFlags: 0 @@ -1096,7 +1392,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.00001303082, y: 0.000037865175} + m_AnchoredPosition: {x: 0.00001303082, y: 0.0000076293945} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5716221044664382828 diff --git a/Assets/Prefabs/UI/levelScoreboard.prefab b/Assets/Prefabs/UI/levelScoreboard.prefab index a1bac20..2a8dc95 100644 --- a/Assets/Prefabs/UI/levelScoreboard.prefab +++ b/Assets/Prefabs/UI/levelScoreboard.prefab @@ -139,7 +139,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 3 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -208,13 +208,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744805866922917} - characterCount: 1 + characterCount: 0 spriteCount: 0 spaceCount: 0 - wordCount: 1 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -299,7 +299,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 4 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -368,13 +368,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744806223885057} - characterCount: 1 + characterCount: 0 spriteCount: 0 spaceCount: 0 - wordCount: 1 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -568,7 +568,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 2 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -637,13 +637,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744806700843740} - characterCount: 1 + characterCount: 0 spriteCount: 0 spaceCount: 0 - wordCount: 1 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -728,7 +728,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 10 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -797,13 +797,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744806702247817} - characterCount: 2 + characterCount: 0 spriteCount: 0 spaceCount: 0 - wordCount: 1 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -1048,7 +1048,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 5 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1117,13 +1117,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744807027815185} - characterCount: 1 + characterCount: 0 spriteCount: 0 spaceCount: 0 - wordCount: 1 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -1208,7 +1208,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 1 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1277,13 +1277,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744807162682307} - characterCount: 1 + characterCount: 0 spriteCount: 0 spaceCount: 0 - wordCount: 1 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -1368,7 +1368,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 2 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1437,13 +1437,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744807220131704} - characterCount: 1 + characterCount: 0 spriteCount: 0 spaceCount: 0 - wordCount: 1 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -1528,7 +1528,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 7 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1597,13 +1597,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744807562529858} - characterCount: 1 + characterCount: 0 spriteCount: 0 spaceCount: 0 - wordCount: 1 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 diff --git a/Assets/Scenes/Client Scenes/ClientScene.unity b/Assets/Scenes/Client Scenes/ClientScene.unity index 59bbb4b..07eb681 100644 --- a/Assets/Scenes/Client Scenes/ClientScene.unity +++ b/Assets/Scenes/Client Scenes/ClientScene.unity @@ -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: @@ -112,18 +112,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &70099146 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5195354181250555041, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - type: 3} - m_PrefabInstance: {fileID: 5195354181466942481} - m_PrefabAsset: {fileID: 0} ---- !u!1 &136803099 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4080157917815310858, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - type: 3} - m_PrefabInstance: {fileID: 5195354181466942481} - m_PrefabAsset: {fileID: 0} --- !u!1 &1254212986 GameObject: m_ObjectHideFlags: 0 @@ -193,45 +181,16 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1324620580 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5195354183101525344, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - type: 3} - m_PrefabInstance: {fileID: 5195354181466942481} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1324620581 +--- !u!114 &1324620581 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324620580} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 140e56929e1450a48b2f7716511bb327, type: 3} - m_Name: - m_EditorClassIdentifier: - Priority: 0 - Prefab: {fileID: 6973439230367005604, guid: f1daf3f500b22a048bbbad4287c2fcb2, type: 3} - insertIndex: -1 - content: {fileID: 1704581577} - playButton: {fileID: 70099146} - returnButton: {fileID: 136803099} - border: {fileID: 1324620582} - maxLength: 6 - reader: - LogicChain: [] - readerQueue: [] ---- !u!114 &1324620582 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5195354183101525349, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, + m_CorrespondingSourceObject: {fileID: 3185526843783068320, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} m_PrefabInstance: {fileID: 5195354181466942481} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324620580} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 140e56929e1450a48b2f7716511bb327, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &1352513146 @@ -605,12 +564,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1593162620} m_CullTransparentMesh: 0 ---- !u!224 &1704581577 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - type: 3} - m_PrefabInstance: {fileID: 5195354181466942481} - m_PrefabAsset: {fileID: 0} --- !u!1 &1902492079 GameObject: m_ObjectHideFlags: 0 @@ -1008,7 +961,7 @@ PrefabInstance: - target: {fileID: 5195354183101525346, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AspectRatio - value: 12.0465555 + value: 16.580997 objectReference: {fileID: 0} - target: {fileID: 5195354183134146559, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} diff --git a/Assets/Scenes/ColourCollideOne.unity b/Assets/Scenes/ColourCollideOne.unity index 62a630b..a154795 100644 --- a/Assets/Scenes/ColourCollideOne.unity +++ b/Assets/Scenes/ColourCollideOne.unity @@ -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: @@ -3700,7 +3700,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &752624502 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9476,6 +9476,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: csc + value: + objectReference: {fileID: 796136093} - target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_Name @@ -9486,11 +9491,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, - type: 3} - propertyPath: csc - value: - objectReference: {fileID: 796136093} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_LocalPosition.x @@ -9546,12 +9546,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, + - target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a, + - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_Enabled value: 1 diff --git a/Assets/Scenes/ColourCollide_Smaller.unity b/Assets/Scenes/ColourCollide_Smaller.unity index 661fa1f..ef5b149 100644 --- a/Assets/Scenes/ColourCollide_Smaller.unity +++ b/Assets/Scenes/ColourCollide_Smaller.unity @@ -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: @@ -133,11 +133,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -204,7 +204,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -258,240 +258,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 31602557} m_PrefabAsset: {fileID: 0} ---- !u!1 &58961777 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 58961780} - - component: {fileID: 58961779} - - component: {fileID: 58961778} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &58961778 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 58961777} - 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: 0, b: 0.12657738, 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: 10907, guid: 0000000000000000f000000000000000, type: 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 &58961779 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 58961777} - m_CullTransparentMesh: 0 ---- !u!224 &58961780 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 58961777} - 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: 426175847} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -10} - m_SizeDelta: {x: 15, y: 15} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &106115467 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 106115470} - - component: {fileID: 106115469} - - component: {fileID: 106115468} - m_Layer: 5 - m_Name: TextMeshPro Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &106115468 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 106115467} - 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: - 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: 4294967295 - m_fontColor: {r: 1, g: 1, 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: 15 - m_fontSizeBase: 15 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 260 - 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: 106115468} - characterCount: 0 - spriteCount: 0 - spaceCount: 0 - wordCount: 0 - linkCount: 0 - lineCount: 0 - pageCount: 0 - 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 &106115469 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 106115467} - m_CullTransparentMesh: 0 ---- !u!224 &106115470 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 106115467} - 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: 426175847} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -11} - m_SizeDelta: {x: -20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &185552107 PrefabInstance: m_ObjectHideFlags: 0 @@ -513,11 +279,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5.0000005 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -584,7 +350,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -2 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -655,15 +421,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.x - value: 2.9999998 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -7 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -791,11 +557,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 200105989} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 12.01, y: 0.13, z: 5.14} + m_LocalPosition: {x: 12, y: 0, z: 14} m_LocalScale: {x: 3, y: 1, z: 3} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &207131013 GameObject: @@ -891,7 +657,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -970,7 +736,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -1049,7 +815,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -1128,7 +894,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -1203,11 +969,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -1434,7 +1200,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -7 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -1518,7 +1284,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -1597,7 +1363,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -1639,123 +1405,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 376465028} m_PrefabAsset: {fileID: 0} ---- !u!1 &426175842 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 426175847} - - component: {fileID: 426175846} - - component: {fileID: 426175845} - - component: {fileID: 426175844} - - component: {fileID: 426175843} - m_Layer: 5 - m_Name: Collection UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &426175843 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 426175842} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 15e038497e984864fb91253066856048, type: 3} - m_Name: - m_EditorClassIdentifier: - colouredTexture: {fileID: 2800000, guid: 750f08c2a813294428aa533055aafe1f, type: 3} - counterScore: {fileID: 106115467} - colourCube: {fileID: 58961777} - currentPlayerColour: {r: 0.8039216, g: 0, b: 1, a: 1} ---- !u!114 &426175844 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 426175842} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &426175845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 426175842} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!223 &426175846 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 426175842} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &426175847 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 426175842} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 106115470} - - {fileID: 58961780} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!1 &460731873 GameObject: m_ObjectHideFlags: 0 @@ -1850,7 +1499,7 @@ RectTransform: - {fileID: 266582950} - {fileID: 542142941} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1882,7 +1531,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -2119,7 +1768,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalRotation.x @@ -2186,7 +1835,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -2253,7 +1902,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -2328,7 +1977,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalRotation.x @@ -2395,7 +2044,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -2484,7 +2133,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -2559,7 +2208,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalRotation.x @@ -2647,7 +2296,7 @@ Transform: - {fileID: 1305485801} - {fileID: 1863302647} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &952972657 GameObject: @@ -2693,6 +2342,9 @@ MonoBehaviour: - element: {fileID: 11400000, guid: 0086f005a63e8404aaee25e4ae4734d7, type: 2} Count: 1 isInfinit: 0 + - element: {fileID: 11400000, guid: 194f051bd7d3e7d4fb5b96a8e1d5b162, type: 2} + Count: 1 + isInfinit: 0 ConnectedClients: [] clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} SpawnBlocks: [] @@ -2742,7 +2394,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &955180180 PrefabInstance: @@ -2769,7 +2421,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -2848,7 +2500,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -1 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -2927,7 +2579,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3087,7 +2739,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -1 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3166,7 +2818,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3245,7 +2897,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3324,7 +2976,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3403,7 +3055,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3482,7 +3134,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -2 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3553,7 +3205,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.x - value: 2.9999998 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y @@ -3561,7 +3213,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -7 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -3628,7 +3280,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -3695,7 +3347,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -3762,7 +3414,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -1 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3841,7 +3493,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -3916,11 +3568,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -3987,7 +3639,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -2 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -4066,7 +3718,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -4129,11 +3781,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -4196,7 +3848,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalPosition.z - value: -2 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalRotation.x @@ -4263,7 +3915,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -4382,11 +4034,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1439763346} m_LocalRotation: {x: 0.33111775, y: 0.37305233, z: -0.14454454, w: 0.85457593} - m_LocalPosition: {x: 0.52, y: 4.3, z: -7.06} + m_LocalPosition: {x: 1, y: 4, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 42.359, y: 47.166, z: 0} --- !u!114 &1439763350 MonoBehaviour: @@ -4425,7 +4077,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -4504,7 +4156,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -4583,7 +4235,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -2 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -4736,7 +4388,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -4815,7 +4467,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -4894,7 +4546,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -1 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -4969,7 +4621,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalPosition.z - value: -2 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4967946560886230, guid: 2cb12feb62290af4ab4634e7ac62b956, type: 3} propertyPath: m_LocalRotation.x @@ -5036,7 +4688,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -2 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -5111,11 +4763,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -5182,7 +4834,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -5261,7 +4913,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: 0.99999994 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -5346,11 +4998,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -5417,7 +5069,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -1 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -5496,7 +5148,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -5559,11 +5211,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: -2.5 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -5617,6 +5269,11 @@ PrefabInstance: propertyPath: m_Name value: GameManager objectReference: {fileID: 0} + - target: {fileID: 1698745550996942700, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3} propertyPath: m_LocalPosition.x @@ -5655,7 +5312,7 @@ PrefabInstance: - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3} @@ -5709,7 +5366,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: -4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x @@ -5776,7 +5433,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x @@ -5855,7 +5512,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalRotation.x diff --git a/Assets/Scenes/MainMenu Server.unity b/Assets/Scenes/MainMenu Server.unity index 8235d3f..ba9064f 100644 --- a/Assets/Scenes/MainMenu Server.unity +++ b/Assets/Scenes/MainMenu Server.unity @@ -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: @@ -1281,7 +1281,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &405258849 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1921,11 +1921,11 @@ MonoBehaviour: lineCount: 3 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: @@ -2953,11 +2953,11 @@ MonoBehaviour: 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: @@ -3919,7 +3919,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1470057392 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4999,11 +4999,11 @@ MonoBehaviour: 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: diff --git a/Assets/Scenes/Scoreboards.unity b/Assets/Scenes/Scoreboards.unity index e2222e4..58b0a05 100644 --- a/Assets/Scenes/Scoreboards.unity +++ b/Assets/Scenes/Scoreboards.unity @@ -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: @@ -146,17 +146,17 @@ MonoBehaviour: m_EditorClassIdentifier: ConnectedClients: [] clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} - levelScoreboard: {fileID: 0} + levelScoreboard: {fileID: 1703320150} players: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 1703320149} + - {fileID: 1703320148} + - {fileID: 1703320147} + - {fileID: 1703320146} scores: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 1703320145} + - {fileID: 1703320144} + - {fileID: 1703320143} + - {fileID: 1703320142} mainscoreboard: {fileID: 103817391} --- !u!114 &103817391 MonoBehaviour: @@ -1007,6 +1007,60 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a475835665805f14892abc694728c976, type: 3} +--- !u!1 &1703320142 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744807220131707, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703320143 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744807027815184, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703320144 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744807562529861, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703320145 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744806702247816, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703320146 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744806223885056, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703320147 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744805866922916, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703320148 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744806700843743, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703320149 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744807162682306, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703320150 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4166744806657786151, guid: a475835665805f14892abc694728c976, + type: 3} + m_PrefabInstance: {fileID: 1703320141} + m_PrefabAsset: {fileID: 0} --- !u!1 &2074594311 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TuteLevelFour.unity b/Assets/Scenes/TuteLevelFour.unity index d4afa97..6e5ce64 100644 --- a/Assets/Scenes/TuteLevelFour.unity +++ b/Assets/Scenes/TuteLevelFour.unity @@ -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: @@ -2921,11 +2921,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00000051192166 + value: 0.00008392334 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000056790712 + value: 0.0000044933727 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_SizeDelta.y @@ -2964,6 +2964,10 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 1324620581, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} + propertyPath: playButton + value: + objectReference: {fileID: 1687365505} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} --- !u!1001 &378945308 @@ -3769,11 +3773,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, - type: 3} - propertyPath: m_Name - value: Character - objectReference: {fileID: 0} - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: nextScene @@ -3811,6 +3810,11 @@ PrefabInstance: propertyPath: isTuteLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_Name + value: Character + objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_LocalPosition.x @@ -11950,6 +11954,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1686982023} m_PrefabAsset: {fileID: 0} +--- !u!1 &1687365505 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6977535679819254998, guid: 47297317c21fe8a4c91caa79d00cc9a6, + type: 3} + m_PrefabInstance: {fileID: 377001489} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1698327106 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs b/Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs index f4e934b..aace739 100644 --- a/Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs +++ b/Assets/Scripts/Collectables/LogicCollectable_Multiplayer.cs @@ -9,8 +9,11 @@ public class LogicCollectable_Multiplayer : Collectable public override void OnCollect (Character character) { + character.Inventory.Add(Collectable); Destroy (gameObject); + + //reference to client to send the message to the mobile of what block it picked up } diff --git a/Assets/Scripts/GameMode/GameMode.cs b/Assets/Scripts/GameMode/GameMode.cs index c7290f7..710092b 100644 --- a/Assets/Scripts/GameMode/GameMode.cs +++ b/Assets/Scripts/GameMode/GameMode.cs @@ -21,6 +21,8 @@ public abstract class GameMode : ScriptableObject public Action RoundEndEvent; public Action OnGameOverEvent; + private List gameTimes; + protected abstract void OnGameStart(PlayerData[] allPlayers); @@ -51,15 +53,16 @@ public abstract class GameMode : ScriptableObject public float GetRoundTime() { - float retVal = RoundTimes[0]; - - if (RoundTimes.Count > 1) - RoundTimes.RemoveAt(0); - return RoundTimes[0]; + float retVal = gameTimes[0]; + if (gameTimes.Count > 1) + gameTimes.RemoveAt(0); + return retVal; } public void GameStart(PlayerData[] allPlayers) { + gameTimes = new List(RoundTimes); + if (!String.IsNullOrEmpty(GameModeScene)) UnityEngine.SceneManagement.SceneManager.LoadScene(GameModeScene,UnityEngine.SceneManagement.LoadSceneMode.Additive); diff --git a/Assets/Scripts/LogicBlocks.meta b/Assets/Scripts/LogicBlocks.meta deleted file mode 100644 index 98af9d1..0000000 --- a/Assets/Scripts/LogicBlocks.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8936b441d7647f74884c94f97bfb8931 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 36d77e9..88c03f7 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -96,7 +96,8 @@ public class GameManager : MonoBehaviour { gamemode.RoundStart(playerArray.ToArray()); LogicProtocols.FloatMsg RoundTime = new LogicProtocols.FloatMsg( gamemode.GetRoundTime()); - + bspawn.getPlayerScores(); + bspawn.getPlayerLocations(); playerArray.ForEach(p => p.client.conn.Send(LogicProtocols.SendRoundTime, RoundTime)); } @@ -112,7 +113,7 @@ public class GameManager : MonoBehaviour { if (player.blockReader.CurrentBlock != null && !player.blockReader.CurrentBlock.hasBeenRemoved) { - Debug.Log("used Block: " + player.blockReader.CurrentBlock.name); + //Debug.Log("used Block: " + player.blockReader.CurrentBlock.name); player.client.Inventory.Remove(player.blockReader.CurrentBlock); player.blockReader.CurrentBlock.hasBeenRemoved = true; } @@ -148,7 +149,7 @@ public class GameManager : MonoBehaviour } Debug.Log("Finished Moving"); - bspawn.getPlayerLocations(); + StartRound(); } diff --git a/Assets/Scripts/Networking/Server/ClientList.cs b/Assets/Scripts/Networking/Server/ClientList.cs index c812b36..613bbcb 100644 --- a/Assets/Scripts/Networking/Server/ClientList.cs +++ b/Assets/Scripts/Networking/Server/ClientList.cs @@ -195,7 +195,7 @@ namespace Networking.Server public void SendInventory() { - Debug.Log("Sending inventory"); + //Debug.Log("Sending inventory"); conn.SendByChannel(LogicProtocols.SendInventory, new LogicProtocols.InventoryMsg(Inventory), TransportConfigure.ReliableFragmented); } diff --git a/Assets/Scripts/blockSpawn.cs b/Assets/Scripts/blockSpawn.cs index ebd9095..a9d9fe4 100644 --- a/Assets/Scripts/blockSpawn.cs +++ b/Assets/Scripts/blockSpawn.cs @@ -17,7 +17,7 @@ public class blockSpawn : MonoBehaviour bool spawned = false; // Start is called before the first frame update - void Start() + void Awake() { ConnectedClients = clientDataList.ConnectedClients; SpawnBlocks = FindObjectsOfType().Where(p => p.is_Walkable).ToArray(); @@ -37,11 +37,13 @@ public class blockSpawn : MonoBehaviour { GameObject prefab = Resources.Load("Logic Block") as GameObject; GameObject block = Instantiate(prefab); + int number = (int)Random.Range(1.0f, spawnLogicList.Length); block.GetComponent().Collectable.element = spawnLogicList[number].element; block.GetComponent().Collectable.Count = spawnLogicList[number].Count; block.transform.position = spawnposition; - spawned = true; + Debug.Log("Instantiated new logic block: " + spawnLogicList[number].element + " at position: " + block.transform.position); + spawned = true; break; } } @@ -55,8 +57,8 @@ public class blockSpawn : MonoBehaviour 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); + Vector2 playerOne = new Vector2(ConnectedClients[0].playerCharacter.CurrentBlock.VisualPosition.x, ConnectedClients[0].playerCharacter.CurrentBlock.VisualPosition.z); //x if (playerOne.x > playerTwo.x) { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 2117a00..28a98a7 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bced6857668e364ebcdbd38ee88f9a95a73447d2702fc07c01ac3f77b53ef81a -size 1446 +oid sha256:1c4723dc3a09139620a6b72fea1f04c72967c27cf726a578a3d779cd4455043c +size 1650