提交防洪形式实时计算统计数据

Assets/Art/Textrue/DanDuiChangJing/TaoKou/WuZi_WuZi2_BaseMap.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/TaoKou/WuZi_WuZi2_MaskMap.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/TaoKou/WuZi_WuZi2_Normal.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl1_Albedo.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl1_Masks.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl1_Normal.jpg.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl2_Albedo.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl2_Masks.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl2_Norm.jpg.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl3_Albedo.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl3_Mask.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl3_Normal.jpg.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl4_Albedo.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl4_Masks.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl4_Normal.jpg.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl5_Albedo.jpg.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl5_Masks.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/Textrue/DanDuiChangJing/dl5_Normal.jpg.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 75
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,18 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Prefabs/UI/Item/SunShiLieBiaoItem.prefab

@@ -411,6 +411,7 @@ GameObject:
   - component: {fileID: 7297671884697215014}
   - component: {fileID: 3027626984825288541}
   - component: {fileID: 1301405587438419805}
+  - component: {fileID: 6672126214636632366}
   m_Layer: 5
   m_Name: SunShiLieBiaoItem
   m_TagString: Untagged
@@ -481,3 +482,24 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6672126214636632366
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7962924587405963994}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d908c9aa64886e64190696daa06353b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  nameText: {fileID: 8526735427837098399}
+  mianjiText: {fileID: 951383912572261035}
+  gengdiText: {fileID: 2643716336672703847}
+  renKouText: {fileID: 4517754377431695874}
+  caichanText: {fileID: 6417096165789310103}
+  currentMianJi: 0
+  currentGenDi: 0
+  currentRenKou: 0
+  currentCaiChan: 0

Assets/Prefabs/UI/XHYZT/FHXS.prefab

@@ -6623,7 +6623,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 37.68 <color=#A5BFE2>m</color>
+  m_Text: "37.68 <color=#A5BFE2>\u5E73\u65B9\u516C\u91CC</color>"
 --- !u!1 &1481383066877289379
 GameObject:
   m_ObjectHideFlags: 0
@@ -16226,7 +16226,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 37.68 <color=#A5BFE2>m</color>
+  m_Text: "37.68 <color=#A5BFE2>\u4EBF\u5143</color>"
 --- !u!1 &3619094271651339291
 GameObject:
   m_ObjectHideFlags: 0
@@ -21854,7 +21854,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6DF9\u6CA1\u4EBA\u53E3"
+  m_Text: "\u5F71\u54CD\u4EBA\u53E3"
 --- !u!1 &4707934879941841985
 GameObject:
   m_ObjectHideFlags: 0
@@ -23053,7 +23053,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8569519553765437650}
-  - {fileID: 8303650255936531645}
   m_Father: {fileID: 4329683648081956734}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -29489,6 +29488,13 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   viewMode: 0
+  ymmjText: {fileID: 7347211014698479347}
+  ymgdText: {fileID: 4920935187480963235}
+  yxrkText: {fileID: 1081544584058206144}
+  ccssText: {fileID: 4927858422482049444}
+  shuiShiliebiaoParent: {fileID: 3902749860706787631}
+  shuiShiLieBiaoItems: []
+  shuiShiLieBiaoItem: {fileID: 6672126214636632366, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
   shuiWeiZhuangKuangData:
     yuJingZongShu: 12
     chaoJingJieShuiWei: 4
@@ -29496,6 +29502,7 @@ MonoBehaviour:
     chaoLiShiShuiWei: 3
     chaoXunXianShuiWei: 1
     zhengChangShuiWei: 32
+  mTools: {fileID: 0}
   hotPoints:
   - {fileID: 4228957073843360748}
   - {fileID: 5804461944582223033}
@@ -38633,7 +38640,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 37.68 <color=#A5BFE2>m</color>
+  m_Text: "37.68 <color=#A5BFE2>\u4EA9</color>"
 --- !u!1 &7600986018257309020
 GameObject:
   m_ObjectHideFlags: 0
@@ -46768,115 +46775,21 @@ PrefabInstance:
       value: WaterRangeCtrl
       objectReference: {fileID: 0}
     - target: {fileID: 8253048677781518242, guid: 5c1f49625394b2044a3305a17ec878e4, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5c1f49625394b2044a3305a17ec878e4, type: 3}
---- !u!224 &9102740461271434579 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8253048677660793634, guid: 5c1f49625394b2044a3305a17ec878e4, type: 3}
-  m_PrefabInstance: {fileID: 926569663512600177}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &1619875313248242843
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1134412424709094752}
-    m_Modifications:
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
+    - target: {fileID: 8253048677781518242, guid: 5c1f49625394b2044a3305a17ec878e4, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
+    - target: {fileID: 8253048677781518242, guid: 5c1f49625394b2044a3305a17ec878e4, type: 3}
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 360
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 24
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7962924587405963994, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-      propertyPath: m_Name
-      value: SunShiLieBiaoItem
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
---- !u!224 &8303650255936531645 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 5c1f49625394b2044a3305a17ec878e4, type: 3}
+--- !u!224 &9102740461271434579 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7297671884697215014, guid: ffb8704c66550b64daaa04d7649249d1, type: 3}
-  m_PrefabInstance: {fileID: 1619875313248242843}
+  m_CorrespondingSourceObject: {fileID: 8253048677660793634, guid: 5c1f49625394b2044a3305a17ec878e4, type: 3}
+  m_PrefabInstance: {fileID: 926569663512600177}
   m_PrefabAsset: {fileID: 0}

Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -35730,6 +35730,7 @@ MonoBehaviour:
   taskPointIconContent: {fileID: 7813683317312756564}
   taskPointIcons: []
   taskPointLineRenderer: {fileID: 2184664091310860110}
+  closePanelBtn: {fileID: 2637482160221612901}
 --- !u!1 &6125915536224638305
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/UI/Data/GlobalData.cs

@@ -78,6 +78,11 @@ public class GlobalData
     /// </summary>
     public static List<StationData> swDatas = new List<StationData>();
 
+    /// <summary>
+    /// 一张图第七页防洪形势数据
+    /// </summary>
+    public static List<AreaFHXSData> areaFHXSDatas = new List<AreaFHXSData>();
+
 
     #region 一张图第八页数据
     public static B08_dataStatis B08DataStatis;

Assets/Scripts/UI/UIView/FHSS/FHSSLayer.cs

@@ -4,6 +4,20 @@ using System.Collections.Generic;
 using DG.Tweening;
 using UnityEngine;
 using UnityEngine.UI;
+using System.IO;
+using Newtonsoft.Json; 
+
+public class AreaFHXSData
+{
+
+    public string areaName;
+    public float totalPopulation;
+    public float totalSize;
+    public float totalFarmSize;
+    public float totalPrize;
+    public float startEva;
+    public float endEva;
+}
 
 public class FHSSLayer : YZTRootLayer
 {
@@ -13,12 +27,58 @@ public class FHSSLayer : YZTRootLayer
     private Text chaoLiShiShuiWeiText;
     private Text chaoXunXianShuiWeiText;
     private Text zhengChangShuiWeiText;
-    
+
+    public Text ymmjText;
+    public Text ymgdText;
+    public Text yxrkText;
+    public Text ccssText;
+
+    public VerticalLayoutGroup shuiShiliebiaoParent;
+
+    public List<ShuiShiLieBiaoItem> shuiShiLieBiaoItems = new List<ShuiShiLieBiaoItem>();
+    public ShuiShiLieBiaoItem shuiShiLieBiaoItem;
+
+
     [Header("水位状况")]
     public ShuiWeiZhuangKuangData shuiWeiZhuangKuangData;
 
 
+    public WaterRangeCtrlTool mTools;
     public RectTransform[] hotPoints;
+
+    public void InitData() {
+
+        if (File.Exists(Application.streamingAssetsPath + "/areaBaseData.json")) {
+            string areaBaseDataContent = File.ReadAllText(Application.streamingAssetsPath + "/areaBaseData.json");
+            GlobalData.areaFHXSDatas = JsonConvert.DeserializeObject<List<AreaFHXSData>>(areaBaseDataContent);
+            for (int i = 0; i < GlobalData.areaFHXSDatas.Count; i++) {
+                ShuiShiLieBiaoItem tempItem = Instantiate(shuiShiLieBiaoItem);
+                shuiShiLieBiaoItems.Add(tempItem);
+                tempItem.transform.SetParent(shuiShiliebiaoParent.transform);
+                tempItem.transform.localScale = Vector3.one;
+                tempItem.SetData(GlobalData.areaFHXSDatas[i]);
+                tempItem.Evaluate(1);
+            }
+        }
+        mTools.onCtrlChange = (float value) =>
+        {
+            float ymmj = 0;
+            float ymgd = 0;
+            float yxrk = 0;
+            float ccss = 0;
+            for (int i = 0; i < shuiShiLieBiaoItems.Count; i++) {
+                shuiShiLieBiaoItems[i].Evaluate(value);
+                ymmj += shuiShiLieBiaoItems[i].currentMianJi;
+                ymgd += shuiShiLieBiaoItems[i].currentGenDi;
+                yxrk += shuiShiLieBiaoItems[i].currentRenKou;
+                ccss += shuiShiLieBiaoItems[i].currentCaiChan;
+            }
+            ymmjText.text = ymmj.ToString("0.00") + "<color=#A5BFE2>平方公里</color>";
+            ymgdText.text = ymgd.ToString("0.0") + "<color=#A5BFE2>亩</color>";
+            yxrkText.text = yxrk.ToString("0") + "<color=#A5BFE2>个</color>";
+            ccssText.text = ccss.ToString("0.00") + "<color=#A5BFE2>亿元</color>";
+        };
+    }
     
     private void Awake()
     {
@@ -38,6 +98,7 @@ public class FHSSLayer : YZTRootLayer
             chaoXunXianShuiWeiText.text = $"{shuiWeiZhuangKuangData.chaoXunXianShuiWei}个";
             zhengChangShuiWeiText.text = $"{shuiWeiZhuangKuangData.zhengChangShuiWei}个";
         }
+        InitData();
     }
 
     private void OnEnable()

Assets/Scripts/UI/UIView/FHSS/ShuiShiLieBiaoItem.cs

@@ -0,0 +1,50 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+public class ShuiShiLieBiaoItem : MonoBehaviour
+{
+
+    public Text nameText;
+    public Text mianjiText;
+    public Text gengdiText;
+    public Text renKouText;
+    public Text caichanText;
+
+    public AreaFHXSData data;
+
+    public float currentMianJi;
+    public float currentGenDi;
+    public float currentRenKou;
+    public float currentCaiChan;
+
+    public void SetData(AreaFHXSData da) {
+        data = da;
+        nameText.text = da.areaName;
+    }
+
+    public void Evaluate(float value) {
+        if (value > data.startEva)
+        {
+            this.gameObject.SetActive(false);
+        }
+        else {
+            this.gameObject.SetActive(true);
+            currentMianJi = (data.totalSize * Mathf.Clamp((data.startEva - value) / (data.startEva - data.endEva),0, 1));
+            mianjiText.text = currentMianJi.ToString("0.0") + "ƽ·½¹«Àï";
+            currentGenDi = (data.totalFarmSize * Mathf.Clamp((data.startEva - value) / (data.startEva - data.endEva),0, 1));
+            gengdiText.text = currentGenDi.ToString("0.0") + "Ķ";
+            currentRenKou = (data.totalPopulation * Mathf.Clamp((data.startEva - value) / (data.startEva - data.endEva),0, 1));
+            renKouText.text = currentRenKou.ToString("0") + "¸ö";
+            currentCaiChan = (data.totalPrize * Mathf.Clamp((data.startEva - value) / (data.startEva - data.endEva),0, 1));
+            caichanText.text = currentCaiChan.ToString("0.0") + "ÒÚÔª";
+
+        }
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/UI/UIView/FHSS/ShuiShiLieBiaoItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d908c9aa64886e64190696daa06353b0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/areaBaseData.json

@@ -0,0 +1,171 @@
+[
+    {
+        "areaName":"螺山镇",
+        "totalPopulation":39830,
+        "totalSize":140.83,
+        "totalFarmSize":62323,
+        "totalPrize":80.07,
+        "startEva":0.99,
+        "endEva":0.88
+        
+    },
+    {
+        "areaName":"乌林镇",
+        "totalPopulation":48182,
+        "totalSize":121.84,
+        "totalFarmSize":52347,
+        "totalPrize":82.28,
+        "startEva":0.99,
+        "endEva":0.88
+        
+    },
+    {
+        "areaName":"龙口镇",
+        "totalPopulation":51356,
+        "totalSize":123.86,
+        "totalFarmSize":61631,
+        "totalPrize":85.72,
+        "startEva":0.99,
+        "endEva":0.88
+    },
+    {
+        "areaName":"燕窝镇",
+        "totalPopulation":40975,
+        "totalSize":153.89,
+        "totalFarmSize":109379,
+        "totalPrize":86.36,
+        "startEva":0.088,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"新滩镇",
+        "totalPopulation":39915,
+        "totalSize":163.41,
+        "totalFarmSize":72356,
+        "totalPrize":88.37,
+        "startEva":0.105,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"黄家口镇",
+        "totalPopulation":37856,
+        "totalSize":121.96,
+        "totalFarmSize":54181,
+        "totalPrize":73.17,
+        "startEva":0.019,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"汊河镇",
+        "totalPopulation":55298,
+        "totalSize":160.28,
+        "totalFarmSize":98837,
+        "totalPrize":101.08,
+        "startEva":0.02,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"沙口镇",
+        "totalPopulation":55199,
+        "totalSize":123.24,
+        "totalFarmSize":52638,
+        "totalPrize":88.88,
+        "startEva":0.02,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"瞿家湾镇",
+        "totalPopulation":19379,
+        "totalSize":38.63,
+        "totalFarmSize":23289,
+        "totalPrize":29.74,
+        "startEva":0.02,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"万全镇",
+        "totalPopulation":2210,
+        "totalSize":164.53,
+        "totalFarmSize":5571.66,
+        "totalPrize":55.57,
+        "startEva":0.02,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"老湾乡",
+        "totalPopulation":17317,
+        "totalSize":61.31,
+        "totalFarmSize":19685,
+        "totalPrize":35.32,
+        "startEva":0.82,
+        "endEva":0.16
+        
+    },
+    {
+        "areaName":"新堤街道",
+        "totalPopulation":128625,
+        "totalSize":47.8,
+        "totalFarmSize":5159,
+        "totalPrize":129.09,
+        "startEva":0.02,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"滨湖街道",
+        "totalPopulation":37922,
+        "totalSize":76.8,
+        "totalFarmSize":5161,
+        "totalPrize":58.51,
+        "startEva":0.02,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"经济开发区",
+        "totalPopulation":16294,
+        "totalSize":9.04,
+        "totalFarmSize":0,
+        "totalPrize":17.31,
+        "startEva":0.02,
+        "endEva":0
+        
+    },
+    {
+        "areaName":"大同湖管理区",
+        "totalPopulation":37272,
+        "totalSize":142.25,
+        "totalFarmSize":17757,
+        "totalPrize":79.27,
+        "startEva":0.25,
+        "endEva":0.06
+        
+    },
+    {
+        "areaName":"大沙湖管理区",
+        "totalPopulation":36255,
+        "totalSize":176,
+        "totalFarmSize":33090,
+        "totalPrize":89.28,
+        "startEva":0.50,
+        "endEva":0.11
+        
+    },
+    {
+        "areaName":"小港管理区",
+        "totalPopulation":13653,
+        "totalSize":24.219,
+        "totalFarmSize":3289,
+        "totalPrize":19.99,
+        "startEva":0.030,
+        "endEva":0
+        
+    }
+]

Assets/WaterRangeCtrlTool.cs

@@ -15,6 +15,7 @@ public class WaterRangeCtrlTool : MonoBehaviour
     public AnimationCurve waterCurve_65000;
     public AnimationCurve waterCurve_70000;
 
+    public Action<float> onCtrlChange;
     public int waterCurveIndex
     {
         private set;
@@ -72,6 +73,7 @@ public class WaterRangeCtrlTool : MonoBehaviour
         }
         //Debug.Log(rangeValue);
         waterRangeMat.SetFloat("_ClipLength",rangeValue);
+        onCtrlChange?.Invoke(rangeValue);
     }
 
     public void ChangeWaterCurve(int index)