Browse Source

Remove colour and added some more animals to allow for eight players, script set up to hard code a colour for each animal - colours not actually set up specifically yet

Josh_Dev_branch
Claire Peta 5 years ago
parent
commit
dac57cd66c
28 changed files with 1184 additions and 432 deletions
  1. +0
    -8
      Assets/Plugins/IngameDebugConsole.meta
  2. +971
    -147
      Assets/Scenes/Client Scenes/LoginScreen.unity
  3. +2
    -2
      Assets/Scenes/ColourCollide_Smaller.unity
  4. +5
    -0
      Assets/Scenes/Scoreboards.unity
  5. +2
    -2
      Assets/Scenes/Server Scenes/Lobby.unity
  6. +6
    -6
      Assets/Scenes/TuteLevelFive.unity
  7. +9
    -5
      Assets/Scenes/TuteLevelFour.unity
  8. +61
    -61
      Assets/Scenes/TuteLevelOne.unity
  9. +17
    -8
      Assets/Scenes/TuteLevelThree.unity
  10. +11
    -6
      Assets/Scenes/UI_TestScene.unity
  11. +5
    -1
      Assets/Scripts/Networking/Server/ServerObject.cs
  12. +66
    -0
      Assets/Scripts/UI/Client/LoginUIManager.cs
  13. +2
    -2
      Assets/Textures/AnimalSprites/cat.png
  14. +3
    -3
      Assets/Textures/AnimalSprites/cat.png.meta
  15. +2
    -2
      Assets/Textures/AnimalSprites/cow.png
  16. +2
    -2
      Assets/Textures/AnimalSprites/cow.png.meta
  17. +2
    -2
      Assets/Textures/AnimalSprites/dog.png
  18. +2
    -2
      Assets/Textures/AnimalSprites/dog.png.meta
  19. +2
    -2
      Assets/Textures/AnimalSprites/fox.png
  20. +2
    -2
      Assets/Textures/AnimalSprites/fox.png.meta
  21. +0
    -3
      Assets/Textures/AnimalSprites/iguana.png
  22. +0
    -154
      Assets/Textures/AnimalSprites/iguana.png.meta
  23. +2
    -2
      Assets/Textures/AnimalSprites/lion.png
  24. +2
    -2
      Assets/Textures/AnimalSprites/lion.png.meta
  25. +2
    -2
      Assets/Textures/AnimalSprites/panda.png
  26. +2
    -2
      Assets/Textures/AnimalSprites/panda.png.meta
  27. +2
    -2
      Assets/Textures/AnimalSprites/pig.png
  28. +2
    -2
      Assets/Textures/AnimalSprites/pig.png.meta

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

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

+ 971
- 147
Assets/Scenes/Client Scenes/LoginScreen.unity
File diff suppressed because it is too large
View File


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

@ -1043,7 +1043,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
m_IsActive: 0
--- !u!23 &200105990
MeshRenderer:
m_ObjectHideFlags: 0
@ -2659,7 +2659,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &460731874
MonoBehaviour:
m_ObjectHideFlags: 0

+ 5
- 0
Assets/Scenes/Scoreboards.unity View File

@ -1116,6 +1116,11 @@ PrefabInstance:
propertyPath: m_Name
value: Menu Background
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001500, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec,
type: 3}
propertyPath: m_LocalPosition.x

+ 2
- 2
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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -1271,7 +1271,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 220b4889c8b3f7b4f84286ba8773e1b6, type: 3}
m_Name:
m_EditorClassIdentifier:
Port: 2222
Port: 80
StartServerOnAwake: 1
Server: {fileID: 11400000, guid: aba6c842adfc9904dba334cb48257361, type: 2}
--- !u!4 &1421753750

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

@ -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}
@ -1425,7 +1425,7 @@ 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
@ -1433,7 +1433,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000016973769
value: -0.000030517578
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -7781,7 +7781,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1061892581}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 5, y: 4, z: -10}
m_LocalPosition: {x: 5, y: 50, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -11846,7 +11846,7 @@ Transform:
m_GameObject: {fileID: 1556019605}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.64, y: 0.2, z: 0.34}
m_LocalScale: {x: 3, y: 1, z: 1}
m_LocalScale: {x: 4, y: 4, z: 4}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
@ -13191,7 +13191,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}

+ 9
- 5
Assets/Scenes/TuteLevelFour.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -675,7 +675,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
@ -2782,7 +2782,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}
@ -2916,11 +2916,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.y
value: 0.000027255839
value: -0.000038146973
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000047551825
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}

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

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -127,7 +127,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}
@ -261,25 +261,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0000053478443
value: -0.000030517578
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.0000134155825
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 0
value: -0.000045705332
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -296,6 +286,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 86
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
--- !u!1001 &19108096
@ -2651,6 +2651,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: blockReader.LogicChain.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: nextScene
@ -2743,16 +2753,6 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: blockReader.LogicChain.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3}
--- !u!114 &1271739762 stripped
@ -4133,7 +4133,17 @@ PrefabInstance:
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
@ -4260,15 +4270,35 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1425704337}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
- target: {fileID: 6379596649083080723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
propertyPath: m_MatchWidthOrHeight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
- target: {fileID: 7589238259672119554, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 0
propertyPath: m_AnchoredPosition.y
value: 111
objectReference: {fileID: 0}
- target: {fileID: 6379596649530639660, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -39
objectReference: {fileID: 0}
- target: {fileID: 6379596650567274008, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 11.000008
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -169
objectReference: {fileID: 0}
- target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
@ -4300,36 +4330,6 @@ PrefabInstance:
propertyPath: m_fontSizeBase
value: 60
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_MatchWidthOrHeight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7589238259672119554, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 111
objectReference: {fileID: 0}
- target: {fileID: 6379596649530639660, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -39
objectReference: {fileID: 0}
- target: {fileID: 6379596650567274008, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 11.000008
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
objectReference: {fileID: 0}
- target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -169
objectReference: {fileID: 0}
- target: {fileID: 7589238260184858646, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_Sprite

+ 17
- 8
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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -238,7 +238,7 @@ PrefabInstance:
type: 3}
propertyPath: m_text
value: "In this level you will learn how to use the \nrotate right block, a
rotate rightblock allows your character to rotate right in place\ndrag and
rotate right block allows your character to rotate right in place\ndrag and
drop the rotate right block to the tray then\nclick play to watch the character
move"
objectReference: {fileID: 0}
@ -255,17 +255,17 @@ PrefabInstance:
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_textInfo.characterCount
value: 224
value: 225
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 42
value: 43
objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_textInfo.wordCount
value: 42
value: 43
objectReference: {fileID: 0}
- target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
@ -3996,6 +3996,11 @@ PrefabInstance:
propertyPath: m_Name
value: Single_Player Canvas
objectReference: {fileID: 0}
- target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: character
@ -4128,11 +4133,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.y
value: 0.000015645546
value: -0.000022888184
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00004660575
objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
@ -6779,7 +6788,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}

+ 11
- 6
Assets/Scenes/UI_TestScene.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -216,8 +216,8 @@ Camera:
m_GameObject: {fileID: 1352513146}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0.011480933, g: 0.7870813, b: 0.8113208, a: 0}
m_ClearFlags: 1
m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
@ -257,7 +257,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1352513146}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalPosition: {x: 0, y: 1, z: -3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -341,6 +341,11 @@ PrefabInstance:
propertyPath: m_Name
value: Player Canvas
objectReference: {fileID: 0}
- target: {fileID: 5195354182462625300, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5195354182462625304, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_LocalPosition.x
@ -464,12 +469,12 @@ PrefabInstance:
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0000000069480643
value: -0.000015258789
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: -101.69998
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3}

+ 5
- 1
Assets/Scripts/Networking/Server/ServerObject.cs View File

@ -1,4 +1,5 @@
using System.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Networking;
@ -19,6 +20,8 @@ namespace Networking.Server {
[SerializeField]
private ClientList LoginHandler;
public bool useWebSockets;
#endregion Inspector Fields
@ -33,6 +36,7 @@ namespace Networking.Server {
LoginHandler.DisconnectedClients = new List<ClientData>();
Debug.Log("Starting Server on " + port);
server = new NetworkServerSimple();
server.useWebSockets = useWebSockets;
server.Configure(TransportConfigure.CreateConfigure(),32);

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

@ -162,6 +162,72 @@ public class LoginUIManager : MonoBehaviour
{
UnityEngine.SceneManagement.SceneManager.LoadScene(SceneToLoad);
}
public void getPlayerColour(string playerAnimal)
{
Color newColor = new Color();
string hex = "#000000";
switch (playerAnimal)
{
case "Bear":
hex = "#C62828";
break;
case "Cat":
hex = "#1565C0";
break;
case "Cow":
hex = "#EC407A";
break;
case "Deer":
hex = "#1565C0";
break;
case "Dog":
hex = "#1565C0";
break;
case "Fox":
hex = "#1565C0";
break;
case "Goat":
hex = "#1565C0";
break;
case "Horse":
hex = "#1565C0";
break;
case "Lion":
hex = "#1565C0";
break;
case "Lizard":
hex = "#1565C0";
break;
case "Panda":
hex = "#1565C0";
break;
case "Pig":
hex = "#1565C0";
break;
case "Sheep":
hex = "#1565C0";
break;
case "Turtle":
hex = "#1565C0";
break;
case "Wolf":
hex = "#1565C0";
break;
case "Zebra":
hex = "#1565C0";
break;
default:
break;
}
if (ColorUtility.TryParseHtmlString(hex, out newColor))
{
this.playerColor = newColor;
colorSelected = true;
}
}
#endregion UI Functionality
#region Helper Functions

+ 2
- 2
Assets/Textures/AnimalSprites/cat.png View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6eea09e647b4d2f310088f8db18dfc538eddfe8ec229c62d52c0c6f8ffe63f3
size 25113
oid sha256:9c412948bd86a12ee1116eb863a5f0a0e0bb24b95dac63a8a16b78617d6614f7
size 38159

+ 3
- 3
Assets/Textures/AnimalSprites/cat.png.meta View File

@ -41,12 +41,12 @@ TextureImporter:
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteExtrude: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 150, y: 50, z: 150, w: 50}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -141,7 +141,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: 5e3d52987c3699c43953f8ce24bcfd87
vertices: []
indices:
edges: []

+ 2
- 2
Assets/Textures/AnimalSprites/cow.png View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1d93339ca540bea59a5d11d00ea7427b120539740d0153cf12adbc900f2bdd4
size 35307
oid sha256:19022b5817d645e012c754fe3c4ef929e45bf5b20f312031cb8f7cb505cc01e4
size 40139

+ 2
- 2
Assets/Textures/AnimalSprites/cow.png.meta View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 150, y: 50, z: 150, w: 50}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -141,7 +141,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: fa4e3215426d6704f9184c2bc8d29b1d
vertices: []
indices:
edges: []

+ 2
- 2
Assets/Textures/AnimalSprites/dog.png View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c7636779d5928ffd4fc5c549147455356062f84314e68fcfdd1d3a73daca7aa
size 33483
oid sha256:e6fb774cc04362abb4088645b7aee6f3b324466c0f6939fb90363cc8350032c2
size 36005

+ 2
- 2
Assets/Textures/AnimalSprites/dog.png.meta View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 150, y: 50, z: 150, w: 50}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -141,7 +141,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: d7cc1f9fae4a9cf4eb29df4e279d5c88
vertices: []
indices:
edges: []

+ 2
- 2
Assets/Textures/AnimalSprites/fox.png View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:028fdaf4d3c624eb2059c16c2041b427b21d976c773d155d90905fa121654536
size 25911
oid sha256:94cab74305cd5ac4cf6f370daedbf1b02f3107fa5471809d60f2a2fb89a52ace
size 37703

+ 2
- 2
Assets/Textures/AnimalSprites/fox.png.meta View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 150, y: 50, z: 150, w: 50}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -141,7 +141,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: d6829e93fcbced048b1f48287faa0335
vertices: []
indices:
edges: []

+ 0
- 3
Assets/Textures/AnimalSprites/iguana.png View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c0388ff66836eced3996a4dda7231c092ba0b4703015befb0c583c8260c376d
size 31560

+ 0
- 154
Assets/Textures/AnimalSprites/iguana.png.meta View File

@ -1,154 +0,0 @@
fileFormatVersion: 2
guid: 2fbadfac53f6550458d973ce1d9d15a4
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
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: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
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
- 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: tvOS
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: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

+ 2
- 2
Assets/Textures/AnimalSprites/lion.png View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34c4dd04c628d5726de3ab0e0c8b90668970c81bed3e2bc1121e9d23ebbe0899
size 29373
oid sha256:09d95f6bf359699e66de7dd61a9c9b8c77a786944df6486c3090da32f97e4343
size 37151

+ 2
- 2
Assets/Textures/AnimalSprites/lion.png.meta View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 150, y: 50, z: 150, w: 50}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -141,7 +141,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: 43d7c61b68febfe468e8a475482da23c
vertices: []
indices:
edges: []

+ 2
- 2
Assets/Textures/AnimalSprites/panda.png View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1aefbc664f1b578bd21268ca03e17231472e37532452b55f556ee3fe188c6e61
size 18733
oid sha256:ff8f7901ba7f937ec296dcb6328dae57737e096987df7c08d1c73515fef19de1
size 32744

+ 2
- 2
Assets/Textures/AnimalSprites/panda.png.meta View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 150, y: 50, z: 150, w: 50}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -141,7 +141,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: b9086521ebc5d4340acfbba03aa9a79c
vertices: []
indices:
edges: []

+ 2
- 2
Assets/Textures/AnimalSprites/pig.png View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2173258f79d82f08d1df6bbe7d6bf02ba73784f4183aff226534c7e5ce9c46c2
size 27443
oid sha256:1257224f90db66ae5649f81b458f1128cce86c9f4eba7e83df34dc21f59913ff
size 36729

+ 2
- 2
Assets/Textures/AnimalSprites/pig.png.meta View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 150, y: 50, z: 150, w: 50}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -141,7 +141,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: 8574d95f73910f44db473172031e6cfb
vertices: []
indices:
edges: []

Loading…
Cancel
Save