Merge branch 'master' of ooftooft.net:Racesm
# Conflicts: # Assets/ML-Agents/Timers/AI training_timers.json
This commit is contained in:
@@ -38,7 +38,7 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -1503,7 +1503,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8242215082626919376, guid: 3664a8beed80ac848a9377d9ee14cb9b, type: 3}
|
||||
propertyPath: m_Model
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
objectReference: {fileID: 5022602860645237092, guid: 7c92cf2a61a090049a5ecfd3ce317c87, type: 3}
|
||||
- target: {fileID: 8242215082626919376, guid: 3664a8beed80ac848a9377d9ee14cb9b, type: 3}
|
||||
propertyPath: m_BehaviorName
|
||||
value: BensonImitationV3
|
||||
|
||||
Reference in New Issue
Block a user