Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts: # U3D_DrivingSystem/Assets/Scenes/main_.unity
This commit is contained in:
yzx
commit
9876cd7594
|
|
@ -144281,7 +144281,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 121}
|
||||
m_SizeDelta: {x: 1668.4, y: 328.9581}
|
||||
m_SizeDelta: {x: 684.5062, y: 328.9581}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &453954404
|
||||
MonoBehaviour:
|
||||
|
|
@ -144303,7 +144303,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text:
|
||||
m_text: New Text
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 3c43848d99fb62a49b2052d5183af633, type: 2}
|
||||
m_sharedMaterial: {fileID: -6384026463690451776, guid: 3c43848d99fb62a49b2052d5183af633,
|
||||
|
|
@ -144331,8 +144331,8 @@ MonoBehaviour:
|
|||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 56.3
|
||||
m_fontSizeBase: 56.3
|
||||
m_fontSize: 86.4
|
||||
m_fontSizeBase: 86.4
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
|
|
@ -146884,7 +146884,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
|
||||
|
|
@ -224510,6 +224510,16 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.z
|
||||
value: 157.83643
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7782823664498374465, guid: 63c0ff75cd2443b49ae41f5c1479c637,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.41678852
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7782823664498374465, guid: 63c0ff75cd2443b49ae41f5c1479c637,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 64.820015
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7782823664805435893, guid: 63c0ff75cd2443b49ae41f5c1479c637,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
@ -364061,7 +364071,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1178793710}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -18.64, y: 12.13, z: 152.08}
|
||||
m_LocalPosition: {x: -11.14, y: 12.13, z: 152.08}
|
||||
m_LocalScale: {x: 4.9545784, y: 2.1688, z: 6.1666484}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7928649737340227750}
|
||||
|
|
@ -691988,91 +691998,6 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 49167339311633067, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 980181084903255922, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1206854713874889726, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1662085984384966345, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u7981\u6B62\u505C\u8F66"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1662085984384966345, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: honglvdengchufa
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2524456371799540492, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u7981\u6B62\u505C\u8F66"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2524456371799540492, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: honglvdengchufa
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2900364512092444737, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u7981\u6B62\u505C\u8F66"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2900364512092444737, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: honglvdengchufa
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3652927567884504588, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4186728241202212498, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u7981\u6B62\u505C\u8F66"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4186728241202212498, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: honglvdengchufa
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4762023537263328882, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4955462312588466583, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5074667480526899052, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5372998102007544568, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5473465045006229401, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5768735755992601427, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
|
|
@ -692133,61 +692058,6 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5905501523241570349, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u7981\u6B62\u505C\u8F66"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5905501523241570349, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: honglvdengchufa
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6361357693364105690, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7399999655184691216, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7448538251787773224, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8506479154709204441, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8749242382117567078, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u7981\u6B62\u505C\u8F66"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8749242382117567078, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: honglvdengchufa
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9034157292851835196, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9103274811662428509, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u7981\u6B62\u505C\u8F66"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9103274811662428509, guid: ed1136c7c0a971247baae99b2ab4d336,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: honglvdengchufa
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3}
|
||||
--- !u!1 &6431737264722758854
|
||||
|
|
|
|||
Loading…
Reference in New Issue