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

Assets/_Scenes/3_Main.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.28317237, g: 0.3055275, b: 0.3646918, a: 1}
+  m_IndirectSpecularColor: {r: 0.2830634, g: 0.30545175, b: 0.36456245, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -13829,6 +13829,10 @@ PrefabInstance:
         type: 3}
       insertIndex: -1
       addedObject: {fileID: 1344408286}
+    - targetCorrespondingSourceObject: {fileID: 1035387831314624882, guid: 8839cb5fe2a7ccf4c95234eac8a48fc2,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 218538197}
   m_SourcePrefab: {fileID: 100100000, guid: 8839cb5fe2a7ccf4c95234eac8a48fc2, type: 3}
 --- !u!4 &218538195 stripped
 Transform:
@@ -13836,6 +13840,193 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 218538194}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &218538196 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1035387831314624882, guid: 8839cb5fe2a7ccf4c95234eac8a48fc2,
+    type: 3}
+  m_PrefabInstance: {fileID: 218538194}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &218538197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 218538196}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  profile: {fileID: 11400000, guid: 5807d36770a3c5349993b3978c3a2941, type: 2}
+  profileSync: 0
+  camerasLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  effectGroup: 0
+  effectGroupLayer:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  effectNameFilter: 
+  DisHightLightTarget: []
+  combineMeshes: 0
+  alphaCutOff: 0
+  cullBackFaces: 1
+  ignoreObjectVisibility: 0
+  reflectionProbes: 0
+  GPUInstancing: 1
+  optimizeSkinnedMesh: 1
+  depthClip: 0
+  cameraDistanceFade: 0
+  cameraDistanceFadeNear: 0
+  cameraDistanceFadeFar: 1000
+  normalsOption: 0
+  ignore: 0
+  _highlighted: 0
+  fadeInDuration: 0
+  fadeOutDuration: 0
+  flipY: 0
+  constantWidth: 1
+  subMeshMask: -1
+  overlay: 0
+  overlayMode: 0
+  overlayColor: {r: 0.031772893, g: 0.9622642, b: 0.058159083, a: 1}
+  overlayAnimationSpeed: 1
+  overlayMinIntensity: 0.5
+  overlayBlending: 1
+  overlayTexture: {fileID: 0}
+  overlayTextureUVSpace: 0
+  overlayTextureScale: 1
+  overlayTextureScrolling: {x: 0, y: 0}
+  overlayVisibility: 0
+  outline: 1
+  outlineColor: {r: 1, g: 0, b: 0.019191265, a: 1}
+  outlineColorStyle: 0
+  outlineGradient:
+    serializedVersion: 2
+    key0: {r: 1, g: 1, b: 1, a: 1}
+    key1: {r: 1, g: 1, b: 1, a: 1}
+    key2: {r: 0, g: 0, b: 0, a: 0}
+    key3: {r: 0, g: 0, b: 0, a: 0}
+    key4: {r: 0, g: 0, b: 0, a: 0}
+    key5: {r: 0, g: 0, b: 0, a: 0}
+    key6: {r: 0, g: 0, b: 0, a: 0}
+    key7: {r: 0, g: 0, b: 0, a: 0}
+    ctime0: 0
+    ctime1: 65535
+    ctime2: 0
+    ctime3: 0
+    ctime4: 0
+    ctime5: 0
+    ctime6: 0
+    ctime7: 0
+    atime0: 0
+    atime1: 65535
+    atime2: 0
+    atime3: 0
+    atime4: 0
+    atime5: 0
+    atime6: 0
+    atime7: 0
+    m_Mode: 0
+    m_ColorSpace: -1
+    m_NumColorKeys: 2
+    m_NumAlphaKeys: 2
+  outlineGradientInLocalSpace: 0
+  outlineWidth: 0.4
+  outlineBlurPasses: 2
+  outlineQuality: 1
+  outlineEdgeMode: 0
+  outlineEdgeThreshold: 0.995
+  outlineSharpness: 1
+  outlineDownsampling: 2
+  outlineVisibility: 0
+  glowBlendMode: 0
+  outlineBlitDebug: 0
+  outlineIndependent: 0
+  outlineContourStyle: 0
+  outlineMaskMode: 0
+  glow: 0
+  glowWidth: 0.5
+  glowQuality: 1
+  glowBlurMethod: 0
+  glowDownsampling: 2
+  glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
+  glowDithering: 1
+  glowDitheringStyle: 0
+  glowMagicNumber1: 0.75
+  glowMagicNumber2: 0.5
+  glowAnimationSpeed: 1
+  glowVisibility: 0
+  glowBlitDebug: 0
+  glowBlendPasses: 1
+  glowPasses:
+  - offset: 4
+    alpha: 0.1
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 3
+    alpha: 0.2
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 2
+    alpha: 0.3
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 1
+    alpha: 0.4
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  glowMaskMode: 0
+  innerGlow: 0
+  innerGlowWidth: 1
+  innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
+  innerGlowBlendMode: 0
+  innerGlowVisibility: 0
+  targetFX: 0
+  targetFXTexture: {fileID: 0}
+  targetFXColor: {r: 1, g: 1, b: 1, a: 1}
+  targetFXCenter: {fileID: 0}
+  targetFXRotationSpeed: 50
+  targetFXInitialScale: 4
+  targetFXEndScale: 1.5
+  targetFXScaleToRenderBounds: 0
+  targetFXUseEnclosingBounds: 0
+  targetFXAlignToGround: 0
+  targetFXOffset: {x: 0, y: 0, z: 0}
+  targetFXFadePower: 32
+  targetFXGroundMaxDistance: 15
+  targetFXGroundLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  targetFXTransitionDuration: 0.5
+  targetFXStayDuration: 1.5
+  targetFXVisibility: 1
+  seeThrough: 2
+  seeThroughOccluderMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  seeThroughOccluderThreshold: 0.4
+  seeThroughOccluderMaskAccurate: 0
+  seeThroughOccluderCheckInterval: 1
+  seeThroughOccluderCheckIndividualObjects: 0
+  seeThroughDepthOffset: 0
+  seeThroughMaxDepth: 0
+  seeThroughIntensity: 0.8
+  seeThroughTintAlpha: 0.5
+  seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
+  seeThroughNoise: 1
+  seeThroughBorder: 0
+  seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
+  seeThroughBorderOnly: 0
+  seeThroughBorderWidth: 0.45
+  seeThroughOrdered: 0
+  seeThroughTexture: {fileID: 0}
+  seeThroughTextureUVSpace: 0
+  seeThroughTextureScale: 1
+  seeThroughChildrenSortingMode: 0
+  rmsCount: 18
+  hitFxInitialIntensity: 0
+  hitFxMode: 0
+  hitFxFadeOutDuration: 0.25
+  hitFxColor: {r: 1, g: 1, b: 1, a: 1}
+  hitFxRadius: 0.5
 --- !u!1 &219127276
 GameObject:
   m_ObjectHideFlags: 0
@@ -15079,17 +15270,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Facilitys:
   - FacilityName: "\u62C6\u7801\u579B\u673A"
-    highlight: {fileID: 0}
+    highlight: {fileID: 2088542548}
   - FacilityName: "\u7535\u6E90\u67DC"
-    highlight: {fileID: 0}
+    highlight: {fileID: 273574910}
   - FacilityName: "\u4E0A\u4E0B\u6599\u5355\u5143"
-    highlight: {fileID: 0}
+    highlight: {fileID: 218538197}
   - FacilityName: "\u7801\u579B\u63A7\u5236\u67DC"
-    highlight: {fileID: 0}
+    highlight: {fileID: 1350230009}
   - FacilityName: "\u5916\u89C2\u68C0\u6D4B\u5355\u51431"
-    highlight: {fileID: 0}
+    highlight: {fileID: 66582217}
   - FacilityName: "\u5916\u89C2\u68C0\u6D4B\u5355\u51432"
-    highlight: {fileID: 0}
+    highlight: {fileID: 91489517}
   - FacilityName: "\u7EDD\u7F18\u8010\u538B\u5355\u51431"
     highlight: {fileID: 216970225}
   - FacilityName: "\u7EDD\u7F18\u8010\u538B\u5355\u51432"
@@ -33237,7 +33428,7 @@ MonoBehaviour:
   AGVManager: {fileID: 1863911049}
   facilityManager: {fileID: 229087081}
   AGVName: AGV1
-  ReportErrorsUI: {fileID: 9113711836560366625, guid: 2a25391e5be82954881b4276687dc048,
+  ReportErrorsUI: {fileID: 9113711836560366625, guid: 1889a8584c0a52f4084308847b8cd4f6,
     type: 3}
   IsHasError: []
 --- !u!114 &560685328

Assets/_预设/UI/Canvas-3D跟随 1.prefab.meta

+fileFormatVersion: 2
+guid: 1889a8584c0a52f4084308847b8cd4f6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: