三个统计图修改

Assets/Art/UI/lineStyle.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: aa73eb4c56ac8b245b03bd279b977bc8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  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: WebGL
+    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: Android
+    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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/WaterTrendPanel.prefab

@@ -3362,7 +3362,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8798635478655261248}
   - component: {fileID: 7534034091272499084}
-  - component: {fileID: 7314249221309833024}
+  - component: {fileID: 2060159603102001071}
   m_Layer: 5
   m_Name: Blue
   m_TagString: Untagged
@@ -3399,7 +3399,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1533212042284031334}
   m_CullTransparentMesh: 1
---- !u!114 &7314249221309833024
+--- !u!114 &2060159603102001071
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3408,27 +3408,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 1533212042284031334}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5108579, g: 0.703948, b: 0.990566, a: 1}
+  m_Color: {r: 0.4117647, g: 0.6392157, b: 1, a: 0.29803923}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_Texture: {fileID: 2800000, guid: aa73eb4c56ac8b245b03bd279b977bc8, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 20
+    height: 1
 --- !u!1 &1559580242658314539
 GameObject:
   m_ObjectHideFlags: 0
@@ -3599,7 +3596,7 @@ GameObject:
   m_Component:
   - component: {fileID: 808457991465782903}
   - component: {fileID: 4085646007238084527}
-  - component: {fileID: 5898456195000155538}
+  - component: {fileID: 1419286470980385477}
   m_Layer: 5
   m_Name: Yellow
   m_TagString: Untagged
@@ -3636,7 +3633,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1712860872418343510}
   m_CullTransparentMesh: 1
---- !u!114 &5898456195000155538
+--- !u!114 &1419286470980385477
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3645,27 +3642,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 1712860872418343510}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.92684215, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 0, a: 0.29803923}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_Texture: {fileID: 2800000, guid: aa73eb4c56ac8b245b03bd279b977bc8, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 20
+    height: 1
 --- !u!1 &1740636749122270306
 GameObject:
   m_ObjectHideFlags: 0
@@ -4407,7 +4401,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2698979164398184293}
   - component: {fileID: 5077751307637559809}
-  - component: {fileID: 5002733111355185605}
+  - component: {fileID: 3917361750098853909}
   m_Layer: 5
   m_Name: Blue
   m_TagString: Untagged
@@ -4444,7 +4438,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1989026396877825536}
   m_CullTransparentMesh: 1
---- !u!114 &5002733111355185605
+--- !u!114 &3917361750098853909
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4453,27 +4447,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 1989026396877825536}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5108579, g: 0.703948, b: 0.990566, a: 1}
+  m_Color: {r: 0.4117647, g: 0.6392157, b: 1, a: 0.29803923}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_Texture: {fileID: 2800000, guid: aa73eb4c56ac8b245b03bd279b977bc8, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 20
+    height: 1
 --- !u!1 &2040967851150428327
 GameObject:
   m_ObjectHideFlags: 0
@@ -4858,7 +4849,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4203040552399427101}
   - component: {fileID: 5812097702650287270}
-  - component: {fileID: 973483039593781945}
+  - component: {fileID: 3700051306121924737}
   m_Layer: 5
   m_Name: Yellow
   m_TagString: Untagged
@@ -4895,7 +4886,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2200596766038324655}
   m_CullTransparentMesh: 1
---- !u!114 &973483039593781945
+--- !u!114 &3700051306121924737
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4904,27 +4895,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 2200596766038324655}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.92684215, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 0, a: 0.29803923}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_Texture: {fileID: 2800000, guid: aa73eb4c56ac8b245b03bd279b977bc8, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 20
+    height: 1
 --- !u!1 &2205797383714430655
 GameObject:
   m_ObjectHideFlags: 0
@@ -10263,7 +10251,7 @@ GameObject:
   m_Component:
   - component: {fileID: 222095657328492838}
   - component: {fileID: 7006761351780830063}
-  - component: {fileID: 6718769201547511693}
+  - component: {fileID: 5707798776769662731}
   m_Layer: 5
   m_Name: Red
   m_TagString: Untagged
@@ -10300,7 +10288,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4278538055865652343}
   m_CullTransparentMesh: 1
---- !u!114 &6718769201547511693
+--- !u!114 &5707798776769662731
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -10309,27 +10297,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 4278538055865652343}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 0, b: 0, a: 0.29803923}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_Texture: {fileID: 2800000, guid: aa73eb4c56ac8b245b03bd279b977bc8, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 20
+    height: 1
 --- !u!1 &4282717673081414737
 GameObject:
   m_ObjectHideFlags: 0
@@ -16582,7 +16567,7 @@ MonoBehaviour:
       m_MinSize: 0
       m_MaxSize: 0
     m_Animation:
-      m_Enable: 1
+      m_Enable: 0
       m_Type: 0
       m_Easting: 0
       m_Threshold: 2000
@@ -17810,6 +17795,10 @@ MonoBehaviour:
   localityText: {fileID: 3677013427395369476}
   frgrdText: {fileID: 2712359138785898027}
   usflText: {fileID: 4989867749949875132}
+  searchButton: {fileID: 0}
+  threePanel: {fileID: 0}
+  bythreePanel: {fileID: 0}
+  taokouthreePanel: {fileID: 0}
 --- !u!1 &6918429472038712126
 GameObject:
   m_ObjectHideFlags: 0
@@ -22367,7 +22356,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6430656383865326129}
   - component: {fileID: 6476866206301188312}
-  - component: {fileID: 574881569594365169}
+  - component: {fileID: 2596126486690551194}
   m_Layer: 5
   m_Name: Red
   m_TagString: Untagged
@@ -22404,7 +22393,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8893300378045116372}
   m_CullTransparentMesh: 1
---- !u!114 &574881569594365169
+--- !u!114 &2596126486690551194
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -22413,27 +22402,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 8893300378045116372}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 0, b: 0, a: 0.29803923}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_Texture: {fileID: 2800000, guid: aa73eb4c56ac8b245b03bd279b977bc8, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 20
+    height: 1
 --- !u!1 &8919275888979690819
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -18921,7 +18921,7 @@ MonoBehaviour:
     m_Show: 1
     m_CoordSystem: GridCoord
     m_SerieType: Bar
-    m_SerieName: serie0
+    m_SerieName: "\u7A81\u53D1\u4E8B\u4EF6"
     m_State: 0
     m_ColorBy: 0
     m_Stack: 
@@ -19423,7 +19423,7 @@ MonoBehaviour:
     m_Show: 1
     m_CoordSystem: GridCoord
     m_SerieType: Bar
-    m_SerieName: serie1
+    m_SerieName: "\u6574\u6539\u95EE\u9898"
     m_State: 0
     m_ColorBy: 0
     m_Stack: 

Assets/Prefabs/UI/XHYZT/XHGK.prefab

@@ -3201,7 +3201,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 6219495180201940521}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9945462
+  m_Size: 0.99671245
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -3580,7 +3580,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000015258789, y: -386.11584}
+  m_AnchoredPosition: {x: 0.000015258789, y: -385.88434}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6219495181246091879

Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -580,8 +580,8 @@ public class SWYJLayer : YZTRootLayer
             y_chart.axisName.name = "水位/m";
 
             var tempSeries = shuiWeiBianHua.series;
+            tempSeries[0].serieName = "水位/m";
             tempSeries[0].ClearData();
-            tempSeries[1].ClearData();
             SerieData[] serieDatas = new SerieData[shuiWeiBianHuaData.value.Length];
             for (int i = 0; i < shuiWeiBianHuaData.value.Length; i++)
             {
@@ -590,9 +590,7 @@ public class SWYJLayer : YZTRootLayer
                 serieDatas[i].data.Add(i);
                 serieDatas[i].data.Add(shuiWeiBianHuaData.value[i]);
             }
-
             tempSeries[0].data.AddRange(serieDatas);
-            tempSeries[1].data.AddRange(serieDatas);
         }
     }