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

# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/Scenes/Racetrack mini.unity

Signed-off-by: Ciakon <noahkarottki@gmail.com>
This commit is contained in:
2024-04-23 10:46:53 +02:00
12 changed files with 21120 additions and 5075 deletions

View File

@@ -94,13 +94,13 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: IsTurning
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

View File

@@ -1758,7 +1758,7 @@ Transform:
m_GameObject: {fileID: 153506}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -124.06736, y: 0, z: 100.35948}
m_LocalPosition: {x: -640.6719, y: 0, z: 100.35948}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:

View File

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

View File

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

View File

@@ -1 +1,5 @@
{"count":1,"self":10.982344,"total":11.1048147,"children":{"InitializeActuators":{"count":1,"self":0.0010012999999999999,"total":0.0010012999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0015044,"total":0.0015044,"children":null},"AgentSendState":{"count":321,"self":0.008182,"total":0.0197174,"children":{"CollectObservations":{"count":65,"self":0.0025157,"total":0.0025157,"children":null},"WriteActionMask":{"count":65,"self":0,"total":0,"children":null},"RequestDecision":{"count":65,"self":0.0090197,"total":0.0090197,"children":null}}},"DecideAction":{"count":321,"self":0.086684299999999992,"total":0.086684299999999992,"children":{"RayPerceptionSensor.Perceive":{"count":130,"self":0,"total":0,"children":null}}},"AgentAct":{"count":321,"self":0.012562,"total":0.012562,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713861459","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 249cbe37-b739-48da-be83-8703208ec644 -accessToken 8HP4BNN_d2rYa9gBqxxeXFjsh8NpNokVC4_Asgt7liQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713861470"}}
<<<<<<< HEAD
{"count":1,"self":10.982344,"total":11.1048147,"children":{"InitializeActuators":{"count":1,"self":0.0010012999999999999,"total":0.0010012999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0015044,"total":0.0015044,"children":null},"AgentSendState":{"count":321,"self":0.008182,"total":0.0197174,"children":{"CollectObservations":{"count":65,"self":0.0025157,"total":0.0025157,"children":null},"WriteActionMask":{"count":65,"self":0,"total":0,"children":null},"RequestDecision":{"count":65,"self":0.0090197,"total":0.0090197,"children":null}}},"DecideAction":{"count":321,"self":0.086684299999999992,"total":0.086684299999999992,"children":{"RayPerceptionSensor.Perceive":{"count":130,"self":0,"total":0,"children":null}}},"AgentAct":{"count":321,"self":0.012562,"total":0.012562,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713861459","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 249cbe37-b739-48da-be83-8703208ec644 -accessToken 8HP4BNN_d2rYa9gBqxxeXFjsh8NpNokVC4_Asgt7liQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713861470"}}
=======
{"count":1,"self":67.02152319999999,"total":68.75985519999999,"children":{"InitializeActuators":{"count":1,"self":0.00099969999999999985,"total":0.00099969999999999985,"children":null},"InitializeSensors":{"count":1,"self":0.0029919,"total":0.0029919,"children":null},"AgentSendState":{"count":3173,"self":0.0853182,"total":0.146277,"children":{"CollectObservations":{"count":635,"self":0.0375563,"total":0.0375563,"children":null},"WriteActionMask":{"count":635,"self":0.0019976,"total":0.0019976,"children":null},"RequestDecision":{"count":635,"self":0.021404899999999998,"total":0.021404899999999998,"children":null}}},"DecideAction":{"count":3173,"self":1.3692536,"total":1.3805634,"children":{"RayPerceptionSensor.Perceive":{"count":1270,"self":0.0113098,"total":0.0113098,"children":null}}},"AgentAct":{"count":3173,"self":0.20445629999999998,"total":0.20445629999999998,"children":null}},"gauges":{"BensonV6.1.CumulativeReward":{"count":2,"max":25.4223919,"min":12.8763666,"runningAverage":19.14938,"value":12.8763666,"weightedAverage":22.2858849}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713860886","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\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 85628495-4bbf-4ebf-9a76-a3f42df70699 -accessToken SYITqeuCKSOmslEUEeguWUuVHsXrKJl43gox_St5y34005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713860954"}}
>>>>>>> 2990a061aeca8ed1ac64145cadd8b499f1d65402

View File

@@ -47,10 +47,10 @@ WheelCollider:
spring: 35000
damper: 1500
targetPosition: 1
m_SuspensionDistance: 0.3
m_SuspensionDistance: 0.25
m_ForceAppPointDistance: 0
m_Mass: 20
m_WheelDampingRate: 0.25
m_Mass: 80
m_WheelDampingRate: 0.01
m_ForwardFriction:
m_ExtremumSlip: 0.4
m_ExtremumValue: 1
@@ -135,10 +135,10 @@ WheelCollider:
spring: 35000
damper: 1500
targetPosition: 1
m_SuspensionDistance: 0.3
m_SuspensionDistance: 0.25
m_ForceAppPointDistance: 0
m_Mass: 20
m_WheelDampingRate: 0.25
m_Mass: 80
m_WheelDampingRate: 0.01
m_ForwardFriction:
m_ExtremumSlip: 0.4
m_ExtremumValue: 1
@@ -223,22 +223,22 @@ WheelCollider:
spring: 35000
damper: 1500
targetPosition: 1
m_SuspensionDistance: 0.3
m_SuspensionDistance: 0.25
m_ForceAppPointDistance: 0
m_Mass: 20
m_WheelDampingRate: 0.25
m_Mass: 80
m_WheelDampingRate: 0.01
m_ForwardFriction:
m_ExtremumSlip: 0.4
m_ExtremumValue: 1
m_AsymptoteSlip: 0.8
m_AsymptoteValue: 0.5
m_Stiffness: 1
m_Stiffness: 2
m_SidewaysFriction:
m_ExtremumSlip: 0.2
m_ExtremumValue: 1
m_AsymptoteSlip: 0.5
m_AsymptoteValue: 0.75
m_Stiffness: 1
m_Stiffness: 2
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -311,22 +311,22 @@ WheelCollider:
spring: 35000
damper: 1500
targetPosition: 1
m_SuspensionDistance: 0.3
m_SuspensionDistance: 0.25
m_ForceAppPointDistance: 0
m_Mass: 20
m_WheelDampingRate: 0.25
m_Mass: 80
m_WheelDampingRate: 0.01
m_ForwardFriction:
m_ExtremumSlip: 0.4
m_ExtremumValue: 1
m_AsymptoteSlip: 0.8
m_AsymptoteValue: 0.5
m_Stiffness: 1
m_Stiffness: 2
m_SidewaysFriction:
m_ExtremumSlip: 0.2
m_ExtremumValue: 1
m_AsymptoteSlip: 0.5
m_AsymptoteValue: 0.75
m_Stiffness: 1
m_Stiffness: 2
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -406,7 +406,7 @@ Rigidbody:
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitCom: 0
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
@@ -427,7 +427,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
motorTorque: 300
brakeTorque: 500
maxSpeed: 400
maxSpeed: 100
steeringRange: 10
steeringRangeAtMaxSpeed: 7
autoBrake: 100

View File

@@ -45,12 +45,12 @@ WheelCollider:
m_Radius: 0.3555168
m_SuspensionSpring:
spring: 35000
damper: 4500
damper: 1500
targetPosition: 0.5
m_SuspensionDistance: 0.3
m_SuspensionDistance: 0.25
m_ForceAppPointDistance: 0
m_Mass: 20
m_WheelDampingRate: 0.25
m_Mass: 80
m_WheelDampingRate: 0.01
m_ForwardFriction:
m_ExtremumSlip: 0.4
m_ExtremumValue: 1
@@ -133,12 +133,12 @@ WheelCollider:
m_Radius: 0.3555168
m_SuspensionSpring:
spring: 35000
damper: 4500
damper: 1500
targetPosition: 0.5
m_SuspensionDistance: 0.3
m_SuspensionDistance: 0.25
m_ForceAppPointDistance: 0
m_Mass: 20
m_WheelDampingRate: 0.25
m_Mass: 80
m_WheelDampingRate: 0.01
m_ForwardFriction:
m_ExtremumSlip: 0.4
m_ExtremumValue: 1
@@ -150,7 +150,7 @@ WheelCollider:
m_ExtremumValue: 1
m_AsymptoteSlip: 0.5
m_AsymptoteValue: 0.75
m_Stiffness: 1
m_Stiffness: 1.125
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -172,7 +172,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3}
m_Name:
m_EditorClassIdentifier:
wheelModel: {fileID: 3021246406777660175}
wheelModel: {fileID: 129542991850398677}
WheelCollider: {fileID: 0}
steerable: 0
motorized: 1
@@ -224,13 +224,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3}
m_Name:
m_EditorClassIdentifier:
motorTorque: 2000
brakeTorque: 2000
maxSpeed: 20
steeringRange: 30
steeringRangeAtMaxSpeed: 10
autoBrake: 0
lookat: {fileID: 8764419593260817307}
motorTorque: 300
brakeTorque: 400
maxSpeed: 250
steeringRange: 9
steeringRangeAtMaxSpeed: 7
autoBrake: 100
audio: {fileID: 2596011702013363691}
rigidBody: {fileID: 0}
--- !u!54 &8561609910625013332
@@ -253,7 +252,7 @@ Rigidbody:
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitCom: 0
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
@@ -305,12 +304,12 @@ WheelCollider:
m_Radius: 0.3555168
m_SuspensionSpring:
spring: 35000
damper: 4500
damper: 1500
targetPosition: 0.5
m_SuspensionDistance: 0.3
m_SuspensionDistance: 0.25
m_ForceAppPointDistance: 0
m_Mass: 20
m_WheelDampingRate: 0.25
m_Mass: 80
m_WheelDampingRate: 0.01
m_ForwardFriction:
m_ExtremumSlip: 0.4
m_ExtremumValue: 1
@@ -322,7 +321,7 @@ WheelCollider:
m_ExtremumValue: 1
m_AsymptoteSlip: 0.5
m_AsymptoteValue: 0.75
m_Stiffness: 1
m_Stiffness: 1.125
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -393,12 +392,12 @@ WheelCollider:
m_Radius: 0.3555168
m_SuspensionSpring:
spring: 35000
damper: 4500
damper: 1500
targetPosition: 0.5
m_SuspensionDistance: 0.3
m_SuspensionDistance: 0.25
m_ForceAppPointDistance: 0
m_Mass: 20
m_WheelDampingRate: 0.25
m_Mass: 80
m_WheelDampingRate: 0.01
m_ForwardFriction:
m_ExtremumSlip: 0.4
m_ExtremumValue: 1
@@ -662,8 +661,16 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 473435645620777240, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
insertIndex: -1
addedObject: {fileID: 3215875682596354958}
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 7125661131191776206, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
insertIndex: -1
addedObject: {fileID: 3073178764391476130}
m_SourcePrefab: {fileID: 100100000, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
--- !u!4 &129542991850398677 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6444586294712828132, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
m_PrefabInstance: {fileID: 6387229884709069617}
m_PrefabAsset: {fileID: 0}
--- !u!4 &716333724680151082 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5860047361562542875, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
@@ -679,6 +686,32 @@ Transform:
m_CorrespondingSourceObject: {fileID: 9064403983274732764, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
m_PrefabInstance: {fileID: 6387229884709069617}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4197513966662553855 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7125661131191776206, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
m_PrefabInstance: {fileID: 6387229884709069617}
m_PrefabAsset: {fileID: 0}
--- !u!65 &3073178764391476130
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4197513966662553855}
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: 3
m_Size: {x: 2.2657216, y: 1.5574021, z: 4.5322247}
m_Center: {x: 0.0000004768373, y: 0.8336425, z: -0.011788848}
--- !u!4 &6787492584016843305 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 473435645620777240, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}

View File

@@ -4007,13 +4007,13 @@ MonoBehaviour:
m_HorizontalDamping: 4.8
m_VerticalDamping: 0.5
m_ScreenX: 0.5
m_ScreenY: 0.5
m_ScreenY: 0.62
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
m_SoftZoneWidth: 0.264
m_SoftZoneHeight: 0.181
m_SoftZoneWidth: 0.04
m_SoftZoneHeight: 0.11
m_BiasX: 0
m_BiasY: 0
m_BiasY: -0.12
m_CenterOnActivate: 1
--- !u!1001 &287427410
PrefabInstance:
@@ -4298,7 +4298,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &323815922
Transform:
m_ObjectHideFlags: 0
@@ -6026,6 +6026,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
--- !u!4 &440836397 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
m_PrefabInstance: {fileID: 1205272008}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &443573514
PrefabInstance:
m_ObjectHideFlags: 0
@@ -14899,6 +14904,63 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
--- !u!1001 &1205272008
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalPosition.x
value: 62.069893
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalPosition.y
value: 0.25062922
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalPosition.z
value: 13.101168
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3343305849921024470, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_Name
value: StreetRacist
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
--- !u!1001 &1207110270
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17269,11 +17331,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
--- !u!4 &1427960685 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1671451206055750931, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
m_PrefabInstance: {fileID: 1427960684}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1430263216
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17433,8 +17490,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1438942457}
serializedVersion: 2
m_LocalRotation: {x: 0.16245987, y: 0.688191, z: -0.16245987, w: 0.688191}
m_LocalPosition: {x: 10.6308975, y: -35.366627, z: 101.59595}
m_LocalRotation: {x: 0.11473485, y: 0.6977363, z: -0.11473485, w: 0.6977363}
m_LocalPosition: {x: 9.25079, y: -35.426, z: 97.42711}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -17459,8 +17516,8 @@ MonoBehaviour:
m_StreamingVersion: 20170927
m_Priority: 10
m_StandbyUpdate: 2
m_LookAt: {fileID: 1427960685}
m_Follow: {fileID: 1427960685}
m_LookAt: {fileID: 440836397}
m_Follow: {fileID: 440836397}
m_Lens:
FieldOfView: 60.000004
OrthographicSize: 5
@@ -25024,6 +25081,63 @@ MonoBehaviour:
animator: {fileID: 2019051411}
npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
audio: {fileID: 0}
--- !u!1001 &2047826617
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_Name
value: SchoolBus
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalPosition.x
value: 64.31719
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalPosition.y
value: 0.25099647
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalPosition.z
value: 14.522134
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
--- !u!1 &2049722134
GameObject:
m_ObjectHideFlags: 0
@@ -25051,8 +25165,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2049722134}
serializedVersion: 2
m_LocalRotation: {x: 0.16245987, y: 0.688191, z: -0.16245987, w: 0.688191}
m_LocalPosition: {x: 10.6308975, y: -35.366627, z: 101.59595}
m_LocalRotation: {x: 0.11473485, y: 0.6977363, z: -0.11473485, w: 0.6977363}
m_LocalPosition: {x: 9.25079, y: -35.426, z: 97.42711}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -26495,3 +26609,5 @@ SceneRoots:
- {fileID: 998358590}
- {fileID: 323815922}
- {fileID: 556260504}
- {fileID: 1205272008}
- {fileID: 2047826617}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -10,8 +10,7 @@ AnimatorState:
m_Name: Fall
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 6812994496983608102}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -65,7 +64,7 @@ AnimatorController:
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_DefaultBool: 1
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
@@ -105,28 +104,6 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 7207422066676919104}
--- !u!1101 &6812994496983608102
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.93775934
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &7207422066676919104
AnimatorState:
serializedVersion: 6