Browse Source

提交诸多bug,修改

wartheking2024 13 hours ago
parent
commit
2653c41f93

+ 63 - 63
Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -2130,8 +2130,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: 5.0000076, y: 0}
-  m_SizeDelta: {x: 70, y: 30}
+  m_AnchoredPosition: {x: 5.000008, y: 0}
+  m_SizeDelta: {x: 75.3, y: 30}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4071412897390170865
 CanvasRenderer:
@@ -3267,8 +3267,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: 127.44306, y: 0}
-  m_SizeDelta: {x: 99.086, y: 30}
+  m_AnchoredPosition: {x: 129.89166, y: 0}
+  m_SizeDelta: {x: 94.1888, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2903449770767840548
 CanvasRenderer:
@@ -6115,10 +6115,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 57.5, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 57.5, y: -12.607}
+  m_SizeDelta: {x: 115, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653251029749
 CanvasRenderer:
@@ -10039,10 +10039,10 @@ RectTransform:
   m_Father: {fileID: 9093061653224198802}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 14.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 14.5, y: -15.27755}
+  m_SizeDelta: {x: 29, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653390156198
 CanvasRenderer:
@@ -13064,10 +13064,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 61, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 61, y: -11.8005}
+  m_SizeDelta: {x: 90, y: 20}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061653439058966
 CanvasRenderer:
@@ -18618,10 +18618,10 @@ RectTransform:
   m_Father: {fileID: 9093061653594052294}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 12, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 12, y: -15.27755}
+  m_SizeDelta: {x: 24, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653670084901
 CanvasRenderer:
@@ -21321,10 +21321,10 @@ RectTransform:
   m_Father: {fileID: 9093061653762445161}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 71, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 71, y: -15.27755}
+  m_SizeDelta: {x: 30, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653826032820
 CanvasRenderer:
@@ -24276,8 +24276,8 @@ RectTransform:
   m_Father: {fileID: 9093061655007520458}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 180.735, y: 0}
   m_SizeDelta: {x: 361.47, y: 0}
   m_Pivot: {x: 0.5, y: 1}
@@ -26523,10 +26523,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 136, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 136, y: -12.607}
+  m_SizeDelta: {x: 42, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654075877072
 CanvasRenderer:
@@ -26838,10 +26838,10 @@ RectTransform:
   m_Father: {fileID: 9093061655109922683}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 12, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 12, y: -15.27755}
+  m_SizeDelta: {x: 24, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654081961281
 CanvasRenderer:
@@ -27307,10 +27307,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 214.5, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 214.5, y: -12.607}
+  m_SizeDelta: {x: 115, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654110165202
 CanvasRenderer:
@@ -38714,10 +38714,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 53, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 53, y: -11.8005}
+  m_SizeDelta: {x: 16, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654650731069
 CanvasRenderer:
@@ -39882,10 +39882,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -11.8005}
+  m_SizeDelta: {x: 45, y: 20}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061654711297927
 CanvasRenderer:
@@ -40506,10 +40506,10 @@ RectTransform:
   m_Father: {fileID: 9093061653762445161}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 26.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 26.5, y: -15.27755}
+  m_SizeDelta: {x: 53, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654753997887
 CanvasRenderer:
@@ -42431,7 +42431,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "72.28m\xB2"
+  m_Text: "72.28km\xB2"
 --- !u!1 &9093061654860837455
 GameObject:
   m_ObjectHideFlags: 0
@@ -51668,10 +51668,10 @@ RectTransform:
   m_Father: {fileID: 9093061655109922683}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 34.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 34.5, y: -15.27755}
+  m_SizeDelta: {x: 15, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655252027404
 CanvasRenderer:
@@ -52856,10 +52856,10 @@ RectTransform:
   m_Father: {fileID: 9093061653224198802}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 39.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 39.5, y: -15.27755}
+  m_SizeDelta: {x: 15, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655287619152
 CanvasRenderer:
@@ -54263,10 +54263,10 @@ RectTransform:
   m_Father: {fileID: 9093061653594052294}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 34.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 34.5, y: -15.27755}
+  m_SizeDelta: {x: 15, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655308691109
 CanvasRenderer:

File diff suppressed because it is too large
+ 98 - 1
Assets/Scene 1.unity


+ 1 - 1
Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -556,7 +556,7 @@ public class BigScreenLayer : MonoBehaviour
         floodStorageAreaData[0].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.area.description;
         floodStorageAreaData[1].text = GlobalData.floodStorageArea.leveeLength.value + "km";
         floodStorageAreaData[1].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.leveeLength.description;
-        floodStorageAreaData[2].text = GlobalData.floodStorageArea.storageCapacity.value + "亿m";
+        floodStorageAreaData[2].text = GlobalData.floodStorageArea.storageCapacity.value + "亿m³";
         floodStorageAreaData[2].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.storageCapacity.description;
         floodStorageAreaData[3].text = GlobalData.floodStorageArea.designWaterLevel.value + "m";
         floodStorageAreaData[3].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.designWaterLevel.description;

+ 2 - 1
Assets/Scripts/UI/UIView/RKZY/RKZYLayer.cs

@@ -245,13 +245,14 @@ public class RKZYLayer : YZTRootLayer
                     Debug.LogWarning("RKZYLayer基础数据联网不成功,原因:返序列化失败");
                 }
             }
-
         }
         catch (Exception e)
         {
             successInternet = false;
             Debug.LogWarning("RKZYLayer基础数据联网不成功,原因:" + e.ToString());
         }
+
+        
     }
 
     async Task InitMovePlan() {

Some files were not shown because too many files changed in this diff