Merge branch 'master' of git@gitlab.sd-zeus.com:yangzeyu/SCVerificationPipelineDT.git

# Conflicts:
#	Assets/_美术资源/模型/建筑/地面_蓝色瓷砖.mat

Assets/_美术资源/材质库/Decal_textrue/Decal_外观检查单元.mat

@@ -38,7 +38,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - Base_Map:
-        m_Texture: {fileID: 2800000, guid: 23901476db5ed454c8474143142e9f26, type: 3}
+        m_Texture: {fileID: 2800000, guid: a6433233e8b804346a6154617f10314a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - Normal_Map:

Assets/_美术资源/材质库/Decal_textrue/Decal_空箱拆码垛机.mat

@@ -38,7 +38,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - Base_Map:
-        m_Texture: {fileID: 2800000, guid: 23901476db5ed454c8474143142e9f26, type: 3}
+        m_Texture: {fileID: 2800000, guid: cfaa215fd24d7d040bb0ee6465b7d0c2, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - Normal_Map:

Assets/_美术资源/材质库/Decal_textrue/Decal_绑定单元.mat

@@ -38,7 +38,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - Base_Map:
-        m_Texture: {fileID: 2800000, guid: 23901476db5ed454c8474143142e9f26, type: 3}
+        m_Texture: {fileID: 2800000, guid: aed4fca0d566fc44e833e77251b51f73, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - Normal_Map:

Assets/_美术资源/材质库/Decal_textrue/Decal_耐压试验单元.mat

@@ -38,7 +38,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - Base_Map:
-        m_Texture: {fileID: 2800000, guid: 23901476db5ed454c8474143142e9f26, type: 3}
+        m_Texture: {fileID: 2800000, guid: bd43d8ab18648ab448e13a396b212685, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - Normal_Map:

Assets/_美术资源/材质库/Decal_textrue/Decal_自动贴标单元.mat

@@ -38,7 +38,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - Base_Map:
-        m_Texture: {fileID: 2800000, guid: 23901476db5ed454c8474143142e9f26, type: 3}
+        m_Texture: {fileID: 2800000, guid: 1e1eb8fdfa3c79a4cac2e61856bc84a9, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - Normal_Map:

Assets/_美术资源/模型/建筑/地面_蓝色瓷砖.mat

@@ -41,7 +41,7 @@ Material:
     m_TexEnvs:
     - _BaseMap:
         m_Texture: {fileID: 2800000, guid: 1f5e75ae75e59c14fa83bfe60f419474, type: 3}
-        m_Scale: {x: 50, y: 50}
+        m_Scale: {x: 20, y: 20}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 2800000, guid: 5cb7cf199de3cf04295c4f7d70b8a3f8, type: 3}
@@ -65,7 +65,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 1f5e75ae75e59c14fa83bfe60f419474, type: 3}
-        m_Scale: {x: 50, y: 50}
+        m_Scale: {x: 20, y: 20}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 2800000, guid: d96163e0e505e3b47b8d014b9cc60b44, type: 3}
@@ -101,7 +101,7 @@ Material:
     - _AlphaToMask: 0
     - _Blend: 0
     - _BlendModePreserveSpecular: 1
-    - _BumpScale: 5
+    - _BumpScale: 3
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
     - _Cull: 2
@@ -119,7 +119,7 @@ Material:
     - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.532
+    - _Smoothness: 0.314
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -128,8 +128,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 1}
-    - _Color: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 1}
+    - _BaseColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1}
+    - _Color: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1}
     - _EmissionColor: {r: 1.4017444, g: 1.6688899, b: 1.6981132, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

Assets/_美术资源/模型/设备/刻码验证单元与信息识别单元/刻码验证单元与信息识别单元.prefab

@@ -166,6 +166,62 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &1543222312360119735
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1710313917696040365}
+  - component: {fileID: 1465293102475322691}
+  m_Layer: 0
+  m_Name: "Decal_\u4FE1\u606F\u8BC6\u522B\u5355\u5143"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1710313917696040365
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1543222312360119735}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00046301674, y: 0.7071589, z: 0.00026019587, w: -0.70705444}
+  m_LocalPosition: {x: 0.3729992, y: 0.54938424, z: -0.006000519}
+  m_LocalScale: {x: 0.47381067, y: 0.26823196, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7292121364802025039}
+  m_LocalEulerAnglesHint: {x: 180.059, y: 89.992, z: -179.984}
+--- !u!114 &1465293102475322691
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1543222312360119735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 3881abaab7017564eb27623d2e6815f8, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1 &2007067184456738661
 GameObject:
   m_ObjectHideFlags: 0
@@ -527,6 +583,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5099360992417830003}
+  - {fileID: 1710313917696040365}
   - {fileID: 1973348095028288846}
   - {fileID: 4196924061039677775}
   - {fileID: 1982408135002934778}
@@ -537,6 +595,62 @@ Transform:
   - {fileID: 4499491147488163492}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6902817387693690925
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5099360992417830003}
+  - component: {fileID: 1030689185842580637}
+  m_Layer: 0
+  m_Name: "Decal_\u523B\u7801\u9A8C\u8BC1\u5355\u5143"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &5099360992417830003
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6902817387693690925}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00046301674, y: 0.7071589, z: 0.00026019587, w: -0.70705444}
+  m_LocalPosition: {x: 0.3729992, y: 0.54938424, z: -0.006000519}
+  m_LocalScale: {x: 0.47381067, y: 0.26823196, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7292121364802025039}
+  m_LocalEulerAnglesHint: {x: 180.059, y: 89.992, z: -179.984}
+--- !u!114 &1030689185842580637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6902817387693690925}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 7d000b80997694840a07678aad8337d3, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1 &7094789084099984907
 GameObject:
   m_ObjectHideFlags: 0

Assets/_美术资源/模型/设备/码垛机+拆码机/码垛机+拆码机.prefab

@@ -29,6 +29,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5891053063742711564}
   - {fileID: 2825622312087925570}
   - {fileID: 4079494990400038561}
   - {fileID: 1274837072051101606}
@@ -206,6 +207,62 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &4284292765865971131
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5891053063742711564}
+  - component: {fileID: 6659907236368903151}
+  m_Layer: 0
+  m_Name: "Decal_\u62C6\u579B\u673A"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5891053063742711564
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4284292765865971131}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00046303633, y: 0.7071067, z: 0.0002601624, w: -0.70710677}
+  m_LocalPosition: {x: 0.5339966, y: 1.683, z: 0.02499944}
+  m_LocalScale: {x: 0.3278132, y: 0.26823196, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7440437150259613945}
+  m_LocalEulerAnglesHint: {x: 180.059, y: 0, z: -179.984}
+--- !u!114 &6659907236368903151
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4284292765865971131}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: bd8b74a4ef1fc4146b82011d5379e703, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1 &4373836480372948846
 GameObject:
   m_ObjectHideFlags: 0

Assets/_美术资源/模型/设备/空箱拆码垛机/空箱拆码垛机.prefab

@@ -369,6 +369,7 @@ Transform:
   - {fileID: 5265019439387550363}
   - {fileID: 4468019651459414986}
   - {fileID: 7618114630076796248}
+  - {fileID: 4621783396944455153}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!1 &5597151784157535798
@@ -537,6 +538,62 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &7124635709555071044
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4621783396944455153}
+  - component: {fileID: 5358111977416698284}
+  m_Layer: 0
+  m_Name: "Decal_\u4FE1\u606F\u8BC6\u522B\u5355\u5143 (3)"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4621783396944455153
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7124635709555071044}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.00025975716, y: 0.7077251, z: 0.00046326523, w: 0.7064877}
+  m_LocalPosition: {x: -0.5099984, y: 2.395, z: -0.01000011}
+  m_LocalScale: {x: 0.47381058, y: 0.26823193, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2283457141743138180}
+  m_LocalEulerAnglesHint: {x: 180.059, y: 0.1000061, z: -179.984}
+--- !u!114 &5358111977416698284
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7124635709555071044}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 2c07c2d99f00d3b40ae1230e78a687e5, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1 &7965404106573941274
 GameObject:
   m_ObjectHideFlags: 0

Assets/_美术资源/模型/设备/绑定单元/绑定单元.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2275635952995693520
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6831955040034935581}
+  - component: {fileID: 6649090510431568909}
+  m_Layer: 0
+  m_Name: "Decal_\u7ED1\u5B9A\u5355\u5143"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6831955040034935581
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2275635952995693520}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.70679265, z: -0, w: 0.7074208}
+  m_LocalPosition: {x: 0.5039997, y: 1.692, z: 0.0009994507}
+  m_LocalScale: {x: 0.59946513, y: 0.3393671, z: 1.2651999}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9044338776679230125}
+  m_LocalEulerAnglesHint: {x: 0, y: -89.949, z: 0}
+--- !u!114 &6649090510431568909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2275635952995693520}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: c86cc415eff410a40b57c547bf90ee5f, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1 &3443070011868012362
 GameObject:
   m_ObjectHideFlags: 0
@@ -701,5 +757,6 @@ Transform:
   - {fileID: 6861036697580627467}
   - {fileID: 3924552515214395975}
   - {fileID: 1482532264713570027}
+  - {fileID: 6831955040034935581}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/_美术资源/模型/设备/耐压试验单元/耐压试验单元.prefab

@@ -166,6 +166,62 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &4015737585106171302
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7716630396732447986}
+  - component: {fileID: 6869571654181302465}
+  m_Layer: 0
+  m_Name: "Decal_\u8010\u538B\u8BD5\u9A8C\u5355\u5143"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7716630396732447986
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4015737585106171302}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00051139784, y: 0.0001372993, z: -0.00014338343, w: -0.99999994}
+  m_LocalPosition: {x: -0.0070004463, y: 1.126, z: -0.8928032}
+  m_LocalScale: {x: 0.4738106, y: 0.26823193, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3356469215767749473}
+  m_LocalEulerAnglesHint: {x: 180.059, y: 179.984, z: -179.984}
+--- !u!114 &6869571654181302465
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4015737585106171302}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 9f36c59a28195ec4ab8a4b23f706771e, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1 &6971097036792396596
 GameObject:
   m_ObjectHideFlags: 0
@@ -527,6 +583,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7716630396732447986}
   - {fileID: 8551808667670448954}
   - {fileID: 7843566352727167259}
   - {fileID: 820526911392383015}

Assets/_美术资源/模型/设备/自动贴标单元/自动贴标单元.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &349350157601228320
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 621609440133401458}
+  - component: {fileID: 3428227587803659534}
+  m_Layer: 0
+  m_Name: "Decal_\u81EA\u52A8\u8D34\u6807\u5355\u5143"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &621609440133401458
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 349350157601228320}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00046294607, y: 0.70735115, z: 0.00026032218, w: -0.70686215}
+  m_LocalPosition: {x: 0.6920004, y: 1.837, z: -0.008200212}
+  m_LocalScale: {x: 0.5994652, y: 0.33936712, z: 1.2651999}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2161847736656846597}
+  m_LocalEulerAnglesHint: {x: 180.059, y: 269.96, z: -179.984}
+--- !u!114 &3428227587803659534
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 349350157601228320}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: b10e925ed9e629b4183095f128846d23, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1 &664799772741368411
 GameObject:
   m_ObjectHideFlags: 0
@@ -537,6 +593,7 @@ Transform:
   - {fileID: 4701119100365266829}
   - {fileID: 7994408795775240717}
   - {fileID: 1264245666004070793}
+  - {fileID: 621609440133401458}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &4426592900246559160

Assets/_美术资源/模型/设备/识别单元/识别单元.prefab

@@ -278,6 +278,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1266064884848833292}
+  - {fileID: 831753184427332957}
   - {fileID: 2968673482859714199}
   - {fileID: 2147579056449929184}
   - {fileID: 5902855663590291836}
@@ -289,6 +291,62 @@ Transform:
   - {fileID: 6715302255253881784}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3668932178561822485
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1266064884848833292}
+  - component: {fileID: 288749193608487865}
+  m_Layer: 0
+  m_Name: "Decal_\u8BC6\u522B\u5355\u5143"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1266064884848833292
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3668932178561822485}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00046303638, y: 0.7071066, z: 0.00026016237, w: -0.7071068}
+  m_LocalPosition: {x: 0.5489997, y: 1.683, z: -0.0010006428}
+  m_LocalScale: {x: 0.38518053, y: 0.268232, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6152851794714797706}
+  m_LocalEulerAnglesHint: {x: 180.059, y: 0, z: -179.984}
+--- !u!114 &288749193608487865
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3668932178561822485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 77d5e136f07196f4893ff80f1ac58146, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1 &4353257348466204755
 GameObject:
   m_ObjectHideFlags: 0
@@ -704,6 +762,62 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &9158787351196183275
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 831753184427332957}
+  - component: {fileID: 7732228105582298270}
+  m_Layer: 0
+  m_Name: "Decal_\u5916\u89C2\u68C0\u67E5\u5355\u5143"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &831753184427332957
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9158787351196183275}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00046289753, y: 0.7074849, z: 0.00026040975, w: -0.7067283}
+  m_LocalPosition: {x: 0.5500002, y: 1.676, z: 0.005001068}
+  m_LocalScale: {x: 0.4738106, y: 0.26823196, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6152851794714797706}
+  m_LocalEulerAnglesHint: {x: 180.059, y: 89.939, z: -179.984}
+--- !u!114 &7732228105582298270
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9158787351196183275}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 5932886f00c069d44bf18ad177610295, type: 2}
+  m_DrawDistance: 1000
+  m_FadeScale: 0.9
+  m_StartAngleFade: 180
+  m_EndAngleFade: 180
+  m_UVScale: {x: 1, y: 1}
+  m_UVBias: {x: 0, y: 0}
+  m_DecalLayerMask: 1
+  m_ScaleMode: 1
+  m_Offset: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.83380604, y: 0.27221668, z: 0.26570433}
+  m_FadeFactor: 1
 --- !u!1001 &1109524452505379116
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/_预设/New Scene.unity.meta

+fileFormatVersion: 2
+guid: d04a27e8609b08746af5c5ed09195d5d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/第三方库/Bakery/Editor/x64/Bakery/.denoiserlog.txt

@@ -673,3 +673,9 @@ Tiles: 1
 Loading shader denoisePrepareOIDN.ptx::oxMain...
 Loading shader denoiseFinishOIDN.ptx::oxMain...
 Done
+2024-5-20
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done

bakery_times.log

@@ -30,3 +30,4 @@
 05/20/2024 10:47 | HJL | 0h 1m 9s
 05/20/2024 10:57 | HJL | 0h 1m 17s
 05/20/2024 11:30 | HJL | 0h 1m 38s
+05/20/2024 11:58 | HJL | 0h 0m 29s