提交大作战修改

Assets/Art/UI/YZT/B01/work/aqq.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/UI/YZT/B01/work/by.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 100
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 100
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/UI/YZT/B01/work/dsh.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/UI/YZT/B01/work/gtk.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 100
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 100
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/UI/YZT/B01/work/njh.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 80
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/UI/YZT/B01/work/ntg.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 100
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0

Assets/Art/UI/YZT/B01/work/tk.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 100
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 100
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/UI/YZT/B01/work/work.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 100
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 100
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/UI/YZT/B01/work/xtk.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 80
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Art/UI/YZT/B01/work/yk.jpg.meta

@@ -67,11 +67,11 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 100
+    compressionQuality: 90
     crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 100
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Prefabs/UI/Item/obsIcon.prefab

@@ -178,6 +178,7 @@ GameObject:
   - component: {fileID: 3405379800184817410}
   - component: {fileID: 9076946353492734133}
   - component: {fileID: 1123870414268019485}
+  - component: {fileID: 1548078307019092676}
   m_Layer: 5
   m_Name: Tint
   m_TagString: Untagged
@@ -284,6 +285,27 @@ MonoBehaviour:
   m_ChildScaleWidth: 1
   m_ChildScaleHeight: 1
   m_ReverseArrangement: 0
+--- !u!223 &1548078307019092676
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 1
+  m_TargetDisplay: 0
 --- !u!1 &6060978376918982434
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/RuntimePoint.prefab

@@ -598,8 +598,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 60.3897, y: 0.000061507}
-  m_SizeDelta: {x: 79.2207, y: 26.6}
+  m_AnchoredPosition: {x: 79.725, y: 0.000061507}
+  m_SizeDelta: {x: 117.89, y: 26.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7260287978442146811
 CanvasRenderer:
@@ -633,9 +633,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
     m_FontSize: 15
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 16
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1

Assets/Prefabs/UI/SWHeightUnit.prefab

@@ -536,7 +536,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E0A\u95F8"
+  m_Text: "\u95F8\u4E0A"
 --- !u!1 &7661421400308574244
 GameObject:
   m_ObjectHideFlags: 0
@@ -616,7 +616,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E0B\u95F8"
+  m_Text: "\u95F8\u4E0B"
 --- !u!1 &8089338825089076131
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/Thing0.prefab

@@ -36,7 +36,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: 6.2, y: -0.000043273}
+  m_AnchoredPosition: {x: 18.3, y: -0.000043273}
   m_SizeDelta: {x: 0, y: 32.631}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3125190103186430771
@@ -113,7 +113,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3125190103243628213
 RectTransform:
   m_ObjectHideFlags: 0
@@ -132,7 +132,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 92.7, y: 0.00004828}
-  m_SizeDelta: {x: 0, y: 32.631}
+  m_SizeDelta: {x: 28, y: 32.631}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3125190103243628218
 CanvasRenderer:
@@ -500,7 +500,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: 147.5, y: -0.000043273}
+  m_AnchoredPosition: {x: 134.23, y: -0.000043273}
   m_SizeDelta: {x: 0, y: 32.631}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3125190104102707606

Assets/Prefabs/UI/Thing3.prefab

@@ -116,7 +116,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 96.78, y: 21}
+  m_SizeDelta: {x: 85.8053, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4637747037617293179
 CanvasRenderer:
@@ -298,12 +298,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 19
+    m_Left: 15
     m_Right: 0
     m_Top: 4
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 7.3
+  m_Spacing: 18.18
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -410,7 +410,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4637747038139636178
 RectTransform:
   m_ObjectHideFlags: 0
@@ -426,9 +426,9 @@ RectTransform:
   m_Father: {fileID: 4637747037787186530}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 334.5877, y: -14.42375}
   m_SizeDelta: {x: 43.2188, y: 20.8475}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4637747038139636176
@@ -509,7 +509,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 88.5206, y: 23.5405}
+  m_SizeDelta: {x: 106.7, y: 23.5405}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6593640882800683398
 CanvasRenderer:

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -1122,7 +1122,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 302.3039, y: -166.4}
+  m_AnchoredPosition: {x: 323.8, y: -128.8}
   m_SizeDelta: {x: 86.4319, y: 86.434}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8985284013205833646
@@ -8219,7 +8219,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 242.70605, y: -87.60193}
+  m_AnchoredPosition: {x: 34.8, y: -131}
   m_SizeDelta: {x: 88.8438, y: 87.236}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2644698483499104706
@@ -10202,7 +10202,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1639
+  m_Text: '-'
 --- !u!1 &1884665795172454146
 GameObject:
   m_ObjectHideFlags: 0
@@ -11910,7 +11910,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 32
+  m_Text: 13
 --- !u!1 &2295319418156349889
 GameObject:
   m_ObjectHideFlags: 0
@@ -19199,7 +19199,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8790349253201509195
 RectTransform:
   m_ObjectHideFlags: 0
@@ -27053,7 +27053,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5F53\u65E5\u6700\u9AD8\u6C34\u4F4D/mm"
+  m_Text: "\u5F53\u65E5\u6700\u9AD8\u6C34\u4F4D/m"
 --- !u!1 &5612253937446614128
 GameObject:
   m_ObjectHideFlags: 0
@@ -29348,7 +29348,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6405440006157944174
 RectTransform:
   m_ObjectHideFlags: 0
@@ -29699,6 +29699,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   viewMode: 0
+  bjjkBtn: {fileID: 4881004128139257058}
+  bjxxBtn: {fileID: 8481721607646558076}
+  bjScrollView: {fileID: 1318187474266871639}
   BengZhanJianKongItemOri: {fileID: 7307049750120180821, guid: b850a596273faef4791545930fc5baea, type: 3}
   BengZhanJianKongDatas:
   - name: "\u4E00\u53F7\u6CF5\u7AD9"
@@ -34806,7 +34809,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '96
+  m_Text: '198
 
 '
 --- !u!1 &7114187177631874018
@@ -35923,6 +35926,7 @@ GameObject:
   - component: {fileID: 818448502405759074}
   - component: {fileID: 6667186421326135643}
   - component: {fileID: 20857908867191251}
+  - component: {fileID: 4881004128139257058}
   m_Layer: 0
   m_Name: BengZhanLieBiao
   m_TagString: Untagged
@@ -36064,6 +36068,50 @@ MonoBehaviour:
     - {r: 0, g: 0, b: 0, a: 0}
     - {r: 0, g: 0, b: 0, a: 0}
     m_Rotation: 90
+--- !u!114 &4881004128139257058
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7306157283770226637}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 20857908867191251}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7322888095085854172
 GameObject:
   m_ObjectHideFlags: 0
@@ -37258,7 +37306,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 180.696, y: -166.4}
+  m_AnchoredPosition: {x: 180.696, y: -130.33}
   m_SizeDelta: {x: 88.8437, y: 86.432}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6551978832003639811
@@ -43501,6 +43549,7 @@ GameObject:
   - component: {fileID: 7977724680968329736}
   - component: {fileID: 6378822003481052141}
   - component: {fileID: 617292035895373654}
+  - component: {fileID: 8481721607646558076}
   m_Layer: 0
   m_Name: BaoJingXinXi
   m_TagString: Untagged
@@ -43642,6 +43691,50 @@ MonoBehaviour:
     - {r: 0, g: 0, b: 0, a: 0}
     - {r: 0, g: 0, b: 0, a: 0}
     m_Rotation: 90
+--- !u!114 &8481721607646558076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8935124959407963110}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 617292035895373654}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8958646188559040005
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/HttpHelper.cs

@@ -736,7 +736,7 @@ public class HttpHelper : MonoBehaviour
     {
         string result = "";
         string cmdUrl = ServerAddress.API_PlayStart;
-        cmdUrl += $"/{deviceId}/{channelId}";
+        cmdUrl += $"/{deviceId}/{channelId}?token=12345678";
         Debug.Log($"send:{cmdUrl}");
         UnityWebRequest requestData = UnityWebRequest.Get(cmdUrl);
         await requestData.SendWebRequest();

Assets/Scripts/UI/Item/DeviceIconCtrl.cs

@@ -107,8 +107,11 @@ public class DeviceIconCtrl : MonoBehaviour
     // 在物体销毁前调用这个方法来解除绑定
     private void OnDestroy()
     {
-        _camera.GetComponent<CameraBird>().OnCameraBeginChange -= CameraBeginChange;
-        _camera.GetComponent<CameraBird>().OnCameraEndChange -= CameraEndChange;
+        if (_camera)
+        {
+            _camera.GetComponent<CameraBird>().OnCameraBeginChange -= CameraBeginChange;
+            _camera.GetComponent<CameraBird>().OnCameraEndChange -= CameraEndChange;
+        }
     }
 
     void Update()

Assets/Scripts/UI/Item/ObsIconCtrl.cs

@@ -82,8 +82,11 @@ public class ObsIconCtrl : MonoBehaviour,IPointerEnterHandler,IPointerExitHandle
     // 在物体销毁前调用这个方法来解除绑定
     private void OnDestroy()
     {
-        _camera.GetComponent<CameraBird>().OnCameraBeginChange -= CameraBeginChange;
-        _camera.GetComponent<CameraBird>().OnCameraEndChange -= CameraEndChange;
+        if (_camera)
+        {
+            _camera.GetComponent<CameraBird>().OnCameraBeginChange -= CameraBeginChange;
+            _camera.GetComponent<CameraBird>().OnCameraEndChange -= CameraEndChange;
+        }
     }
 
 

Assets/Scripts/UI/Item/ShuiWeiCtrl.cs

@@ -22,7 +22,7 @@ public class ShuiWeiCtrl : MonoBehaviour
         nameText = this.transform.Find("nameText").GetComponent<Text>();
     }
 
-    public void SetData(string name,float? swValue,Transform target)
+    public void SetData(string name,string swValue,Transform target)
     {
         nameText.text = name;
         string swStr = swValue.ToString();

Assets/Scripts/UI/UIView/3D/ZMJKLayer.cs

@@ -153,8 +153,8 @@ public class ZMJKLayer : MonoBehaviour
 
         if (type == 0)
         {
-            float? swUp = null;
-            float? swDown = null;
+            string swUp = null;
+            string swDown = null;
             string swUpName = "";
             string swDownName = "";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
@@ -176,8 +176,8 @@ public class ZMJKLayer : MonoBehaviour
         }
         else
         {
-            float? swUp = null;
-            float? swDown=null;
+            string swUp = null;
+            string swDown =null;
             string swUpName="";
             string swDownName="";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)

Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -490,10 +490,10 @@ public class BigScreenLayer : MonoBehaviour
             swKey = "大沙";
         }
 
-        float swH = -1.0f;
+        string swH = "-";
         for (int i = 0; i < GlobalData.swDatas.Count; i++) {
             if (GlobalData.swDatas[i].stnm == swkey) {
-                swH = GlobalData.swDatas[i].upz ?? 0;
+                swH = GlobalData.swDatas[i].upz;
                 break;
             }
         }

Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -146,6 +146,9 @@ public class GCJKLayer : YZTRootLayer
 {
     public static GCJKLayer _Instance;
 
+    public Button bjjkBtn;
+    public Button bjxxBtn;
+    public GameObject bjScrollView;
 
     //泵站监控面板
     private RectTransform _bengZhanJianKongPanel;
@@ -362,6 +365,20 @@ public class GCJKLayer : YZTRootLayer
             }
         }
 
+        bjjkBtn.onClick.AddListener(() =>
+        {
+            bjScrollView.gameObject.SetActive(true);
+            bjjkBtn.GetComponentInChildren<Text>().color = Color.white;
+            bjxxBtn.GetComponentInChildren<Text>().color = Color.gray;
+        });
+
+        bjxxBtn.onClick.AddListener(() =>
+        {
+            bjScrollView.gameObject.SetActive(false);
+            bjjkBtn.GetComponentInChildren<Text>().color = Color.gray;
+            bjxxBtn.GetComponentInChildren<Text>().color = Color.white;
+        });
+
         //闸站
         _zhaZhanJianKongPanel = this.transform.Find("ZhaZhanJianKong").GetComponent<RectTransform>();
         _zhaZhanJianKongContent =
@@ -399,11 +416,11 @@ public class GCJKLayer : YZTRootLayer
             .GetComponent<Text>();
         if (currentGongChengJianCeData != null)
         {
-            _pingJunLiuLiangText.text = $"{currentGongChengJianCeData.pinJunLiuLiang}";
-            _zuiGaoShuiWeiText.text = $"{currentGongChengJianCeData.zuiGaoShuiWei}";
-            _zuiDaLiuLiangText.text = $"{currentGongChengJianCeData.zuiDaLiuLiang}";
-            _gongChengGaoJingText.text = $"{currentGongChengJianCeData.gongChengJingGao}";
-            _zhengChangYunXingText.text = $"{currentGongChengJianCeData.zhengChangYunXing}";
+            //_pingJunLiuLiangText.text = $"{currentGongChengJianCeData.pinJunLiuLiang}";
+            //_zuiGaoShuiWeiText.text = $"{currentGongChengJianCeData.zuiGaoShuiWei}";
+            //_zuiDaLiuLiangText.text = $"{currentGongChengJianCeData.zuiDaLiuLiang}";
+            //_gongChengGaoJingText.text = $"{currentGongChengJianCeData.gongChengJingGao}";
+            //_zhengChangYunXingText.text = $"{currentGongChengJianCeData.zhengChangYunXing}";
         }
 
         //工程列表
@@ -633,8 +650,8 @@ public class GCJKLayer : YZTRootLayer
 
         if (currentDataType == 0)
         {
-            float? swUp = null;
-            float? swDown=null;
+            string swUp = null;
+            string swDown =null;
             string swUpName="";
             string swDownName="";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
@@ -685,8 +702,8 @@ public class GCJKLayer : YZTRootLayer
         }
         else
         {
-            float? swUp = null;
-            float? swDown=null;
+            string swUp = null;
+            string swDown =null;
             string swUpName="";
             string swDownName="";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
@@ -1650,8 +1667,8 @@ public class GCJKLayer : YZTRootLayer
         
         if (currentDataType == 0)
         {
-            float? swUp = null;
-            float? swDown = null;
+            string swUp = null;
+            string swDown = null;
             string swUpName = "";
             string swDownName = "";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
@@ -1673,8 +1690,8 @@ public class GCJKLayer : YZTRootLayer
         }
         else
         {
-            float? swUp = null;
-            float? swDown=null;
+            string swUp = null;
+            string swDown =null;
             string swUpName="";
             string swDownName="";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)

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

@@ -27,9 +27,9 @@ public class StationData : IComparable
     public string lttd; // 纬度
     public string stcd; // 站码
 
-    public float? upz; // 上水位
-    public float? dwz; // 下水位
-    public float? tgtq; // 流量
+    public string upz; // 上水位
+    public string dwz; // 下水位
+    public string tgtq; // 流量
     public string tm; // 时间
 
     public string swchrcd;
@@ -239,46 +239,73 @@ public class SWYJLayer : YZTRootLayer
             title.text = "监测数据" + "(补元)";
             int index1 = YZTLayer.FindIndexByHotPointName("套口(上)");
             int index2 = YZTLayer.FindIndexByHotPointName("套口(下)");
-            float value1 = GlobalData.swDatas[index1].upz ?? 0;
-            float value2 = GlobalData.swDatas[index1].dwz ?? 0;
-            if (value1 > 1000)
+
+            string value1 = GlobalData.swDatas[index1].upz;
+            string value2 = GlobalData.swDatas[index1].dwz;
+
+            float num1 = (value1 == "-") ? float.MinValue : float.Parse(value1);
+            float num2 = (value2 == "-") ? float.MinValue : float.Parse(value2);
+
+            float avgValue = 0f;
+
+            if (num1 == float.MinValue && num2 == float.MinValue)
             {
-                value1 = value1 / 100.0f;
+                _pingJunShuiWeiText.text = "-";
             }
-
-            if (value2 > 1000)
+            else if (num1 == float.MinValue)
+            {
+                _pingJunShuiWeiText.text = $"{num2.ToString("0.00")} <color=#A5BBE2>m</color>";
+            }
+            else if (num2 == float.MinValue)
+            {
+                _pingJunShuiWeiText.text = $"{num1.ToString("0.00")} <color=#A5BBE2>m</color>";
+            }
+            else
             {
-                value2 = value2 / 100.0f;
+                avgValue = (num1 + num2) / 2;
+                _pingJunShuiWeiText.text = $"{avgValue.ToString("0.00")} <color=#A5BBE2>m</color>";
             }
 
-            _pingJunShuiWeiText.text = $"{((value1 + value2) / 2).ToString("0.00")} <color=#A5BBE2>m</color>";
             _sheFangShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[0].floodProtectionLevel} m";
             _jingJieShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[0].warningLevel} m";
             _baoZhengShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[0].guaranteeLevel} m";
-            _shuiWeiText.text = $"{value1.ToString("0.00")}";
+            _shuiWeiText.text = $"{value1}";
         }
         else
         {
             title.text = "监测数据" + "(套口)";
             int index1 = YZTLayer.FindIndexByHotPointName("套口(上)");
             int index2 = YZTLayer.FindIndexByHotPointName("套口(下)");
-            float value1 = GlobalData.swDatas[index1].upz ?? 0;
-            float value2 = GlobalData.swDatas[index1].dwz ?? 0;
-            if (value1 > 1000)
+
+            string value1 = GlobalData.swDatas[index1].upz;
+            string value2 = GlobalData.swDatas[index1].dwz;
+
+            float num1 = (value1 == "-") ? float.MinValue : float.Parse(value1);
+            float num2 = (value2 == "-") ? float.MinValue : float.Parse(value2);
+
+            float avgValue = 0f;
+
+            if (num1 == float.MinValue && num2 == float.MinValue)
             {
-                value1 = value1 / 100.0f;
+                _pingJunShuiWeiText.text = "-";
             }
-
-            if (value2 > 1000)
+            else if (num1 == float.MinValue)
             {
-                value2 = value2 / 100.0f;
+                _pingJunShuiWeiText.text = $"{num2.ToString("0.00")} <color=#A5BBE2>m</color>";
+            }
+            else if (num2 == float.MinValue)
+            {
+                _pingJunShuiWeiText.text = $"{num1.ToString("0.00")} <color=#A5BBE2>m</color>";
+            }
+            else
+            {
+                avgValue = (num1 + num2) / 2;
+                _pingJunShuiWeiText.text = $"{avgValue.ToString("0.00")} <color=#A5BBE2>m</color>";
             }
-
-            _pingJunShuiWeiText.text = $"{((value1 + value2) / 2).ToString("0.00")} <color=#A5BBE2>m</color>";
             _sheFangShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].floodProtectionLevel} m";
             _jingJieShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].warningLevel} m";
             _baoZhengShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].guaranteeLevel} m";
-            _shuiWeiText.text = $"{value1.ToString("0.00")}";
+            _shuiWeiText.text = $"{value1}";
         }
     }
 
@@ -288,8 +315,8 @@ public class SWYJLayer : YZTRootLayer
     {
         if (currentDataType == 0)
         {
-            float? swUp = null;
-            float? swDown = null;
+            string swUp = null;
+            string swDown = null;
             string swUpName = "";
             string swDownName = "";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
@@ -323,8 +350,8 @@ public class SWYJLayer : YZTRootLayer
         }
         else
         {
-            float? swUp = null;
-            float? swDown = null;
+            string swUp = null;
+            string swDown = null;
             string swUpName = "";
             string swDownName = "";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
@@ -425,8 +452,8 @@ public class SWYJLayer : YZTRootLayer
         public string lgtd;      // 经度
         public string lttd;      // 纬度
 
-        public float? upz;       // 上水位
-        public float? dwz;       // 下水位
+        public string upz;       // 上水位
+        public string dwz;       // 下水位
         public float? tgtq;      // 流量
     }
 
@@ -490,9 +517,9 @@ public class SWYJLayer : YZTRootLayer
                 GameObject gameObject = Instantiate(sWHeightUnitPrefab);
                 SWHeightUnit swHUnit = gameObject.GetComponent<SWHeightUnit>();
                 swHUnit.transform.SetParent(miniMapSWContent.transform);
-                float upz = stationDataLib[key].upz ?? 0;
-                float dwz = stationDataLib[key].dwz ?? 0;
-                swHUnit.Init(stationDataLib[key].lgtd, stationDataLib[key].lttd, stationDataLib[key].stnm, upz.ToString("0.00"), dwz.ToString("0.00"));
+                string upz = stationDataLib[key].upz;
+                string dwz = stationDataLib[key].dwz;
+                swHUnit.Init(stationDataLib[key].lgtd, stationDataLib[key].lttd, stationDataLib[key].stnm, upz, dwz);
                 sWHeightUnits.Add(swHUnit);
 
                 swHUnit.bingObj = Instantiate(runtimePointObj).gameObject;
@@ -511,9 +538,9 @@ public class SWYJLayer : YZTRootLayer
             int i = 0;
             foreach (var key in stationDataLib.Keys)
             {
-                float upz = stationDataLib[key].upz ?? 0;
-                float dwz = stationDataLib[key].dwz ?? 0;
-                sWHeightUnits[i].Init(stationDataLib[key].lgtd, stationDataLib[key].lttd, stationDataLib[key].stnm, upz.ToString("0.00"), dwz.ToString("0.00"));
+                string upz = stationDataLib[key].upz;
+                string dwz = stationDataLib[key].dwz;
+                sWHeightUnits[i].Init(stationDataLib[key].lgtd, stationDataLib[key].lttd, stationDataLib[key].stnm, upz, dwz);
                 i += 0;
             }
         }
@@ -569,6 +596,7 @@ public class SWYJLayer : YZTRootLayer
         endDateStr = today.ToString("yyyy-MM-dd");
         
         var chartJsonStr = await HttpHelper._Instance.GetWaterTrend_Chart(_stcd, startDateStr, endDateStr);
+        //Debug.Log(chartJsonStr);
         WaterTrendData_Chart tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<WaterTrendData_Chart>(chartJsonStr);
         
         if (tempData != null)
@@ -582,7 +610,7 @@ public class SWYJLayer : YZTRootLayer
             }
 
             var tempSeries = shuiWeiBianHua.series;
-            tempSeries[0].serieName = "水位(m)";
+            tempSeries[1].serieName = "水位(m)";
             SerieData[] tempDatas = new SerieData[tempData.data.Count];
             for (int i = 0; i < tempDatas.Length; i++)
             {
@@ -600,8 +628,8 @@ public class SWYJLayer : YZTRootLayer
                 tempDatas[i].data.Add(tempValue);
             }
 
-            tempSeries[0].data.Clear();
-            tempSeries[0].data.AddRange(tempDatas);
+            tempSeries[1].data.Clear();
+            tempSeries[1].data.AddRange(tempDatas);
         }
     }
 
@@ -629,7 +657,24 @@ public class SWYJLayer : YZTRootLayer
                 obj.transform.SetParent(zdpmParent.transform);
                 obj.transform.localScale = Vector3.one;
                 obj.transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].stnm;
-                float max = MathF.Max(stationDatas[i].upz ?? 0, stationDatas[i].dwz ?? 0);
+
+                string max = "";
+
+                string valueUpz = stationDatas[i].upz;
+                string valueDwz = stationDatas[i].dwz;
+
+                if (valueUpz == "-" && valueDwz == "-")
+                {
+                    max = "-";
+                }
+                else
+                {
+                    float parsedUpz = (valueUpz == "-") ? float.MinValue : float.Parse(valueUpz);
+                    float parsedDwz = (valueDwz == "-") ? float.MinValue : float.Parse(valueDwz);
+
+                    max = MathF.Max(parsedUpz, parsedDwz).ToString("0.00");
+                }
+
                 //if (i == 0)
                 //    obj.transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "1";
                 //else if (i == 1)
@@ -645,13 +690,23 @@ public class SWYJLayer : YZTRootLayer
             {
                 string name = stationDatas[i].stnm;
                 zdpmObjs[i].transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].stnm;
-                float max = MathF.Max(stationDatas[i].upz ?? 0, stationDatas[i].dwz ?? 0);
-                if (i == 0)
-                    zdpmObjs[i].transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "1";
-                else if (i == 1)
-                    zdpmObjs[i].transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "2";
+                string max = "";
+
+                string valueUpz = stationDatas[i].upz;
+                string valueDwz = stationDatas[i].dwz;
+
+                if (valueUpz == "-" && valueDwz == "-")
+                {
+                    max = "-";
+                }
                 else
-                    zdpmObjs[i].transform.GetChild(0).GetChild(0).GetComponent<Text>().text = i + "";
+                {
+                    float parsedUpz = (valueUpz == "-") ? float.MinValue : float.Parse(valueUpz);
+                    float parsedDwz = (valueDwz == "-") ? float.MinValue : float.Parse(valueDwz);
+
+                    max = MathF.Max(parsedUpz, parsedDwz).ToString("0.00");
+                }
+                zdpmObjs[i].transform.GetChild(0).GetChild(0).GetComponent<Text>().text = i + 1 + "";
                 zdpmObjs[i].transform.GetChild(1).GetChild(0).GetComponent<Text>().text =
                     $"{max} <size=14><color=#A5BBE2>m</color></size>";
             }

Assets/Scripts/UI/UIView/YZT/OnePicNav.cs

@@ -129,13 +129,13 @@ public class OnePicNav : MonoBehaviour
         else
             znz.transform.rotation = Quaternion.identity;
 
-        for (int i = 0; i < runtimePointStatic.Length; i++)
-        {
-            bool cameraEnable = CameraManager.instance.secondCamera.enabled;
-            runtimePointStatic[i].gameObject.SetActive(cameraEnable);
-            if (cameraEnable)
-                runtimePointStatic[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(runtimePointStaticBind[i].transform.position) * 1920.0f / Screen.width;
-        }
+        //for (int i = 0; i < runtimePointStatic.Length; i++)
+        //{
+        //    bool cameraEnable = CameraManager.instance.secondCamera.enabled;
+        //    runtimePointStatic[i].gameObject.SetActive(cameraEnable);
+        //    if (cameraEnable)
+        //        runtimePointStatic[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(runtimePointStaticBind[i].transform.position) * 1920.0f / Screen.width;
+        //}
        
         
     }

Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -115,7 +115,7 @@ public class SWStationRecordData
 {
     public string name;
     public string time;
-    public float value;
+    public string value;
     public int dir;
     public string stcd = "0";
 }
@@ -252,14 +252,14 @@ public class YZTLayer : YZTRootLayer
 
     async void InitGCGKData()
     {
-        await new WaitUntil(() =>
-        {
-            return GlobalData.gcgkContents.Count > 2;
-        });
-        normalCount.text = GlobalData.gcgkContents[0].count.ToString() + "个";
-        badCount.text = GlobalData.gcgkContents[1].count.ToString() + "个";
-        stopCount.text = GlobalData.gcgkContents[2].count.ToString() + "个";
-        allCount.text = (GlobalData.gcgkContents[0].count + GlobalData.gcgkContents[1].count + GlobalData.gcgkContents[2].count).ToString() + "个";
+        //await new WaitUntil(() =>
+        //{
+        //    return GlobalData.gcgkContents.Count > 2;
+        //});
+        //normalCount.text = GlobalData.gcgkContents[0].count.ToString() + "个";
+        //badCount.text = GlobalData.gcgkContents[1].count.ToString() + "个";
+        //stopCount.text = GlobalData.gcgkContents[2].count.ToString() + "个";
+        //allCount.text = (GlobalData.gcgkContents[0].count + GlobalData.gcgkContents[1].count + GlobalData.gcgkContents[2].count).ToString() + "个";
     }
 
     async void InitJKYJData()
@@ -315,14 +315,34 @@ public class YZTLayer : YZTRootLayer
 
         int index1 = FindIndexByHotPointName("套口(闸上)");
         int index2 = FindIndexByHotPointName("套口(闸下)");
-        float value1 = GlobalData.swDatas[index1].upz ?? 0;
-        float value2 = GlobalData.swDatas[index1].dwz ?? 0;
-        //Debug.Log("777");
-        avgSWText.text = $"{((value1 + value2) / 2).ToString("0.00")}";
+        string value1 = GlobalData.swDatas[index1].upz ;
+        string value2 = GlobalData.swDatas[index1].dwz;
+
+        float avgValue = 0f;
+        bool hasNumber1 = float.TryParse(value1, out float num1);
+        bool hasNumber2 = float.TryParse(value2, out float num2);
+
+        if (value1 == "-" && value2 == "-")
+        {
+            avgSWText.text = "-";
+        }
+        else if (hasNumber1 && hasNumber2)
+        {
+            avgValue = (num1 + num2) / 2;
+            avgSWText.text = avgValue.ToString("0.00");
+        }
+        else if (hasNumber1)
+        {
+            avgSWText.text = num1.ToString("0.00");
+        }
+        else if (hasNumber2)
+        {
+            avgSWText.text = num2.ToString("0.00");
+        }
         sfSWText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].floodProtectionLevel}";
         jjSWText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].warningLevel}";
         bzSWText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].guaranteeLevel}";
-        currentSWText.text = value1.ToString("0.00");
+        currentSWText.text = value1;
     }
 
     void InitLeftBtn()
@@ -384,7 +404,27 @@ public class YZTLayer : YZTRootLayer
                 SWStationRecordData sWStationRecordData = new SWStationRecordData();
                 sWStationRecordData.dir = 0;
                 sWStationRecordData.name = GlobalData.swDatas[i].stnm;
-                sWStationRecordData.value = ((GlobalData.swDatas[i].upz ?? 0) > (GlobalData.swDatas[i].dwz ?? 0)) ? GlobalData.swDatas[i].upz ?? 0 : GlobalData.swDatas[i].dwz ?? 0;
+
+                float valueUpz = GlobalData.swDatas[i].upz == "-" ? float.MinValue : float.Parse(GlobalData.swDatas[i].upz);
+                float valueDwz = GlobalData.swDatas[i].dwz == "-" ? float.MinValue : float.Parse(GlobalData.swDatas[i].dwz);
+
+                if (valueUpz == float.MinValue && valueDwz == float.MinValue)
+                {
+                    sWStationRecordData.value = "-";
+                }
+                else if (valueUpz == float.MinValue)
+                {
+                    sWStationRecordData.value = GlobalData.swDatas[i].dwz;
+                }
+                else if (valueDwz == float.MinValue)
+                {
+                    sWStationRecordData.value = GlobalData.swDatas[i].upz;
+                }
+                else
+                {
+                    sWStationRecordData.value = (valueUpz > valueDwz) ? GlobalData.swDatas[i].upz : GlobalData.swDatas[i].dwz;
+                }
+
                 sWStationRecordData.time = DateTime.Now.ToString("MM/dd HH:mm");
                 sWStationRecordData.stcd = GlobalData.swDatas[i].stcd;
                 rescordSWStationData.Add(sWStationRecordData);
@@ -425,21 +465,42 @@ public class YZTLayer : YZTRootLayer
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
             {
                 rescordSWStationData[i].name = GlobalData.swDatas[i].stnm;
-                float lastValue = rescordSWStationData[i].value;
-                rescordSWStationData[i].value = ((GlobalData.swDatas[i].upz ?? 0) > (GlobalData.swDatas[i].dwz ?? 0)) ? GlobalData.swDatas[i].upz ?? 0 : GlobalData.swDatas[i].dwz ?? 0;
-                rescordSWStationData[i].time = DateTime.Now.ToString("MM/dd HH:mm");
-                if (rescordSWStationData[i].value > lastValue)
+                // float lastValue = rescordSWStationData[i].value;
+
+                float valueUpz = GlobalData.swDatas[i].upz == "-" ? float.MinValue : float.Parse(GlobalData.swDatas[i].upz);
+                float valueDwz = GlobalData.swDatas[i].dwz == "-" ? float.MinValue : float.Parse(GlobalData.swDatas[i].dwz);
+
+                if (valueUpz == float.MinValue && valueDwz == float.MinValue)
                 {
-                    rescordSWStationData[i].dir = 1;
+                    rescordSWStationData[i].value = "-";
                 }
-                else if (rescordSWStationData[i].value > lastValue)
+                else if (valueUpz == float.MinValue)
                 {
-                    rescordSWStationData[i].dir = 0;
+                    rescordSWStationData[i].value = GlobalData.swDatas[i].dwz;
+                }
+                else if (valueDwz == float.MinValue)
+                {
+                    rescordSWStationData[i].value = GlobalData.swDatas[i].upz;
                 }
                 else
                 {
-                    rescordSWStationData[i].dir = -1;
+                    rescordSWStationData[i].value = (valueUpz > valueDwz) ? GlobalData.swDatas[i].upz : GlobalData.swDatas[i].dwz;
                 }
+
+
+                rescordSWStationData[i].time = DateTime.Now.ToString("MM/dd HH:mm");
+                //if (rescordSWStationData[i].value > lastValue)
+                //{
+                //    rescordSWStationData[i].dir = 1;
+                //}
+                //else if (rescordSWStationData[i].value > lastValue)
+                //{
+                //    rescordSWStationData[i].dir = 0;
+                //}
+                //else
+                //{
+                //    rescordSWStationData[i].dir = -1;
+                //}
             }
 
             for (int i = 0; i < rescordSWStationData.Count; i++)
@@ -778,8 +839,20 @@ public class YZTLayer : YZTRootLayer
             infoRight.GetChild(i).gameObject.SetActive(false);
         }
         infoRight.GetChild(index).gameObject.SetActive(true);
-        GameObject title = infoRight.GetChild(index).GetChild(0).GetChild(1).gameObject;
-        GameObject text1 = infoRight.GetChild(index).GetChild(0).GetChild(2).gameObject;
+
+        GameObject title;
+        GameObject text1;
+        if (infoRight.GetChild(index).GetComponentInChildren<ScrollRect>() != null)
+        {
+            title = infoRight.GetChild(index).GetChild(0).GetChild(0).GetChild(0).GetChild(0).GetChild(1).gameObject;
+            text1 = infoRight.GetChild(index).GetChild(0).GetChild(0).GetChild(0).GetChild(0).GetChild(2).gameObject;
+        }
+        else {
+            title = infoRight.GetChild(index).GetChild(0).GetChild(1).gameObject;
+            text1 = infoRight.GetChild(index).GetChild(0).GetChild(2).gameObject;
+        }
+
+        
 
         if (title != null)
         {
@@ -855,7 +928,7 @@ public class YZTLayer : YZTRootLayer
 
         Item0 item1 = Instantiate(item0Prefab, Vector3.zero, Quaternion.identity);
         item1.GetComponent<RectTransform>().SetParent(item0Parent.transform);
-        item1.InitPoint(hotPointSprite[7], "GeTi", "隔提", "1");
+        item1.InitPoint(hotPointSprite[7], "GeTi", "隔堤", "1");
 
         RunTimeLayerClick(0);
         RunTimeLayerClick(1);