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

# Conflicts:
#	Assets/ArtRes/Fonts/SourceHanSansCN-Regular SDF.asset
#	Assets/Resources/UI/UI_Panel/UI_LowTensionWorkTicketPanel.prefab
#	Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab
#	Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs

Assets/SandBox/TestUIPanelScenes/UI_LowTensionWorkTicketPanel.unity

@@ -123,108 +123,6 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1001 &278349793
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 8048042365218946059}
-    m_Modifications:
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9212047459532377511, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_Name
-      value: UI_LowTensionWorkTicketPanel
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
---- !u!224 &793798410 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-  m_PrefabInstance: {fileID: 278349793}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &845611926
 GameObject:
   m_ObjectHideFlags: 0
@@ -343,6 +241,152 @@ MonoBehaviour:
   m_RequiresDepthTexture: 0
   m_RequiresColorTexture: 0
   m_Version: 2
+--- !u!1001 &1204582736
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8048042367136801948}
+    m_Modifications:
+    - target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 349154382982398426, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 349154382982398426, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2177821829111094747, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2177821829111094747, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4829562738776111112, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4829562738776111112, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8632911327012071035, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8632911327012071035, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9212047459532377511, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_Name
+      value: UI_LowTensionWorkTicketPanel
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+--- !u!224 &1204582737 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+  m_PrefabInstance: {fileID: 1204582736}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1361204692
 GameObject:
   m_ObjectHideFlags: 0
@@ -485,8 +529,7 @@ 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: 793798410}
   m_Father: {fileID: 8048042365605609282}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -752,7 +795,8 @@ 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: 1204582737}
   m_Father: {fileID: 8048042365605609282}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}