Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts: # U3D_DrivingSystem/Assets/Scenes/main_.unity
This commit is contained in:
commit
abbcb42da0
File diff suppressed because it is too large
Load Diff
|
@ -4741,6 +4741,7 @@ GameObject:
|
|||
- component: {fileID: 19900002}
|
||||
- component: {fileID: 2115698211}
|
||||
- component: {fileID: 3811386118896120206}
|
||||
- component: {fileID: 9146666170578535980}
|
||||
m_Layer: 0
|
||||
m_Name: Rain Heavy
|
||||
m_TagString: Untagged
|
||||
|
@ -9521,6 +9522,19 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
che: {fileID: 0}
|
||||
--- !u!114 &3811386118896120206
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 100002}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aaf89ec77057b6440bf8ec744f89dedd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
che: {fileID: 0}
|
||||
--- !u!114 &9146666170578535980
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -9550,7 +9564,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &400004
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
Loading…
Reference in New Issue