Browse Source

Re-Build with different sizing and video upload for Presentation video

master
Claire Peta 5 years ago
parent
commit
31364ee301
21 changed files with 450 additions and 162 deletions
  1. +0
    -8
      Assets/Plugins/IngameDebugConsole/Sprites.meta
  2. +2
    -2
      Assets/Scenes/Client Scenes/ClientScene.unity
  3. +7
    -2
      Assets/Scenes/ColourCollide_Smaller.unity
  4. +13
    -13
      Assets/Scenes/MainMenu Client.unity
  5. +5
    -5
      Assets/Scenes/MainMenu Server.unity
  6. +257
    -1
      Assets/Scenes/Scoreboards.unity
  7. +55
    -49
      Assets/Scenes/TuteLevelFive.unity
  8. +24
    -23
      Assets/Scenes/TuteLevelFour.unity
  9. +35
    -34
      Assets/Scenes/TuteLevelThree.unity
  10. +0
    -8
      Assets/Scripts/Components.meta
  11. +2
    -2
      Assets/Scripts/Managers/GameManager.cs
  12. +2
    -0
      Assets/Scripts/Networking/Client/ClientObject.cs
  13. +6
    -0
      Assets/Scripts/Networking/Server/ServerObject.cs
  14. +3
    -0
      Assets/Scripts/UI/ScoreBoard.cs
  15. +10
    -10
      Assets/Scripts/blockSpawn.cs
  16. +1
    -1
      Assets/Third Party Assets/KUBIKOS - World/Shaders/Cloud_Shader.shader
  17. +1
    -1
      Assets/Third Party Assets/KUBIKOS - World/Shaders/Sun_Shader.shader
  18. +3
    -0
      Assets/Videos/Tutorial.mp4
  19. +21
    -0
      Assets/Videos/Tutorial.mp4.meta
  20. +1
    -1
      ProjectSettings/EditorBuildSettings.asset
  21. +2
    -2
      ProjectSettings/GraphicsSettings.asset

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

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

+ 2
- 2
Assets/Scenes/Client Scenes/ClientScene.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -685,7 +685,7 @@ PrefabInstance:
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0.000022883927
value: -0.000018425188
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3} type: 3}

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

@ -1112,7 +1112,7 @@ Transform:
m_GameObject: {fileID: 200105989} m_GameObject: {fileID: 200105989}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 7.61, y: 0.5, z: 8.84} m_LocalPosition: {x: 7.61, y: 0.5, z: 8.84}
m_LocalScale: {x: 2, y: 1, z: 2}
m_LocalScale: {x: 10, y: 1, z: 10}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 4
@ -4374,18 +4374,23 @@ MonoBehaviour:
spawnLogicList: spawnLogicList:
- element: {fileID: 11400000, guid: b5887451436a375419e538ef3706ecf9, type: 2} - element: {fileID: 11400000, guid: b5887451436a375419e538ef3706ecf9, type: 2}
Count: 2 Count: 2
minCount: 0
isInfinit: 0 isInfinit: 0
- element: {fileID: 11400000, guid: ba4f7785390953441913d0e6f419d9b7, type: 2} - element: {fileID: 11400000, guid: ba4f7785390953441913d0e6f419d9b7, type: 2}
Count: 2 Count: 2
minCount: 0
isInfinit: 0 isInfinit: 0
- element: {fileID: 11400000, guid: 0086f005a63e8404aaee25e4ae4734d7, type: 2} - element: {fileID: 11400000, guid: 0086f005a63e8404aaee25e4ae4734d7, type: 2}
Count: 2 Count: 2
minCount: 0
isInfinit: 0 isInfinit: 0
- element: {fileID: 11400000, guid: e11629d4fbb1e8246b7d4f003800bfa0, type: 2} - element: {fileID: 11400000, guid: e11629d4fbb1e8246b7d4f003800bfa0, type: 2}
Count: 2 Count: 2
minCount: 0
isInfinit: 0 isInfinit: 0
- element: {fileID: 11400000, guid: 57d435792b9c3504caa273c796738050, type: 2} - element: {fileID: 11400000, guid: 57d435792b9c3504caa273c796738050, type: 2}
Count: 2 Count: 2
minCount: 0
isInfinit: 0 isInfinit: 0
ConnectedClients: [] ConnectedClients: []
clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
@ -6193,7 +6198,7 @@ Camera:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 2 m_ClearFlags: 2
m_BackGroundColor: {r: 0.4784314, g: 0.6117647, b: 0.7176471, a: 0}
m_BackGroundColor: {r: 0.50980395, g: 0.64705884, b: 0.75294125, a: 0}
m_projectionMatrixMode: 1 m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24} m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0} m_LensShift: {x: 0, y: 0}

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

@ -419,8 +419,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4285624689
m_fontColor: {r: 0.44313726, g: 0.44313726, b: 0.44313726, a: 1}
rgba: 4283585106
m_fontColor: {r: 0.32156864, g: 0.32156864, b: 0.32156864, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -1416,9 +1416,9 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'Tap the screen to bring down the inventory. Drag and drop
m_text: 'Tap to bring down the inventory. Drag and drop blocks to
blocks to the tray, press play to watch your character move'
the tray, press play to watch your character move'
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -1427,8 +1427,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4285624689
m_fontColor: {r: 0.44313726, g: 0.44313726, b: 0.44313726, a: 1}
rgba: 4283519313
m_fontColor: {r: 0.3207547, g: 0.3207547, b: 0.3207547, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -1464,7 +1464,7 @@ MonoBehaviour:
m_enableWordWrapping: 1 m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_firstOverflowCharacterIndex: 59
m_firstOverflowCharacterIndex: 58
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0 m_isLinkedTextComponent: 0
m_isTextTruncated: 0 m_isTextTruncated: 0
@ -1487,10 +1487,10 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo: m_textInfo:
textComponent: {fileID: 670072610} textComponent: {fileID: 670072610}
characterCount: 119
characterCount: 108
spriteCount: 0 spriteCount: 0
spaceCount: 23
wordCount: 22
spaceCount: 21
wordCount: 20
linkCount: 0 linkCount: 0
lineCount: 2 lineCount: 2
pageCount: 1 pageCount: 1
@ -1718,8 +1718,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4285624689
m_fontColor: {r: 0.44313726, g: 0.44313726, b: 0.44313726, a: 1}
rgba: 4283585106
m_fontColor: {r: 0.32156864, g: 0.32156864, b: 0.32156864, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -4887,7 +4887,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &2128700972 --- !u!114 &2128700972
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 5
- 5
Assets/Scenes/MainMenu Server.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {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 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -868,7 +868,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &381263523 --- !u!114 &381263523
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1057,7 +1057,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &405258849 --- !u!114 &405258849
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2752,7 +2752,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1034326866 --- !u!114 &1034326866
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4421,7 +4421,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1815018909} m_GameObject: {fileID: 1815018909}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5.5, y: 2.67, z: -3.8}
m_LocalPosition: {x: 5.5, y: 2.67, z: -5.51}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}

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

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {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 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -171,6 +171,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
serverObj: {fileID: 11400000, guid: aba6c842adfc9904dba334cb48257361, type: 2}
ConnectedClients: [] ConnectedClients: []
players: players:
- {fileID: 247796239} - {fileID: 247796239}
@ -364,6 +365,36 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12, - target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -374,6 +405,36 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4901904979204054646, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12, - target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -384,6 +445,36 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5379694262758207299, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12, - target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -394,6 +485,36 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4265049797263514251, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12, - target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -404,6 +525,31 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value: Player
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241999, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12, - target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -414,6 +560,31 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value: Player
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449071, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12, - target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -424,6 +595,31 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value: Player
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788345, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12, - target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -434,6 +630,61 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_text
value: Player
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.characterCount
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947280046279521, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6715947278990241998, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -100
objectReference: {fileID: 0}
- target: {fileID: 2884078359755468917, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -100
objectReference: {fileID: 0}
- target: {fileID: 6715947279265788344, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -200
objectReference: {fileID: 0}
- target: {fileID: 3995179923864538319, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -200
objectReference: {fileID: 0}
- target: {fileID: 6715947279057449070, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -300
objectReference: {fileID: 0}
- target: {fileID: 5347233904862125077, guid: bfffca149e6d42947a4de37af2b35d12,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -300
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bfffca149e6d42947a4de37af2b35d12, type: 3} m_SourcePrefab: {fileID: 100100000, guid: bfffca149e6d42947a4de37af2b35d12, type: 3}
--- !u!1 &247796231 stripped --- !u!1 &247796231 stripped
@ -597,6 +848,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: levelScoreboard value: levelScoreboard
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4166744806657786151, guid: a475835665805f14892abc694728c976,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4166744806657786144, guid: a475835665805f14892abc694728c976, - target: {fileID: 4166744806657786144, guid: a475835665805f14892abc694728c976,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x

+ 55
- 49
Assets/Scenes/TuteLevelFive.unity View File

@ -1429,11 +1429,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0.0000075928965
value: -0.00005340208
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0.0000002119406
value: 0.000016973769
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
@ -1889,7 +1889,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 222433591} m_GameObject: {fileID: 222433591}
m_LocalRotation: {x: 0.33747193, y: -0, z: -0, w: 0.9413356} m_LocalRotation: {x: 0.33747193, y: -0, z: -0, w: 0.9413356}
m_LocalPosition: {x: 3.54, y: 4.35, z: -5.99}
m_LocalPosition: {x: 3.54, y: 5.29, z: -6.4}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
@ -3007,6 +3007,16 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Character value: Character
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: waitTime
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: Inventory propertyPath: Inventory
@ -3083,16 +3093,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: waitTime
value: 0.5
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3}
--- !u!114 &421711685 stripped --- !u!114 &421711685 stripped
@ -8297,6 +8297,11 @@ PrefabInstance:
Level Five' Level Five'
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3718319460935249713, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -170
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3}
--- !u!1 &1117427231 stripped --- !u!1 &1117427231 stripped
@ -11840,7 +11845,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556019605} m_GameObject: {fileID: 1556019605}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.64, y: 0, z: 0.6}
m_LocalPosition: {x: 2.64, y: 0.2, z: 0.34}
m_LocalScale: {x: 3, y: 1, z: 1} m_LocalScale: {x: 3, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
@ -12962,6 +12967,7 @@ MonoBehaviour:
Collectable: Collectable:
element: {fileID: 11400000, guid: 8f19e10be0ee35345a97f600791a8747, type: 2} element: {fileID: 11400000, guid: 8f19e10be0ee35345a97f600791a8747, type: 2}
Count: 2 Count: 2
minCount: 0
isInfinit: 1 isInfinit: 1
BlockMenu: {fileID: 1792455936} BlockMenu: {fileID: 1792455936}
popUpText: {fileID: 426450898} popUpText: {fileID: 426450898}
@ -13187,6 +13193,41 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.characterCount
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -13317,41 +13358,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick value: OnContinueClick
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.characterCount
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target

+ 24
- 23
Assets/Scenes/TuteLevelFour.unity View File

@ -677,6 +677,16 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -807,15 +817,15 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick value: OnContinueClick
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1290702247}
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_isInputParsingRequired
value: 1
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
@ -837,16 +847,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1290702247}
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3}
--- !u!114 &84034262 stripped --- !u!114 &84034262 stripped
@ -2920,7 +2920,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0.0000122188385
value: 0.000027255839
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
@ -3742,6 +3742,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Character value: Character
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: nextScene propertyPath: nextScene
@ -3854,11 +3859,6 @@ PrefabInstance:
propertyPath: characterSpeed propertyPath: characterSpeed
value: 0.5 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5970776295824438666, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 5970776295824438666, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
@ -10896,6 +10896,7 @@ MonoBehaviour:
Collectable: Collectable:
element: {fileID: 11400000, guid: e11629d4fbb1e8246b7d4f003800bfa0, type: 2} element: {fileID: 11400000, guid: e11629d4fbb1e8246b7d4f003800bfa0, type: 2}
Count: 2 Count: 2
minCount: 0
isInfinit: 1 isInfinit: 1
BlockMenu: {fileID: 1724137008} BlockMenu: {fileID: 1724137008}
popUpText: {fileID: 84034262} popUpText: {fileID: 84034262}

+ 35
- 34
Assets/Scenes/TuteLevelThree.unity View File

@ -245,12 +245,12 @@ PrefabInstance:
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c, - target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
value: 0
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c, - target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3} type: 3}
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 0
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c, - target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3} type: 3}
@ -277,12 +277,12 @@ PrefabInstance:
- target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c, - target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
value: 0
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c, - target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3} type: 3}
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 0
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c, - target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3} type: 3}
@ -1811,6 +1811,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Character value: Character
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: nextScene propertyPath: nextScene
@ -1903,11 +1908,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4912471391544438089, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 4912471391544438089, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
@ -2485,7 +2485,7 @@ Transform:
m_GameObject: {fileID: 647730074} m_GameObject: {fileID: 647730074}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -35.9, y: 0.19, z: 42.4} m_LocalPosition: {x: -35.9, y: 0.19, z: 42.4}
m_LocalScale: {x: 10, y: 10, z: 10}
m_LocalScale: {x: 20, y: 20, z: 20}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9 m_RootOrder: 9
@ -4114,7 +4114,7 @@ PrefabInstance:
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_AspectRatio propertyPath: m_AspectRatio
value: 22.587385
value: 8.548341
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
@ -4132,8 +4132,13 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0.00000900157
value: 0.000015645546
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 343624471}
- target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -4144,11 +4149,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 343624471}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
--- !u!1001 &1265836395 --- !u!1001 &1265836395
@ -5028,6 +5028,7 @@ MonoBehaviour:
Collectable: Collectable:
element: {fileID: 11400000, guid: 41f4cb946475b2849a802a8297d81e25, type: 2} element: {fileID: 11400000, guid: 41f4cb946475b2849a802a8297d81e25, type: 2}
Count: 0 Count: 0
minCount: 0
isInfinit: 1 isInfinit: 1
BlockMenu: {fileID: 2081762624} BlockMenu: {fileID: 2081762624}
popUpText: {fileID: 2081762625} popUpText: {fileID: 2081762625}
@ -6780,6 +6781,16 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -6905,15 +6916,15 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick value: OnContinueClick
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 862455471}
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_isInputParsingRequired
value: 1
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
@ -6935,16 +6946,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 862455471}
- target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnContinueClick
objectReference: {fileID: 0}
- target: {fileID: 6379596650567274009, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - target: {fileID: 6379596650567274009, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3} type: 3}
propertyPath: m_Text propertyPath: m_Text

+ 0
- 8
Assets/Scripts/Components.meta View File

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

+ 2
- 2
Assets/Scripts/Managers/GameManager.cs View File

@ -135,7 +135,7 @@ public class GameManager : MonoBehaviour
player.client.SendInventory(); player.client.SendInventory();
player.client.ChangeScene("ClientScene"); player.client.ChangeScene("ClientScene");
} }
Debug.Log("Finished Moving");
//Debug.Log("Finished Moving");
StartRound(); StartRound();
} }
@ -170,7 +170,7 @@ public class GameManager : MonoBehaviour
float waitTime; float waitTime;
while (!blockFinished && !data.blockReader.Finished) while (!blockFinished && !data.blockReader.Finished)
{ {
Debug.Log(data.client + "Moving once");
//Debug.Log(data.client + "Moving once");
if (data.blockReader.CurrentBlock != null && !data.blockReader.CurrentBlock.hasBeenRemoved) if (data.blockReader.CurrentBlock != null && !data.blockReader.CurrentBlock.hasBeenRemoved)
{ {

+ 2
- 0
Assets/Scripts/Networking/Client/ClientObject.cs View File

@ -79,6 +79,8 @@ namespace Networking.Client
public void Stop() public void Stop()
{ {
this.Port = 0;
this.ServerIP = "";
client.Disconnect(); client.Disconnect();
} }

+ 6
- 0
Assets/Scripts/Networking/Server/ServerObject.cs View File

@ -40,6 +40,12 @@ namespace Networking.Server {
server.Listen(port); server.Listen(port);
} }
public void ServerClose()
{
if (server != null)
server.Stop();
}
public void ServerUpdate() public void ServerUpdate()
{ {
if (server != null) if (server != null)

+ 3
- 0
Assets/Scripts/UI/ScoreBoard.cs View File

@ -10,6 +10,7 @@ using UnityEngine.SceneManagement;
public class ScoreBoard : MonoBehaviour public class ScoreBoard : MonoBehaviour
{ {
public ClientList clientDataList; public ClientList clientDataList;
public ServerObject serverObj;
public List<ClientData> ConnectedClients; public List<ClientData> ConnectedClients;
public GameObject[] players = new GameObject[4]; public GameObject[] players = new GameObject[4];
@ -27,6 +28,8 @@ public class ScoreBoard : MonoBehaviour
{ {
display.SetActive (true); display.SetActive (true);
yield return new WaitForSeconds(time); yield return new WaitForSeconds(time);
clientDataList.server.DisconnectAllConnections();
serverObj.ServerClose();
SceneManager.LoadScene("MainMenu Server"); SceneManager.LoadScene("MainMenu Server");
} }

+ 10
- 10
Assets/Scripts/blockSpawn.cs View File

@ -40,14 +40,14 @@ public class blockSpawn : MonoBehaviour
ConnectedClients.Sort((b, a) => a.SceneScore.CompareTo(b.SceneScore)); ConnectedClients.Sort((b, a) => a.SceneScore.CompareTo(b.SceneScore));
int totalScores = 0; int totalScores = 0;
scoreDifference = ConnectedClients[0].SceneScore + ConnectedClients[ConnectedClients.Count-1].SceneScore; scoreDifference = ConnectedClients[0].SceneScore + ConnectedClients[ConnectedClients.Count-1].SceneScore;
Debug.Log("score difference " + scoreDifference);
//Debug.Log("score difference " + scoreDifference);
for(int i = 0; i < ConnectedClients.Count; i++) for(int i = 0; i < ConnectedClients.Count; i++)
{ {
totalScores += ConnectedClients[i].SceneScore; totalScores += ConnectedClients[i].SceneScore;
} }
average = totalScores / ConnectedClients.Count; average = totalScores / ConnectedClients.Count;
Debug.Log("score average " + average);
//Debug.Log("score average " + average);
} }
private bool checkDuplicatePosition(Vector3 spawnposition) private bool checkDuplicatePosition(Vector3 spawnposition)
@ -123,17 +123,17 @@ public class blockSpawn : MonoBehaviour
for (int i = 0; i < clients.Length; i++) for (int i = 0; i < clients.Length; i++)
{ {
spawnposition += clients[i].playerCharacter.CurrentBlock.VisualPosition; spawnposition += clients[i].playerCharacter.CurrentBlock.VisualPosition;
Debug.Log("currentBlock.VisualPosition " + clients[i].playerCharacter.CurrentBlock.VisualPosition);
//Debug.Log("currentBlock.VisualPosition " + clients[i].playerCharacter.CurrentBlock.VisualPosition);
} }
spawnposition *= (1.0f / clients.Length); spawnposition *= (1.0f / clients.Length);
Debug.Log("spawnposition " + spawnposition);
//Debug.Log("spawnposition " + spawnposition);
Vector3[] direction = new Vector3[clients.Length]; Vector3[] direction = new Vector3[clients.Length];
for (int i = 0; i < clients.Length; i++) for (int i = 0; i < clients.Length; i++)
{ {
direction[i] = (spawnposition - clients[i].playerCharacter.CurrentBlock.VisualPosition); direction[i] = (spawnposition - clients[i].playerCharacter.CurrentBlock.VisualPosition);
Debug.Log("direction " + i + " " + direction[i]);
//Debug.Log("direction " + i + " " + direction[i]);
} }
//weighting calculations //weighting calculations
@ -145,14 +145,14 @@ public class blockSpawn : MonoBehaviour
float[] ratio = new float[clients.Length]; float[] ratio = new float[clients.Length];
Debug.Log("difAvg[0] " + difAvg[0]);
//Debug.Log("difAvg[0] " + difAvg[0]);
if (difAvg[0] == 0) if (difAvg[0] == 0)
{ {
for (int i = 0; i < clients.Length; i++) for (int i = 0; i < clients.Length; i++)
{ {
weightings[i] = 0.5f * weightMultiplier; weightings[i] = 0.5f * weightMultiplier;
Debug.Log("weightings " + i + " " + weightings[i]);
//Debug.Log("weightings " + i + " " + weightings[i]);
} }
} }
else else
@ -164,7 +164,7 @@ public class blockSpawn : MonoBehaviour
ratio[i] += 0.5f; ratio[i] += 0.5f;
weightings[i] = ratio[i] * weightMultiplier; weightings[i] = ratio[i] * weightMultiplier;
weightings[i] = Mathf.Clamp(weightings[i], 0, 1); weightings[i] = Mathf.Clamp(weightings[i], 0, 1);
Debug.Log("weightings " + i + " " + weightings[i]);
//Debug.Log("weightings " + i + " " + weightings[i]);
} }
} }
@ -173,11 +173,11 @@ public class blockSpawn : MonoBehaviour
for (int i = 0; i < clients.Length; i++) for (int i = 0; i < clients.Length; i++)
{ {
spawnposition += (weightings[i] * direction[i]); spawnposition += (weightings[i] * direction[i]);
Debug.Log("(weightings[i] * direction[i] " + (weightings[i] * direction[i]));
//Debug.Log("(weightings[i] * direction[i] " + (weightings[i] * direction[i]));
} }
spawnposition += Vector3.one * 0.5f; spawnposition += Vector3.one * 0.5f;
Debug.Log("spawnposition " + spawnposition);
//Debug.Log("spawnposition " + spawnposition);
//spawn first block //spawn first block
checkLocation(spawnposition); checkLocation(spawnposition);
} }

+ 1
- 1
Assets/Third Party Assets/KUBIKOS - World/Shaders/Cloud_Shader.shader View File

@ -161,7 +161,7 @@ Shader "Animmal/Cloud"
} }
fixed4 frag( v2f IN fixed4 frag( v2f IN
#if !defined( CAN_SKIP_VPOS ) #if !defined( CAN_SKIP_VPOS )
, UNITY_VPOS_TYPE vpos : VPOS
, UNITY_VPOS_TYPE vpos : SV_POSITION
#endif #endif
) : SV_Target ) : SV_Target
{ {

+ 1
- 1
Assets/Third Party Assets/KUBIKOS - World/Shaders/Sun_Shader.shader View File

@ -171,7 +171,7 @@ Shader "Animmal/Sun"
} }
fixed4 frag( v2f IN fixed4 frag( v2f IN
#if !defined( CAN_SKIP_VPOS ) #if !defined( CAN_SKIP_VPOS )
, UNITY_VPOS_TYPE vpos : VPOS
, UNITY_VPOS_TYPE vpos : SV_POSITION
#endif #endif
) : SV_Target ) : SV_Target
{ {

+ 3
- 0
Assets/Videos/Tutorial.mp4 View File

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

+ 21
- 0
Assets/Videos/Tutorial.mp4.meta View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 4089a5970011d59468b6e8ea63f70cc7
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
useLegacyImporter: 0
quality: 0.5
isColorLinear: 0
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

+ 1
- 1
ProjectSettings/EditorBuildSettings.asset View File

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

+ 2
- 2
ProjectSettings/GraphicsSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:758221ccdd8ed2b386a3367cc69cc6c5466fe975c0b4a77ac65f68abcdaa7ffd
size 2428
oid sha256:06f2c9c42c3e01f1143d4c15cfe4f316cfab490aba17fde694e466c130d4e3a4
size 2359

Loading…
Cancel
Save