Merge branch 'master' of ooftooft.net:Racesm
# Conflicts: # Assets/ML-Agents/Timers/WinScreen_timers.json
This commit is contained in:
@@ -25,8 +25,8 @@ RenderSettings:
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 0
|
||||
m_SubtractiveShadowColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 10756, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_SubtractiveShadowColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
@@ -37,8 +37,8 @@ RenderSettings:
|
||||
m_ReflectionBounces: 1
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: NaN, g: NaN, b: NaN, a: 1}
|
||||
m_Sun: {fileID: 1158590934}
|
||||
m_IndirectSpecularColor: {r: 0.29684296, g: 0.6337676, b: 0.9937157, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -123,6 +123,113 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &53774097
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 53774101}
|
||||
- component: {fileID: 53774100}
|
||||
- component: {fileID: 53774099}
|
||||
- component: {fileID: 53774098}
|
||||
m_Layer: 0
|
||||
m_Name: Cylinder
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!136 &53774098
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 53774097}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5000001
|
||||
m_Height: 2
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
|
||||
--- !u!23 &53774099
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 53774097}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 9d6913bc815c98847b3f5446ba52a72e, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &53774100
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 53774097}
|
||||
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &53774101
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 53774097}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.25, y: -1, z: -4}
|
||||
m_LocalScale: {x: 5, y: 1, z: 5}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &127894453
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -427,9 +534,11 @@ PrefabInstance:
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 1416994316725918661, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 8413941805919799639, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
insertIndex: 0
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 784053826}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
@@ -503,9 +612,11 @@ PrefabInstance:
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 1416994316725918661, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 8413941805919799639, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
insertIndex: 0
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1860006978}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
@@ -1050,7 +1161,7 @@ Transform:
|
||||
m_GameObject: {fileID: 869443461}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.05988247, y: -0, z: -0, w: 0.9982055}
|
||||
m_LocalPosition: {x: 0.75, y: 1.5, z: -9.44}
|
||||
m_LocalPosition: {x: 0.75, y: 0.50717175, z: -9.55955}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@@ -1133,9 +1244,11 @@ PrefabInstance:
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 1416994316725918661, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 8413941805919799639, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
insertIndex: 0
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 204152977}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
@@ -1204,9 +1317,11 @@ PrefabInstance:
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 1416994316725918661, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 8413941805919799639, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
insertIndex: 0
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1204717677}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
@@ -1318,7 +1433,7 @@ Light:
|
||||
serializedVersion: 10
|
||||
m_Type: 1
|
||||
m_Shape: 0
|
||||
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
|
||||
m_Color: {r: 0.8773585, g: 0.86551505, b: 0.83321464, a: 1}
|
||||
m_Intensity: 1
|
||||
m_Range: 10
|
||||
m_SpotAngle: 30
|
||||
@@ -1557,9 +1672,11 @@ PrefabInstance:
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 1416994316725918661, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 8413941805919799639, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
insertIndex: 0
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1556617106}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
@@ -2127,6 +2244,8 @@ PrefabInstance:
|
||||
- {fileID: 6692659148362127303, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 1416994316725918661, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 8413941805919799639, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
@@ -2470,9 +2589,11 @@ PrefabInstance:
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 1416994316725918661, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 8413941805919799639, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
insertIndex: 0
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 127894454}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
@@ -2558,9 +2679,11 @@ PrefabInstance:
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 1416994316725918661, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
- {fileID: 8413941805919799639, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
insertIndex: 1
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 850453473}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
|
||||
@@ -2577,6 +2700,7 @@ SceneRoots:
|
||||
- {fileID: 1158590935}
|
||||
- {fileID: 2002437009}
|
||||
- {fileID: 786979192}
|
||||
- {fileID: 53774101}
|
||||
- {fileID: 2144194469}
|
||||
- {fileID: 1496457013}
|
||||
- {fileID: 1873035929}
|
||||
|
||||
Reference in New Issue
Block a user