From 2897abef903cde4125ec92bed9c00952b013ec93 Mon Sep 17 00:00:00 2001 From: JoshuaReason Date: Thu, 2 May 2019 16:03:14 +1000 Subject: [PATCH] Added spawn to collor collide two + temp fixed Jump --- Assets/Data/Inventory/BaseInventory.asset | 4 ++-- Assets/Data/Logic Blocks/Jump.asset | 4 ++-- Assets/Data/Logic Blocks/U-Turn.asset | 4 ++-- Assets/Scenes/ColourCollide_Smaller.unity | 22 +++++++++++++++++++++- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Assets/Data/Inventory/BaseInventory.asset b/Assets/Data/Inventory/BaseInventory.asset index 56292ac..010ea95 100644 --- a/Assets/Data/Inventory/BaseInventory.asset +++ b/Assets/Data/Inventory/BaseInventory.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d360d0ff81fda73eaa731c63eb6db331d86a9daa51809f0eab2011dbfc6f7e9 -size 859 +oid sha256:c5679085887a5b78c9d233a70d5fd0ce061945cbe7f8cb80ddfaf9634f6aa58f +size 970 diff --git a/Assets/Data/Logic Blocks/Jump.asset b/Assets/Data/Logic Blocks/Jump.asset index fd55d3e..76bc20f 100644 --- a/Assets/Data/Logic Blocks/Jump.asset +++ b/Assets/Data/Logic Blocks/Jump.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f714c1e2427f440973c4b364ef594f0ae120c6b7110676cbf8514a5788b8942 -size 629 +oid sha256:c9211422d6f3cfba3e04170bd445709448f60af5eb2070a1a6453cb27ec20ca1 +size 534 diff --git a/Assets/Data/Logic Blocks/U-Turn.asset b/Assets/Data/Logic Blocks/U-Turn.asset index 42749a7..678c1f3 100644 --- a/Assets/Data/Logic Blocks/U-Turn.asset +++ b/Assets/Data/Logic Blocks/U-Turn.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20daf275a96f6c1909034cff9a3cc39f2636f25983e408ed050d69d8d18a37c8 -size 537 +oid sha256:4d57b5a4d9f3be8811de72751bdd37c58d43b12d02ca79d49ed98966267f6cd9 +size 710 diff --git a/Assets/Scenes/ColourCollide_Smaller.unity b/Assets/Scenes/ColourCollide_Smaller.unity index 513be5a..2b2664b 100644 --- a/Assets/Scenes/ColourCollide_Smaller.unity +++ b/Assets/Scenes/ColourCollide_Smaller.unity @@ -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.44657868, g: 0.49641263, b: 0.57481706, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1480,6 +1480,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 8101348915751558870, guid: d7698c69246c64044ab2a94628bf0291, + type: 3} + propertyPath: isSpawnable + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &290844647 stripped @@ -3148,6 +3153,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 8101348915751558870, guid: d7698c69246c64044ab2a94628bf0291, + type: 3} + propertyPath: isSpawnable + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &1010658036 stripped @@ -5620,6 +5630,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 8101348915751558870, guid: d7698c69246c64044ab2a94628bf0291, + type: 3} + propertyPath: isSpawnable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8101348915751558870, guid: d7698c69246c64044ab2a94628bf0291, + type: 3} + propertyPath: SpawnDirection + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &1800916209 stripped