Browse Source

i did more things

master
Claire Peta 5 years ago
parent
commit
140ae8df02
17 changed files with 2310 additions and 12724 deletions
  1. +0
    -8
      Assets/Models.meta
  2. +0
    -8
      Assets/Plugins/IngameDebugConsole/Android.meta
  3. +0
    -8
      Assets/Plugins/IngameDebugConsole/Prefabs.meta
  4. +0
    -8
      Assets/Plugins/IngameDebugConsole/Scripts.meta
  5. +0
    -8
      Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta
  6. +37
    -32
      Assets/Scenes/Client Scenes/ClientScene.unity
  7. +2073
    -12633
      Assets/Scenes/ColourCollideOne.unity
  8. +110
    -0
      Assets/Scenes/ColourCollide_Smaller.unity
  9. +31
    -1
      Assets/Scenes/GameMode Scenes/ColorGameMode.unity
  10. +6
    -1
      Assets/Scenes/TuteLevelFive.unity
  11. +6
    -1
      Assets/Scenes/TuteLevelFour.unity
  12. +22
    -1
      Assets/Scenes/TuteLevelOne.unity
  13. +7
    -2
      Assets/Scenes/TuteLevelThree.unity
  14. +10
    -5
      Assets/Scenes/TuteLevelTwo.unity
  15. +1
    -0
      Assets/Scripts/GameMode/GameMode.cs
  16. +7
    -0
      Assets/Scripts/GameMode/GameModeEvents.cs
  17. +0
    -8
      Assets/Scripts/LogicBlocks.meta

+ 0
- 8
Assets/Models.meta View File

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

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

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

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

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

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

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

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

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

+ 37
- 32
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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -654,42 +654,11 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 1240851277759925011, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: TrayUI
value:
objectReference: {fileID: 1324620581}
- target: {fileID: 1240851277759925011, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: TimeText
value:
objectReference: {fileID: 1363815578}
- target: {fileID: 5195354182462625300, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 5195354182462625300, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Player Canvas value: Player Canvas
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.00009918213
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000039558963
objectReference: {fileID: 0}
- target: {fileID: 5195354183134146528, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: inventory
value:
objectReference: {fileID: 11400000, guid: 9f2bac6895147d444858493b9609d026,
type: 2}
- target: {fileID: 5195354182462625304, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 5195354182462625304, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -810,6 +779,21 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 85.99994 value: 85.99994
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000034560708
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.00007200272
objectReference: {fileID: 0}
- target: {fileID: 5195354183101525346, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 5195354183101525346, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3} type: 3}
propertyPath: m_AspectRatio propertyPath: m_AspectRatio
@ -905,6 +889,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: -1 value: -1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5195354183083441314, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5195354183083441314, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 5195354183083441314, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
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
@ -965,6 +954,12 @@ PrefabInstance:
propertyPath: m_Color.a propertyPath: m_Color.a
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5195354183134146528, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: inventory
value:
objectReference: {fileID: 11400000, guid: 9f2bac6895147d444858493b9609d026,
type: 2}
- target: {fileID: 2665231841929910951, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 2665231841929910951, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -1040,6 +1035,16 @@ PrefabInstance:
propertyPath: m_Sprite propertyPath: m_Sprite
value: value:
objectReference: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} objectReference: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
- target: {fileID: 1240851277759925011, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: TrayUI
value:
objectReference: {fileID: 1324620581}
- target: {fileID: 1240851277759925011, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: TimeText
value:
objectReference: {fileID: 1363815578}
m_RemovedComponents: m_RemovedComponents:
- {fileID: 5195354182462625307, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} - {fileID: 5195354182462625307, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3}
- {fileID: 5195354183157824118, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} - {fileID: 5195354183157824118, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3}

+ 2073
- 12633
Assets/Scenes/ColourCollideOne.unity
File diff suppressed because it is too large
View File


+ 110
- 0
Assets/Scenes/ColourCollide_Smaller.unity View File

@ -2651,6 +2651,116 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 742803852} m_PrefabInstance: {fileID: 742803852}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &866901954
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 866901959}
- component: {fileID: 866901958}
- component: {fileID: 866901957}
- component: {fileID: 866901956}
- component: {fileID: 866901955}
m_Layer: 0
m_Name: Jump
m_TagString: New Block
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &866901955
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866901954}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3de8ea85fe104ee46819ac1ff5e87159, type: 3}
m_Name:
m_EditorClassIdentifier:
Collectable:
element: {fileID: 11400000, guid: 8f19e10be0ee35345a97f600791a8747, type: 2}
Count: 2
isInfinit: 0
BlockMenu: {fileID: 0}
popUpText: {fileID: 0}
--- !u!65 &866901956
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866901954}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &866901957
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866901954}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &866901958
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866901954}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &866901959
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866901954}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 6, y: 1, z: -3}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &883752935 --- !u!1001 &883752935
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

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

@ -513,6 +513,22 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Reference: {fileID: 11400000, guid: be8c78868a86aad448fd14e46bd40e51, type: 2} Reference: {fileID: 11400000, guid: be8c78868a86aad448fd14e46bd40e51, type: 2}
OnGameStart:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 993492622}
m_MethodName: StartCoroutine
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
OnRoundStart: OnRoundStart:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
@ -808,6 +824,7 @@ GameObject:
- component: {fileID: 993492620} - component: {fileID: 993492620}
- component: {fileID: 993492619} - component: {fileID: 993492619}
- component: {fileID: 993492618} - component: {fileID: 993492618}
- component: {fileID: 993492622}
m_Layer: 5 m_Layer: 5
m_Name: Level Info m_Name: Level Info
m_TagString: Untagged m_TagString: Untagged
@ -849,7 +866,7 @@ MonoBehaviour:
m_ScaleFactor: 1 m_ScaleFactor: 1
m_ReferenceResolution: {x: 1600, y: 1000} m_ReferenceResolution: {x: 1600, y: 1000}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_MatchWidthOrHeight: 0.38
m_PhysicalUnit: 3 m_PhysicalUnit: 3
m_FallbackScreenDPI: 96 m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96 m_DefaultSpriteDPI: 96
@ -897,6 +914,19 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {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 --- !u!1 &1026770877
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

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

@ -1443,7 +1443,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.000057834026
value: -0.000061035156
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
@ -3003,6 +3003,11 @@ PrefabInstance:
value: value:
objectReference: {fileID: 11400000, guid: 57948efb1cd9603419511d2dd2eabc3d, objectReference: {fileID: 11400000, guid: 57948efb1cd9603419511d2dd2eabc3d,
type: 2} type: 2}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: CloneInventoryOnStart
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x

+ 6
- 1
Assets/Scenes/TuteLevelFour.unity View File

@ -2527,7 +2527,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.000019817573
value: 0.00008392334
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
@ -3220,6 +3220,11 @@ PrefabInstance:
value: value:
objectReference: {fileID: 11400000, guid: b06e54ffefee9e549a8e1652d5af07f9, objectReference: {fileID: 11400000, guid: b06e54ffefee9e549a8e1652d5af07f9,
type: 2} type: 2}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: CloneInventoryOnStart
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x

+ 22
- 1
Assets/Scenes/TuteLevelOne.unity View File

@ -256,7 +256,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.0000037364848
value: -0.000038146973
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
@ -2638,6 +2638,11 @@ PrefabInstance:
value: value:
objectReference: {fileID: 11400000, guid: 808f6e35b72adbf47a19927d1f3efd35, objectReference: {fileID: 11400000, guid: 808f6e35b72adbf47a19927d1f3efd35,
type: 2} type: 2}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: CloneInventoryOnStart
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -3694,6 +3699,22 @@ PrefabInstance:
propertyPath: InitialModule.startColor.maxColor.b propertyPath: InitialModule.startColor.maxColor.b
value: 0.92156863 value: 0.92156863
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 869170613, guid: afd6305e706fd444eaeb68953a8475e9, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1030375178, guid: afd6305e706fd444eaeb68953a8475e9, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1445301355, guid: afd6305e706fd444eaeb68953a8475e9, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1630298526, guid: afd6305e706fd444eaeb68953a8475e9, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} m_SourcePrefab: {fileID: 100100000, guid: afd6305e706fd444eaeb68953a8475e9, type: 3}
--- !u!1001 &2011542510 --- !u!1001 &2011542510

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

@ -1843,6 +1843,11 @@ PrefabInstance:
value: value:
objectReference: {fileID: 11400000, guid: 26baa66216f4923448239677997ac13d, objectReference: {fileID: 11400000, guid: 26baa66216f4923448239677997ac13d,
type: 2} type: 2}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: CloneInventoryOnStart
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -4149,11 +4154,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.y propertyPath: m_AnchoredPosition.y
value: -0.000045776367
value: -0.000027639435
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.00014762946
value: -0.00002681424
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y

+ 10
- 5
Assets/Scenes/TuteLevelTwo.unity View File

@ -349,7 +349,7 @@ MonoBehaviour:
Collectable: Collectable:
element: {fileID: 11400000, guid: 4f23e55aecdb22443a7451e7a72c879d, type: 2} element: {fileID: 11400000, guid: 4f23e55aecdb22443a7451e7a72c879d, type: 2}
Count: 0 Count: 0
isInfinit: 0
isInfinit: 1
BlockMenu: {fileID: 632167809} BlockMenu: {fileID: 632167809}
popUpText: {fileID: 1530669372} popUpText: {fileID: 1530669372}
--- !u!1001 &255797841 --- !u!1001 &255797841
@ -482,12 +482,12 @@ PrefabInstance:
- target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5147304212338809448, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 5147304212338809448, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory propertyPath: inventory
@ -529,11 +529,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.y propertyPath: m_AnchoredPosition.y
value: 0.000047617446
value: 0.000016578942
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.00007879174
value: 0.00003976453
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
@ -4394,6 +4394,11 @@ PrefabInstance:
value: value:
objectReference: {fileID: 11400000, guid: d342ea734412a4b40bb6096d5cafc2fb, objectReference: {fileID: 11400000, guid: d342ea734412a4b40bb6096d5cafc2fb,
type: 2} type: 2}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: CloneInventoryOnStart
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x

+ 1
- 0
Assets/Scripts/GameMode/GameMode.cs View File

@ -11,6 +11,7 @@ public abstract class GameMode : ScriptableObject
[Tooltip("Scene to load which contains Gamemode UI")] [Tooltip("Scene to load which contains Gamemode UI")]
private string GameModeScene; private string GameModeScene;
public Action GameStartEvent;
public Action RoundStartEvent; public Action RoundStartEvent;
public Action AllPlayersMovedEvent; public Action AllPlayersMovedEvent;
public Action RoundEndEvent; public Action RoundEndEvent;

+ 7
- 0
Assets/Scripts/GameMode/GameModeEvents.cs View File

@ -10,6 +10,7 @@ public class GameModeEvents : MonoBehaviour
private GameModeReference Reference; private GameModeReference Reference;
[Header("Events")] [Header("Events")]
public UnityEvent OnGameStart = new UnityEvent();
public UnityEvent OnRoundStart = new UnityEvent(); public UnityEvent OnRoundStart = new UnityEvent();
public UnityEvent OnPlayersMoved = new UnityEvent(); public UnityEvent OnPlayersMoved = new UnityEvent();
public UnityEvent OnRoundEnd = new UnityEvent(); public UnityEvent OnRoundEnd = new UnityEvent();
@ -18,6 +19,7 @@ public class GameModeEvents : MonoBehaviour
private void OnEnable() private void OnEnable()
{ {
Reference.Value.GameStartEvent += GameStart;
Reference.Value.RoundStartEvent += RoundStart; Reference.Value.RoundStartEvent += RoundStart;
Reference.Value.AllPlayersMovedEvent += PlayersMoved; Reference.Value.AllPlayersMovedEvent += PlayersMoved;
Reference.Value.RoundEndEvent += RoundEnd; Reference.Value.RoundEndEvent += RoundEnd;
@ -26,12 +28,17 @@ public class GameModeEvents : MonoBehaviour
private void OnDisable() private void OnDisable()
{ {
Reference.Value.GameStartEvent -= GameStart;
Reference.Value.RoundStartEvent -= RoundStart; Reference.Value.RoundStartEvent -= RoundStart;
Reference.Value.AllPlayersMovedEvent -= PlayersMoved; Reference.Value.AllPlayersMovedEvent -= PlayersMoved;
Reference.Value.RoundEndEvent -= RoundEnd; Reference.Value.RoundEndEvent -= RoundEnd;
Reference.Value.OnGameOverEvent -= GameOver; Reference.Value.OnGameOverEvent -= GameOver;
} }
private void GameStart()
{
OnGameStart.Invoke();
}
private void RoundStart() private void RoundStart()
{ {

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

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

Loading…
Cancel
Save