提交日志-20240628-2039

1、优化了模型的高亮效果
2、新增了煤堆边框高亮动效
3、更新了折线图x轴显示效果，并重新处理数据使其按照正确的时间排序展示
4、优化了小地图，当前版本小地图不再渲染UI相关内容

BulkCargo_UnityProject/Assets/GameAssets/Model/华能（福建）海港有限公司海关监管场所/390m.fbx.meta

@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 4eff77f99128c5445a6c4c0c2b135013
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BulkCargo_UnityProject/Assets/GameAssets/Shader/Community Highlight Animated/Highlight Animated.mat

@@ -123,7 +123,7 @@ Material:
     - _ZWrite: 1
     - __dirty: 0
     m_Colors:
-    - _Color: {r: 1, g: 0.952896, b: 0.9103774, a: 1}
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _HighlightColor: {r: 0.7065311, g: 0.97058815, b: 0.95966166, a: 1}
   m_BuildTextureStacks: []

BulkCargo_UnityProject/Assets/GameAssets/自定义.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 556f5130552498a43a76d255cb192d6b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BulkCargo_UnityProject/Assets/GameAssets/自定义/Materials.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d6a35537ff624904a89f78f85caf79be
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BulkCargo_UnityProject/Assets/GameAssets/自定义/Materials/Frame.mat

@@ -0,0 +1,151 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-4975114960719924091
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Frame
+  m_Shader: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3}
+  m_ValidKeywords:
+  - _EMISSION
+  - _RECEIVE_SHADOWS_OFF
+  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords:
+  - _FLIPBOOKBLENDING_OFF
+  m_LightmapFlags: 0
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - DepthOnly
+  - SHADOWCASTER
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 679dc76e1386fc344a72f720fd3e74ea, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BlendOp: 0
+    - _BumpScale: 1
+    - _CameraFadingEnabled: 0
+    - _CameraFarFadeDistance: 2
+    - _CameraNearFadeDistance: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _ColorMode: 0
+    - _Cull: 0
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DistortionBlend: 0.5
+    - _DistortionEnabled: 0
+    - _DistortionStrength: 1
+    - _DistortionStrengthScaled: 0.1
+    - _DstBlend: 10
+    - _EnvironmentReflections: 1
+    - _FlipbookBlending: 0
+    - _FlipbookMode: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 0
+    - _Smoothness: 0.5
+    - _SmoothnessSource: 0
+    - _SmoothnessTextureChannel: 0
+    - _SoftParticlesEnabled: 0
+    - _SoftParticlesFarFadeDistance: 1
+    - _SoftParticlesNearFadeDistance: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _Surface: 1
+    - _WorkflowMode: 1
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
+    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []

BulkCargo_UnityProject/Assets/GameAssets/自定义/Materials/Frame.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1eea214c939905645abda4e7e7cd522a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BulkCargo_UnityProject/Assets/GameAssets/自定义/Models.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 765e95cff5acf124bbf8e6c9b6acfbb8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BulkCargo_UnityProject/Assets/GameAssets/自定义/Models/边框.fbx.meta

@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 3bb4205e0c05e8e42b23e63f2e4a4bb9
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BulkCargo_UnityProject/Assets/GameAssets/自定义/Textures.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b16751278cfd3941985bda0877d963a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BulkCargo_UnityProject/Assets/GameAssets/自定义/Textures/hexagon_gradient2.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 679dc76e1386fc344a72f720fd3e74ea
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BulkCargo_UnityProject/Assets/MiniMap/Prefabs/MiniMapRoot.prefab

@@ -155,7 +155,7 @@ Camera:
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 23
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: eb2348187ce6e8342b18435f608b12a5, type: 2}
   m_TargetDisplay: 0
@@ -619,7 +619,7 @@ MonoBehaviour:
   orthographicSizeRate: 0
   DragSpeed: 0.5
   ZoomSpeed: 1
-  OrthographicSizeClamp: {x: 5, y: 15}
+  MinOrthographicSize: 20
 --- !u!1 &3896793120727956044
 GameObject:
   m_ObjectHideFlags: 0

BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/MeasuringScaleInfo/MeasuringScale.prefab

@@ -107,7 +107,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 437179214}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -145,7 +145,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -4696,7 +4696,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -5373,7 +5373,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -12047,8 +12047,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2609511}
   - {fileID: 565688656}
+  - {fileID: 2609511}
   m_Father: {fileID: 4429255974201311953}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -15729,7 +15729,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 437179214}
-  m_RootOrder: 1
+  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}
@@ -41087,7 +41087,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -75729,7 +75729,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4429255972641847838}
-  m_LocalRotation: {x: 0, y: 0, z: 0.25881907, w: 0.9659259}
+  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
@@ -76459,7 +76459,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -77793,7 +77793,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0, y: 0}
-  m_SizeDelta: {x: 36, y: 27}
+  m_SizeDelta: {x: 61, y: 27}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4429255973006215700
 CanvasRenderer:
@@ -77826,7 +77826,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -77836,7 +77836,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u91CD\u91CF"
+  m_Text: "\u91CD\u91CF/\u5428"
 --- !u!1 &4429255973012104151
 GameObject:
   m_ObjectHideFlags: 0
@@ -78118,7 +78118,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -79832,7 +79832,7 @@ MonoBehaviour:
           m_AutoColor: 0
           m_Color: {r: 0, g: 0, b: 0, a: 0}
           m_FontSize: 0
-          m_FontStyle: 0
+          m_FontStyle: 2
           m_LineSpacing: 1
           m_Alignment: 4
     m_AxisTick:
@@ -79851,7 +79851,7 @@ MonoBehaviour:
           rgba: 0
         m_Width: 0
         m_Length: 0
-        m_Opacity: 1
+        m_Opacity: 0.5
         m_DashLength: 4
         m_DotLength: 2
         m_GapLength: 2
@@ -79867,7 +79867,7 @@ MonoBehaviour:
       m_Position: 0
       m_AutoOffset: 0
       m_Offset: {x: 0, y: -10, z: 0}
-      m_Rotate: 30
+      m_Rotate: 0
       m_AutoRotate: 0
       m_Distance: 8
       m_Formatter: 
@@ -79908,17 +79908,17 @@ MonoBehaviour:
         m_AutoColor: 0
         m_Color: {r: 0, g: 0, b: 0, a: 0}
         m_FontSize: 0
-        m_FontStyle: 0
+        m_FontStyle: 2
         m_LineSpacing: 1
         m_Alignment: 4
-      m_Interval: 0
+      m_Interval: 1
       m_Inside: 0
       m_ShowAsPositiveNumber: 0
       m_OnZero: 0
       m_ShowStartLabel: 1
       m_ShowEndLabel: 1
       m_TextLimit:
-        m_Enable: 1
+        m_Enable: 0
         m_MaxWidth: 0
         m_Gap: 1
         m_Suffix: ...
@@ -80079,7 +80079,7 @@ MonoBehaviour:
         m_Type: 5
         m_Color:
           serializedVersion: 2
-          rgba: 0
+          rgba: 1737395854
         m_ToColor:
           serializedVersion: 2
           rgba: 0
@@ -80104,13 +80104,13 @@ MonoBehaviour:
           rgba: 0
     m_AxisName:
       m_Show: 1
-      m_Name: "\u91CD\u91CF"
+      m_Name: "\u91CD\u91CF/\u5428"
       m_OnZero: 0
       m_LabelStyle:
         m_Show: 1
         m_Position: 10
         m_AutoOffset: 0
-        m_Offset: {x: 0, y: 25, z: 0}
+        m_Offset: {x: -15, y: 25, z: 0}
         m_Rotate: 0
         m_AutoRotate: 0
         m_Distance: 0
@@ -80145,14 +80145,14 @@ MonoBehaviour:
           m_Bottom: 0
         m_TextStyle:
           m_Show: 1
-          m_Font: {fileID: 0}
+          m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
           m_AutoWrap: 0
           m_AutoAlign: 1
           m_Rotate: 0
           m_AutoColor: 0
           m_Color: {r: 0, g: 0, b: 0, a: 0}
           m_FontSize: 0
-          m_FontStyle: 0
+          m_FontStyle: 2
           m_LineSpacing: 1
           m_Alignment: 4
     m_AxisTick:
@@ -80171,7 +80171,7 @@ MonoBehaviour:
           rgba: 0
         m_Width: 0
         m_Length: 0
-        m_Opacity: 1
+        m_Opacity: 0.5
         m_DashLength: 4
         m_DotLength: 2
         m_GapLength: 2
@@ -80221,14 +80221,14 @@ MonoBehaviour:
         m_Bottom: 0
       m_TextStyle:
         m_Show: 1
-        m_Font: {fileID: 0}
+        m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
         m_AutoWrap: 0
         m_AutoAlign: 1
         m_Rotate: 0
         m_AutoColor: 0
         m_Color: {r: 0, g: 0, b: 0, a: 0}
         m_FontSize: 0
-        m_FontStyle: 0
+        m_FontStyle: 2
         m_LineSpacing: 1
         m_Alignment: 4
       m_Interval: 0
@@ -80969,7 +80969,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -82352,7 +82352,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4429255973514215625}
-  m_LocalRotation: {x: 0, y: 0, z: 0.25881907, w: 0.9659259}
+  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
@@ -82924,7 +82924,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -83112,7 +83112,7 @@ RectTransform:
   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: -28, y: 0}
+  m_AnchoredPosition: {x: -40.5, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4429255973738987204
@@ -83433,7 +83433,7 @@ RectTransform:
   m_GameObject: {fileID: 4429255973807001642}
   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_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4429255973514215626}
@@ -83475,7 +83475,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -83559,8 +83559,8 @@ RectTransform:
   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: -282.36, y: 107.880005}
+  m_AnchoredPosition: {x: -297.36, y: 107.880005}
-  m_SizeDelta: {x: 40, y: 27}
+  m_SizeDelta: {x: 65, y: 27}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4429255973826219877
 CanvasRenderer:
@@ -83815,7 +83815,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -83929,7 +83929,7 @@ RectTransform:
   m_GameObject: {fileID: 4429255973888028456}
   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_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4429255973988315728}
@@ -83971,7 +83971,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -84160,7 +84160,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4429255973921979965}
-  m_LocalRotation: {x: 0, y: 0, z: 0.25881907, w: 0.9659259}
+  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
@@ -84659,7 +84659,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4429255973988315735}
-  m_LocalRotation: {x: 0, y: 0, z: 0.25881907, w: 0.9659259}
+  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
@@ -84893,7 +84893,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -88210,7 +88210,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -89091,7 +89091,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e76d760b90909bc439340217554ba527, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 2
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -89204,7 +89204,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4429255974626209010}
-  m_LocalRotation: {x: 0, y: 0, z: 0.25881907, w: 0.9659259}
+  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
@@ -89815,7 +89815,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 10, y: 0}
-  m_SizeDelta: {x: 3, y: 0}
+  m_SizeDelta: {x: 5, y: 0}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &4557869115599376973
 CanvasRenderer:

BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/YardInfo/YardInformation.prefab

@@ -704,7 +704,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 20, y: 0}
-  m_SizeDelta: {x: 3, y: 0}
+  m_SizeDelta: {x: 5, y: 0}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &6447911896157005946
 CanvasRenderer:

BulkCargo_UnityProject/Assets/Scenes/MainScene.unity

@@ -3032,7 +3032,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a946f432636a8b64d9594412dabd0cea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  IpAddress: 
 --- !u!114 &1216416872
 MonoBehaviour:
   m_ObjectHideFlags: 0

BulkCargo_UnityProject/Assets/Scripts/wj/Device/YardDevice.cs

@@ -36,6 +36,11 @@ public class YardDevice : DeviceBase
     [Range(0, 1)]
     public float MinimumPercentage = 0.1f;
 
+    /// <summary>
+    /// Á£×ÓЧ¹û
+    /// </summary>
+    public ParticleSystem ParticleSystem;
+
     /// <summary>
     /// ÉÁ˸½Å±¾
     /// </summary>
@@ -45,8 +50,8 @@ public class YardDevice : DeviceBase
         base.Awake();
         MeshRenderers = transform.parent.GetComponentsInChildren<MeshRenderer>().ToList();
         Piles = transform.parent.GetComponentsInChildren<PileDevice>().ToList();
-        shark=GetComponent<Shark>();
+        shark = GetComponent<Shark>();
-
+        ParticleSystem = transform.parent.GetComponentInChildren<ParticleSystem>();
         if (AutoAllocationWeight)
         {
             for (int i = 0; i < Piles.Count; i++)
@@ -60,20 +65,21 @@ public class YardDevice : DeviceBase
     {
         if (_enable)
         {
-            //for (int i = 0; i < MeshRenderers.Count; i++)
+            for (int i = 0; i < MeshRenderers.Count; i++)
-            //{
+            {
-            //    MeshRenderers[i].material.EnableKeyword("_ENABLE");
+                MeshRenderers[i].material.EnableKeyword("_ENABLE");
-            //}
+            }
-
+            ParticleSystem?.Play();
-            shark.StartShak();
+            //shark.StartShak();
         }
         else
         {
-            //for (int i = 0; i < MeshRenderers.Count; i++)
+            for (int i = 0; i < MeshRenderers.Count; i++)
-            //{
+            {
-            //    MeshRenderers[i].material.DisableKeyword("_ENABLE");
+                MeshRenderers[i].material.DisableKeyword("_ENABLE");
-            //}
+            }
-            shark.StopShak();
+            ParticleSystem?.Stop();
+            //shark.StopShak();
         }
     }
 

BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs

@@ -376,6 +376,11 @@ public class MeasuringScale : PanelBase
                 _item.Init(_T_ALM_PIPECOLLDATACOMPARE_List[i]);
                 MeasuringScaleItems.Add(_item);
 
+            }
+
+            //返回的数据最新的在前，在折线图展示时需要颠倒顺序
+            for (int i = _T_ALM_PIPECOLLDATACOMPARE_List.Count - 1; i >= 0; i--)
+            {
                 LineChart.AddXAxisData(_T_ALM_PIPECOLLDATACOMPARE_List[i].COLL_TIME.ToString());
                 HelpTool.Kg2Ton(_T_ALM_PIPECOLLDATACOMPARE_List[i].STAN_PRESENT_FLOWMETER_TOTAL_QUALITY, out float _value);
                 LineChart.series[0].AddData(_value);

BulkCargo_UnityProject/Assets/ShaderGraphs/Shader Graphs_ShaderGraph_Mei.mat

@@ -52,16 +52,20 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
+    - _Breath: 1.09
     - _ENABLE: 0
+    - _ENABLEBREATH: 0
     - _EnableOutLine: 0
-    - _FresnelPower: 2
+    - _FresnelPower: 5
+    - _High: 2
+    - _Low: 1
     - _Metallic: 0.1
     - _QueueControl: 0
     - _QueueOffset: 0
     - _Smoothness: 0
     - _Strength: 0
     m_Colors:
-    - _Color: {r: 0, g: 0.0009765625, b: 0.00011871936, a: 1}
+    - _Color: {r: 0, g: 3.031433, b: 0, a: 1}
     - _MainTexUV: {r: 0, g: 0, b: 0, a: 0}
     - _Tiling: {r: 1, g: 1, b: 0, a: 0}
   m_BuildTextureStacks: []

BulkCargo_UnityProject/Assets/ShaderGraphs/Shader Graphs_ShaderGraph_OutLine.mat

@@ -21,15 +21,15 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Shader Graphs_ShaderGraph_OutLine
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: ac77f135d70cb3349b34c80bb2f09b86,
+    type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 6
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
-  stringTagMap:
+  stringTagMap: {}
-    RenderType: Opaque
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -59,7 +59,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: bac3a585490c1164faad38dab7267a80, type: 3}
+        m_Texture: {fileID: 2800000, guid: 4b30af4daef82bf49a3e442acba6147c, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -94,6 +94,7 @@ Material:
     m_Floats:
     - _AlphaClip: 0
     - _Blend: 0
+    - _Breath: 1
     - _BumpScale: 1
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
@@ -103,12 +104,15 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _ENABLE: 0
+    - _ENABLEBREATH: 0
     - _EnableOutLine: 0
     - _EnvironmentReflections: 1
     - _FresnelPower: 2
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
+    - _High: 0.5
+    - _Low: 0.5
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.005
@@ -125,7 +129,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0, g: 4, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tiling: {r: 1, g: 1, b: 0, a: 0}