huangjiayu
/
H_SafeExperienceDrivingSystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: huangjiayu:dd6d060c1e71e03eeec943fc4972dc33c183b533
Branches Tags
huangjiayu:master
huangjiayu:ModelFile
..
compare: huangjiayu:a305812f3a70c1adc33d4181ff81618e79adfcaa
Branches Tags
huangjiayu:master
huangjiayu:ModelFile

No commits in common. "dd6d060c1e71e03eeec943fc4972dc33c183b533" and "a305812f3a70c1adc33d4181ff81618e79adfcaa" have entirely different histories.
dd6d060c1e ... a305812f3a

4 changed files with 42 additions and 139 deletions
Show Stats Expand all files Collapse all files

122
U3D_DrivingSystem/Assets/EVP5/Prefabs/Sport Coupe Drift.prefab
View File

@ -2736,7 +2736,6 @@ Transform:
- {fileID: 489826}
- {fileID: 6508499484186839446}
- {fileID: 4279975699638886894}
- {fileID: 7451027909656068748}
- {fileID: 2793264845307687955}
- {fileID: 2286986072208732639}
- {fileID: 4133721943607334640}
@ -3404,7 +3403,7 @@ Transform:
m_LocalScale: {x: 0.4536, y: 0.072123155, z: 0.36368668}
m_Children: []
m_Father: {fileID: 448752}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: -30.615, y: -8.694, z: 7.512}
--- !u!33 &1911478035
MeshFilter:
@ -3500,7 +3499,7 @@ Transform:
m_LocalScale: {x: 0.4536, y: 0.072123155, z: 0.36368668}
m_Children: []
m_Father: {fileID: 448752}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: -30.615, y: -8.694, z: 7.512}
--- !u!33 &6901097826872303320
MeshFilter:
@ -3651,7 +3650,7 @@ GameObject:
- component: {fileID: 1592101705092406238}
- component: {fileID: 6131819028027874167}
m_Layer: 0
m_Name: Camera (3840)
m_Name: Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -3664,13 +3663,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3190887408370009811}
m_LocalRotation: {x: 0.06241548, y: -0.010198355, z: 0.00036551856, w: 0.99799806}
m_LocalPosition: {x: -0.345, y: 1.34, z: 0.099}
m_LocalRotation: {x: 0.037859958, y: 0.015582657, z: -0.0005904539, w: 0.99916136}
m_LocalPosition: {x: -0.34838867, y: 1.23, z: 0.027679443}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 448752}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 7.157, y: -1.173, z: -0.031}
m_LocalEulerAnglesHint: {x: 4.34, y: 1.787, z: 0}
--- !u!20 &1592101705092406238
Camera:
m_ObjectHideFlags: 0
@ -3796,89 +3795,6 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &5662506501635351616
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7451027909656068748}
- component: {fileID: 8286275851766532935}
- component: {fileID: 5960655805693439526}
m_Layer: 0
m_Name: Camera (1920)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7451027909656068748
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5662506501635351616}
m_LocalRotation: {x: 0.16109273, y: 0.015536118, z: 0.0013405092, w: 0.98681617}
m_LocalPosition: {x: -0.311, y: 1.333, z: 0.227}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 448752}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 18.536, y: 1.879, z: 0.462}
--- !u!20 &8286275851766532935
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5662506501635351616}
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_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.01
far clip plane: 1000
field of view: 84
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!81 &5960655805693439526
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5662506501635351616}
m_Enabled: 1
--- !u!1 &5944950343217813341
GameObject:
m_ObjectHideFlags: 0
@ -4058,7 +3974,7 @@ Transform:
m_LocalScale: {x: 1.5643288, y: 0.32157, z: 0.23278}
m_Children: []
m_Father: {fileID: 448752}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2418447381329667029
MeshFilter:
@ -4133,7 +4049,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 55989554c1a34ce4cb7d62e795009019,
type: 3}
propertyPath: m_RootOrder
value: 14
value: 13
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 55989554c1a34ce4cb7d62e795009019,
type: 3}
@ -4213,7 +4129,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: e9623c62033886a45a7956cd0612cb41,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 9
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e9623c62033886a45a7956cd0612cb41,
type: 3}
@ -4402,12 +4318,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9623c62033886a45a7956cd0612cb41, type: 3}
--- !u!4 &4133721943607334640 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e9623c62033886a45a7956cd0612cb41,
type: 3}
m_PrefabInstance: {fileID: 4528183924312944923}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3777414465739210646 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8450084165629505907, guid: e9623c62033886a45a7956cd0612cb41,
@ -4420,9 +4330,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 4528183924312944923}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9137534757401886588 stripped
--- !u!4 &4133721943607334640 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4604829209037648281, guid: e9623c62033886a45a7956cd0612cb41,
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e9623c62033886a45a7956cd0612cb41,
type: 3}
m_PrefabInstance: {fileID: 4528183924312944923}
m_PrefabAsset: {fileID: 0}
@ -4432,6 +4342,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 4528183924312944923}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9137534757401886588 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4604829209037648281, guid: e9623c62033886a45a7956cd0612cb41,
type: 3}
m_PrefabInstance: {fileID: 4528183924312944923}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4547925605561270747
PrefabInstance:
m_ObjectHideFlags: 0
@ -4447,7 +4363,7 @@ PrefabInstance:
- target: {fileID: 5856191283668754160, guid: 38ac1e88fde2ab4448fb31797aff9982,
type: 3}
propertyPath: m_RootOrder
value: 12
value: 11
objectReference: {fileID: 0}
- target: {fileID: 5856191283668754160, guid: 38ac1e88fde2ab4448fb31797aff9982,
type: 3}
@ -4522,7 +4438,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 7586302d624a25549a081880865f1b60,
type: 3}
propertyPath: m_RootOrder
value: 11
value: 10
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7586302d624a25549a081880865f1b60,
type: 3}

2
U3D_DrivingSystem/Assets/Materials/clearglass.mat
View File

@ -56,7 +56,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
@ -77,4 +76,3 @@ Material:
m_Colors:
- _Color: {r: 0.32941177, g: 0.32941177, b: 0.32941177, a: 0.4423529}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

4
U3D_DrivingSystem/Assets/Materials/windowglass.mat
View File

@ -56,7 +56,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
@ -75,6 +74,5 @@ Material:
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 0, g: 0, b: 0, a: 0.078431375}
- _Color: {r: 0.5825027, g: 0.6603774, b: 0.6211913, a: 0.28235295}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

53
U3D_DrivingSystem/Assets/Scenes/main_.unity
View File

@ -5023,7 +5023,7 @@ Transform:
m_LocalScale: {x: 73.365715, y: 0.36673844, z: 50.597057}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8922218
BoxCollider:
@ -75020,7 +75020,7 @@ RectTransform:
m_Children:
- {fileID: 67935769}
m_Father: {fileID: 2037673175}
m_RootOrder: 17
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -228405,7 +228405,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &463649141
Transform:
m_ObjectHideFlags: 0
@ -309802,7 +309802,7 @@ Transform:
m_LocalScale: {x: 73.365715, y: 0.36673844, z: 50.597057}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &633184629
BoxCollider:
@ -486468,7 +486468,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 4bee9f170838fc64c8b1ea132c784129,
type: 3}
propertyPath: m_RootOrder
value: 15
value: 13
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4bee9f170838fc64c8b1ea132c784129,
type: 3}
@ -531409,7 +531409,7 @@ Transform:
m_LocalScale: {x: 1.6529, y: 0.25783, z: 0.19514}
m_Children: []
m_Father: {fileID: 2037673175}
m_RootOrder: 19
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1102889086
BoxCollider:
@ -589599,7 +589599,7 @@ Transform:
m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1224440451
BoxCollider:
@ -604139,7 +604139,7 @@ Transform:
m_LocalScale: {x: 73.365715, y: 0.36673844, z: 85.630455}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 16
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1254592514
BoxCollider:
@ -616341,7 +616341,7 @@ MonoBehaviour:
vehicleStandardInput: {fileID: 1276762325}
accidentManager: {fileID: 1323185945}
cam1: {fileID: 1136185827}
cam2: {fileID: 1662170220}
cam2: {fileID: 1785647646}
menuUI: {fileID: 1648579876}
carInfoUI: {fileID: 1944520099}
ygq: {fileID: 1559914993}
@ -634573,7 +634573,7 @@ Transform:
m_LocalScale: {x: 73.365715, y: 0.36673844, z: 50.597057}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1315243454
BoxCollider:
@ -645225,7 +645225,7 @@ Transform:
m_LocalScale: {x: 0.4536, y: 0.072123155, z: 0.2131459}
m_Children: []
m_Father: {fileID: 2037673175}
m_RootOrder: 16
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: -30.615, y: -8.694, z: 7.512}
--- !u!65 &1337615174
BoxCollider:
@ -772505,7 +772505,7 @@ Transform:
m_LocalScale: {x: 1.5643288, y: 0.32157, z: 0.089189656}
m_Children: []
m_Father: {fileID: 2037673175}
m_RootOrder: 18
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1603714624
BoxCollider:
@ -792850,7 +792850,7 @@ Transform:
m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1644651297
BoxCollider:
@ -800523,12 +800523,6 @@ Transform:
m_Father: {fileID: 914279218}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1662170220 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5662506501635351616, guid: 4292160a5e1fde347934ac660b2c5d30,
type: 3}
m_PrefabInstance: {fileID: 2037673174}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1662250641
GameObject:
m_ObjectHideFlags: 0
@ -863389,6 +863383,12 @@ Transform:
m_Father: {fileID: 1728209287}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1785647646 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3190887408370009811, guid: 4292160a5e1fde347934ac660b2c5d30,
type: 3}
m_PrefabInstance: {fileID: 2037673174}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1785683964
GameObject:
m_ObjectHideFlags: 0
@ -952275,7 +952275,7 @@ Transform:
m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1963281148
BoxCollider:
@ -991652,10 +991652,6 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1276762318, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3}
propertyPath: firstPerson
value:
objectReference: {fileID: 1662170220}
- target: {fileID: 1276762318, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3}
propertyPath: thirdPerson
value:
@ -991859,11 +991855,6 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5662506501635351616, guid: 4292160a5e1fde347934ac660b2c5d30,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5770903130997611019, guid: 4292160a5e1fde347934ac660b2c5d30,
type: 3}
propertyPath: m_IsActive
@ -1011876,7 +1011867,7 @@ Transform:
m_LocalScale: {x: 73.365715, y: 0.36673844, z: 85.630455}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 17
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2076278831
BoxCollider:
@ -1016468,7 +1016459,7 @@ Transform:
m_LocalScale: {x: 55.09669, y: 0.36673844, z: 61.54306}
m_Children: []
m_Father: {fileID: 1866218925}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2085621374
BoxCollider: