Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology
This commit is contained in:
commit
52acbe5f40
|
|
@ -31,6 +31,8 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1689929310}
|
||||
- {fileID: 5879227229163359814}
|
||||
- {fileID: 3855241710097231104}
|
||||
- {fileID: 313023283}
|
||||
m_Father: {fileID: 3654540742598116600}
|
||||
m_RootOrder: 0
|
||||
|
|
@ -87,6 +89,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 107056970}
|
||||
- component: {fileID: 2134631234}
|
||||
m_Layer: 5
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
|
|
@ -106,23 +109,36 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1097090143193896257}
|
||||
- {fileID: 924176059}
|
||||
- {fileID: 4704270928333874369}
|
||||
- {fileID: 7475986469163045628}
|
||||
- {fileID: 4031383086894429222}
|
||||
- {fileID: 3533447696354477250}
|
||||
- {fileID: 2755684646752163517}
|
||||
- {fileID: 4599615484544120457}
|
||||
- {fileID: 3364259029635073816}
|
||||
- {fileID: 5879227229163359814}
|
||||
- {fileID: 3855241710097231104}
|
||||
m_Father: {fileID: 1995774216}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 1033.2917}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 34, y: 0}
|
||||
m_SizeDelta: {x: 978.5089, y: 956}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2134631234
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 107056969}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &313023282
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -157,13 +173,13 @@ RectTransform:
|
|||
- {fileID: 1995774216}
|
||||
- {fileID: 1780928670}
|
||||
m_Father: {fileID: 59446052}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0.874}
|
||||
m_AnchoredPosition: {x: 0, y: 1.5}
|
||||
m_SizeDelta: {x: 0, y: 3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -78}
|
||||
m_SizeDelta: {x: 1050, y: 484.0483}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &313023286
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -261,15 +277,16 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1097090143193896257}
|
||||
m_RootOrder: 1
|
||||
m_Children:
|
||||
- {fileID: 1097090143193896257}
|
||||
m_Father: {fileID: 107056970}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -14, y: -8}
|
||||
m_AnchoredPosition: {x: 0, y: -42}
|
||||
m_SizeDelta: {x: 92, y: 21}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &924176061
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -402,7 +419,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -20, y: -20}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1689929309
|
||||
GameObject:
|
||||
|
|
@ -489,7 +506,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -20, y: -34}
|
||||
m_SizeDelta: {x: 22.1054, y: 622.3079}
|
||||
m_SizeDelta: {x: 22.1054, y: 529.47}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &1780928673
|
||||
CanvasRenderer:
|
||||
|
|
@ -572,8 +589,8 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 1811112674}
|
||||
m_HandleRect: {fileID: 1811112673}
|
||||
m_Direction: 2
|
||||
m_Value: 1
|
||||
m_Size: 0.54762465
|
||||
m_Value: 0.99999994
|
||||
m_Size: 0.5063267
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -614,7 +631,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1811112675
|
||||
CanvasRenderer:
|
||||
|
|
@ -693,7 +710,7 @@ RectTransform:
|
|||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1995774219
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1351,18 +1368,18 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 356495793340954476}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5780500777112997426}
|
||||
m_Father: {fileID: 3533447696354477250}
|
||||
m_Father: {fileID: 5749827229883739022}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 235, y: -37}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 478, y: -50}
|
||||
m_SizeDelta: {x: 956, y: 36}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2301589033225948877
|
||||
|
|
@ -2675,7 +2692,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -6.2, y: 0}
|
||||
m_AnchoredPosition: {x: -14, y: -8.5}
|
||||
m_SizeDelta: {x: 21.7626, y: -17}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &6541348181733156628
|
||||
|
|
@ -4396,13 +4413,13 @@ RectTransform:
|
|||
- {fileID: 8813782146055326700}
|
||||
- {fileID: 4159243742621048825}
|
||||
m_Father: {fileID: 107056970}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -419.4, y: 190}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 170.19995}
|
||||
m_SizeDelta: {x: 106, y: 21}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &2392045896982425394
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4657,11 +4674,11 @@ RectTransform:
|
|||
m_Father: {fileID: 3364259029635073816}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 635, y: -176}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 487.3, y: -8}
|
||||
m_SizeDelta: {x: 468, y: 312}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 0, y: 1.0000001}
|
||||
--- !u!222 &3639917004986938328
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4871,7 +4888,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 44, y: -82}
|
||||
m_AnchoredPosition: {x: 0, y: -82}
|
||||
m_SizeDelta: {x: 232, y: 21}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &6855310515995072597
|
||||
|
|
@ -5080,6 +5097,43 @@ MonoBehaviour:
|
|||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &2578640652711806351
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5749827229883739022}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5749827229883739022
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2578640652711806351}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1466350726877476667}
|
||||
m_Father: {fileID: 3533447696354477250}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -194, y: -39.5}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &2596595932327537848
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5398,12 +5452,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3533447696354477250}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 107056970}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 234.80444, y: -72.8}
|
||||
m_AnchoredPosition: {x: -11.254, y: -250.8}
|
||||
m_SizeDelta: {x: 956, y: 36}
|
||||
m_Pivot: {x: 0.5, y: 1.0000001}
|
||||
--- !u!222 &5048485349505778235
|
||||
|
|
@ -6518,11 +6572,11 @@ RectTransform:
|
|||
m_Father: {fileID: 3364259029635073816}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 149.5, y: -175.40002}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -8}
|
||||
m_SizeDelta: {x: 468, y: 312}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5425936997880607031
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6802,14 +6856,13 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1466350726877476667}
|
||||
- {fileID: 4031383086894429222}
|
||||
- {fileID: 5749827229883739022}
|
||||
m_Father: {fileID: 107056970}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 44, y: -178}
|
||||
m_AnchoredPosition: {x: 0, y: -178}
|
||||
m_SizeDelta: {x: 488, y: 21}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &708812292294675129
|
||||
|
|
@ -6946,7 +6999,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -5.5, y: 0}
|
||||
m_AnchoredPosition: {x: -14, y: -10.7}
|
||||
m_SizeDelta: {x: 22.4161, y: -17}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &6960982968646939113
|
||||
|
|
@ -9058,7 +9111,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -29.3, y: -34}
|
||||
m_AnchoredPosition: {x: -29.300049, y: -34}
|
||||
m_SizeDelta: {x: 360, y: 36}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &8332412935936888752
|
||||
|
|
@ -10084,13 +10137,12 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1003711475360801014}
|
||||
- {fileID: 924176059}
|
||||
m_Father: {fileID: 107056970}
|
||||
m_Father: {fileID: 924176059}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 150, y: -34}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 14, y: 18}
|
||||
m_SizeDelta: {x: 360, y: 36}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8259768406327632652
|
||||
|
|
@ -10834,12 +10886,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 107056970}
|
||||
m_RootOrder: 7
|
||||
m_Father: {fileID: 59446052}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -171.0857, y: 34}
|
||||
m_AnchoredPosition: {x: -182, y: 34}
|
||||
m_SizeDelta: {x: 100, y: 36}
|
||||
m_Pivot: {x: 1, y: 0}
|
||||
--- !u!222 &5021147924941287437
|
||||
|
|
@ -11303,11 +11355,11 @@ RectTransform:
|
|||
- {fileID: 5620092988020911199}
|
||||
- {fileID: 7227599259414342308}
|
||||
m_Father: {fileID: 107056970}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -385.5, y: -86}
|
||||
m_AnchoredPosition: {x: -400.75, y: -86}
|
||||
m_SizeDelta: {x: 177, y: 21}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8445885940180315578
|
||||
|
|
@ -11630,11 +11682,11 @@ RectTransform:
|
|||
- {fileID: 2963898299955172258}
|
||||
- {fileID: 6016040151706726244}
|
||||
m_Father: {fileID: 107056970}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -350, y: 111}
|
||||
m_AnchoredPosition: {x: -366.25, y: 111.6}
|
||||
m_SizeDelta: {x: 246, y: 21}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7496227892135041332
|
||||
|
|
@ -12109,12 +12161,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 107056970}
|
||||
m_RootOrder: 8
|
||||
m_Father: {fileID: 59446052}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -39.39988, y: 34}
|
||||
m_AnchoredPosition: {x: -50, y: 34}
|
||||
m_SizeDelta: {x: 100, y: 36}
|
||||
m_Pivot: {x: 1, y: 0}
|
||||
--- !u!222 &424957404513236065
|
||||
|
|
|
|||
Loading…
Reference in New Issue