Merge branch 'master' of git@ooftooft.net:Racesm.git

This commit is contained in:
PokingPines
2024-04-19 16:08:55 +02:00
16 changed files with 4281 additions and 1902 deletions

Binary file not shown.

View File

@@ -0,0 +1,16 @@
fileFormatVersion: 2
guid: 5d1f7ab87b601564eb6f2b6e149a4315
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 683b6cb6d0a474744822c888b46772c9, type: 3}
optimizeModel: 1
forceArbitraryBatchSize: 1
treatErrorsAsWarnings: 0
importMode: 1
weightsTypeMode: 0
activationTypeMode: 0

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d884527f3e242c144af52b11faf49d2f
guid: 58f7e79a87c79824597746e8c1bfe400
DefaultImporter:
externalObjects: {}
userData:

View File

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

View File

@@ -1 +1 @@
{"count":1,"self":37.447126399999995,"total":38.1944854,"children":{"InitializeActuators":{"count":1,"self":0.0025220999999999998,"total":0.0025220999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.0015034,"total":0.0015034,"children":null},"AgentSendState":{"count":1670,"self":0.10014859999999999,"total":0.668503,"children":{"CollectObservations":{"count":1670,"self":0.54390779999999994,"total":0.54390779999999994,"children":null},"WriteActionMask":{"count":1670,"self":0.0030217,"total":0.0030217,"children":null},"RequestDecision":{"count":1670,"self":0.012055399999999999,"total":0.0214249,"children":{"RayPerceptionSensor.Perceive":{"count":3340,"self":0.0093695,"total":0.0093695,"children":null}}}}},"DecideAction":{"count":1670,"self":0.0163969,"total":0.0163969,"children":null},"AgentAct":{"count":1670,"self":0.056928099999999995,"total":0.056928099999999995,"children":{"RayPerceptionSensor.Perceive":{"count":4,"self":0,"total":0,"children":null}}}},"gauges":{"BensonV4.CumulativeReward":{"count":2,"max":24.2291832,"min":23.1571674,"runningAverage":23.6931763,"value":24.2291832,"weightedAverage":23.42517}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713519122","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 4068a663-bd5e-4526-907d-88111baad304 -accessToken lEnHrjqkaCSQA7MdFiPPC8yoqdYZh4_FAtRTqZKLQPI005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI training","end_time_seconds":"1713519160"}}
{"count":1,"self":48.641856,"total":49.1630518,"children":{"InitializeActuators":{"count":1,"self":0.0010003,"total":0.0010003,"children":null},"InitializeSensors":{"count":1,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"AgentSendState":{"count":2213,"self":0.044592599999999996,"total":0.0698158,"children":{"CollectObservations":{"count":443,"self":0.009644,"total":0.009644,"children":null},"WriteActionMask":{"count":443,"self":0.0005038,"total":0.0005038,"children":null},"RequestDecision":{"count":443,"self":0.0150754,"total":0.0150754,"children":null}}},"DecideAction":{"count":2213,"self":0.36232129999999996,"total":0.3648423,"children":{"RayPerceptionSensor.Perceive":{"count":886,"self":0.002521,"total":0.002521,"children":null}}},"AgentAct":{"count":2213,"self":0.0835345,"total":0.0835345,"children":null}},"gauges":{"BensonV4.CumulativeReward":{"count":3,"max":5.96420574,"min":5.87237167,"runningAverage":5.908585,"value":5.87237167,"weightedAverage":5.92717934}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713535484","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 4068a663-bd5e-4526-907d-88111baad304 -accessToken 2br8Tr5WDuAnqRzlr3wnNZ_EORRyV0BMpmUN7FvToCw005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI training","end_time_seconds":"1713535533"}}

View File

@@ -58,14 +58,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3737921037825940745}
serializedVersion: 2
m_LocalRotation: {x: 0.22189745, y: -0, z: -0, w: 0.97507}
m_LocalPosition: {x: 2.5158076, y: 1.0294907, z: 1.9411907}
m_LocalRotation: {x: 0.24253564, y: -0, z: -0, w: 0.97014254}
m_LocalPosition: {x: 86.31581, y: -1.0605093, z: -50.95881}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5074368049883446301}
m_Father: {fileID: 6331817402021486753}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 25.641, y: 0, z: 0}
--- !u!114 &8858152487650577344
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -116,7 +116,7 @@ GameObject:
- component: {fileID: 5074368049883446301}
- component: {fileID: 2165901318259190681}
- component: {fileID: 2100622393876020061}
- component: {fileID: 7119497487385811357}
- component: {fileID: 4849827436373015423}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
@@ -164,10 +164,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Damping: {x: 1, y: 0.4, z: 1}
ShoulderOffset: {x: 0, y: 1.75, z: 0}
VerticalArmLength: 0.5
ShoulderOffset: {x: 0, y: 0.5, z: 0}
VerticalArmLength: 0.3
CameraSide: 0.5
CameraDistance: 5
CameraDistance: 1.5
CameraCollisionFilter:
serializedVersion: 2
m_Bits: 0
@@ -175,7 +175,7 @@ MonoBehaviour:
CameraRadius: 0.494
DampingIntoCollision: 4.6
DampingFromCollision: 2
--- !u!114 &7119497487385811357
--- !u!114 &4849827436373015423
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -214,13 +214,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5810170567460595970}
serializedVersion: 2
m_LocalRotation: {x: 0.11043153, y: -0, z: -0, w: 0.9938837}
m_LocalPosition: {x: 2.5158076, y: 0.8794906, z: -3.0588093}
m_LocalRotation: {x: 0.24253564, y: -0, z: -0, w: 0.97014254}
m_LocalPosition: {x: 86.31581, y: -1.0605093, z: -50.95881}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6331817402021486753}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 10.641, y: 0, z: 0}
--- !u!20 &679652745285801860
Camera:
m_ObjectHideFlags: 0
@@ -254,7 +254,7 @@ Camera:
height: 1
near clip plane: 0.3
far clip plane: 500
field of view: 60
field of view: 60.000004
orthographic: 0
orthographic size: 5
m_Depth: 0

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.32097438, g: 0.2113182, b: 0.404351, a: 1}
m_IndirectSpecularColor: {r: 0.32097125, g: 0.21131825, b: 0.40435025, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -228,6 +228,103 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
--- !u!1 &279243547
GameObject:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 279243548}
- component: {fileID: 279243551}
- component: {fileID: 279243550}
- component: {fileID: 279243552}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &279243548
Transform:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 279243547}
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: 1438942458}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &279243550
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 279243547}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
m_HorizontalDamping: 0.5
m_VerticalDamping: 0.5
m_ScreenX: 0.5
m_ScreenY: 0.5
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
m_SoftZoneWidth: 0.8
m_SoftZoneHeight: 0.8
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!114 &279243551
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 279243547}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &279243552
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 279243547}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bd6043bde05a7fc4cba197d06915c1e3, type: 3}
m_Name:
m_EditorClassIdentifier:
Damping: {x: 0.1, y: 0.5, z: 0.3}
ShoulderOffset: {x: 0.5, y: 1, z: 0}
VerticalArmLength: 0.4
CameraSide: 0.5
CameraDistance: 4
CameraCollisionFilter:
serializedVersion: 2
m_Bits: 0
IgnoreTag:
CameraRadius: 0.2
DampingIntoCollision: 0
DampingFromCollision: 2
--- !u!1001 &434643104
PrefabInstance:
m_ObjectHideFlags: 0
@@ -714,6 +811,78 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1001 &1077232721
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 610841007621907579, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_IsKinematic
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1907112288057292323, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_Name
value: Character
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.x
value: 82.05
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.y
value: 0.03
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.z
value: -29.44
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3330552193559583600, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_IsKinematic
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7376795614926180791, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1144658963992784436, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
insertIndex: -1
addedObject: {fileID: 1927000308}
m_SourcePrefab: {fileID: 100100000, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
--- !u!4 &1138161466 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
@@ -1180,6 +1349,39 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
--- !u!1 &1375563098
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1375563099}
m_Layer: 0
m_Name: Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1375563099
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1375563098}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 50.819103, y: 36.67663, z: -84.32594}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2049722135}
- {fileID: 1438942458}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1427960684
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1194,7 +1396,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.x
value: 83.8
value: 83.27
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.y
@@ -1202,7 +1404,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.z
value: -56.4
value: -58.63
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.w
@@ -1236,11 +1438,87 @@ PrefabInstance:
propertyPath: m_Name
value: Hotrod
objectReference: {fileID: 0}
- target: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
--- !u!1 &1438942457
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1438942458}
- component: {fileID: 1438942459}
m_Layer: 0
m_Name: Virtual Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1438942458
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1438942457}
serializedVersion: 2
m_LocalRotation: {x: 0.1675435, y: -0, z: -0, w: 0.9858647}
m_LocalPosition: {x: 32.450893, y: -35.21663, z: 21.695942}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 279243548}
m_Father: {fileID: 1375563099}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1438942459
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1438942457}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ExcludedPropertiesInInspector:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 10
m_StandbyUpdate: 2
m_LookAt: {fileID: 1693759701}
m_Follow: {fileID: 1693759701}
m_Lens:
FieldOfView: 60.000004
OrthographicSize: 5
NearClipPlane: 0.05
FarClipPlane: 1000
Dutch: 0
ModeOverride: 0
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
m_SensorSize: {x: 1, y: 1}
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
m_OnCameraLive:
m_PersistentCalls:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 279243548}
--- !u!1001 &1495114367
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1301,6 +1579,10 @@ PrefabInstance:
propertyPath: m_Name
value: Truck
objectReference: {fileID: 0}
- target: {fileID: 4635384822206797428, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- target: {fileID: 5061132905868936189, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Enabled
value: 0
@@ -1314,171 +1596,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
--- !u!1001 &1574695326
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 86.31581
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0605093
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: -50.95881
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
value: 0.97014254
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0.24253564
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 25.641
objectReference: {fileID: 0}
- target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: field of view
value: 60.000004
objectReference: {fileID: 0}
- target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: far clip plane
value: 500
objectReference: {fileID: 0}
- target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: near clip plane
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 1387890555408215438, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_Name
value: Camera
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: CameraSide
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: CameraDistance
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: ShoulderOffset.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: ShoulderOffset.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: VerticalArmLength
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: -2.5158076
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: 1.9205093
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: -6.9411907
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_Follow
value:
objectReference: {fileID: 1693759701}
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LookAt
value:
objectReference: {fileID: 1693759701}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 86.31581
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0605093
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: -50.95881
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
value: 0.97014254
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0.24253564
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 10.641
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 7119497487385811357, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4840733166066636179, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
insertIndex: -1
addedObject: {fileID: 2015283370}
m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
--- !u!1001 &1611352892
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1676,23 +1793,150 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
--- !u!1 &2015283366 stripped
--- !u!1 &1927000304 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4840733166066636179, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
m_PrefabInstance: {fileID: 1574695326}
m_CorrespondingSourceObject: {fileID: 1144658963992784436, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
m_PrefabInstance: {fileID: 1077232721}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2015283370
--- !u!114 &1927000308
MonoBehaviour:
m_ObjectHideFlags: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2015283366}
m_GameObject: {fileID: 1927000304}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3}
m_Script: {fileID: 11500000, guid: b7391613e08a1e4419083635391e73ec, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2049722134
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2049722135}
- component: {fileID: 2049722137}
- component: {fileID: 2049722136}
- component: {fileID: 2049722138}
m_Layer: 0
m_Name: Virtual cam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2049722135
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2049722134}
serializedVersion: 2
m_LocalRotation: {x: 0.1675435, y: -0, z: -0, w: 0.9858647}
m_LocalPosition: {x: 32.450893, y: -35.21663, z: 21.695942}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1375563099}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &2049722136
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2049722134}
m_Enabled: 1
--- !u!20 &2049722137
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2049722134}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.05
far clip plane: 1000
field of view: 60.000004
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!114 &2049722138
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2049722134}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowDebugText: 0
m_ShowCameraFrustum: 1
m_IgnoreTimeScale: 0
m_WorldUpOverride: {fileID: 0}
m_UpdateMethod: 2
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 2
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_CustomBlends: {fileID: 0}
m_CameraCutEvent:
m_PersistentCalls:
m_Calls: []
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
--- !u!1001 &802517270703114805
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1755,8 +1999,9 @@ SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1051678512}
- {fileID: 1574695326}
- {fileID: 1770047257}
- {fileID: 802517270703114805}
- {fileID: 1427960684}
- {fileID: 1495114367}
- {fileID: 1077232721}
- {fileID: 1375563099}

View File

@@ -123,10 +123,10 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!4 &83369034 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
m_PrefabInstance: {fileID: 7444232797940731829}
--- !u!1 &449437553 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1144658963992784436, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
m_PrefabInstance: {fileID: 5664739312409415817}
m_PrefabAsset: {fileID: 0}
--- !u!1 &705507993
GameObject:
@@ -222,23 +222,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1897464303 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4840733166066636179, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
m_PrefabInstance: {fileID: 4212961364147142189}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1897464309
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1897464303}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1915174277
GameObject:
m_ObjectHideFlags: 0
@@ -389,6 +372,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 43a3b21977ed2c64b8d62ca5013ab914, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2057961604
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 449437553}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b7391613e08a1e4419083635391e73ec, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1328367594557032345
PrefabInstance:
m_ObjectHideFlags: 0
@@ -446,7 +441,7 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
--- !u!1001 &4212961364147142189
--- !u!1001 &5664739312409415817
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -454,151 +449,110 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 610841007621907579, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_IsKinematic
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1144658963992698464, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1144658963992707264, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1144658963992709954, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1144658963992891298, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1144658963992940466, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.x
value: 1.2441272
value: 0
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 1144658963992940466, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.y
value: -0.67545605
value: 0
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 1144658963992940466, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.z
value: 7.5518694
value: 0
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9938837
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0.11043153
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: field of view
value: 60
objectReference: {fileID: 0}
- target: {fileID: 1387890555408215438, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 1907112288057292323, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_Name
value: Camera
value: Character
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: CameraRadius
value: 1
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalScale.x
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: CameraDistance
value: 10
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalScale.y
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: ShoulderOffset.z
value: 0
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalScale.z
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: DampingFromCollision
value: 5.09
objectReference: {fileID: 0}
- target: {fileID: 2100622393876020061, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: DampingIntoCollision
value: 6.83
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.x
value: -2.5158076
value: -0.904
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.y
value: 4.4205093
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalPosition.z
value: -13.941193
value: 6.75
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6331817402021486753, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_Follow
value:
objectReference: {fileID: 83369034}
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LookAt
value:
objectReference: {fileID: 83369034}
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_Lens.FieldOfView
value: 60
- target: {fileID: 3330552193559583600, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_IsKinematic
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 1.2441272
- target: {fileID: 5818284127759273160, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
propertyPath: m_ProvidesContacts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -0.67545605
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: 7.5518694
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9938837
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0.11043153
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 7119497487385811357, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4840733166066636179, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
- targetCorrespondingSourceObject: {fileID: 1144658963992784436, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
insertIndex: -1
addedObject: {fileID: 1897464309}
m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
addedObject: {fileID: 2057961604}
m_SourcePrefab: {fileID: 100100000, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
--- !u!1001 &6862354766440944207
PrefabInstance:
m_ObjectHideFlags: 0
@@ -609,7 +563,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 4284629084863024120, guid: d5caff8338f793c4eb4490cc52546faf, type: 3}
propertyPath: m_LocalPosition.x
value: -3.3487434
value: -0.84874344
objectReference: {fileID: 0}
- target: {fileID: 4284629084863024120, guid: d5caff8338f793c4eb4490cc52546faf, type: 3}
propertyPath: m_LocalPosition.y
@@ -617,7 +571,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4284629084863024120, guid: d5caff8338f793c4eb4490cc52546faf, type: 3}
propertyPath: m_LocalPosition.z
value: -2.3607507
value: 3.6392493
objectReference: {fileID: 0}
- target: {fileID: 4284629084863024120, guid: d5caff8338f793c4eb4490cc52546faf, type: 3}
propertyPath: m_LocalRotation.w
@@ -674,7 +628,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalPosition.z
value: 3.6106765
value: -0.8893235
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalRotation.w
@@ -720,7 +674,7 @@ SceneRoots:
- {fileID: 705507995}
- {fileID: 2026056264}
- {fileID: 1915174281}
- {fileID: 4212961364147142189}
- {fileID: 1328367594557032345}
- {fileID: 6862354766440944207}
- {fileID: 7444232797940731829}
- {fileID: 5664739312409415817}

View File

@@ -14,8 +14,6 @@ using System;
public class AgentControllerV4 : Agent
{
public float motorForce = 300;
public float brakeForce = 500;
public float maxSpeed = 400;
public float steeringRange = 9;
Rigidbody rigidBody;
public List<GameObject> checkpoints;
@@ -24,14 +22,12 @@ public class AgentControllerV4 : Agent
int currentStep = 0;
int stepsSinceCheckpoint = 0;
public int maxStepsPerCheckpoint = 300;
public int distanceBetweenCheckpoints;
public int distanceBetweenCheckpoints = 5;
// Start is called before the first frame update
void Start()
{
rigidBody = GetComponent<Rigidbody>();
// Find all child GameObjects that have the WheelControl script attached
startPosition = transform.localPosition;
startRotation = transform.localRotation;
}
@@ -67,8 +63,8 @@ public class AgentControllerV4 : Agent
}
}
print(transform.rotation.y);
sensor.AddObservation(transform.rotation.y);
// Agent rotation
sensor.AddObservation(transform.localRotation.y);
Vector3 position = transform.localPosition;
Vector3 checkpointPosition = currentCheckpoint.localPosition;
@@ -78,21 +74,15 @@ public class AgentControllerV4 : Agent
checkpointPosition.z - position.z
);
// Normalized vector in direction of checkpoint and distancce to checkpoint.
sensor.AddObservation(toCheckpoint.normalized);
sensor.AddObservation(toCheckpoint.magnitude);
sensor.AddObservation(distanceToCheckpoint(currentCheckpoint));
var FullVelocityMagnitude = rigidBody.velocity.magnitude; // Velocity including angular velocity
var angularMagnitude = rigidBody.angularVelocity.magnitude;
var forwardMagnitude = Mathf.Sqrt( Mathf.Pow(FullVelocityMagnitude, 2) - Mathf.Pow(angularMagnitude, 2)); // Agent velocity in forward direction
if (forwardMagnitude >= 0.001)
sensor.AddObservation(forwardMagnitude);
else
sensor.AddObservation(FullVelocityMagnitude);
sensor.AddObservation(angularMagnitude);
Vector2 velocity = new Vector2(rigidBody.velocity.x, rigidBody.velocity.z);
// Velocity
sensor.AddObservation(velocity);
}
public override void OnActionReceived(ActionBuffers actions)
@@ -111,13 +101,6 @@ public class AgentControllerV4 : Agent
if (actions.DiscreteActions[1] == 1)
hInput = 1f;
// reward for going forward
// if (vInput == 1f)
// {
// AddReward(0.02f);
// }
// give benson mental pain for existing (punishment for maximizing first checkpoint by standing still)
AddReward(-0.002f);
@@ -155,12 +138,13 @@ public class AgentControllerV4 : Agent
currentCheckpoint.GetComponent<Checkpoint>().isCollected = true;
stepsSinceCheckpoint = 0;
// If last checkpoint
if (currentCheckpoint == checkpoints[checkpoints.Count - 1].transform)
{
AddReward(10f);
EndEpisode();
}
AddReward(1.0f);
AddReward(1f);
}
currentStep += 1;
@@ -208,19 +192,23 @@ public class AgentControllerV4 : Agent
return angle;
}
// punishment for hitting a wall
private void OnCollisionEnter(Collision other) {
if (other.gameObject.tag == "Wall")
{
AddReward(-0.05f);
}
private void OnTriggerEnter(Collider other) {
}
// punishment for staying at a wall
private void OnCollisionStay(Collision other) {
if (other.gameObject.tag == "Wall")
{
AddReward(-0.05f);
}
}
// // punishment for hitting a wall
// private void OnCollisionEnter(Collision other) {
// if (other.gameObject.tag == "Wall")
// {
// AddReward(-0.05f);
// }
// }
// // punishment for staying at a wall
// private void OnCollisionStay(Collision other) {
// if (other.gameObject.tag == "Wall")
// {
// AddReward(-0.005f);
// }
// }
}

71
Assets/Scripts/NPC.cs Normal file
View File

@@ -0,0 +1,71 @@
using System.Collections;
using System.Collections.Generic;
using Unity.MLAgents.SideChannels;
using UnityEngine;
public class NPC : MonoBehaviour
{
private Rigidbody[] RBchildren;
// Start is called before the first frame update
void Start()
{
foreach (Transform g in transform.GetComponentsInChildren<Transform>())
{
try
{
var rb = g.GetComponent<Rigidbody>();
rb.useGravity = false;
}
catch (System.Exception)
{
continue;
}
}
// for (int i = 0; i < RBchildren.Length; i++)
// {
// RBchildren[i].useGravity = false;
// }
}
// Update is called once per frame
void Update()
{
}
private void OnCollisionEnter(Collision collision)
{
if (collision.gameObject.tag == "Player")
{
foreach (Transform g in transform.GetComponentsInChildren<Transform>())
{
try
{
var rb = g.GetComponent<Rigidbody>();
rb.useGravity = true;
rb.isKinematic = false;
}
catch (System.Exception)
{
continue;
}
}
}
// for (int i = 0; i < RBchildren.Length; i++)
// {
// RBchildren[i].useGravity = true;
// RBchildren[i].isKinematic = false;
// }
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b7391613e08a1e4419083635391e73ec
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: