Merge branch 'master' of http://172.16.1.12/taosuqi/ND_SimulationAutomaticControl
This commit is contained in:
commit
4577fe6940
|
|
@ -3030,7 +3030,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 31224567}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.0028152466, y: 0.7140899, z: -2.166627}
|
||||
m_LocalPosition: {x: 0.0028152466, y: 1.64, z: -2.166627}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -3058,7 +3058,7 @@ MeshRenderer:
|
|||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -7921980808414145770, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
- {fileID: 2100000, guid: ef389274d66a92c4e92a2ec2f2452885, type: 2}
|
||||
- {fileID: 2100000, guid: 0c0f05601b68b0d47aa19ab02889caec, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -6444,7 +6444,7 @@ MonoBehaviour:
|
|||
Data: 19
|
||||
- Name:
|
||||
Entry: 10
|
||||
Data: 9
|
||||
Data: 18
|
||||
- Name:
|
||||
Entry: 10
|
||||
Data: 20
|
||||
|
|
@ -6532,7 +6532,7 @@ MonoBehaviour:
|
|||
Data: 19
|
||||
- Name:
|
||||
Entry: 10
|
||||
Data: 9
|
||||
Data: 18
|
||||
- Name:
|
||||
Entry: 10
|
||||
Data: 22
|
||||
|
|
@ -12142,6 +12142,89 @@ Transform:
|
|||
m_Father: {fileID: 465936286}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &318028056
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 318028057}
|
||||
- component: {fileID: 318028059}
|
||||
- component: {fileID: 318028058}
|
||||
m_Layer: 0
|
||||
m_Name: xian18
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!4 &318028057
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 318028056}
|
||||
m_LocalRotation: {x: -0.064153604, y: 0.12825492, z: 0.57795626, w: 0.8033689}
|
||||
m_LocalPosition: {x: 0.36000252, y: -1.6200008, z: 0.99000025}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1062660323}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: -14.556, y: 7.833, z: 70.462}
|
||||
--- !u!23 &318028058
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 318028056}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 7352493565548493882, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &318028059
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 318028056}
|
||||
m_Mesh: {fileID: 6715115950236244489, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
--- !u!1 &318780164
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -17576,6 +17659,10 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7331933716409274965, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7734363600695680384, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
|
|
@ -22459,7 +22546,7 @@ MeshRenderer:
|
|||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -7921980808414145770, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
- {fileID: 2100000, guid: ef389274d66a92c4e92a2ec2f2452885, type: 2}
|
||||
- {fileID: 2100000, guid: 0c0f05601b68b0d47aa19ab02889caec, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -26501,6 +26588,89 @@ BoxCollider:
|
|||
serializedVersion: 2
|
||||
m_Size: {x: 1.0980015, y: 1.0442657, z: 0.31353664}
|
||||
m_Center: {x: 0.00000423193, y: 0.000002503395, z: 0.13375789}
|
||||
--- !u!1 &753498525
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 753498526}
|
||||
- component: {fileID: 753498528}
|
||||
- component: {fileID: 753498527}
|
||||
m_Layer: 0
|
||||
m_Name: xian18
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &753498526
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 753498525}
|
||||
m_LocalRotation: {x: -0.064153604, y: 0.12825492, z: 0.57795626, w: 0.8033689}
|
||||
m_LocalPosition: {x: 0.36, y: -1.62, z: 0.99}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2104792250}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: -14.556, y: 7.833, z: 70.462}
|
||||
--- !u!23 &753498527
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 753498525}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 7352493565548493882, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &753498528
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 753498525}
|
||||
m_Mesh: {fileID: 6715115950236244489, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
--- !u!1 &754513119 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -2578546517966586142, guid: e908463f3f6b7e54cb2ffaa2e941c53e, type: 3}
|
||||
|
|
@ -28691,7 +28861,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 844721860}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.0028152466, y: 0.7140899, z: -2.166627}
|
||||
m_LocalPosition: {x: 0.0028152466, y: 1.72, z: -2.166627}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -35895,7 +36065,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1062660323}
|
||||
m_Layer: 0
|
||||
m_Name: "UI_1uF\u8FDEIN2_200K"
|
||||
m_Name: "UI_1uF\u8FDEIN1_100K"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -35916,6 +36086,8 @@ Transform:
|
|||
- {fileID: 844721861}
|
||||
- {fileID: 1552403910}
|
||||
- {fileID: 1273963461}
|
||||
- {fileID: 318028057}
|
||||
- {fileID: 2005144413}
|
||||
m_Father: {fileID: 1683730126}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -44824,7 +44996,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &1273963461
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -72679,7 +72851,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &1928760252
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -73550,6 +73722,89 @@ Transform:
|
|||
m_Father: {fileID: 1756418058}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2005144412
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2005144413}
|
||||
- component: {fileID: 2005144415}
|
||||
- component: {fileID: 2005144414}
|
||||
m_Layer: 0
|
||||
m_Name: xian12
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2005144413
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2005144412}
|
||||
m_LocalRotation: {x: -0.012151027, y: -0.057626877, z: -0.044851452, w: 0.9972562}
|
||||
m_LocalPosition: {x: -0.57, y: -1.26, z: 2.15}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1062660323}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: -1.685, y: -6.54, z: -5.054}
|
||||
--- !u!23 &2005144414
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2005144412}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 7352493565548493882, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &2005144415
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2005144412}
|
||||
m_Mesh: {fileID: -2079573671270639393, guid: 1579a07ed6dc2d6429cae7f53a978e7f, type: 3}
|
||||
--- !u!1001 &2006555949
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -77593,7 +77848,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2104792250}
|
||||
m_Layer: 0
|
||||
m_Name: "UI_10uF\u8FDEIN2_200K"
|
||||
m_Name: "UI_10uF\u8FDEIN1_100K"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -77614,6 +77869,7 @@ Transform:
|
|||
- {fileID: 31224568}
|
||||
- {fileID: 655017958}
|
||||
- {fileID: 1928760252}
|
||||
- {fileID: 753498526}
|
||||
m_Father: {fileID: 507321695}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
|||
Loading…
Reference in New Issue