WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
YangHua 2024-08-27 17:25:13 +08:00
parent 704dfbf569 29f88c7bb1
commit 7d9fc1250c
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Resources/UI/UI_Item/UI_LowTensionWorkTicketPanel 1/Working line name or equipment dual name.prefab
View File

@ -498,8 +498,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.5, y: -0.5}
m_SizeDelta: {x: 1, y: -13}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1547929000058604275
MonoBehaviour:

58
Assets/Resources/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.prefab
View File

@ -24944,14 +24944,15 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 3968992069564736474}
m_Father: {fileID: 5092569754580650293}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 44, y: 312}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: 23.7, y: 288.7}
m_SizeDelta: {x: 64, y: 24}
m_Pivot: {x: 0, y: 0}
--- !u!222 &906015078869605092
CanvasRenderer:
@ -27382,8 +27383,8 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: -83}
m_Pivot: {x: 1, y: 1}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &5092569753790709664
CanvasRenderer:
m_ObjectHideFlags: 0
@ -27466,7 +27467,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 5092569754049507613}
m_Direction: 2
m_Value: 0.9999996
m_Size: 0.4790909
m_Size: 0.43169042
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -27702,7 +27703,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 23.7, y: -196}
m_SizeDelta: {x: 160, y: 30}
m_SizeDelta: {x: 64, y: 24}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5092569754032104687
CanvasRenderer:
@ -28043,7 +28044,7 @@ RectTransform:
m_Father: {fileID: 5092569753551272701}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5209089}
m_AnchorMin: {x: 0, y: 0.56830937}
m_AnchorMax: {x: 1, y: 0.99999976}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 20}
@ -28537,6 +28538,8 @@ RectTransform:
m_Children:
- {fileID: 5092569754776004780}
- {fileID: 5092569753437325304}
- {fileID: 3205771092384690749}
- {fileID: 5092569754697403459}
- {fileID: 5092569754751786988}
m_Father: {fileID: 5092569753975713875}
m_RootOrder: 0
@ -29425,18 +29428,15 @@ RectTransform:
- {fileID: 5092569754033409204}
- {fileID: 5092569754032104681}
- {fileID: 5092569755045121810}
- {fileID: 5092569754697403459}
- {fileID: 5365963571601898406}
- {fileID: 3057347277895605957}
- {fileID: 3968992069564736474}
- {fileID: 3205771092384690749}
m_Father: {fileID: 5092569755324715940}
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.00027015124}
m_SizeDelta: {x: 0, y: 1100}
m_SizeDelta: {x: 0, y: 1030.7952}
m_Pivot: {x: 0, y: 1}
--- !u!1 &5092569754697403484
GameObject:
@ -29464,17 +29464,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5092569754697403484}
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: []
m_Father: {fileID: 5092569754580650293}
m_Father: {fileID: 5092569754227765712}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -23.5, y: 34}
m_AnchoredPosition: {x: -50, y: 34}
m_SizeDelta: {x: 100, y: 36}
m_Pivot: {x: 1, y: 0}
--- !u!222 &5092569754697403456
@ -29732,8 +29732,8 @@ RectTransform:
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: 0, y: -76.5}
m_SizeDelta: {x: 1010, y: 527}
m_AnchoredPosition: {x: 0, y: -77.40631}
m_SizeDelta: {x: 1010, y: 444.9844}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5092569754740333868
CanvasRenderer:
@ -29833,7 +29833,7 @@ RectTransform:
m_Children:
- {fileID: 5092569754740333871}
m_Father: {fileID: 5092569754227765712}
m_RootOrder: 2
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -42880,7 +42880,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3205771092384690749
RectTransform:
m_ObjectHideFlags: 0
@ -42888,17 +42888,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072822107196108831}
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: []
m_Father: {fileID: 5092569754580650293}
m_RootOrder: 7
m_Father: {fileID: 5092569754227765712}
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: -171, y: 34}
m_AnchoredPosition: {x: -193.5, y: 20}
m_SizeDelta: {x: 100, y: 36}
m_Pivot: {x: 1, y: 0}
--- !u!222 &506603768720686406
@ -43979,7 +43979,7 @@ RectTransform:
- {fileID: 6947139330799229502}
- {fileID: 49639246653435167}
m_Father: {fileID: 5092569754580650293}
m_RootOrder: 4
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}
@ -54648,7 +54648,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9163672961472963002}
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
@ -54718,12 +54718,12 @@ RectTransform:
- {fileID: 8445503884198292400}
- {fileID: 7268588166704359934}
- {fileID: 7690733663551249641}
m_Father: {fileID: 5092569754580650293}
m_RootOrder: 6
m_Father: {fileID: 3057347277895605957}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 23.5, y: 89}
m_AnchoredPosition: {x: 0.000019073486, y: -264.2}
m_SizeDelta: {x: 956, y: 253}
m_Pivot: {x: 0, y: 0}
--- !u!222 &1653998555805000441

4
Assets/Resources/UI/UI_Panel/UI_LowTensionWorkTicketPanel.prefab
View File

@ -9011,8 +9011,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.5, y: -0.5}
m_SizeDelta: {x: 1, y: -13}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7093001907047875333
MonoBehaviour: