Browse Source

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

# Conflicts:
#	Assets/Prefabs/UI/Player Canvas.prefab
#	Assets/Scenes/Client Scenes/ClientScene.unity
Josh_Dev_branch
JoshuaReason 5 years ago
parent
commit
d0a6e06016
29 changed files with 19364 additions and 21543 deletions
  1. +1
    -1
      Assets/Materials/Ring 1.mat
  2. +1
    -1
      Assets/Materials/Ring.mat
  3. +1
    -1
      Assets/Materials/Smoke.mat
  4. +1
    -1
      Assets/Materials/Spark.mat
  5. +1
    -1
      Assets/Materials/square.mat
  6. +0
    -8
      Assets/Plugins/IngameDebugConsole/Sprites.meta
  7. +88
    -10
      Assets/Prefabs/UI/Bag Item.prefab
  8. +1
    -1
      Assets/Prefabs/UI/MainScoreboard.prefab
  9. +129
    -54
      Assets/Prefabs/UI/levelScoreboard.prefab
  10. +1
    -511
      Assets/Scenes/GameMode Scenes/ColorGameMode.unity
  11. +10
    -10
      Assets/Scenes/MainMenu Client.unity
  12. +393
    -2417
      Assets/Scenes/MainMenu Server.unity
  13. +10
    -109
      Assets/Scenes/Scoreboards.unity
  14. +90
    -15
      Assets/Scenes/Server Scenes/Lobby.unity
  15. +20
    -14
      Assets/Scenes/TuteLevelFive.unity
  16. +5
    -5
      Assets/Scenes/TuteLevelOne.unity
  17. +3
    -3
      Assets/Scenes/TuteLevelThree.unity
  18. +0
    -99
      Assets/Scripts/MainMenuController.cs
  19. +0
    -11
      Assets/Scripts/MainMenuController.cs.meta
  20. +7
    -5
      Assets/Scripts/UI/BagItem.cs
  21. +1
    -1
      Assets/Scripts/UI/Client/LoginUIManager.cs
  22. +13713
    -13668
      Assets/Third Party Assets/KUBIKOS - World/Demo/Scenes/Demo1.unity
  23. +2873
    -2836
      Assets/Third Party Assets/KUBIKOS - World/Demo/Scenes/Demo3.unity
  24. +1589
    -1554
      Assets/Third Party Assets/KUBIKOS - World/Demo/Scenes/Demo4.unity
  25. +299
    -190
      Assets/Third Party Assets/KUBIKOS - World/Demo/Scenes/MainMenu.unity
  26. +1
    -1
      Assets/Third Party Assets/KUBIKOS - World/Materials/Fog_Mat.mat
  27. +62
    -7
      Assets/backgroundscreenshot1.PNG.meta
  28. +62
    -7
      Assets/backgroundscreenshot2.PNG.meta
  29. +2
    -2
      ProjectSettings/EditorBuildSettings.asset

+ 1
- 1
Assets/Materials/Ring 1.mat View File

@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 4000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:

+ 1
- 1
Assets/Materials/Ring.mat View File

@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 4000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:

+ 1
- 1
Assets/Materials/Smoke.mat View File

@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 4000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:

+ 1
- 1
Assets/Materials/Spark.mat View File

@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 4000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:

+ 1
- 1
Assets/Materials/square.mat View File

@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 4000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:

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

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

+ 88
- 10
Assets/Prefabs/UI/Bag Item.prefab View File

@ -33,6 +33,7 @@ RectTransform:
m_Children:
- {fileID: 3844581474082900270}
- {fileID: 790293795267805298}
- {fileID: 5299692833379426812}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -130,7 +131,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3844581474082900270
RectTransform:
m_ObjectHideFlags: 0
@ -178,9 +179,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}
@ -226,7 +225,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: 1
m_firstOverflowCharacterIndex: 0
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
@ -249,13 +248,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1281512147706276012}
characterCount: 3
characterCount: 0
spriteCount: 0
spaceCount: 1
wordCount: 1
spaceCount: 0
wordCount: 0
linkCount: 0
lineCount: 2
pageCount: 1
lineCount: 0
pageCount: 0
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -275,6 +274,85 @@ MonoBehaviour:
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3121072513876178664
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5299692833379426812}
- component: {fileID: 4147184175440189351}
- component: {fileID: 4668034268361467339}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5299692833379426812
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3121072513876178664}
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: 5884576982143469529}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 6.525, y: 0.00022888184}
m_SizeDelta: {x: -12.35, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4147184175440189351
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3121072513876178664}
m_CullTransparentMesh: 0
--- !u!114 &4668034268361467339
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3121072513876178664}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: a
--- !u!1 &6191069013480418572
GameObject:
m_ObjectHideFlags: 0

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

@ -172,7 +172,7 @@ GameObject:
- component: {fileID: 2377062637363701813}
- component: {fileID: 4115406359796947631}
m_Layer: 5
m_Name: Image
m_Name: background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

+ 129
- 54
Assets/Prefabs/UI/levelScoreboard.prefab View File

@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 2030593388063923154}
- component: {fileID: 9061181986348577136}
m_Layer: 5
m_Name: Image
m_Name: background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -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_Sprite: {fileID: 21300000, guid: 52b85bb704579c34fb70d5487162efcb, type: 3}
m_Sprite: {fileID: 21300000, guid: 0555516443f0e574683e2f0b012c45ac, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -104,7 +104,7 @@ 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}
@ -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:
m_text: 3
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: 0
characterCount: 1
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -264,7 +264,7 @@ 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}
@ -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:
m_text: 4
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: 0
characterCount: 1
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -425,6 +425,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1345632138352363820}
- {fileID: 280742901022842845}
- {fileID: 4166744806708482473}
- {fileID: 4166744807162682305}
- {fileID: 4166744806700843738}
@ -532,7 +533,7 @@ 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}
@ -567,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:
m_text: 2
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -636,13 +637,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 4166744806700843740}
characterCount: 0
characterCount: 1
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -692,7 +693,7 @@ 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}
@ -727,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:
m_text: 10
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -796,13 +797,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 4166744806702247817}
characterCount: 0
characterCount: 2
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -852,11 +853,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, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7, y: -272}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 100}
m_SizeDelta: {x: 0, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4166744806708482471
@ -1012,7 +1013,7 @@ 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}
@ -1047,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:
m_text: 5
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -1116,13 +1117,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 4166744807027815185}
characterCount: 0
characterCount: 1
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -1172,7 +1173,7 @@ 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}
@ -1207,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:
m_text: 1
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -1276,13 +1277,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 4166744807162682307}
characterCount: 0
characterCount: 1
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -1332,7 +1333,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4166744806657786144}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1367,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:
m_text: 2
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -1436,13 +1437,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 4166744807220131704}
characterCount: 0
characterCount: 1
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -1492,7 +1493,7 @@ 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}
@ -1527,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:
m_text: 7
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -1596,13 +1597,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 4166744807562529858}
characterCount: 0
characterCount: 1
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -1622,3 +1623,77 @@ MonoBehaviour:
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8384719780833323787
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 280742901022842845}
- component: {fileID: 5219852037622109043}
- component: {fileID: 1903974918056915134}
m_Layer: 5
m_Name: capsule
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &280742901022842845
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8384719780833323787}
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: 1
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 &5219852037622109043
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8384719780833323787}
m_CullTransparentMesh: 0
--- !u!114 &1903974918056915134
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8384719780833323787}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 4f0ccff308fa1304cb38a1c665f1216c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0

+ 1
- 511
Assets/Scenes/GameMode Scenes/ColorGameMode.unity View File

@ -516,7 +516,7 @@ MonoBehaviour:
OnGameStart:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 993492622}
- m_Target: {fileID: 0}
m_MethodName: StartCoroutine
m_Mode: 1
m_Arguments:
@ -652,281 +652,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &858593826
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 858593827}
- component: {fileID: 858593829}
- component: {fileID: 858593828}
m_Layer: 5
m_Name: Level
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &858593827
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 858593826}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -14.995315}
m_LocalScale: {x: 1.4995314, y: 1.4995314, z: 1.4995314}
m_Children: []
m_Father: {fileID: 993492621}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 112.29948}
m_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &858593828
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 858593826}
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: Colour Collide
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4285624689
m_fontColor: {r: 0.44313726, g: 0.44313726, b: 0.44313726, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 75
m_fontSizeBase: 75
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 858593828}
characterCount: 14
spriteCount: 0
spaceCount: 1
wordCount: 2
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &858593829
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 858593826}
m_CullTransparentMesh: 0
--- !u!1 &993492617
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 993492621}
- component: {fileID: 993492620}
- component: {fileID: 993492619}
- component: {fileID: 993492618}
- component: {fileID: 993492622}
m_Layer: 5
m_Name: Level Info
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &993492618
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993492617}
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 &993492619
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993492617}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1600, y: 1000}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0.38
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &993492620
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993492617}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
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 &993492621
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993492617}
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: 1902197152}
- {fileID: 858593827}
- {fileID: 1131999651}
m_Father: {fileID: 0}
m_RootOrder: 3
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!114 &993492622
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993492617}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21da11d689c1a6b4ea0ce1a4b7b9769b, type: 3}
m_Name:
m_EditorClassIdentifier:
infoDisplay: {fileID: 993492617}
--- !u!1 &1026770877
GameObject:
m_ObjectHideFlags: 0
@ -1001,167 +726,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1026770877}
m_CullTransparentMesh: 0
--- !u!1 &1131999650
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1131999651}
- component: {fileID: 1131999653}
- component: {fileID: 1131999652}
m_Layer: 5
m_Name: What
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1131999651
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1131999650}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -14.995314}
m_LocalScale: {x: 1.4995314, y: 1.4995314, z: 1.4995314}
m_Children: []
m_Father: {fileID: 993492621}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -48}
m_SizeDelta: {x: 600, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1131999652
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1131999650}
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: In this level you must attempt to colour as many blocks as you can before
you run out of time/moves
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4285624689
m_fontColor: {r: 0.44313726, g: 0.44313726, b: 0.44313726, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 35
m_fontSizeBase: 35
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1131999652}
characterCount: 99
spriteCount: 0
spaceCount: 19
wordCount: 21
linkCount: 0
lineCount: 3
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1131999653
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1131999650}
m_CullTransparentMesh: 0
--- !u!1 &1403693168
GameObject:
m_ObjectHideFlags: 0
@ -1363,77 +927,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1902197151
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1902197152}
- component: {fileID: 1902197154}
- component: {fileID: 1902197153}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1902197152
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1902197151}
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: 993492621}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1902197153
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1902197151}
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!222 &1902197154
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1902197151}
m_CullTransparentMesh: 0

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

@ -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:
@ -499,7 +499,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1646428055}
- m_Target: {fileID: 0}
m_MethodName: OnBackClick
m_Mode: 1
m_Arguments:
@ -665,7 +665,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1646428055}
- m_Target: {fileID: 0}
m_MethodName: OnSoundVolumeClick
m_Mode: 1
m_Arguments:
@ -1113,7 +1113,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f8804ba6a41d3b844834c117935fb0d9, type: 3}
m_Sprite: {fileID: 21300000, guid: 0555516443f0e574683e2f0b012c45ac, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1338,7 +1338,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1646428055}
- m_Target: {fileID: 0}
m_MethodName: OnDifficultyClick
m_Mode: 1
m_Arguments:
@ -1574,7 +1574,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f8804ba6a41d3b844834c117935fb0d9, type: 3}
m_Sprite: {fileID: 21300000, guid: 0555516443f0e574683e2f0b012c45ac, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1650,7 +1650,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1646428055}
- m_Target: {fileID: 0}
m_MethodName: OnMusicVolumeClick
m_Mode: 1
m_Arguments:
@ -2670,7 +2670,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f8804ba6a41d3b844834c117935fb0d9, type: 3}
m_Sprite: {fileID: 21300000, guid: 0555516443f0e574683e2f0b012c45ac, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3011,7 +3011,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1646428055}
- m_Target: {fileID: 0}
m_MethodName: OnSettingsClick
m_Mode: 1
m_Arguments:
@ -3311,7 +3311,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &2110243221
MonoBehaviour:
m_ObjectHideFlags: 0

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


+ 10
- 109
Assets/Scenes/Scoreboards.unity View File

@ -146,17 +146,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
ConnectedClients: []
clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
levelScoreboard: {fileID: 879944371}
levelScoreboard: {fileID: 0}
players:
- {fileID: 879944379}
- {fileID: 879944378}
- {fileID: 879944377}
- {fileID: 879944376}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
scores:
- {fileID: 879944375}
- {fileID: 879944374}
- {fileID: 879944373}
- {fileID: 879944372}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
mainscoreboard: {fileID: 103817391}
--- !u!114 &103817391
MonoBehaviour:
@ -798,7 +798,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &879944370
--- !u!1001 &1703320141
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -810,11 +810,6 @@ PrefabInstance:
propertyPath: m_Name
value: levelScoreboard
objectReference: {fileID: 0}
- target: {fileID: 4166744806657786151, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744806657786144, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_LocalPosition.x
@ -930,11 +925,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
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
@ -945,11 +935,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_havePropertiesChanged
@ -960,11 +945,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_havePropertiesChanged
@ -975,11 +955,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 4166744806708482470, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_havePropertiesChanged
@ -1000,11 +975,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_havePropertiesChanged
@ -1015,11 +985,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_havePropertiesChanged
@ -1030,11 +995,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_havePropertiesChanged
@ -1045,67 +1005,8 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a475835665805f14892abc694728c976, type: 3}
--- !u!1 &879944371 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744806657786151, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &879944372 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744807220131707, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &879944373 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744807027815184, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &879944374 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744807562529861, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &879944375 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744806702247816, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &879944376 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744806223885056, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &879944377 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744805866922916, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &879944378 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744806700843743, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &879944379 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4166744807162682306, guid: a475835665805f14892abc694728c976,
type: 3}
m_PrefabInstance: {fileID: 879944370}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2074594311
GameObject:
m_ObjectHideFlags: 0

+ 90
- 15
Assets/Scenes/Server Scenes/Lobby.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -144,7 +144,7 @@ RectTransform:
m_Children:
- {fileID: 623206018}
m_Father: {fileID: 872212415}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -271,7 +271,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 872212415}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -291,7 +291,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.882353, g: 0.8862746, b: 0.882353, a: 1}
m_Color: {r: 0.882353, g: 0.8862746, b: 0.882353, a: 0.6862745}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -381,7 +381,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 72
m_fontSize: 46.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -422,19 +422,19 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 263791919}
characterCount: 6
characterCount: 14
spriteCount: 0
spaceCount: 0
wordCount: 1
spaceCount: 2
wordCount: 3
linkCount: 0
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:
@ -554,6 +554,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 623206017}
m_CullTransparentMesh: 0
--- !u!1 &644276464
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 644276465}
- component: {fileID: 644276467}
- component: {fileID: 644276466}
m_Layer: 0
m_Name: bg image (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &644276465
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 644276464}
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: 872212415}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &644276466
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 644276464}
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.882353, g: 0.8862746, b: 0.882353, 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: 4f47d65753db7b045921f2f177da5062, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!222 &644276467
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 644276464}
m_CullTransparentMesh: 0
--- !u!1 &872212410
GameObject:
m_ObjectHideFlags: 0
@ -672,6 +746,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 644276465}
- {fileID: 165353639}
- {fileID: 1377133506}
- {fileID: 1584683394}
@ -1023,7 +1098,7 @@ RectTransform:
m_Children:
- {fileID: 1665905655}
m_Father: {fileID: 872212415}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -1244,7 +1319,7 @@ RectTransform:
m_Children:
- {fileID: 263791921}
m_Father: {fileID: 872212415}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -1308,10 +1383,10 @@ MonoBehaviour:
m_ChildAlignment: 1
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 300, y: 300}
m_CellSize: {x: 300, y: 150}
m_Spacing: {x: 20, y: 20}
m_Constraint: 0
m_ConstraintCount: 2
m_Constraint: 1
m_ConstraintCount: 1
--- !u!1 &1665905654
GameObject:
m_ObjectHideFlags: 0

+ 20
- 14
Assets/Scenes/TuteLevelFive.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.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:
@ -1291,7 +1291,7 @@ PrefabInstance:
- target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -1341,7 +1341,7 @@ PrefabInstance:
- target: {fileID: 6538870453604659611, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 9
objectReference: {fileID: 0}
- target: {fileID: 6538870453604659611, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -1430,15 +1430,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: -101.69998
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.000066908186
value: -0.00005312682
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000060198672
value: -0.0000076293945
objectReference: {fileID: 0}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory
@ -1674,7 +1674,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &216081667
PrefabInstance:
@ -1889,7 +1889,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 222433591}
m_LocalRotation: {x: 0.33747193, y: -0, z: -0, w: 0.9413356}
m_LocalPosition: {x: 3.7, y: 4.83, z: -7.78}
m_LocalPosition: {x: 3.54, y: 4.35, z: -5.99}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -3018,6 +3018,11 @@ PrefabInstance:
propertyPath: CloneInventoryOnStart
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: nextScene
value: MainMenu Client
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_LocalPosition.x
@ -6074,6 +6079,7 @@ Transform:
- {fileID: 1262059322}
- {fileID: 929108413}
- {fileID: 436023777}
- {fileID: 1298474495}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -8113,7 +8119,7 @@ PrefabInstance:
- target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_RootOrder
value: 12
value: 11
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
@ -9643,7 +9649,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1298474494}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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:
@ -9785,8 +9791,8 @@ Transform:
- {fileID: 1335972404}
- {fileID: 307065120}
- {fileID: 414592088}
m_Father: {fileID: 0}
m_RootOrder: 8
m_Father: {fileID: 821954416}
m_RootOrder: 63
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1298988500
PrefabInstance:
@ -11848,7 +11854,7 @@ Transform:
m_LocalScale: {x: 3, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1568116010
PrefabInstance:
@ -13264,7 +13270,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_RootOrder
value: 11
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}

+ 5
- 5
Assets/Scenes/TuteLevelOne.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -266,7 +266,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.00006866455
value: -0.000038146973
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
@ -274,7 +274,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.0000003050884
value: -0.00005362805
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
@ -3954,7 +3954,7 @@ PrefabInstance:
- target: {fileID: 7103365430685043221, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
@ -4178,7 +4178,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}

+ 3
- 3
Assets/Scenes/TuteLevelThree.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.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:
@ -4138,11 +4138,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000052051848
value: -0.000026692482
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.00007413613
value: 0.000015472826
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y

+ 0
- 99
Assets/Scripts/MainMenuController.cs View File

@ -1,99 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine.UI;
using UnityEngine;
public class MainMenuController : MonoBehaviour
{
public GameObject SettingsMenu;
public GameObject MainMenu;
public GameObject HowToPlayMenu;
public Button SoundButton;
public Button MusicButton;
public Button DifficultyButton;
bool soundVolume = true;
bool musicVolume = true;
int difficulty = 1;
//On Awake
private void Awake ()
{
MainMenu.SetActive (true);
SettingsMenu.SetActive (false);
HowToPlayMenu.SetActive (false);
}
//Main Menu Options
public void OnPlayClick ()
{
UnityEngine.SceneManagement.SceneManager.LoadScene ("LoginScreen");
}
public void OnSettingsClick ()
{
//toggle which menu displays
MainMenu.SetActive (false);
SettingsMenu.SetActive (true);
}
public void OnTutorialClick ()
{
MainMenu.SetActive (false);
HowToPlayMenu.SetActive (true);
}
public void OnTutorialContinueClick ()
{
UnityEngine.SceneManagement.SceneManager.LoadScene ("TuteLevelOne");
}
//Settings Menu
public void OnBackClick ()
{
//Settings menu
SettingsMenu.SetActive (false);
MainMenu.SetActive (true);
}
//Settings menu
public void OnSoundVolumeClick ()
{
if (soundVolume == true) {
SoundButton.GetComponentInChildren<Text> ().text = "Sound Volume: OFF";
soundVolume = false;
} else {
SoundButton.GetComponentInChildren<Text> ().text = "Sound Volume: ON";
soundVolume = true;
}
}
public void OnMusicVolumeClick ()
{
if (musicVolume == true) {
//backgroundMusic.Stop();
MusicButton.GetComponentInChildren<Text> ().text = "Music Volume: OFF";
musicVolume = false;
} else {
//backgroundMusic.Play();
MusicButton.GetComponentInChildren<Text> ().text = "Music Volume: ON";
musicVolume = true;
}
}
public void OnDifficultyClick ()
{
if (difficulty == 1) {
DifficultyButton.GetComponentInChildren<Text> ().text = "Difficulty: MEDIUM";
difficulty = 2;
} else if (difficulty == 2) {
DifficultyButton.GetComponentInChildren<Text> ().text = "Difficulty: HARD";
difficulty = 3;
} else {
DifficultyButton.GetComponentInChildren<Text> ().text = "Difficulty: EASY";
difficulty = 1;
}
}
}

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

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

+ 7
- 5
Assets/Scripts/UI/BagItem.cs View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using TMPro;
using UnityEngine.UI;
public class BagItem : LogicElementHolder
{
@ -17,7 +18,8 @@ public class BagItem : LogicElementHolder
#region Private Variables
private int Count;
protected Inventory.Data InventoryData;
private TextMeshProUGUI CountText;
//private TextMeshProUGUI CountText;
private Text CountText1;
#endregion Private Variables
#region Read Only
@ -30,8 +32,8 @@ public class BagItem : LogicElementHolder
{
InventoryData = data;
if (CountText == null)
CountText = GetComponentInChildren<TextMeshProUGUI>();
if (CountText1 == null)
CountText1 = GetComponentInChildren<Text>();
Count = data.Count;
@ -44,9 +46,9 @@ public class BagItem : LogicElementHolder
public void UpdateUI()
{
if (!InventoryData.isInfinit)
CountText.text = Count.ToString();
CountText1.text = Count.ToString();
else
CountText.text = "∞";
CountText1.text = "∞";
}
#endregion Class Functionality

+ 1
- 1
Assets/Scripts/UI/Client/LoginUIManager.cs View File

@ -108,7 +108,7 @@ public class LoginUIManager : MonoBehaviour
public void OnClick_Back()
{
UnityEngine.SceneManagement.SceneManager.LoadScene("MainMenu");
UnityEngine.SceneManagement.SceneManager.LoadScene("MainMenu Client");
}
public void OnClick_Connect()

+ 13713
- 13668
Assets/Third Party Assets/KUBIKOS - World/Demo/Scenes/Demo1.unity
File diff suppressed because it is too large
View File


+ 2873
- 2836
Assets/Third Party Assets/KUBIKOS - World/Demo/Scenes/Demo3.unity
File diff suppressed because it is too large
View File


+ 1589
- 1554
Assets/Third Party Assets/KUBIKOS - World/Demo/Scenes/Demo4.unity
File diff suppressed because it is too large
View File


+ 299
- 190
Assets/Third Party Assets/KUBIKOS - World/Demo/Scenes/MainMenu.unity
File diff suppressed because it is too large
View File


+ 1
- 1
Assets/Third Party Assets/KUBIKOS - World/Materials/Fog_Mat.mat View File

@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 5000
m_CustomRenderQueue: 3000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:

+ 62
- 7
Assets/backgroundscreenshot1.PNG.meta View File

@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@ -34,13 +34,13 @@ TextureImporter:
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -49,9 +49,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
@ -69,6 +69,61 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

+ 62
- 7
Assets/backgroundscreenshot2.PNG.meta View File

@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@ -34,13 +34,13 @@ TextureImporter:
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -49,9 +49,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
@ -69,6 +69,61 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

+ 2
- 2
ProjectSettings/EditorBuildSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ddbef00bac42758dd4fb8285d0176c7a56c7aaa4a6a75775045e8a26335b328
size 1338
oid sha256:bced6857668e364ebcdbd38ee88f9a95a73447d2702fc07c01ac3f77b53ef81a
size 1446

Loading…
Cancel
Save