From 5b31d42f21a401f2d941dab52dc61d11e0a936d3 Mon Sep 17 00:00:00 2001 From: "s3607057 (Angus Niven)" Date: Thu, 3 Oct 2019 15:19:57 +1000 Subject: [PATCH 1/2] Fixed wrong bool ticked on one of the map sections. --- .../Prefabs/Map Sections/Width 5/Backbelt 5-1.prefab | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Assets/Prefabs/Map Sections/Width 5/Backbelt 5-1.prefab b/Assets/Prefabs/Map Sections/Width 5/Backbelt 5-1.prefab index 7b76155..079757b 100644 --- a/Assets/Prefabs/Map Sections/Width 5/Backbelt 5-1.prefab +++ b/Assets/Prefabs/Map Sections/Width 5/Backbelt 5-1.prefab @@ -1226,7 +1226,12 @@ PrefabInstance: - target: {fileID: 7954546918817141591, guid: bb9ffc1c11072174694465b720cdb319, type: 3} propertyPath: isSpawnable - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7954546918817141591, guid: bb9ffc1c11072174694465b720cdb319, + type: 3} + propertyPath: isCollectableSpawnable + value: 0 objectReference: {fileID: 0} - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3} propertyPath: m_LocalPosition.x @@ -2811,7 +2816,7 @@ PrefabInstance: - target: {fileID: 7954546918817141591, guid: bb9ffc1c11072174694465b720cdb319, type: 3} propertyPath: isSpawnable - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3} propertyPath: m_LocalPosition.x @@ -3345,7 +3350,7 @@ PrefabInstance: - target: {fileID: 7954546918817141591, guid: bb9ffc1c11072174694465b720cdb319, type: 3} propertyPath: isCollectableSpawnable - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3} propertyPath: m_LocalPosition.x From 3a3270ed11059f5c194f413ae9f3cf4f3884bffd Mon Sep 17 00:00:00 2001 From: Claire Peta Date: Thu, 3 Oct 2019 15:21:41 +1000 Subject: [PATCH 2/2] Uncomment stuff for collectable spawning testing + icon --- .../ColorGameMode/RacetrackGameMode.cs | 2 +- Assets/Scripts/Managers/GameManager.cs | 2 +- Assets/Textures/Icon.png | 3 + Assets/Textures/Icon.png.meta | 88 +++++++++++++++++++ ProjectSettings/EditorBuildSettings.asset | 4 +- ProjectSettings/GraphicsSettings.asset | 4 +- ProjectSettings/ProjectSettings.asset | 4 +- 7 files changed, 99 insertions(+), 8 deletions(-) create mode 100644 Assets/Textures/Icon.png create mode 100644 Assets/Textures/Icon.png.meta diff --git a/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs b/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs index a634eba..320b859 100644 --- a/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs +++ b/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs @@ -110,7 +110,7 @@ public class RacetrackGameMode : GameMode //We check for track sections we need to add/remove mapManager.checkTrack(); - //spawn.wakeup(); + spawn.wakeup(); //Move the camera forward at a steady rate each round /*if (scrollSpeed > 0.0f) diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 56379cb..2590793 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -179,7 +179,7 @@ public class GameManager : MonoBehaviour } } //spawn collectible logic blocks - //spawnBlock.Spawn(); + spawnBlock.Spawn(); //Reset some player Data diff --git a/Assets/Textures/Icon.png b/Assets/Textures/Icon.png new file mode 100644 index 0000000..cf6b402 --- /dev/null +++ b/Assets/Textures/Icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c963d84120be6c9dbd55078d72c6872b193294304954c55db22267f0d5317452 +size 7257 diff --git a/Assets/Textures/Icon.png.meta b/Assets/Textures/Icon.png.meta new file mode 100644 index 0000000..fd817ed --- /dev/null +++ b/Assets/Textures/Icon.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: dbcdf8b485d366b489f13c8f6dc8fecc +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 20d763c..fec7366 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1890d8b9d4cb6c52f70ca8e818b21a7f57189e3c35841758de9fc21b4fd1bbe0 -size 2232 +oid sha256:7be799905646e6d7aaab37702ab8e14db03f14e8814c42bb9471fdcb8028125e +size 1282 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index b70056e..dddc503 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06f2c9c42c3e01f1143d4c15cfe4f316cfab490aba17fde694e466c130d4e3a4 -size 2359 +oid sha256:758221ccdd8ed2b386a3367cc69cc6c5466fe975c0b4a77ac65f68abcdaa7ffd +size 2428 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a063595..15dc092 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3227dc2661fccc064a73220d2846fe530fb7aafdffe3b10140f080c84310528d -size 20392 +oid sha256:33ce654bd4b3898466537593d9c857378b5209e6a58a289ec29fb28490560b89 +size 20897