Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/Scenes/Racetrack.unity
#	Assets/Scenes/mini_racetrack3.unity
This commit is contained in:
magn9775
2024-04-24 10:54:42 +02:00
parent 31d0d32aa9 5d9eab1801
commit c1a33bbd8c
24 changed files with 5772 additions and 1535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
Assets/Prefabs/Cars/Hotrod (Benson) Variant.prefab
View File

@@ -252,9 +252,21 @@ PrefabInstance:
propertyPath: m_CenterOfMass.y
value: 0.05
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.x
value: 60
value: 61.4
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.y
@@ -262,7 +274,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.z
value: 15.4
value: 14.93
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.w
@@ -270,7 +282,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.y
@@ -278,7 +290,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -286,7 +298,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: 90
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -296,6 +308,18 @@ PrefabInstance:
propertyPath: m_Name
value: Hotrod (Benson) Variant
objectReference: {fileID: 0}
- target: {fileID: 7953198523918571078, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7953198523918571078, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7953198523918571078, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 5418785709807611868, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
m_RemovedGameObjects:
@@ -324,6 +348,12 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
insertIndex: -1
addedObject: {fileID: 4221989274307883857}
- targetCorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
insertIndex: -1
addedObject: {fileID: 3410949865351305375}
- targetCorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
insertIndex: -1
addedObject: {fileID: 5400182112440573950}
m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
--- !u!1 &6461281435351799366 stripped
GameObject:
@@ -352,9 +382,9 @@ MonoBehaviour:
VectorActionDescriptions: []
VectorActionSpaceType: 0
hasUpgradedBrainParametersWithActionSpec: 1
m_Model: {fileID: 0}
m_Model: {fileID: 5022602860645237092, guid: 32480f119eb42a149a893e96102e1fed, type: 3}
m_InferenceDevice: 0
m_BehaviorType: 0
m_BehaviorType: 2
m_BehaviorName: BensonV7
TeamId: 0
m_UseChildSensors: 1
@@ -399,9 +429,12 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
maxStepsPerCheckpoint: 400
checkpointsCollected: 0
maxStepsPerCheckpoint: 2000
distanceBetweenCheckpoints: 20
ignoreMentalPain: 1
isPlaying: 1
isFinished: 0
--- !u!114 &4221989274307883857
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -416,6 +449,68 @@ MonoBehaviour:
m_EditorClassIdentifier:
DecisionPeriod: 5
TakeActionsBetweenDecisions: 1
--- !u!114 &3410949865351305375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6461281435351799366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ee5992a8d68a894cba0612b0c18c3db, type: 3}
m_Name:
m_EditorClassIdentifier:
materialParts:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
defaultColors:
- {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2}
- {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2}
- {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2}
- {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2}
- {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2}
--- !u!114 &5400182112440573950
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6461281435351799366}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3}
m_Name:
m_EditorClassIdentifier:
motorTorque: 300
brakeTorque: 500
maxSpeed: 400
steeringRange: 9
steeringRangeAtMaxSpeed: 7
autoBrake: 100
audio: {fileID: 0}
rigidBody: {fileID: 0}
checkpointsCollected: 0
checkpoints:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
--- !u!4 &6760919851603153930 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}

28
Assets/Prefabs/CheckPoint.prefab
View File

@@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 1915818325675539370}
- component: {fileID: 3466260334280045808}
- component: {fileID: 5655726606384773670}
- component: {fileID: 7221852830714037971}
m_Layer: 2
m_Name: CheckPoint
m_TagString: Checkpoint
@@ -120,3 +121,30 @@ MonoBehaviour:
m_EditorClassIdentifier:
isCollected: 0
isVisible: 1
--- !u!54 &7221852830714037971
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7234834637752836426}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0

1350
Assets/Prefabs/Tracks/Racetrack3.prefab
View File

File diff suppressed because it is too large Load Diff

1857
Assets/Prefabs/Tracks/racetrack_4.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/Tracks/racetrack_4.prefab.meta Normal file
View File

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