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

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

Browse Source
This commit is contained in:
magn9775
2024-04-26 12:33:11 +02:00
parent caa6e28bec 49b4414155
commit 1336a2a08e
19 changed files with 1427 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scenes/Car Customization.unity
View File

@@ -4612,7 +4612,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 10cae2fd52e1c0f4eba2e2091d441cd1, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: 0.7
m_Pitch: 1
Loop: 1
Mute: 0

1561
Assets/Scenes/CityRacetrack.unity
View File

File diff suppressed because it is too large Load Diff

165
Assets/Scenes/ForestRacetrack.unity
View File

@@ -950,6 +950,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
insertIndex: -1
addedObject: {fileID: 454865286}
- targetCorrespondingSourceObject: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
insertIndex: -1
addedObject: {fileID: 454865287}
m_SourcePrefab: {fileID: 100100000, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
--- !u!1 &454865285 stripped
GameObject:
@@ -964,6 +967,102 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 454865285}
m_Enabled: 1
--- !u!82 &454865287
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 454865285}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 0ec4461d6a3762242bd78865e611d97a, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 1
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &464917649
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3092,7 +3191,7 @@ PrefabInstance:
- target: {fileID: 1123712215127460916, guid: 7a3d78e18ac1cd7458d86f15c7aedc7a, type: 3}
propertyPath: m_Model
value:
objectReference: {fileID: 5022602860645237092, guid: 0a7181c8b969e1346b8a4323695aea4d, type: 3}
objectReference: {fileID: 5022602860645237092, guid: 88f4c7b886ce6da40a6b4208019aa5b9, type: 3}
- target: {fileID: 1738365250199652202, guid: 7a3d78e18ac1cd7458d86f15c7aedc7a, type: 3}
propertyPath: isPlaying
value: 1
@@ -3324,7 +3423,7 @@ PrefabInstance:
- target: {fileID: 3382312427533002403, guid: 7a3d78e18ac1cd7458d86f15c7aedc7a, type: 3}
propertyPath: m_Model
value:
objectReference: {fileID: 5022602860645237092, guid: 0a7181c8b969e1346b8a4323695aea4d, type: 3}
objectReference: {fileID: 5022602860645237092, guid: 88f4c7b886ce6da40a6b4208019aa5b9, type: 3}
- target: {fileID: 3510852165663727938, guid: 7a3d78e18ac1cd7458d86f15c7aedc7a, type: 3}
propertyPath: m_Model
value:
@@ -5347,6 +5446,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1546992020157654961, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1828470746108631247, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -5387,10 +5490,66 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1853448600777947725, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2255057151155698497, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2591529628987485416, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2658771290197328040, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3048634400342871935, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3300423061332350819, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5380162463718886690, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5616412586995243976, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6344927979691199544, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7034186537795439529, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8332697132827525405, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8638417887361332676, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8723010894896747241, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8777121825423982250, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: m_Name
value: racetrack2
objectReference: {fileID: 0}
- target: {fileID: 8836240323335900378, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
propertyPath: isVisible
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -5574,7 +5733,7 @@ PrefabInstance:
objectReference: {fileID: 1373860105}
- target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: lapAmount
value: 1
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: players.Array.size

124
Assets/Scenes/WinScreen.unity
View File

@@ -646,6 +646,127 @@ RectTransform:
m_AnchoredPosition: {x: 928, y: 230}
m_SizeDelta: {x: 1000, y: 400}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &783549761
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 783549765}
- component: {fileID: 783549764}
- component: {fileID: 783549763}
- component: {fileID: 783549762}
m_Layer: 5
m_Name: Play
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &783549762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783549761}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 783549763}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &783549763
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783549761}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.23031552, g: 0.8490566, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 61583fba956632548911dbe60ba47876, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &783549764
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783549761}
m_CullTransparentMesh: 1
--- !u!224 &783549765
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783549761}
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:
- {fileID: 476199421}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 960, y: 148}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &784053825
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1734,7 +1855,7 @@ MonoBehaviour:
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 1, g: 0, b: 0, a: 1}
m_HighlightedColor: {r: 0.03198047, g: 0.7264151, b: 0.17153284, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
@@ -2586,3 +2707,4 @@ SceneRoots:
- {fileID: 2076255753}
- {fileID: 874635445}
- {fileID: 1050167112}
- {fileID: 783549765}