Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main
This commit is contained in:
commit
bcb3764573
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -27665,6 +27665,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 6b1cb0c16706db34f8a5d7111f1cd3a6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
triggerID: 0
|
||||
--- !u!1 &5092569754032104682
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -812,7 +812,7 @@ RectTransform:
|
|||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -1100,7 +1100,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1263243931714669586
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1238,13 +1238,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7040691280408631362}
|
||||
- {fileID: 4955123006011599717}
|
||||
- {fileID: 7659248119990251660}
|
||||
- {fileID: 6203714921751036000}
|
||||
- {fileID: 725822971673040588}
|
||||
- {fileID: 2544401556514031479}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 664557115506198354}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -1291,615 +1285,3 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 2
|
||||
--- !u!1001 &1845140041570666936
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2473787330965529335}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ToolAndMeterialItem (5)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
--- !u!224 &2544401556514031479 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
m_PrefabInstance: {fileID: 1845140041570666936}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3514604922092967939
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2473787330965529335}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ToolAndMeterialItem (4)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
--- !u!224 &725822971673040588 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
m_PrefabInstance: {fileID: 3514604922092967939}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &5809603104501136963
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2473787330965529335}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ToolAndMeterialItem (2)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
--- !u!224 &7659248119990251660 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
m_PrefabInstance: {fileID: 5809603104501136963}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &6584625223648237197
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2473787330965529335}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ToolAndMeterialItem
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
--- !u!224 &7040691280408631362 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
m_PrefabInstance: {fileID: 6584625223648237197}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &7839855945094123183
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2473787330965529335}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ToolAndMeterialItem (3)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
--- !u!224 &6203714921751036000 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
m_PrefabInstance: {fileID: 7839855945094123183}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &9084011915536819626
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2473787330965529335}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ToolAndMeterialItem (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
--- !u!224 &4955123006011599717 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
|
||||
m_PrefabInstance: {fileID: 9084011915536819626}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,16 @@ public class D_SubProcessStep : I_Enter, I_Exit
|
|||
}
|
||||
}
|
||||
|
||||
public string SceneName()
|
||||
{
|
||||
if (precondition == "Office")
|
||||
return "办公室";
|
||||
if (precondition == "ToolRoom")
|
||||
return "工具间";
|
||||
if (precondition == "Site")
|
||||
return "现场";
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -89,14 +89,6 @@ public enum E_ModeType
|
|||
Exam,
|
||||
}
|
||||
|
||||
//public enum E_SceneName
|
||||
//{
|
||||
// None,
|
||||
// Office,
|
||||
// ToolRoom,
|
||||
// LiveScene
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
/// 工具材料设备
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -124,8 +124,6 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id)
|
||||
{
|
||||
HandoverSubProcessStep(spStepID);
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, subProcessStepID);
|
||||
//GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, subProcessStepTriggerID);
|
||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
|
||||
|
|
@ -140,7 +138,6 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
|
||||
{
|
||||
HandoverSubProcess(spID, 0);
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
|
||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
|
|
@ -193,25 +190,40 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
/// <returns></returns>
|
||||
public int IsRightSubProcessStepsTriggerID(int triggerID, bool isRemove)
|
||||
{
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.precondition == GameManager.RunModelMgr.SceneType.ToString())
|
||||
{
|
||||
int currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
|
||||
if (triggerID == currentSubProcessStepTriggerID)
|
||||
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
|
||||
{
|
||||
//GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepTriggerID);
|
||||
if (isRemove)
|
||||
d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
|
||||
return 0;
|
||||
int currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
|
||||
if (triggerID == currentSubProcessStepTriggerID)
|
||||
{
|
||||
if (isRemove)
|
||||
d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
|
||||
{
|
||||
p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
|
||||
});
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log($"<color=red>currentSubProcessStepsToolId=={currentSubProcessStepTriggerID}</color>");
|
||||
return 1;
|
||||
Debug.Log($"<color=red>没有提示</color>");
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return 2;
|
||||
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
|
||||
{
|
||||
p.Init($"错误,请前往{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.SceneName()}");
|
||||
});
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ public class UI_SubProcessItem : BaseItem
|
|||
{
|
||||
case "subProcessBtn":
|
||||
GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, subProcessStepID);
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,11 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
|
|||
case "Button_Confirm":
|
||||
submit = true;
|
||||
Debug.Log(submit);
|
||||
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, true) == 0)
|
||||
{
|
||||
GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
|
||||
GameManager.UIMgr.HidePanel<UI_InstallAndDismantleTicketPanel>();
|
||||
}
|
||||
break;
|
||||
case "Button_Close":
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue