From 1e438e52256d45ecd8f03f0b95f1fa4673fb00c2 Mon Sep 17 00:00:00 2001 From: Claire Peta Date: Thu, 2 May 2019 13:48:51 +1000 Subject: [PATCH] fixed scoreboard problem, linked score updated into scoreboard script, automatic load --- Assets/MainMenuBackground.jpg | 4 +- Assets/Prefabs/UI/MainScoreboard.prefab | 88 ++-- Assets/Prefabs/UI/levelScoreboard.prefab | 205 +++++--- Assets/Resources/BlueGrass.jpg | 3 - Assets/Resources/BlueGrass.jpg.meta | 88 ---- Assets/Resources/OrangeGrass.jpg | 3 - Assets/Resources/OrangeGrass.jpg.meta | 88 ---- Assets/Resources/PinkGrass.jpg | 3 - Assets/Resources/PinkGrass.jpg.meta | 88 ---- Assets/Resources/PurpleGrass.jpg | 3 - Assets/Resources/PurpleGrass.jpg.meta | 88 ---- Assets/Resources/RedGrass.jpg | 3 - Assets/Resources/RedGrass.jpg.meta | 88 ---- Assets/Resources/YellowGrass.jpg | 3 - Assets/Resources/YellowGrass.jpg.meta | 88 ---- Assets/Scenes/ColourCollideOne.unity | 4 +- Assets/Scenes/MainMenu.unity | 26 +- Assets/Scenes/Scoreboards.unity | 471 +++++++++++++++--- Assets/Scenes/Server Scenes/Lobby.unity | 6 +- Assets/Scenes/TuteLevelOne.unity | 60 ++- .../GameMode/ColorGameMode/ColorGameMode.cs | 5 +- .../GameMode/ColorGameMode/ScoreDisplay.cs | 37 +- Assets/Scripts/GameMode/GameMode.cs | 1 - Assets/Scripts/Managers/GameManager.cs | 2 + Assets/Scripts/UI/ScoreBoard.cs | 37 +- Assets/start_notification.jpg | 4 +- 26 files changed, 688 insertions(+), 808 deletions(-) delete mode 100644 Assets/Resources/BlueGrass.jpg delete mode 100644 Assets/Resources/BlueGrass.jpg.meta delete mode 100644 Assets/Resources/OrangeGrass.jpg delete mode 100644 Assets/Resources/OrangeGrass.jpg.meta delete mode 100644 Assets/Resources/PinkGrass.jpg delete mode 100644 Assets/Resources/PinkGrass.jpg.meta delete mode 100644 Assets/Resources/PurpleGrass.jpg delete mode 100644 Assets/Resources/PurpleGrass.jpg.meta delete mode 100644 Assets/Resources/RedGrass.jpg delete mode 100644 Assets/Resources/RedGrass.jpg.meta delete mode 100644 Assets/Resources/YellowGrass.jpg delete mode 100644 Assets/Resources/YellowGrass.jpg.meta diff --git a/Assets/MainMenuBackground.jpg b/Assets/MainMenuBackground.jpg index 62617bf..d7b2c6f 100644 --- a/Assets/MainMenuBackground.jpg +++ b/Assets/MainMenuBackground.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3b300dde1c8216a8dcd9fd5c108ae1a2f77ea4885253154fc9f207a89ecde78 -size 93136 +oid sha256:36bb9b2caf44a1551e9fc6e2363810af7108c2ff9d6b62aeb2007df2525fa0b2 +size 124786 diff --git a/Assets/Prefabs/UI/MainScoreboard.prefab b/Assets/Prefabs/UI/MainScoreboard.prefab index d820c8a..2b188e4 100644 --- a/Assets/Prefabs/UI/MainScoreboard.prefab +++ b/Assets/Prefabs/UI/MainScoreboard.prefab @@ -65,7 +65,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} @@ -134,13 +134,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 3341401444955201731} - 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: 7 + 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: 4901904979204054646} - 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 @@ -459,7 +459,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} @@ -528,13 +528,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 5379694262758207299} - 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 @@ -619,7 +619,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} @@ -688,13 +688,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4265049797263514251} - 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 @@ -779,7 +779,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Player Two + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -848,13 +848,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 6715947278990241999} - characterCount: 10 + characterCount: 0 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -939,7 +939,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Player Four + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1008,13 +1008,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 6715947279057449071} - characterCount: 11 + characterCount: 0 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -1099,7 +1099,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Player Three + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1168,13 +1168,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 6715947279265788345} - characterCount: 12 + characterCount: 0 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -1366,7 +1366,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Player One + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1435,13 +1435,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 6715947280046279521} - characterCount: 10 + characterCount: 0 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 diff --git a/Assets/Prefabs/UI/levelScoreboard.prefab b/Assets/Prefabs/UI/levelScoreboard.prefab index 3cb053e..cf79819 100644 --- a/Assets/Prefabs/UI/levelScoreboard.prefab +++ b/Assets/Prefabs/UI/levelScoreboard.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2615352587488635865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1345632138352363820} + - component: {fileID: 2030593388063923154} + - component: {fileID: 9061181986348577136} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1345632138352363820 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2615352587488635865} + 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: 4166744806657786144} + 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 &2030593388063923154 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2615352587488635865} + m_CullTransparentMesh: 0 +--- !u!114 &9061181986348577136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2615352587488635865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 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: 21300000, guid: 52b85bb704579c34fb70d5487162efcb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4166744805866922916 GameObject: m_ObjectHideFlags: 0 @@ -30,11 +104,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 3 + 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} - m_AnchoredPosition: {x: 150, y: 0} + m_AnchoredPosition: {x: 100, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744805866922914 @@ -65,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: Player Three + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -134,13 +208,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744805866922917} - characterCount: 12 + characterCount: 0 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 2 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -190,11 +264,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 4 + 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} - m_AnchoredPosition: {x: 400, y: 0} + m_AnchoredPosition: {x: 300, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744806223885086 @@ -225,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: Player Four + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -294,13 +368,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744806223885057} - characterCount: 11 + characterCount: 0 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 2 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -350,6 +424,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1345632138352363820} - {fileID: 4166744806708482473} - {fileID: 4166744807162682305} - {fileID: 4166744806700843738} @@ -457,11 +532,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -150, y: 0} + m_AnchoredPosition: {x: -100, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744806700843741 @@ -492,7 +567,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Player Two + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -561,13 +636,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744806700843740} - characterCount: 10 + characterCount: 0 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 2 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -617,11 +692,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 5 + 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} - m_AnchoredPosition: {x: -400, y: -125} + m_AnchoredPosition: {x: -300, y: -125} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744806702247814 @@ -652,7 +727,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} @@ -721,13 +796,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 @@ -777,11 +852,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -141} + m_AnchoredPosition: {x: 7, y: -200} m_SizeDelta: {x: 0, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744806708482471 @@ -840,8 +915,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 150 - m_fontSizeBase: 150 + m_fontSize: 100 + m_fontSizeBase: 100 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -858,7 +933,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: 0 + m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -937,11 +1012,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 150, y: -125} + m_AnchoredPosition: {x: 100, y: -125} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744807027815278 @@ -972,7 +1047,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} @@ -1041,13 +1116,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 @@ -1097,11 +1172,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -400, y: 0} + m_AnchoredPosition: {x: -300, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744807162682304 @@ -1132,7 +1207,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Player One + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1201,13 +1276,13 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4166744807162682307} - characterCount: 10 + characterCount: 0 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 2 - pageCount: 1 + lineCount: 0 + pageCount: 0 materialCount: 1 m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 @@ -1257,11 +1332,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 400, y: -125} + m_AnchoredPosition: {x: 300, y: -125} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744807220131705 @@ -1292,7 +1367,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} @@ -1361,13 +1436,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 @@ -1417,11 +1492,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4166744806657786144} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -150, y: -125} + m_AnchoredPosition: {x: -100, y: -125} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744807562529859 @@ -1452,7 +1527,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} @@ -1521,13 +1596,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/Resources/BlueGrass.jpg b/Assets/Resources/BlueGrass.jpg deleted file mode 100644 index fdc070b..0000000 --- a/Assets/Resources/BlueGrass.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f424f7354ac4c29139a2c0f3d50e4a998d69cf4a321d75fa61f83b4ed5a783d -size 477993 diff --git a/Assets/Resources/BlueGrass.jpg.meta b/Assets/Resources/BlueGrass.jpg.meta deleted file mode 100644 index 2101ffc..0000000 --- a/Assets/Resources/BlueGrass.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 0eea4dec756f99e40b70a704d4b2a745 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/OrangeGrass.jpg b/Assets/Resources/OrangeGrass.jpg deleted file mode 100644 index 9f423f8..0000000 --- a/Assets/Resources/OrangeGrass.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32a2cc9f8e72ef9358276399b719ce5e03bfa0e32c114d78693acb9819f69e4d -size 492386 diff --git a/Assets/Resources/OrangeGrass.jpg.meta b/Assets/Resources/OrangeGrass.jpg.meta deleted file mode 100644 index 741f330..0000000 --- a/Assets/Resources/OrangeGrass.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: aa2cbb1a53c81b84aa57cc8f3ed456e1 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/PinkGrass.jpg b/Assets/Resources/PinkGrass.jpg deleted file mode 100644 index 17bc3cf..0000000 --- a/Assets/Resources/PinkGrass.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0413242e91988b01608dd87c44482d7d8575db3b865df05f5de697a4f200f2d -size 468434 diff --git a/Assets/Resources/PinkGrass.jpg.meta b/Assets/Resources/PinkGrass.jpg.meta deleted file mode 100644 index e0825b1..0000000 --- a/Assets/Resources/PinkGrass.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: f1763a646017cd140b15e5a656d356e8 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/PurpleGrass.jpg b/Assets/Resources/PurpleGrass.jpg deleted file mode 100644 index dac9ce0..0000000 --- a/Assets/Resources/PurpleGrass.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18c9ac1120530f5032d758fcd3a73bcf7ff74f550efac7c6b723ae7087df7e27 -size 488890 diff --git a/Assets/Resources/PurpleGrass.jpg.meta b/Assets/Resources/PurpleGrass.jpg.meta deleted file mode 100644 index db06ca6..0000000 --- a/Assets/Resources/PurpleGrass.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 750f08c2a813294428aa533055aafe1f -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/RedGrass.jpg b/Assets/Resources/RedGrass.jpg deleted file mode 100644 index 0480051..0000000 --- a/Assets/Resources/RedGrass.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:323054010d3d2a74fe85c830adf45ed7f087d885ed1ba901f4ae6aeedafb3708 -size 488345 diff --git a/Assets/Resources/RedGrass.jpg.meta b/Assets/Resources/RedGrass.jpg.meta deleted file mode 100644 index e6f9c4a..0000000 --- a/Assets/Resources/RedGrass.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 0c9ccc19465ae4c44a2b90b5edfc3463 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/YellowGrass.jpg b/Assets/Resources/YellowGrass.jpg deleted file mode 100644 index a723827..0000000 --- a/Assets/Resources/YellowGrass.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17078eea0066d24e5c86870574f7a643a75de217d36aa3ba9dbd59183c21dee8 -size 475700 diff --git a/Assets/Resources/YellowGrass.jpg.meta b/Assets/Resources/YellowGrass.jpg.meta deleted file mode 100644 index cb2f8d3..0000000 --- a/Assets/Resources/YellowGrass.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 5a0b9a04fbc48c34cbea389c7a77a268 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/ColourCollideOne.unity b/Assets/Scenes/ColourCollideOne.unity index bfecb74..278a607 100644 --- a/Assets/Scenes/ColourCollideOne.unity +++ b/Assets/Scenes/ColourCollideOne.unity @@ -38,13 +38,13 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 11 - m_GIWorkflowMode: 1 + m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 6e0f5fb..a673908 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 170076734} - 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: @@ -294,7 +294,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 182} + m_AnchoredPosition: {x: 0, y: 160} m_SizeDelta: {x: 750, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &405064463 @@ -345,8 +345,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 45 + m_fontSizeBase: 45 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -841,7 +841,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -3} + m_AnchoredPosition: {x: 0, y: 7} m_SizeDelta: {x: 825, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &512508455 @@ -899,8 +899,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 23 + m_fontSizeBase: 23 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1516,7 +1516,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -183} + m_AnchoredPosition: {x: 0, y: -155} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &849731125 @@ -2104,11 +2104,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -2764,11 +2764,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -3282,7 +3282,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 diff --git a/Assets/Scenes/Scoreboards.unity b/Assets/Scenes/Scoreboards.unity index cbdcdf2..f27c3ac 100644 --- a/Assets/Scenes/Scoreboards.unity +++ b/Assets/Scenes/Scoreboards.unity @@ -112,6 +112,126 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &103817389 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 103817394} + - component: {fileID: 103817393} + - component: {fileID: 103817392} + - component: {fileID: 103817391} + - component: {fileID: 103817390} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &103817390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103817389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e9077bfe1c064a4eab073c33f756ebf, type: 3} + m_Name: + m_EditorClassIdentifier: + ConnectedClients: [] + clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} + levelScoreboard: {fileID: 879944371} + players: + - {fileID: 879944379} + - {fileID: 879944378} + - {fileID: 879944377} + - {fileID: 879944376} + scores: + - {fileID: 879944375} + - {fileID: 879944374} + - {fileID: 879944373} + - {fileID: 879944372} + mainscoreboard: {fileID: 103817391} +--- !u!114 &103817391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103817389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f3481b961a4a56046b973a51de723523, type: 3} + m_Name: + m_EditorClassIdentifier: + clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} + ConnectedClients: [] + players: + - {fileID: 247796239} + - {fileID: 247796237} + - {fileID: 247796235} + - {fileID: 247796233} + scores: + - {fileID: 247796238} + - {fileID: 247796236} + - {fileID: 247796234} + - {fileID: 247796232} + nextScene: MainMenu + MainScoreboard: {fileID: 247796231} +--- !u!114 &103817392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103817389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &103817393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103817389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &103817394 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103817389} + 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: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &247796230 PrefabInstance: m_ObjectHideFlags: 0 @@ -127,7 +247,7 @@ PrefabInstance: - target: {fileID: 6715947279418743284, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6715947279418743280, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} @@ -244,6 +364,31 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} propertyPath: m_havePropertiesChanged @@ -254,6 +399,31 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} propertyPath: m_havePropertiesChanged @@ -264,6 +434,31 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} propertyPath: m_havePropertiesChanged @@ -274,6 +469,31 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} propertyPath: m_havePropertiesChanged @@ -284,6 +504,36 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} propertyPath: m_havePropertiesChanged @@ -294,6 +544,36 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} propertyPath: m_havePropertiesChanged @@ -304,6 +584,36 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} propertyPath: m_havePropertiesChanged @@ -314,6 +624,36 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8897488140307869662, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} m_SourcePrefab: {fileID: 100100000, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} @@ -468,7 +808,7 @@ PrefabInstance: - target: {fileID: 4166744806657786151, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744806657786144, guid: a475835665805f14892abc694728c976, type: 3} @@ -578,92 +918,132 @@ PrefabInstance: - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976, + type: 3} + propertyPath: m_text + value: objectReference: {fileID: 0} - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976, + type: 3} + propertyPath: m_text + value: objectReference: {fileID: 0} - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976, + type: 3} + propertyPath: m_text + value: objectReference: {fileID: 0} - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976, + type: 3} + propertyPath: m_text + value: objectReference: {fileID: 0} - target: {fileID: 4166744806708482470, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744806708482470, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976, + type: 3} + propertyPath: m_text + value: objectReference: {fileID: 0} - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976, + type: 3} + propertyPath: m_text + value: objectReference: {fileID: 0} - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976, + type: 3} + propertyPath: m_text + value: objectReference: {fileID: 0} - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_havePropertiesChanged - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976, type: 3} propertyPath: m_isInputParsingRequired - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976, + type: 3} + propertyPath: m_text + value: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a475835665805f14892abc694728c976, type: 3} @@ -731,8 +1111,6 @@ GameObject: m_Component: - component: {fileID: 2074594313} - component: {fileID: 2074594312} - - component: {fileID: 2074594314} - - component: {fileID: 2074594315} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -792,52 +1170,3 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &2074594314 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074594311} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f3481b961a4a56046b973a51de723523, type: 3} - m_Name: - m_EditorClassIdentifier: - clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} - ConnectedClients: [] - FirstPlaceName: {fileID: 247796239} - FirstPlaceScore: {fileID: 247796238} - SecondPlaceName: {fileID: 247796237} - SecondPlaceScore: {fileID: 247796236} - ThirdPlaceName: {fileID: 247796235} - ThirdPlaceScore: {fileID: 247796234} - FourthPlaceName: {fileID: 247796233} - FourthPlaceScore: {fileID: 247796232} - nextScene: MainMenu - MainScoreboard: {fileID: 247796231} ---- !u!114 &2074594315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074594311} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e9077bfe1c064a4eab073c33f756ebf, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedClients: [] - levelScoreboard: {fileID: 879944371} - players: - - {fileID: 879944379} - - {fileID: 879944378} - - {fileID: 879944377} - - {fileID: 879944376} - scores: - - {fileID: 879944375} - - {fileID: 879944374} - - {fileID: 879944373} - - {fileID: 879944372} - mainscoreboard: {fileID: 2074594314} diff --git a/Assets/Scenes/Server Scenes/Lobby.unity b/Assets/Scenes/Server Scenes/Lobby.unity index c5301ee..05b7ed9 100644 --- a/Assets/Scenes/Server Scenes/Lobby.unity +++ b/Assets/Scenes/Server Scenes/Lobby.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: @@ -597,10 +597,10 @@ MonoBehaviour: - {r: 1, g: 0.93624943, b: 0.023584902, a: 1} - {r: 0, g: 0.9622642, b: 0.020812215, a: 1} PlayerAnimals: - - Bear - Cat - - Dog - Pig + - Lion + - Turtle --- !u!114 &872212412 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TuteLevelOne.unity b/Assets/Scenes/TuteLevelOne.unity index 6cdd4c8..ac425bd 100644 --- a/Assets/Scenes/TuteLevelOne.unity +++ b/Assets/Scenes/TuteLevelOne.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: @@ -1485,7 +1485,7 @@ PrefabInstance: - target: {fileID: 5195354182462625304, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 10 objectReference: {fileID: 0} - target: {fileID: 5195354182462625304, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} @@ -1600,12 +1600,12 @@ PrefabInstance: - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000031680058 + value: 0.000009500625 objectReference: {fileID: 0} - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.000015258789 objectReference: {fileID: 0} - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} @@ -1816,7 +1816,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: 50, y: -30, z: 0} --- !u!1001 &680251874 PrefabInstance: @@ -1971,8 +1971,8 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 771373465} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 @@ -2030,11 +2030,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 771373465} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.62, y: 1, z: 15.01} - m_LocalScale: {x: 6, y: 6, z: 6} + m_LocalPosition: {x: 3.01, y: 0, z: 4} + m_LocalScale: {x: 2.5, y: 5, z: 1.2481} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &820487540 PrefabInstance: @@ -2235,7 +2235,7 @@ Transform: - {fileID: 1366289865} - {fileID: 71412293} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1000119733 PrefabInstance: @@ -2569,7 +2569,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 42.500004, y: 0, z: 0} --- !u!1001 &1246883078 PrefabInstance: @@ -2641,6 +2641,16 @@ 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: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: nextScene @@ -2658,16 +2668,6 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 808f6e35b72adbf47a19927d1f3efd35, type: 2} - - target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, - type: 3} - propertyPath: m_Name - value: Character - objectReference: {fileID: 0} - - target: {fileID: 7426725930156175983, guid: c176f4ae8f7b4074db99b27b2e015a2a, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_LocalPosition.x @@ -3073,7 +3073,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1425704337 MonoBehaviour: @@ -3986,7 +3986,7 @@ PrefabInstance: - target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} @@ -4107,6 +4107,11 @@ PrefabInstance: propertyPath: m_Name value: Block Menu objectReference: {fileID: 0} + - target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_LocalPosition.x @@ -4145,7 +4150,7 @@ PrefabInstance: - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} @@ -4262,6 +4267,11 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 0 objectReference: {fileID: 0} + - target: {fileID: 6379596649083080723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_MatchWidthOrHeight + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} --- !u!1 &7103365430263900346 stripped diff --git a/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs b/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs index 806f911..92030a0 100644 --- a/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs +++ b/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs @@ -10,6 +10,8 @@ public class ColorGameMode : GameMode { public int MaxRound = 5; + public string nextScene = "ColourCollideOne"; + List ConnectedClients; public Material OverlayMaterial; @@ -24,13 +26,14 @@ public class ColorGameMode : GameMode RoundCount++; } + /// /// Checks if the Game is finished /// /// returns if game is finished public override bool isGameOver(PlayerData[] allPlayers) { - return (RoundCount <= MaxRound); + return (RoundCount >= MaxRound); } diff --git a/Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs b/Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs index bbf355d..540f35b 100644 --- a/Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs +++ b/Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs @@ -8,6 +8,7 @@ public class ScoreDisplay : MonoBehaviour { public List ConnectedClients; + public ClientList clientDataList; public GameObject levelScoreboard; public GameObject[] players = new GameObject[4]; @@ -18,18 +19,7 @@ public class ScoreDisplay : MonoBehaviour /// /// calculates and assigns scores in desc order, call coroutine /// - public void levelComplete(ClientList clientDataList) - { - ConnectedClients = clientDataList.ConnectedClients; - ConnectedClients.Sort((a, b) => b.SceneScore.CompareTo(a.SceneScore)); - - for (int i = 0; i < ConnectedClients.Count; i++) - { - players[i].GetComponent().text = ConnectedClients[i].Name; - scores[i].GetComponent().text = ConnectedClients[i].SceneScore.ToString(); - } - StartCoroutine(displayforSeconds(levelScoreboard, 10.0f)); - } + /// /// /// couroutine to display level scores @@ -42,6 +32,29 @@ public class ScoreDisplay : MonoBehaviour mainscoreboard.endGame(); } + public void levelComplete() + { + ConnectedClients = clientDataList.ConnectedClients; + ConnectedClients.Sort((a, b) => b.SceneScore.CompareTo(a.SceneScore)); + + for (int i = 0; i < ConnectedClients.Count; i++) + { + players[i].GetComponent().text = ConnectedClients[i].Name; + scores[i].GetComponent().text = ConnectedClients[i].SceneScore.ToString(); + } + int assignedPoints = 3; + for (int i = 0; i < ConnectedClients.Count; i++) + { + ConnectedClients[i].Score += assignedPoints; + assignedPoints--; + } + + StartCoroutine(displayforSeconds(levelScoreboard, 10.0f)); + } + public void Start() + { + levelComplete(); + } } diff --git a/Assets/Scripts/GameMode/GameMode.cs b/Assets/Scripts/GameMode/GameMode.cs index 76babfc..99c1f13 100644 --- a/Assets/Scripts/GameMode/GameMode.cs +++ b/Assets/Scripts/GameMode/GameMode.cs @@ -16,7 +16,6 @@ public abstract class GameMode : ScriptableObject public Action RoundEndEvent; public Action OnGameOverEvent; - protected abstract void OnGameStart(PlayerData[] allPlayers); /// diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index c2415b2..8e5ad1f 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -5,6 +5,7 @@ using UnityEngine; using UnityEngine.Networking; using Networking.Server; using Networking; +using UnityEngine.SceneManagement; public class GameManager : MonoBehaviour @@ -118,6 +119,7 @@ public class GameManager : MonoBehaviour if (gamemode.isGameOver(playerArray.ToArray())) { Debug.Log("Game Over"); + SceneManager.LoadScene("ScoreBoards"); } } diff --git a/Assets/Scripts/UI/ScoreBoard.cs b/Assets/Scripts/UI/ScoreBoard.cs index 5c61d37..4549498 100644 --- a/Assets/Scripts/UI/ScoreBoard.cs +++ b/Assets/Scripts/UI/ScoreBoard.cs @@ -12,23 +12,22 @@ public class ScoreBoard : MonoBehaviour public ClientList clientDataList; public List ConnectedClients; - public GameObject FirstPlaceName; - public GameObject FirstPlaceScore; - public GameObject SecondPlaceName; - public GameObject SecondPlaceScore; - public GameObject ThirdPlaceName; - public GameObject ThirdPlaceScore; - public GameObject FourthPlaceName; - public GameObject FourthPlaceScore; + public GameObject[] players = new GameObject[4]; + public GameObject[] scores = new GameObject[4]; - public string nextScene; + public string nextScene; public GameObject MainScoreboard; - IEnumerator displayforSeconds(GameObject display, float time) + private void Awake() + { + MainScoreboard.SetActive(false); + } + + IEnumerator displayforSeconds(GameObject display, float time) { display.SetActive (true); yield return new WaitForSeconds(time); - SceneManager.LoadScene(nextScene); + SceneManager.LoadScene("ColourCollideOne"); } public void endGame() @@ -36,15 +35,11 @@ public class ScoreBoard : MonoBehaviour ConnectedClients = clientDataList.ConnectedClients; ConnectedClients.Sort((a, b) => b.Score.CompareTo(a.Score)); - FirstPlaceName.GetComponent().text = ConnectedClients[0].Name; - FirstPlaceScore.GetComponent().text = ConnectedClients[0].Score.ToString(); - SecondPlaceName.GetComponent().text = ConnectedClients[1].Name; - SecondPlaceScore.GetComponent().text = ConnectedClients[1].Score.ToString(); - ThirdPlaceName.GetComponent().text = ConnectedClients[2].Name; - ThirdPlaceScore.GetComponent().text = ConnectedClients[2].Score.ToString(); - FourthPlaceName.GetComponent().text = ConnectedClients[3].Name; - FourthPlaceScore.GetComponent().text = ConnectedClients[3].Score.ToString(); - - StartCoroutine(displayforSeconds(MainScoreboard, 10.0f)); + for (int i = 0; i < ConnectedClients.Count; i++) + { + players[i].GetComponent().text = ConnectedClients[i].Name; + scores[i].GetComponent().text = ConnectedClients[i].Score.ToString(); + } + StartCoroutine(displayforSeconds(MainScoreboard, 10.0f)); } } diff --git a/Assets/start_notification.jpg b/Assets/start_notification.jpg index 5cd7ae0..0e0896b 100644 --- a/Assets/start_notification.jpg +++ b/Assets/start_notification.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f438863cc6657096135a77a49635351d1c684d17afa0eb7a04339c563d51324 -size 68733 +oid sha256:7a7a19369bf6c33d284afe2bad17df55539be1594750f04ec63ebefc18fe5bbf +size 85713