Merge branch 'master' of ooftooft.net:Racesm
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.32097125, g: 0.21131825, b: 0.40435025, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.32107174, g: 0.21133253, b: 0.40438062, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -823,10 +823,18 @@ PrefabInstance:
|
||||
propertyPath: m_IsKinematic
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1144658963985576444, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
propertyPath: m_Controller
|
||||
value:
|
||||
objectReference: {fileID: 9100000, guid: 6245007fb9eb9d04c92cdb091fb72a87, type: 2}
|
||||
- target: {fileID: 1907112288057292323, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Character
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1907112288057292323, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3118456698246916321, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 82.05
|
||||
@@ -873,12 +881,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7376795614926180791, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1144658963992739468, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1939912076}
|
||||
- targetCorrespondingSourceObject: {fileID: 1144658963992784436, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1927000308}
|
||||
@@ -1390,10 +1401,6 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5418785709807611868, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 83.27
|
||||
@@ -1438,10 +1445,6 @@ 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: []
|
||||
@@ -1537,7 +1540,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 62.4
|
||||
value: 80.95
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
@@ -1545,7 +1548,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -38.5
|
||||
value: -46.36
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
@@ -1810,6 +1813,26 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: b7391613e08a1e4419083635391e73ec, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1939912072 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1144658963992739468, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
m_PrefabInstance: {fileID: 1077232721}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1939912076
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1939912072}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1cf5c39eb580998489213d03ff8a6760, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
animator: {fileID: 0}
|
||||
npcPrefab: {fileID: 0}
|
||||
audio: {fileID: 0}
|
||||
--- !u!1 &2049722134
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1994,6 +2017,63 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
|
||||
--- !u!1001 &5211344267139555828
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 82.02
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -46.9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7873748132333035523, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Dummy
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2005,3 +2085,4 @@ SceneRoots:
|
||||
- {fileID: 1495114367}
|
||||
- {fileID: 1077232721}
|
||||
- {fileID: 1375563099}
|
||||
- {fileID: 5211344267139555828}
|
||||
|
||||
@@ -38,7 +38,7 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 705507994}
|
||||
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -128,6 +128,38 @@ GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1144658963992784436, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3}
|
||||
m_PrefabInstance: {fileID: 5664739312409415817}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &655394844 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4840733166066636179, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
m_PrefabInstance: {fileID: 1365911219}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &655394846
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 655394844}
|
||||
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!1 &705507993
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -222,6 +254,120 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!1001 &1365911219
|
||||
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: 1.2441272
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.3745439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.5518675
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9701425
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.24253568
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1387890555408215438, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Camera
|
||||
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: 1608778107}
|
||||
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LookAt
|
||||
value:
|
||||
objectReference: {fileID: 1608778107}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 1.2441272
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.3745439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.5518675
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9701425
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.24253568
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 4849827436373015423, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4840733166066636179, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 655394846}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
|
||||
--- !u!4 &1608778107 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
|
||||
m_PrefabInstance: {fileID: 7444232797940731829}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1915174277
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -678,3 +824,4 @@ SceneRoots:
|
||||
- {fileID: 6862354766440944207}
|
||||
- {fileID: 7444232797940731829}
|
||||
- {fileID: 5664739312409415817}
|
||||
- {fileID: 1365911219}
|
||||
|
||||
Reference in New Issue
Block a user