From d4a7239d6a91fb7fc3b9470e49f76796ebc20fe7 Mon Sep 17 00:00:00 2001
From: Rory Maclennan <rmaclennan67@gmail.com>
Date: Fri, 24 May 2019 13:28:59 +0100
Subject: [PATCH] Bug fixes and balancing
---
.../Materials/metal_fence-1_MaskMap.png | 3 +
.../Materials/metal_fence-1_MaskMap.png.meta | 88 +++++++++++++++++++
.../Garage/Materials/garage_MaskMap.png | 3 +
.../Garage/Materials/garage_MaskMap.png.meta | 88 +++++++++++++++++++
.../Materials/GATE_Vehicle_MaskMap.png | 3 +
.../Materials/GATE_Vehicle_MaskMap.png.meta | 88 +++++++++++++++++++
.../Assets/Prefabs/Vehicles/PlayerCar.prefab | 4 +-
.../Resources/Data/LevelData/Level2.asset | 4 +-
.../Resources/Data/LevelData/Level3.asset | 12 +--
.../Roadmap/Signposts/DeadEndSignpost.prefab | 18 ++++
.../Signposts/DirectionalSignpost.prefab | 18 ++++
MarkedUnity/Assets/Scenes/Levels/Level2.unity | 44 ++++++++--
MarkedUnity/Assets/Scenes/Levels/Level3.unity | 52 ++++++++---
MarkedUnity/Assets/Scenes/Tests/Sandbox.unity | 70 +++++++++++++++
.../Game Controllers/LevelGenManager.cs | 8 +-
.../Behaviours/Generation/Roadmap/Signpost.cs | 10 ++-
16 files changed, 486 insertions(+), 27 deletions(-)
create mode 100644 MarkedUnity/Assets/3rdParty/Assets_FenceChained/models/Materials/metal_fence-1_MaskMap.png
create mode 100644 MarkedUnity/Assets/3rdParty/Assets_FenceChained/models/Materials/metal_fence-1_MaskMap.png.meta
create mode 100644 MarkedUnity/Assets/3rdParty/Industrial building/Garage/Materials/garage_MaskMap.png
create mode 100644 MarkedUnity/Assets/3rdParty/Industrial building/Garage/Materials/garage_MaskMap.png.meta
create mode 100644 MarkedUnity/Assets/3rdParty/devotid/Parking Gate/Materials/GATE_Vehicle_MaskMap.png
create mode 100644 MarkedUnity/Assets/3rdParty/devotid/Parking Gate/Materials/GATE_Vehicle_MaskMap.png.meta
diff --git a/MarkedUnity/Assets/3rdParty/Assets_FenceChained/models/Materials/metal_fence-1_MaskMap.png b/MarkedUnity/Assets/3rdParty/Assets_FenceChained/models/Materials/metal_fence-1_MaskMap.png
new file mode 100644
index 0000000..6d7ba05
--- /dev/null
+++ b/MarkedUnity/Assets/3rdParty/Assets_FenceChained/models/Materials/metal_fence-1_MaskMap.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16e619d44c93a266f8d23096421d98b00b3687d4d40322d843de3a3f3128779b
+size 1048293
diff --git a/MarkedUnity/Assets/3rdParty/Assets_FenceChained/models/Materials/metal_fence-1_MaskMap.png.meta b/MarkedUnity/Assets/3rdParty/Assets_FenceChained/models/Materials/metal_fence-1_MaskMap.png.meta
new file mode 100644
index 0000000..7f13528
--- /dev/null
+++ b/MarkedUnity/Assets/3rdParty/Assets_FenceChained/models/Materials/metal_fence-1_MaskMap.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: d27142df7ded08e4c97f5758d1e99586
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 7
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 0
+ 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/MarkedUnity/Assets/3rdParty/Industrial building/Garage/Materials/garage_MaskMap.png b/MarkedUnity/Assets/3rdParty/Industrial building/Garage/Materials/garage_MaskMap.png
new file mode 100644
index 0000000..ff06e31
--- /dev/null
+++ b/MarkedUnity/Assets/3rdParty/Industrial building/Garage/Materials/garage_MaskMap.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef7e54d9c2caff3f85d13d07635d2dd17e2dac4c50b4b84fba7764897110ea45
+size 1627603
diff --git a/MarkedUnity/Assets/3rdParty/Industrial building/Garage/Materials/garage_MaskMap.png.meta b/MarkedUnity/Assets/3rdParty/Industrial building/Garage/Materials/garage_MaskMap.png.meta
new file mode 100644
index 0000000..05b1502
--- /dev/null
+++ b/MarkedUnity/Assets/3rdParty/Industrial building/Garage/Materials/garage_MaskMap.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 29cb3b66d1ff0ed4783ec5324f6a7d83
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 7
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 0
+ 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/MarkedUnity/Assets/3rdParty/devotid/Parking Gate/Materials/GATE_Vehicle_MaskMap.png b/MarkedUnity/Assets/3rdParty/devotid/Parking Gate/Materials/GATE_Vehicle_MaskMap.png
new file mode 100644
index 0000000..8c3ab24
--- /dev/null
+++ b/MarkedUnity/Assets/3rdParty/devotid/Parking Gate/Materials/GATE_Vehicle_MaskMap.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abc475bbb77500a236d561aa781bbcbe1f487b7d1f4a6de7d5b28bdca14eccf2
+size 4129175
diff --git a/MarkedUnity/Assets/3rdParty/devotid/Parking Gate/Materials/GATE_Vehicle_MaskMap.png.meta b/MarkedUnity/Assets/3rdParty/devotid/Parking Gate/Materials/GATE_Vehicle_MaskMap.png.meta
new file mode 100644
index 0000000..28b3579
--- /dev/null
+++ b/MarkedUnity/Assets/3rdParty/devotid/Parking Gate/Materials/GATE_Vehicle_MaskMap.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 862d77ba22381d14dab8384b8814cf2f
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 7
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 0
+ 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/MarkedUnity/Assets/Prefabs/Vehicles/PlayerCar.prefab b/MarkedUnity/Assets/Prefabs/Vehicles/PlayerCar.prefab
index daa3130..7916e57 100644
--- a/MarkedUnity/Assets/Prefabs/Vehicles/PlayerCar.prefab
+++ b/MarkedUnity/Assets/Prefabs/Vehicles/PlayerCar.prefab
@@ -8109,7 +8109,7 @@ MonoBehaviour:
tunerCatchArea: 0.001
Truck: {fileID: 0}
warpDistanceMax: 96
- warpDistanceMin: 16
+ warpDistanceMin: 32
warpAmount: 0
normalSource: {fileID: 7115818538866824881}
warpedSource: {fileID: 2636169313883217922}
@@ -9398,7 +9398,7 @@ MonoBehaviour:
inputOffset: 0
inputOffsetTarget: 0
inputOffsetSpeed: 1
- interferenceMinDist: 8
+ interferenceMinDist: 32
interferenceMaxDist: 64
minStartTime: 1
maxStartTime: 3
diff --git a/MarkedUnity/Assets/Resources/Data/LevelData/Level2.asset b/MarkedUnity/Assets/Resources/Data/LevelData/Level2.asset
index 58b09be..8ee7f85 100644
--- a/MarkedUnity/Assets/Resources/Data/LevelData/Level2.asset
+++ b/MarkedUnity/Assets/Resources/Data/LevelData/Level2.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
levelName: Tuesday
startTutorial: 0
minAttitudeMode: 1
- maxAttitudeMode: 2
+ maxAttitudeMode: 3
attitudeCurve:
serializedVersion: 2
m_Curve:
@@ -42,6 +42,8 @@ MonoBehaviour:
m_RotationOrder: 4
mapSize: 5000
junctionGridLength: 1000
+ roadTime: 60
+ roadParTime: 0.5
junctionFilePaths:
- Roadmap/Junctions/SingleCrossSingle
- Roadmap/Junctions/SingleDiagCrossSingle
diff --git a/MarkedUnity/Assets/Resources/Data/LevelData/Level3.asset b/MarkedUnity/Assets/Resources/Data/LevelData/Level3.asset
index 5b4e131..a85533e 100644
--- a/MarkedUnity/Assets/Resources/Data/LevelData/Level3.asset
+++ b/MarkedUnity/Assets/Resources/Data/LevelData/Level3.asset
@@ -22,17 +22,17 @@ MonoBehaviour:
- serializedVersion: 3
time: 0
value: 0
- inSlope: 1.3333334
- outSlope: 1.3333334
+ inSlope: 2
+ outSlope: 2
tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.75
+ time: 0.5
value: 1
- inSlope: 1.3333334
- outSlope: 1.3333334
+ inSlope: 2
+ outSlope: 2
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
@@ -42,6 +42,8 @@ MonoBehaviour:
m_RotationOrder: 4
mapSize: 5000
junctionGridLength: 1000
+ roadTime: 60
+ roadParTime: 0.5
junctionFilePaths:
- Roadmap/Junctions/SingleCrossSingle
- Roadmap/Junctions/SingleDiagCrossSingle
diff --git a/MarkedUnity/Assets/Resources/Roadmap/Signposts/DeadEndSignpost.prefab b/MarkedUnity/Assets/Resources/Roadmap/Signposts/DeadEndSignpost.prefab
index 38385eb..13681fa 100644
--- a/MarkedUnity/Assets/Resources/Roadmap/Signposts/DeadEndSignpost.prefab
+++ b/MarkedUnity/Assets/Resources/Roadmap/Signposts/DeadEndSignpost.prefab
@@ -164,6 +164,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3917395170444939286}
+ - component: {fileID: 5934479061755452509}
- component: {fileID: 5986768474451776994}
- component: {fileID: 8718977525197563724}
m_Layer: 0
@@ -188,6 +189,22 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!54 &5934479061755452509
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3917395170444971062}
+ serializedVersion: 2
+ m_Mass: 10
+ m_Drag: 0
+ m_AngularDrag: 0.05
+ m_UseGravity: 1
+ m_IsKinematic: 1
+ m_Interpolate: 0
+ m_Constraints: 0
+ m_CollisionDetection: 0
--- !u!65 &5986768474451776994
BoxCollider:
m_ObjectHideFlags: 0
@@ -213,3 +230,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 60d731a9d8092484ab3f66a1b2110426, type: 3}
m_Name:
m_EditorClassIdentifier:
+ minCollisionSpeed: 1.25
diff --git a/MarkedUnity/Assets/Resources/Roadmap/Signposts/DirectionalSignpost.prefab b/MarkedUnity/Assets/Resources/Roadmap/Signposts/DirectionalSignpost.prefab
index 784c0d8..f789acf 100644
--- a/MarkedUnity/Assets/Resources/Roadmap/Signposts/DirectionalSignpost.prefab
+++ b/MarkedUnity/Assets/Resources/Roadmap/Signposts/DirectionalSignpost.prefab
@@ -194,6 +194,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6914513936087144895}
+ - component: {fileID: 3943748609987135536}
- component: {fileID: 5542504484382347651}
- component: {fileID: 8754879842106251429}
m_Layer: 0
@@ -219,6 +220,22 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!54 &3943748609987135536
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6914513936086844831}
+ serializedVersion: 2
+ m_Mass: 10
+ m_Drag: 0
+ m_AngularDrag: 0.05
+ m_UseGravity: 1
+ m_IsKinematic: 1
+ m_Interpolate: 0
+ m_Constraints: 0
+ m_CollisionDetection: 0
--- !u!65 &5542504484382347651
BoxCollider:
m_ObjectHideFlags: 0
@@ -244,3 +261,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 60d731a9d8092484ab3f66a1b2110426, type: 3}
m_Name:
m_EditorClassIdentifier:
+ minCollisionSpeed: 1.25
diff --git a/MarkedUnity/Assets/Scenes/Levels/Level2.unity b/MarkedUnity/Assets/Scenes/Levels/Level2.unity
index 6d83b22..05bb191 100644
--- a/MarkedUnity/Assets/Scenes/Levels/Level2.unity
+++ b/MarkedUnity/Assets/Scenes/Levels/Level2.unity
@@ -195,6 +195,12 @@ PrefabInstance:
propertyPath: levelController
value:
objectReference: {fileID: 1697705362}
+ - target: {fileID: 2179513669611254193, guid: 725f964eb32cb7743b18dfba4bedcd47,
+ type: 3}
+ propertyPath: levelData
+ value:
+ objectReference: {fileID: 11400000, guid: 94294e20330584549b48e2e56e2f89a9,
+ type: 2}
- target: {fileID: 8894608596656475318, guid: 725f964eb32cb7743b18dfba4bedcd47,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -205,12 +211,6 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2179513669611254193, guid: 725f964eb32cb7743b18dfba4bedcd47,
- type: 3}
- propertyPath: levelData
- value:
- objectReference: {fileID: 11400000, guid: 94294e20330584549b48e2e56e2f89a9,
- type: 2}
- target: {fileID: 5493051532432580901, guid: 725f964eb32cb7743b18dfba4bedcd47,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -362,11 +362,13 @@ MonoBehaviour:
levelCtrl: {fileID: 1697705362}
GUICtrl: {fileID: 92925250}
levelGenerated: 0
+ parTime: 0
carMixer: {fileID: 24100000, guid: d8616861915a7b647888c19a5bf84926, type: 2}
LoadingAreaMaxSpeed: 8
houseEnd: {fileID: 39187783}
startJunction: {fileID: 0}
distToStart: 0
+ roadNum: 0
parkingExit: {fileID: 7419627992914699160}
startArea: {fileID: 7414879330863802505}
--- !u!224 &92925246 stripped
@@ -599,6 +601,36 @@ PrefabInstance:
value:
objectReference: {fileID: 11400000, guid: 47ca49b880c7cf4469493b829e5db429,
type: 2}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[1].lightColor.g
+ value: 0.98245615
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[1].lightColor.b
+ value: 0.75
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[2].lightColor.g
+ value: 0.90384614
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[2].lightColor.b
+ value: 0.75
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[3].lightColor.g
+ value: 0.75
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[3].lightColor.b
+ value: 0.75
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2b9070482fce9f04e825c3a227a5745b, type: 3}
--- !u!114 &937500093 stripped
diff --git a/MarkedUnity/Assets/Scenes/Levels/Level3.unity b/MarkedUnity/Assets/Scenes/Levels/Level3.unity
index 9d0c877..40f7a56 100644
--- a/MarkedUnity/Assets/Scenes/Levels/Level3.unity
+++ b/MarkedUnity/Assets/Scenes/Levels/Level3.unity
@@ -195,6 +195,12 @@ PrefabInstance:
propertyPath: levelController
value:
objectReference: {fileID: 1697705362}
+ - target: {fileID: 2179513669611254193, guid: 725f964eb32cb7743b18dfba4bedcd47,
+ type: 3}
+ propertyPath: levelData
+ value:
+ objectReference: {fileID: 11400000, guid: 94294e20330584549b48e2e56e2f89a9,
+ type: 2}
- target: {fileID: 8894608596656475318, guid: 725f964eb32cb7743b18dfba4bedcd47,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -205,12 +211,6 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2179513669611254193, guid: 725f964eb32cb7743b18dfba4bedcd47,
- type: 3}
- propertyPath: levelData
- value:
- objectReference: {fileID: 11400000, guid: 94294e20330584549b48e2e56e2f89a9,
- type: 2}
- target: {fileID: 5493051532432580901, guid: 725f964eb32cb7743b18dfba4bedcd47,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -362,11 +362,13 @@ MonoBehaviour:
levelCtrl: {fileID: 1697705362}
GUICtrl: {fileID: 92925250}
levelGenerated: 0
+ parTime: 0
carMixer: {fileID: 24100000, guid: d8616861915a7b647888c19a5bf84926, type: 2}
LoadingAreaMaxSpeed: 8
houseEnd: {fileID: 39187783}
startJunction: {fileID: 0}
distToStart: 0
+ roadNum: 0
parkingExit: {fileID: 7419627992914699160}
startArea: {fileID: 7414879330863802505}
--- !u!224 &92925246 stripped
@@ -496,14 +498,14 @@ PrefabInstance:
propertyPath: Truck
value:
objectReference: {fileID: 1491437687}
- - target: {fileID: 367537629, guid: 582072740bb14144393cabb26bc7cde6, type: 3}
- propertyPath: truckController
- value:
- objectReference: {fileID: 1491437687}
- target: {fileID: 367537629, guid: 582072740bb14144393cabb26bc7cde6, type: 3}
propertyPath: levelController
value:
objectReference: {fileID: 1697705362}
+ - target: {fileID: 367537629, guid: 582072740bb14144393cabb26bc7cde6, type: 3}
+ propertyPath: truckController
+ value:
+ objectReference: {fileID: 1491437687}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 582072740bb14144393cabb26bc7cde6, type: 3}
--- !u!1001 &760188795
@@ -588,6 +590,36 @@ PrefabInstance:
propertyPath: GUICtrl
value:
objectReference: {fileID: 92925250}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[1].lightColor.g
+ value: 0.9807693
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[1].lightColor.b
+ value: 0.75
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[2].lightColor.g
+ value: 0.88461536
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[2].lightColor.b
+ value: 0.7
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[3].lightColor.g
+ value: 0.65
+ objectReference: {fileID: 0}
+ - target: {fileID: 2398100540760707091, guid: 2b9070482fce9f04e825c3a227a5745b,
+ type: 3}
+ propertyPath: truckInteractions.Array.data[3].lightColor.b
+ value: 0.65
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2b9070482fce9f04e825c3a227a5745b, type: 3}
--- !u!114 &937500093 stripped
diff --git a/MarkedUnity/Assets/Scenes/Tests/Sandbox.unity b/MarkedUnity/Assets/Scenes/Tests/Sandbox.unity
index cbd4a08..83b3b2c 100644
--- a/MarkedUnity/Assets/Scenes/Tests/Sandbox.unity
+++ b/MarkedUnity/Assets/Scenes/Tests/Sandbox.unity
@@ -339,6 +339,51 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5986768474451776994, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: m_Size.x
+ value: 0.05
+ objectReference: {fileID: 0}
+ - target: {fileID: 5986768474451776994, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: m_Size.y
+ value: 1.4164914
+ objectReference: {fileID: 0}
+ - target: {fileID: 5986768474451776994, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: m_Size.z
+ value: 0.024999999
+ objectReference: {fileID: 0}
+ - target: {fileID: 5986768474451776994, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: m_Center.x
+ value: -7.895917e-11
+ objectReference: {fileID: 0}
+ - target: {fileID: 5986768474451776994, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: m_Center.y
+ value: 0.7060109
+ objectReference: {fileID: 0}
+ - target: {fileID: 5986768474451776994, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: m_Center.z
+ value: 0.012499994
+ objectReference: {fileID: 0}
+ - target: {fileID: 8718977525197563724, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: minCollisionSpeed
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5934479061755452509, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: m_IsKinematic
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5934479061755452509, guid: ced1cac180380ba46b5552843df854af,
+ type: 3}
+ propertyPath: m_Mass
+ value: 500
+ objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 3471294773786052965, guid: ced1cac180380ba46b5552843df854af, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: ced1cac180380ba46b5552843df854af, type: 3}
@@ -1212,6 +1257,31 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5542504484382347651, guid: 3a7f03510178e42419fe3572b6e15dee,
+ type: 3}
+ propertyPath: m_Size.y
+ value: 1.3983117
+ objectReference: {fileID: 0}
+ - target: {fileID: 5542504484382347651, guid: 3a7f03510178e42419fe3572b6e15dee,
+ type: 3}
+ propertyPath: m_Center.y
+ value: 0.6987008
+ objectReference: {fileID: 0}
+ - target: {fileID: 8754879842106251429, guid: 3a7f03510178e42419fe3572b6e15dee,
+ type: 3}
+ propertyPath: minCollisionSpeed
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3943748609987135536, guid: 3a7f03510178e42419fe3572b6e15dee,
+ type: 3}
+ propertyPath: m_IsKinematic
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3943748609987135536, guid: 3a7f03510178e42419fe3572b6e15dee,
+ type: 3}
+ propertyPath: m_Mass
+ value: 500
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3a7f03510178e42419fe3572b6e15dee, type: 3}
--- !u!1 &1774099300
diff --git a/MarkedUnity/Assets/Scripts/Behaviours/Game Controllers/LevelGenManager.cs b/MarkedUnity/Assets/Scripts/Behaviours/Game Controllers/LevelGenManager.cs
index 3b6af14..e3de8af 100644
--- a/MarkedUnity/Assets/Scripts/Behaviours/Game Controllers/LevelGenManager.cs
+++ b/MarkedUnity/Assets/Scripts/Behaviours/Game Controllers/LevelGenManager.cs
@@ -49,15 +49,21 @@ public class LevelGenManager : MonoBehaviour
houseEnd.GetComponent<JunctionNode>().levelGen = this;
houseEnd.GetComponent<JunctionNode>().CreateAndLinkNeighbours(ref flatPoints, ref junctionNodeLocations);
+ int highestDepth = 0;
foreach(Transform juncTrans in houseEnd.parent)
{
if (juncTrans.GetComponent<JunctionNode>())
{
juncTrans.GetComponent<JunctionNode>().CreateRoadSigns(2, juncTrans.GetComponent<JunctionNode>().treeDepth / 5);
- roadNum += juncTrans.GetComponent<JunctionNode>().junctionExits.Length;
+ if (juncTrans.GetComponent<JunctionNode>().treeDepth > highestDepth)
+ {
+ highestDepth = juncTrans.GetComponent<JunctionNode>().treeDepth;
+ }
}
}
+ parTime = highestDepth * 60.0f;
+
if (levelCtrl != null)
{
levelCtrl.truckTrans.gameObject.SetActive(false);
diff --git a/MarkedUnity/Assets/Scripts/Behaviours/Generation/Roadmap/Signpost.cs b/MarkedUnity/Assets/Scripts/Behaviours/Generation/Roadmap/Signpost.cs
index 5aa7018..c3c1e58 100644
--- a/MarkedUnity/Assets/Scripts/Behaviours/Generation/Roadmap/Signpost.cs
+++ b/MarkedUnity/Assets/Scripts/Behaviours/Generation/Roadmap/Signpost.cs
@@ -7,6 +7,11 @@ public class Signpost : MonoBehaviour
public float minCollisionSpeed = 2.5f;
+ private void Awake()
+ {
+ this.gameObject.GetComponent<Rigidbody>().isKinematic = true;
+ }
+
private void Update()
{
if (this.transform.position.y < -10)
@@ -19,9 +24,10 @@ public class Signpost : MonoBehaviour
{
if (collision.gameObject.layer == 9 || collision.gameObject.layer == 10)
{
- if (!this.gameObject.GetComponent<Rigidbody>() && collision.relativeVelocity.magnitude > 2.5f)
+ if (collision.relativeVelocity.magnitude > minCollisionSpeed && this.gameObject.GetComponent<Rigidbody>().isKinematic)
{
- this.gameObject.AddComponent<Rigidbody>();
+ this.gameObject.GetComponent<Rigidbody>().isKinematic = false;
+ this.gameObject.GetComponent<Rigidbody>().AddForce((this.transform.position - collision.transform.position).normalized * collision.relativeVelocity.magnitude, ForceMode.Impulse);
}
}
}
--
GitLab