diff --git a/Assets/Images/Map icons/Sun_image.png b/Assets/Images/Map icons/Sun_image.png new file mode 100644 index 0000000..6276d12 Binary files /dev/null and b/Assets/Images/Map icons/Sun_image.png differ diff --git a/Assets/Images/Map icons/Sun_image.png.meta b/Assets/Images/Map icons/Sun_image.png.meta new file mode 100644 index 0000000..fcf2323 --- /dev/null +++ b/Assets/Images/Map icons/Sun_image.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 400f5778dc87d974aae2ce088107c880 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Map icons/moon_image.png b/Assets/Images/Map icons/moon_image.png new file mode 100644 index 0000000..2afb161 Binary files /dev/null and b/Assets/Images/Map icons/moon_image.png differ diff --git a/Assets/Images/Map icons/moon_image.png.meta b/Assets/Images/Map icons/moon_image.png.meta new file mode 100644 index 0000000..c4f6b0d --- /dev/null +++ b/Assets/Images/Map icons/moon_image.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 847cdba528858834fbf109844c293f56 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Imported Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Textures/Polyverse Skies - Blue Sky.png.meta b/Assets/Imported Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Textures/Polyverse Skies - Blue Sky.png.meta index 4b29642..e033ffd 100644 --- a/Assets/Imported Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Textures/Polyverse Skies - Blue Sky.png.meta +++ b/Assets/Imported Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Textures/Polyverse Skies - Blue Sky.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 guid: beb1457d375110e468b8d8e1f29fccea -timeCreated: 1513355663 -licenseType: Store TextureImporter: - fileIDToRecycleName: - 8900000: generatedCubemap + internalIDToNameTable: + - first: + 89: 8900000 + second: generatedCubemap externalObjects: {} - serializedVersion: 4 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,7 +23,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,11 +38,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 2 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +59,19 @@ TextureImporter: spriteTessellationDetail: -1 textureType: 0 textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 2 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -67,8 +80,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -77,8 +93,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - buildTarget: Android + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -87,8 +106,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - buildTarget: WebGL + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -97,13 +119,38 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - spritePackingTag: + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab b/Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab index b21ad3f..b5662d5 100644 --- a/Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab +++ b/Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab @@ -1758,7 +1758,7 @@ Transform: m_GameObject: {fileID: 153506} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -944.4919, y: 0, z: 100.35948} + m_LocalPosition: {x: -944.5319, y: 0, z: 100.35948} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/ML-Agents/Timers/Car Customization_timers.json b/Assets/ML-Agents/Timers/Car Customization_timers.json index e694e9d..9fc1dbc 100644 --- a/Assets/ML-Agents/Timers/Car Customization_timers.json +++ b/Assets/ML-Agents/Timers/Car Customization_timers.json @@ -1 +1 @@ -{"count":1,"self":335.322112,"total":336.04577029999996,"children":{"InitializeActuators":{"count":2,"self":0.0015195999999999999,"total":0.0015195999999999999,"children":null},"InitializeSensors":{"count":2,"self":0.0025536,"total":0.0025536,"children":null},"AgentSendState":{"count":1189,"self":0.0934366,"total":0.1302448,"children":{"CollectObservations":{"count":476,"self":0.0097948,"total":0.0097948,"children":null},"WriteActionMask":{"count":476,"self":0.0030117,"total":0.0030117,"children":null},"RequestDecision":{"count":476,"self":0.0202755,"total":0.024001699999999997,"children":{"RayPerceptionSensor.Perceive":{"count":476,"self":0.0037262,"total":0.0037262,"children":null}}}}},"DecideAction":{"count":1189,"self":0.5467748,"total":0.5548543,"children":{"RayPerceptionSensor.Perceive":{"count":952,"self":0.0080795,"total":0.0080795,"children":null}}},"AgentAct":{"count":1189,"self":0.034494,"total":0.034494,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713968045","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId 68a8aa29-874c-491d-8190-81b339430499 -accessToken aIldjTK1Ru8qZVQIJYeN601l-WMihZl-qvWd4h4pikU005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1713968381"}} \ No newline at end of file +{"count":1,"self":44.298704,"total":44.491450799999996,"children":{"InitializeActuators":{"count":2,"self":0.0010002,"total":0.0010002,"children":null},"InitializeSensors":{"count":2,"self":0.0020448,"total":0.0020448,"children":null},"AgentSendState":{"count":1590,"self":0.1070018,"total":0.1571918,"children":{"CollectObservations":{"count":920,"self":0.035919599999999996,"total":0.035919599999999996,"children":null},"WriteActionMask":{"count":594,"self":0.0020415999999999998,"total":0.0020415999999999998,"children":null},"RequestDecision":{"count":594,"self":0.007285,"total":0.0122288,"children":{"RayPerceptionSensor.Perceive":{"count":1188,"self":0.0049438,"total":0.0049438,"children":null}}}}},"DecideAction":{"count":1264,"self":0.0220853,"total":0.0220853,"children":null},"AgentAct":{"count":1264,"self":0.0104246,"total":0.0104246,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714039554","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId 45b5d559-24dc-4b99-a8b6-a125447684df -accessToken bXHJaHm6Ggta2huR1hMWbJtprK9AdD_DuLyfh8whvdM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714039599"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/Map selector_timers.json b/Assets/ML-Agents/Timers/Map selector_timers.json index fad700b..72a9cf2 100644 --- a/Assets/ML-Agents/Timers/Map selector_timers.json +++ b/Assets/ML-Agents/Timers/Map selector_timers.json @@ -1 +1 @@ -{"count":1,"self":368.38138879999997,"total":369.3048028,"children":{"InitializeActuators":{"count":2,"self":0.0010008,"total":0.0010008,"children":null},"InitializeSensors":{"count":2,"self":0.0026865,"total":0.0026865,"children":null},"AgentSendState":{"count":2034,"self":0.1027444,"total":0.14509229999999998,"children":{"CollectObservations":{"count":814,"self":0.0157754,"total":0.0157754,"children":null},"WriteActionMask":{"count":814,"self":0.0030396,"total":0.0030396,"children":null},"RequestDecision":{"count":814,"self":0.020547,"total":0.0235329,"children":{"RayPerceptionSensor.Perceive":{"count":814,"self":0.0029858999999999997,"total":0.0029858999999999997,"children":null}}}}},"DecideAction":{"count":2034,"self":0.6702108,"total":0.68242649999999994,"children":{"RayPerceptionSensor.Perceive":{"count":1628,"self":0.0122157,"total":0.0122157,"children":null}}},"AgentAct":{"count":2034,"self":0.0922156,"total":0.0922156,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713972613","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId 68a8aa29-874c-491d-8190-81b339430499 -accessToken aIldjTK1Ru8qZVQIJYeN601l-WMihZl-qvWd4h4pikU005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Map selector","end_time_seconds":"1713972982"}} \ No newline at end of file +{"count":1,"self":50.186048,"total":50.726340099999994,"children":{"InitializeActuators":{"count":1,"self":0.0015099,"total":0.0015099,"children":null},"InitializeSensors":{"count":1,"self":0.0035129999999999996,"total":0.0035129999999999996,"children":null},"AgentSendState":{"count":2236,"self":0.3053915,"total":0.5352697,"children":{"CollectObservations":{"count":2236,"self":0.22987819999999998,"total":0.22987819999999998,"children":null}}}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714038869","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId 45b5d559-24dc-4b99-a8b6-a125447684df -accessToken bXHJaHm6Ggta2huR1hMWbJtprK9AdD_DuLyfh8whvdM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Map selector","end_time_seconds":"1714038919"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/Racetrack mini_timers.json b/Assets/ML-Agents/Timers/Racetrack mini_timers.json index 0420c77..a6aedb5 100644 --- a/Assets/ML-Agents/Timers/Racetrack mini_timers.json +++ b/Assets/ML-Agents/Timers/Racetrack mini_timers.json @@ -1,9 +1 @@ -<<<<<<< HEAD -{"count":1,"self":44.7145888,"total":45.639207299999995,"children":{"InitializeActuators":{"count":2,"self":0.0010008,"total":0.0010008,"children":null},"InitializeSensors":{"count":2,"self":0.0026865,"total":0.0026865,"children":null},"AgentSendState":{"count":2034,"self":0.1027444,"total":0.14509229999999998,"children":{"CollectObservations":{"count":814,"self":0.0157754,"total":0.0157754,"children":null},"WriteActionMask":{"count":814,"self":0.0030396,"total":0.0030396,"children":null},"RequestDecision":{"count":814,"self":0.020547,"total":0.0235329,"children":{"RayPerceptionSensor.Perceive":{"count":814,"self":0.0029858999999999997,"total":0.0029858999999999997,"children":null}}}}},"DecideAction":{"count":2034,"self":0.6702108,"total":0.68242649999999994,"children":{"RayPerceptionSensor.Perceive":{"count":1628,"self":0.0122157,"total":0.0122157,"children":null}}},"AgentAct":{"count":2034,"self":0.0922156,"total":0.0922156,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713972613","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId 68a8aa29-874c-491d-8190-81b339430499 -accessToken aIldjTK1Ru8qZVQIJYeN601l-WMihZl-qvWd4h4pikU005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713972658"}} -======= -<<<<<<< HEAD -{"count":1,"self":57.9450176,"total":58.521113199999995,"children":{"InitializeActuators":{"count":3,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"InitializeSensors":{"count":3,"self":0.0025079,"total":0.0025079,"children":null},"AgentSendState":{"count":2654,"self":0.051927299999999996,"total":0.0821732,"children":{"CollectObservations":{"count":1062,"self":0.0080226,"total":0.0080226,"children":null},"WriteActionMask":{"count":1062,"self":0,"total":0,"children":null},"RequestDecision":{"count":1062,"self":0.0157041,"total":0.022223299999999998,"children":{"RayPerceptionSensor.Perceive":{"count":1062,"self":0.0065191999999999993,"total":0.0065191999999999993,"children":null}}}}},"DecideAction":{"count":2654,"self":0.386222,"total":0.39074369999999997,"children":{"RayPerceptionSensor.Perceive":{"count":2124,"self":0.0045217,"total":0.0045217,"children":null}}},"AgentAct":{"count":2654,"self":0.099673799999999993,"total":0.099673799999999993,"children":{"RayPerceptionSensor.Perceive":{"count":2,"self":0,"total":0,"children":null}}}},"gauges":{"BensonV7.CumulativeReward":{"count":1,"max":-2.16966248,"min":-2.16966248,"runningAverage":-2.16966248,"value":-2.16966248,"weightedAverage":-2.16966248}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713949644","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId 985081e8-b814-4bc7-8736-608aea67ce7e -accessToken fMKSu_LeJtSMMwbIluJ0HvaiatLXHDxWic8X4MA6BEQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713949703"}} -======= -{"count":1,"self":9.5370144,"total":9.6568762,"children":{"InitializeActuators":{"count":2,"self":0.0010314,"total":0.0010314,"children":null},"InitializeSensors":{"count":2,"self":0.0023714,"total":0.0023714,"children":null},"AgentSendState":{"count":212,"self":0.0090765,"total":0.0228877,"children":{"CollectObservations":{"count":86,"self":0.0015991999999999998,"total":0.0015991999999999998,"children":null},"WriteActionMask":{"count":86,"self":0,"total":0,"children":null},"RequestDecision":{"count":86,"self":0.012211999999999999,"total":0.012211999999999999,"children":{"RayPerceptionSensor.Perceive":{"count":86,"self":0,"total":0,"children":null}}}}},"DecideAction":{"count":212,"self":0.0874686,"total":0.0884751,"children":{"RayPerceptionSensor.Perceive":{"count":172,"self":0.0010065,"total":0.0010065,"children":null}}},"AgentAct":{"count":212,"self":0.0040986,"total":0.0040986,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713950271","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8870a2b5-eb85-482c-9f97-a69682ef9b2b -accessToken bzgvRbOYucyzh7SN49GEtq72W2SGxkT2it-FtzLbNHM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713950281"}} ->>>>>>> 2e78e93ad0c6c546006cc7170bf48149fd2d2513 ->>>>>>> b83f20fbf8d54a996d03b47e938e70fe62f122ac +{"count":1,"self":34.8998752,"total":35.1358813,"children":{"InitializeActuators":{"count":4,"self":0.0010003,"total":0.0010003,"children":null},"InitializeSensors":{"count":4,"self":0.0021273,"total":0.0021273,"children":null},"AgentSendState":{"count":1451,"self":0.13457819999999998,"total":0.21487389999999998,"children":{"CollectObservations":{"count":1153,"self":0.0682126,"total":0.0682126,"children":null},"WriteActionMask":{"count":328,"self":0.0009983,"total":0.0009983,"children":null},"RequestDecision":{"count":328,"self":0.0085863,"total":0.011084799999999999,"children":{"RayPerceptionSensor.Perceive":{"count":656,"self":0.0024985,"total":0.0024985,"children":null}}}}},"DecideAction":{"count":626,"self":0.0138103,"total":0.0138103,"children":null},"AgentAct":{"count":626,"self":0.0031948,"total":0.0031948,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714039602","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId 45b5d559-24dc-4b99-a8b6-a125447684df -accessToken bXHJaHm6Ggta2huR1hMWbJtprK9AdD_DuLyfh8whvdM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1714039637"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/mini_racetrack3_timers.json b/Assets/ML-Agents/Timers/mini_racetrack3_timers.json index c4ec80e..fc26d2e 100644 --- a/Assets/ML-Agents/Timers/mini_racetrack3_timers.json +++ b/Assets/ML-Agents/Timers/mini_racetrack3_timers.json @@ -1 +1 @@ -{"count":1,"self":57.9887808,"total":58.107647899999996,"children":{"InitializeActuators":{"count":2,"self":0.0010314,"total":0.0010314,"children":null},"InitializeSensors":{"count":2,"self":0.0023714,"total":0.0023714,"children":null},"AgentSendState":{"count":212,"self":0.0090765,"total":0.0228877,"children":{"CollectObservations":{"count":86,"self":0.0015991999999999998,"total":0.0015991999999999998,"children":null},"WriteActionMask":{"count":86,"self":0,"total":0,"children":null},"RequestDecision":{"count":86,"self":0.012211999999999999,"total":0.012211999999999999,"children":{"RayPerceptionSensor.Perceive":{"count":86,"self":0,"total":0,"children":null}}}}},"DecideAction":{"count":212,"self":0.0874686,"total":0.0884751,"children":{"RayPerceptionSensor.Perceive":{"count":172,"self":0.0010065,"total":0.0010065,"children":null}}},"AgentAct":{"count":212,"self":0.0040986,"total":0.0040986,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713950271","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8870a2b5-eb85-482c-9f97-a69682ef9b2b -accessToken bzgvRbOYucyzh7SN49GEtq72W2SGxkT2it-FtzLbNHM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"mini_racetrack3","end_time_seconds":"1713950329"}} \ No newline at end of file +{"count":1,"self":38.132784,"total":38.3270614,"children":{"InitializeActuators":{"count":2,"self":0.0010002,"total":0.0010002,"children":null},"InitializeSensors":{"count":2,"self":0.0020448,"total":0.0020448,"children":null},"AgentSendState":{"count":1590,"self":0.1070018,"total":0.1571918,"children":{"CollectObservations":{"count":920,"self":0.035919599999999996,"total":0.035919599999999996,"children":null},"WriteActionMask":{"count":594,"self":0.0020415999999999998,"total":0.0020415999999999998,"children":null},"RequestDecision":{"count":594,"self":0.007285,"total":0.0122288,"children":{"RayPerceptionSensor.Perceive":{"count":1188,"self":0.0049438,"total":0.0049438,"children":null}}}}},"DecideAction":{"count":1264,"self":0.0220853,"total":0.0220853,"children":null},"AgentAct":{"count":1264,"self":0.0104246,"total":0.0104246,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714039554","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId 45b5d559-24dc-4b99-a8b6-a125447684df -accessToken bXHJaHm6Ggta2huR1hMWbJtprK9AdD_DuLyfh8whvdM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"mini_racetrack3","end_time_seconds":"1714039593"}} \ No newline at end of file diff --git a/Assets/Prefabs/Tracks/Racetrack3.prefab b/Assets/Prefabs/Tracks/Racetrack3.prefab index be19b1f..139378e 100644 --- a/Assets/Prefabs/Tracks/Racetrack3.prefab +++ b/Assets/Prefabs/Tracks/Racetrack3.prefab @@ -478,6 +478,52 @@ Transform: - {fileID: 7281725579112279301} m_Father: {fileID: 8440853621307243318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7688166367366294230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3222507829086583714} + - component: {fileID: 7106641318900524479} + m_Layer: 0 + m_Name: SkyboxLoader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3222507829086583714 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7688166367366294230} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8440853621307243318} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7106641318900524479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7688166367366294230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56ccdf5df0a83eb4091e7eeb634e5d5a, type: 3} + m_Name: + m_EditorClassIdentifier: + skyboxDay: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2} + skyboxNight: {fileID: 2100000, guid: 1c8ac9deb3459a4448cc882add76b675, type: 2} --- !u!1 &7708173528503215869 GameObject: m_ObjectHideFlags: 0 @@ -597,6 +643,7 @@ Transform: - {fileID: 2572699368672332911} - {fileID: 9053630949307204883} - {fileID: 1302603537520559881} + - {fileID: 3222507829086583714} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &13224934022731104 diff --git a/Assets/Prefabs/Tracks/racetrack1.prefab b/Assets/Prefabs/Tracks/racetrack1.prefab index 83e9897..dc52f09 100644 --- a/Assets/Prefabs/Tracks/racetrack1.prefab +++ b/Assets/Prefabs/Tracks/racetrack1.prefab @@ -35,6 +35,52 @@ Transform: - {fileID: 8987086998349677766} m_Father: {fileID: 253009768242110962} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3735274376836254210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2208510029805912171} + - component: {fileID: 4669520680851688400} + m_Layer: 0 + m_Name: SkyboxLoader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2208510029805912171 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735274376836254210} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 253009768242110962} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4669520680851688400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735274376836254210} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56ccdf5df0a83eb4091e7eeb634e5d5a, type: 3} + m_Name: + m_EditorClassIdentifier: + skyboxDay: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2} + skyboxNight: {fileID: 2100000, guid: 1c8ac9deb3459a4448cc882add76b675, type: 2} --- !u!1 &4620690873510956438 GameObject: m_ObjectHideFlags: 0 @@ -107,6 +153,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2208510029805912171} - {fileID: 2444740508382612148} - {fileID: 1522313409382438026} m_Father: {fileID: 0} diff --git a/Assets/Prefabs/Tracks/racetrack2.prefab b/Assets/Prefabs/Tracks/racetrack2.prefab index 5932b35..fab2e6c 100644 --- a/Assets/Prefabs/Tracks/racetrack2.prefab +++ b/Assets/Prefabs/Tracks/racetrack2.prefab @@ -259,6 +259,52 @@ Transform: - {fileID: 4032044262844639312} m_Father: {fileID: 2931873659120596923} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4430388929851039885 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 641138911149416759} + - component: {fileID: 4043771586756452115} + m_Layer: 0 + m_Name: SkyboxLoader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &641138911149416759 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4430388929851039885} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4, y: 4, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1828470746108631247} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4043771586756452115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4430388929851039885} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56ccdf5df0a83eb4091e7eeb634e5d5a, type: 3} + m_Name: + m_EditorClassIdentifier: + skyboxDay: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2} + skyboxNight: {fileID: 2100000, guid: 1c8ac9deb3459a4448cc882add76b675, type: 2} --- !u!1 &6222662985324615828 GameObject: m_ObjectHideFlags: 0 @@ -550,6 +596,7 @@ Transform: m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 641138911149416759} - {fileID: 7081213788216054539} - {fileID: 5608896868433561930} - {fileID: 2931873659120596923} diff --git a/Assets/Scenes/Map selector.unity b/Assets/Scenes/Map selector.unity index 2645eac..31a0340 100644 --- a/Assets/Scenes/Map selector.unity +++ b/Assets/Scenes/Map selector.unity @@ -123,6 +123,138 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &643772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 643773} + - component: {fileID: 643776} + - component: {fileID: 643775} + - component: {fileID: 643774} + m_Layer: 5 + m_Name: ButtonToNight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &643773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643772} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 973202480} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &643774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 643775} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1193353611} + m_TargetAssemblyTypeName: TimeOfDay, Assembly-CSharp + m_MethodName: ChangeToNightTime + 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 +--- !u!114 &643775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 847cdba528858834fbf109844c293f56, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &643776 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643772} + m_CullTransparentMesh: 1 --- !u!1 &59547258 GameObject: m_ObjectHideFlags: 0 @@ -362,8 +494,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1096132571} + m_Children: [] m_Father: {fileID: 1526088042} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -557,6 +688,138 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &500464406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 500464407} + - component: {fileID: 500464411} + - component: {fileID: 500464410} + - component: {fileID: 500464409} + m_Layer: 5 + m_Name: ButtonToDay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &500464407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500464406} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 973202480} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &500464409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500464406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 500464410} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1193353611} + m_TargetAssemblyTypeName: TimeOfDay, Assembly-CSharp + m_MethodName: ChangeToDayTime + 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 +--- !u!114 &500464410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500464406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 400f5778dc87d974aae2ce088107c880, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &500464411 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500464406} + m_CullTransparentMesh: 1 --- !u!1 &521052946 GameObject: m_ObjectHideFlags: 0 @@ -835,7 +1098,7 @@ GameObject: - component: {fileID: 973202482} - component: {fileID: 973202481} m_Layer: 5 - m_Name: Time Of Day Panel + m_Name: TimeOfDayPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -852,7 +1115,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 643773} + - {fileID: 500464407} m_Father: {fileID: 1978614972} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -931,11 +1196,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 654884796} - m_Father: {fileID: 287191330} + m_Father: {fileID: 1978614972} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 460, y: -512} + m_AnchoredPosition: {x: 0, y: -392} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1096132572 @@ -995,6 +1260,18 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: + - m_Target: {fileID: 1193353611} + m_TargetAssemblyTypeName: TimeOfDay, Assembly-CSharp + m_MethodName: SetTimeOfDay + 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_Target: {fileID: 1096132572} m_TargetAssemblyTypeName: MapSelectorScript, Assembly-CSharp m_MethodName: selectMap @@ -1045,6 +1322,186 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1096132570} m_CullTransparentMesh: 1 +--- !u!1 &1181192970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1181192971} + - component: {fileID: 1181192973} + - component: {fileID: 1181192972} + m_Layer: 5 + m_Name: MainText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1181192971 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1181192970} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1978614972} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 300} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1181192972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1181192970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1181192973 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1181192970} + m_CullTransparentMesh: 1 +--- !u!1 &1193353610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1193353612} + - component: {fileID: 1193353611} + m_Layer: 0 + m_Name: SkyboxManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1193353611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193353610} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab14f81283cca7e4c91a272a9773809d, type: 3} + m_Name: + m_EditorClassIdentifier: + skyboxMaterial: + MainText: {fileID: 1181192972} +--- !u!4 &1193353612 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193353610} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1526088041 GameObject: m_ObjectHideFlags: 0 @@ -1122,6 +1579,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526088041} m_CullTransparentMesh: 1 +--- !u!1 &1623944367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1623944368} + - component: {fileID: 1623944370} + - component: {fileID: 1623944369} + m_Layer: 5 + m_Name: TextDayTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1623944368 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1623944367} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1978614972} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 700, y: 300} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1623944369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1623944367} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Time of day + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 5 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1623944370 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1623944367} + m_CullTransparentMesh: 1 --- !u!1 &1858338886 GameObject: m_ObjectHideFlags: 0 @@ -1287,7 +1878,10 @@ RectTransform: - {fileID: 79177201} - {fileID: 973202480} - {fileID: 1526088042} + - {fileID: 1096132571} - {fileID: 59547259} + - {fileID: 1623944368} + - {fileID: 1181192971} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1302,3 +1896,4 @@ SceneRoots: - {fileID: 333991148} - {fileID: 1858338889} - {fileID: 1978614972} + - {fileID: 1193353612} diff --git a/Assets/Scenes/Racetrack mini.unity b/Assets/Scenes/Racetrack mini.unity index 49359e2..c6c688e 100644 --- a/Assets/Scenes/Racetrack mini.unity +++ b/Assets/Scenes/Racetrack mini.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: 1c8ac9deb3459a4448cc882add76b675, type: 2} + m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.32107174, g: 0.21133253, b: 0.40438062, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scenes/mini_racetrack3.unity b/Assets/Scenes/mini_racetrack3.unity index 7aacd16..be75a8f 100644 --- a/Assets/Scenes/mini_racetrack3.unity +++ b/Assets/Scenes/mini_racetrack3.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.29684302, g: 0.6337671, b: 0.9937157, a: 1} + m_IndirectSpecularColor: {r: 0.44783193, g: 0.4978208, b: 0.5754451, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -818,6 +818,20 @@ Transform: m_CorrespondingSourceObject: {fileID: 2591688003132231430, guid: 63afb34a2c116fe498ae42967d35d805, type: 3} m_PrefabInstance: {fileID: 993115565} m_PrefabAsset: {fileID: 0} +--- !u!1 &1279834367 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7708173528503215869, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + m_PrefabInstance: {fileID: 1903297572} + m_PrefabAsset: {fileID: 0} +--- !u!45 &1279834369 +Skybox: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1279834367} + m_Enabled: 1 + m_CustomSkybox: {fileID: 2100000, guid: cc421da483ed06c49933077a621bff25, type: 2} --- !u!1 &1329472083 GameObject: m_ObjectHideFlags: 0 @@ -15877,7 +15891,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7708173528503215869, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1279834369} m_SourcePrefab: {fileID: 100100000, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} --- !u!1 &2027171391 GameObject: diff --git a/Assets/Scripts/Car Customization/Garage.cs b/Assets/Scripts/Car Customization/Garage.cs index d7bca9a..a537bcc 100644 --- a/Assets/Scripts/Car Customization/Garage.cs +++ b/Assets/Scripts/Car Customization/Garage.cs @@ -71,7 +71,7 @@ public class Garage : MonoBehaviour void startGame() { - SceneManager.LoadScene("Racetrack mini"); + SceneManager.LoadScene("Map selector"); carData.GetComponent().carType = CurrentCar.name; carData.GetComponent().carColor = currentColor; } diff --git a/Assets/Scripts/map selector script/Map Selector Script.cs b/Assets/Scripts/map selector script/Map Selector Script.cs index 36216ed..c7436c1 100644 --- a/Assets/Scripts/map selector script/Map Selector Script.cs +++ b/Assets/Scripts/map selector script/Map Selector Script.cs @@ -7,11 +7,11 @@ public class MapSelectorScript : MonoBehaviour { public int scene; public void change_to_track2(){ - scene = 2; + scene = 1; } public void change_to_track3(){ - scene = 3; + scene = 2; } public void selectMap(){ diff --git a/Assets/Scripts/map selector script/SkyboxLoader.cs b/Assets/Scripts/map selector script/SkyboxLoader.cs new file mode 100644 index 0000000..a5d3358 --- /dev/null +++ b/Assets/Scripts/map selector script/SkyboxLoader.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SkyboxLoader : MonoBehaviour +{ + public Material skyboxDay; + public Material skyboxNight; + string skyboxToLoad; + void Awake() + { + skyboxToLoad = GameObject.Find("SkyboxManager").GetComponent().skyboxMaterial; + Debug.Log("Skybox: " + skyboxToLoad); + if (skyboxToLoad == "Day") + { + RenderSettings.skybox = skyboxDay; + } + else + { + RenderSettings.skybox = skyboxNight; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/map selector script/SkyboxLoader.cs.meta b/Assets/Scripts/map selector script/SkyboxLoader.cs.meta new file mode 100644 index 0000000..3f272f8 --- /dev/null +++ b/Assets/Scripts/map selector script/SkyboxLoader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 56ccdf5df0a83eb4091e7eeb634e5d5a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/map selector script/TimeOfDay.cs b/Assets/Scripts/map selector script/TimeOfDay.cs new file mode 100644 index 0000000..4444ba2 --- /dev/null +++ b/Assets/Scripts/map selector script/TimeOfDay.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using TMPro; + +public class TimeOfDay : MonoBehaviour +{ + public string skyboxMaterial; + + public static TimeOfDay Instance; + public TextMeshProUGUI MainText; + + public void ChangeToDayTime() + { + skyboxMaterial = "Day"; + } + public void ChangeToNightTime() + { + skyboxMaterial = "Night"; + } + private void Awake() + { + Instance = this; + DontDestroyOnLoad(gameObject); + } + private void Update() + { + MainText.text = "Selected time of day: \n" + skyboxMaterial; + } +} diff --git a/Assets/Scripts/map selector script/TimeOfDay.cs.meta b/Assets/Scripts/map selector script/TimeOfDay.cs.meta new file mode 100644 index 0000000..da0accb --- /dev/null +++ b/Assets/Scripts/map selector script/TimeOfDay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab14f81283cca7e4c91a272a9773809d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SkyboxSaver.cs b/Assets/SkyboxSaver.cs new file mode 100644 index 0000000..0763c6b --- /dev/null +++ b/Assets/SkyboxSaver.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SkyboxSaver : MonoBehaviour +{ + public string skyboxMaterial; + void Awake() + { + DontDestroyOnLoad(this.gameObject); + } +} diff --git a/Assets/SkyboxSaver.cs.meta b/Assets/SkyboxSaver.cs.meta new file mode 100644 index 0000000..9c35fbc --- /dev/null +++ b/Assets/SkyboxSaver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c18c8390868ebd643b4f572d9a90e043 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index facbef1..ef33faf 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,7 +7,7 @@ TagManager: - Wall - NPC - Checkpoint - - Button1 + - Skybox layers: - Default - TransparentFX