Merge remote-tracking branch 'origin/hdrp' into hdrp

Assets/Artwork/under_of_monument/under_of_monument 2.fbx.meta

@@ -3,7 +3,12 @@ guid: 5ef4186f269b2c04c865e865716c1da0
 ModelImporter:
   serializedVersion: 21300
   internalIDToNameTable: []
-  externalObjects: {}
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: mat_2.003
+    second: {fileID: 2100000, guid: 0b746badcf58ef24692612bf34f836c8, type: 2}
   materials:
     materialImportMode: 2
     materialName: 0

Assets/HDRPDefaultResources/RaceSettingsVolumeProfile.asset

@@ -174,7 +174,7 @@ MonoBehaviour:
     m_Value: {x: 1, y: 1, z: 1, w: -0.10169492}
   midtones:
     m_OverrideState: 1
-    m_Value: {x: 0.95224893, y: 0.94751924, z: 1, w: -0.15593222}
+    m_Value: {x: 0.95224893, y: 0.94751924, z: 1, w: -0.024257028}
   highlights:
     m_OverrideState: 0
     m_Value: {x: 1, y: 1, z: 1, w: 0}

Assets/Images/UI/Leaderboard/GradientHoriz.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: a2f6b90bc02b46f488da14e8df631387
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 1
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Models/Materials/Coin.mat

@@ -179,8 +179,8 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _AORemapMax: 1
+    - _AORemapMax: 0.63846695
-    - _AORemapMin: 0
+    - _AORemapMin: 0.187997
     - _ATDistance: 1
     - _AddPrecomputedVelocity: 0
     - _AlbedoAffectEmissive: 0
@@ -248,8 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicRemapMax: 0
+    - _MetallicRemapMax: 0.6456978
-    - _MetallicRemapMin: 0
+    - _MetallicRemapMin: 0.39985526
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,8 +268,8 @@ Material:
     - _ReceivesSSRTransparent: 0
     - _RefractionModel: 0
     - _Smoothness: 0.711
-    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMax: 0.8517714
-    - _SmoothnessRemapMin: 0
+    - _SmoothnessRemapMin: 0.021691974
     - _SmoothnessTextureChannel: 0
     - _SpecularAAScreenSpaceVariance: 0.1
     - _SpecularAAThreshold: 0.2

Assets/Prefabs/DailyLeaderboard.prefab

@@ -459,7 +459,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 691635673165867307}
   m_HandleRect: {fileID: 3616298632600822043}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -653,7 +653,7 @@ GameObject:
   - component: {fileID: 7190364961365455574}
   - component: {fileID: 5864365335655830861}
   - component: {fileID: 1258478440402116419}
-  - component: {fileID: 1102832381560581036}
+  - component: {fileID: 29518458399480013}
   m_Layer: 5
   m_Name: MainPlace
   m_TagString: Untagged
@@ -750,7 +750,7 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &1102832381560581036
+--- !u!114 &29518458399480013
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -759,10 +759,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 8993949608287977334}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
+  m_Padding: {x: 0, y: 0, z: 0, w: 0}
+  m_Softness: {x: 0, y: 215}
 --- !u!1001 &4018193355936880868
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Prefabs/GlobalLeaderboard.prefab

@@ -607,7 +607,7 @@ GameObject:
   - component: {fileID: 4016059987460768723}
   - component: {fileID: 703943760305419375}
   - component: {fileID: 3125213394203612223}
-  - component: {fileID: 284488763224500802}
+  - component: {fileID: 3211430545210950125}
   m_Layer: 5
   m_Name: MainPlace
   m_TagString: Untagged
@@ -704,7 +704,7 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &284488763224500802
+--- !u!114 &3211430545210950125
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -713,10 +713,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 6126630462746495280}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
+  m_Padding: {x: 0, y: 0, z: 0, w: 0}
+  m_Softness: {x: 0, y: 215}
 --- !u!1 &7219288113117811363
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/LeaderboardEntry 1.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d76a5b8db7c25624d97bf51689ba7565
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/Monument_Debug2/Sky and Fog Settings Profile.asset

@@ -164,10 +164,10 @@ MonoBehaviour:
     m_Value: -0
   limitMin:
     m_OverrideState: 1
-    m_Value: 13.2
+    m_Value: 12
   limitMax:
     m_OverrideState: 1
-    m_Value: 12.8
+    m_Value: 12.5
   curveMap:
     m_OverrideState: 0
     m_Value:

Assets/_Road/Roads/materials/bort.mat

@@ -178,7 +178,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _AORemapMax: 1
-    - _AORemapMin: 1
+    - _AORemapMin: 0.38177872
     - _ATDistance: 1
     - _AddPrecomputedVelocity: 0
     - _AlbedoAffectEmissive: 1
@@ -246,8 +246,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicRemapMax: 0
+    - _MetallicRemapMax: 0.9204628
-    - _MetallicRemapMin: 0
+    - _MetallicRemapMin: 0.6493131
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -266,8 +266,8 @@ Material:
     - _ReceivesSSRTransparent: 0
     - _RefractionModel: 0
     - _Smoothness: 1
-    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMax: 0.8879252
-    - _SmoothnessRemapMin: 0.4640884
+    - _SmoothnessRemapMin: 0.536395
     - _SmoothnessTextureChannel: 0
     - _SpecularAAScreenSpaceVariance: 0.1
     - _SpecularAAThreshold: 0.2

Assets/_Road/Roads/materials/road 1.mat

@@ -169,7 +169,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _AORemapMax: 1
-    - _AORemapMin: 1
+    - _AORemapMin: 0.65798986
     - _ATDistance: 1
     - _AddPrecomputedVelocity: 0
     - _AlbedoAffectEmissive: 0
@@ -213,7 +213,7 @@ Material:
     - _EmissiveExposureWeight: 1
     - _EmissiveIntensity: 1
     - _EmissiveIntensityUnit: 0
-    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 0
     - _EnableFogOnTransparent: 1
     - _EnableGeometricSpecularAA: 0
     - _EnergyConservingSpecularColor: 1
@@ -238,7 +238,7 @@ Material:
     - _MaterialID: 1
     - _Metallic: 1
     - _MetallicRemapMax: 1
-    - _MetallicRemapMin: 0
+    - _MetallicRemapMin: 0.4193781
     - _Mode: 3
     - _NormalMapSpace: 0
     - _NormalScale: 0.3
@@ -257,8 +257,8 @@ Material:
     - _ReceivesSSRTransparent: 0
     - _RefractionModel: 0
     - _Smoothness: 1
-    - _SmoothnessRemapMax: 0
+    - _SmoothnessRemapMax: 0.72885007
-    - _SmoothnessRemapMin: 0
+    - _SmoothnessRemapMin: 0.26030368
     - _SmoothnessTextureChannel: 0
     - _SpecularAAScreenSpaceVariance: 0.1
     - _SpecularAAThreshold: 0.2
@@ -300,9 +300,9 @@ Material:
     - _ZTestTransparent: 4
     - _ZWrite: 0
     m_Colors:
-    - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _BaseColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
     - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
-    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _Color: {r: 0.9, g: 0.9, b: 0.9, a: 1}
     - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
     - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

Assets/_Road/Roads/materials/walls.mat

@@ -165,7 +165,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _AORemapMax: 1
-    - _AORemapMin: 1
+    - _AORemapMin: 0.5408534
     - _ATDistance: 1
     - _AddPrecomputedVelocity: 0
     - _AlbedoAffectEmissive: 0
@@ -234,8 +234,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicRemapMax: 0
+    - _MetallicRemapMax: 1
-    - _MetallicRemapMin: 0.44119966
+    - _MetallicRemapMin: 0.6349813
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -256,8 +256,8 @@ Material:
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _Smoothness: 1
-    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMax: 0.68225646
-    - _SmoothnessRemapMin: 0.42620364
+    - _SmoothnessRemapMin: 0.263919
     - _SmoothnessTextureChannel: 0
     - _SpecularAAScreenSpaceVariance: 0.1
     - _SpecularAAThreshold: 0.2
@@ -307,9 +307,9 @@ Material:
     - _ZTestTransparent: 4
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 1, g: 0.9764151, b: 0.9764151, a: 1}
+    - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
     - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
-    - _Color: {r: 1, g: 0.9764151, b: 0.9764151, a: 1}
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
     - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
     - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}