This commit is contained in:
parent
1293e653e7
commit
0a9c36e8e1
File diff suppressed because one or more lines are too long
|
|
@ -13395,7 +13395,7 @@ PrefabInstance:
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: -0.391
|
value: -0.119
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -13405,7 +13405,7 @@ PrefabInstance:
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
value: 0.36
|
value: 0.037
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -15071,6 +15071,26 @@ Transform:
|
||||||
m_Father: {fileID: 1020920655}
|
m_Father: {fileID: 1020920655}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &181223857 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 1768058533522684488, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 340901018}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!64 &181223861
|
||||||
|
MeshCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 181223857}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Convex: 1
|
||||||
|
m_CookingOptions: 30
|
||||||
|
m_Mesh: {fileID: -338322426595602427, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88, type: 3}
|
||||||
--- !u!1 &181231820
|
--- !u!1 &181231820
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -28261,6 +28281,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: -8850316279254416729, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: diandongche
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -8679921383154817045, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
- target: {fileID: -8679921383154817045, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
|
|
@ -28326,6 +28351,11 @@ PrefabInstance:
|
||||||
propertyPath: m_Materials.Array.data[1]
|
propertyPath: m_Materials.Array.data[1]
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 2100000, guid: f7720306479c37645b04f0c661771a99, type: 2}
|
objectReference: {fileID: 2100000, guid: f7720306479c37645b04f0c661771a99, type: 2}
|
||||||
|
- target: {fileID: -7331174601730368651, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: diandongche
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -6024174542927964174, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
- target: {fileID: -6024174542927964174, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Materials.Array.data[1]
|
propertyPath: m_Materials.Array.data[1]
|
||||||
|
|
@ -28341,16 +28371,36 @@ PrefabInstance:
|
||||||
propertyPath: m_Materials.Array.data[11]
|
propertyPath: m_Materials.Array.data[11]
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 2100000, guid: 584b3de33591a734cb2908e3b622c047, type: 2}
|
objectReference: {fileID: 2100000, guid: 584b3de33591a734cb2908e3b622c047, type: 2}
|
||||||
|
- target: {fileID: -3215384998749568814, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: diandongche
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -3066759780280748541, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: Untagged
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -2122559366745935871, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
- target: {fileID: -2122559366745935871, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Materials.Array.data[8]
|
propertyPath: m_Materials.Array.data[8]
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 2100000, guid: 06f71a27aed771d4f947ad6f66961012, type: 2}
|
objectReference: {fileID: 2100000, guid: 06f71a27aed771d4f947ad6f66961012, type: 2}
|
||||||
|
- target: {fileID: 125318030066836514, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: Untagged
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 919132149155446097, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
- target: {fileID: 919132149155446097, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: dianpingche
|
value: dianpingche
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1768058533522684488, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: diandongche
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6678439820174699977, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
- target: {fileID: 6678439820174699977, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Materials.Array.data[8]
|
propertyPath: m_Materials.Array.data[8]
|
||||||
|
|
@ -28361,6 +28411,16 @@ PrefabInstance:
|
||||||
propertyPath: m_Materials.Array.data[11]
|
propertyPath: m_Materials.Array.data[11]
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 2100000, guid: 584b3de33591a734cb2908e3b622c047, type: 2}
|
objectReference: {fileID: 2100000, guid: 584b3de33591a734cb2908e3b622c047, type: 2}
|
||||||
|
- target: {fileID: 6866880679909356167, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: Untagged
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7099308057813573989, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: Untagged
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8459456348869938449, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
- target: {fileID: 8459456348869938449, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Materials.Array.data[11]
|
propertyPath: m_Materials.Array.data[11]
|
||||||
|
|
@ -66576,7 +66636,7 @@ PrefabInstance:
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: -0.096
|
value: 0.176
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -66586,7 +66646,7 @@ PrefabInstance:
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
value: 0.45
|
value: 0.127
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -78945,6 +79005,26 @@ MeshFilter:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1001436569}
|
m_GameObject: {fileID: 1001436569}
|
||||||
m_Mesh: {fileID: 216540384573601919, guid: 87a0133680c4d5f499f32d303d358b8e, type: 3}
|
m_Mesh: {fileID: 216540384573601919, guid: 87a0133680c4d5f499f32d303d358b8e, type: 3}
|
||||||
|
--- !u!1 &1002851454 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: -3215384998749568814, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 340901018}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!64 &1002851458
|
||||||
|
MeshCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1002851454}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Convex: 1
|
||||||
|
m_CookingOptions: 30
|
||||||
|
m_Mesh: {fileID: -6963510225929745251, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88, type: 3}
|
||||||
--- !u!1 &1005352887
|
--- !u!1 &1005352887
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -83989,6 +84069,26 @@ MeshCollider:
|
||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: -9074611409885000647, guid: 78424a213b5b9e44db863b48b96bf797, type: 3}
|
m_Mesh: {fileID: -9074611409885000647, guid: 78424a213b5b9e44db863b48b96bf797, type: 3}
|
||||||
|
--- !u!1 &1057252047 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: -8850316279254416729, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 340901018}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!64 &1057252051
|
||||||
|
MeshCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1057252047}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Convex: 1
|
||||||
|
m_CookingOptions: 30
|
||||||
|
m_Mesh: {fileID: 8304121796980078606, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88, type: 3}
|
||||||
--- !u!1001 &1057446345
|
--- !u!1001 &1057446345
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -104989,7 +105089,7 @@ PrefabInstance:
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: -0.251
|
value: 0.021
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -104999,7 +105099,7 @@ PrefabInstance:
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
value: 0.97
|
value: 0.647
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
- target: {fileID: -8679921383154817045, guid: 99de7c0e18b43734b848642041577492,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -130232,7 +130332,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!65 &1632119360
|
--- !u!65 &1632119360
|
||||||
BoxCollider:
|
BoxCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -151628,6 +151728,26 @@ Transform:
|
||||||
m_Father: {fileID: 1998553144}
|
m_Father: {fileID: 1998553144}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &1889931523 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: -7331174601730368651, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 340901018}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!64 &1889931527
|
||||||
|
MeshCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1889931523}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Convex: 1
|
||||||
|
m_CookingOptions: 30
|
||||||
|
m_Mesh: {fileID: 6215414773965752956, guid: fa9a5f4dd91cc9c4a99ff7fe025ecd88, type: 3}
|
||||||
--- !u!1 &1890126022
|
--- !u!1 &1890126022
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ public class AccidentManager : MonoBehaviour
|
||||||
{
|
{
|
||||||
StartCoroutine(PlayAnimation());
|
StartCoroutine(PlayAnimation());
|
||||||
}
|
}
|
||||||
else if (other.name == "电动车穿行")
|
else if (other.transform.tag == "diandongche")
|
||||||
{
|
{
|
||||||
StartCoroutine(diandongche());
|
StartCoroutine(diandongche());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ TagManager:
|
||||||
- Bcycle
|
- Bcycle
|
||||||
- plane
|
- plane
|
||||||
- fan
|
- fan
|
||||||
|
- diandongche
|
||||||
layers:
|
layers:
|
||||||
- Default
|
- Default
|
||||||
- TransparentFX
|
- TransparentFX
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue