Browse Source

实例化一张图水位面板

Void_F 1 week ago
parent
commit
c472e4087a

File diff suppressed because it is too large
+ 392 - 201
Assets/Prefabs/UI/WaterTrendPanel.prefab


+ 37 - 37
Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -229,8 +229,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -75, y: -107.6}
-  m_SizeDelta: {x: 24, y: 16}
+  m_AnchoredPosition: {x: -75, y: -105.6}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3345997210897809839
 CanvasRenderer:
@@ -3695,7 +3695,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: -22, y: 0}
+  m_AnchoredPosition: {x: -19, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3216383722025815248
@@ -5694,7 +5694,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 24, y: 16}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8323792542141554874
 CanvasRenderer:
@@ -5726,10 +5726,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 9
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 9
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -8134,7 +8134,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5225438287272203347
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8295,7 +8295,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: -22, y: 0}
+  m_AnchoredPosition: {x: -19, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6920119055428392411
@@ -9696,7 +9696,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: -22, y: 0}
+  m_AnchoredPosition: {x: -19, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7922950874420606670
@@ -13354,7 +13354,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: -22, y: 0}
+  m_AnchoredPosition: {x: -19, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8774058948850474194
@@ -14623,7 +14623,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: -22, y: 0}
+  m_AnchoredPosition: {x: -19, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6950322813793112135
@@ -15542,7 +15542,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 24, y: 16}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &593608672374469069
 CanvasRenderer:
@@ -15574,10 +15574,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 9
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 9
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -15938,7 +15938,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0, y: 0}
-  m_SizeDelta: {x: 24, y: 16}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8333045464175016456
 CanvasRenderer:
@@ -15970,10 +15970,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 9
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 9
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -17441,8 +17441,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 87, y: -107.6}
-  m_SizeDelta: {x: 24, y: 16}
+  m_AnchoredPosition: {x: 87, y: -105.6}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3855559117499624163
 CanvasRenderer:
@@ -19889,7 +19889,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: -22, y: 0}
+  m_AnchoredPosition: {x: -19, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4616621074267386291
@@ -21734,7 +21734,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0, y: 0}
-  m_SizeDelta: {x: 24, y: 16}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8984293302702734866
 CanvasRenderer:
@@ -21766,10 +21766,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 9
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 9
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -22127,8 +22127,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 141, y: -107.6}
-  m_SizeDelta: {x: 24, y: 16}
+  m_AnchoredPosition: {x: 141, y: -105.6}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1366373822994504838
 CanvasRenderer:
@@ -31134,8 +31134,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -129, y: -107.6}
-  m_SizeDelta: {x: 24, y: 16}
+  m_AnchoredPosition: {x: -129, y: -105.6}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7174194171434137997
 CanvasRenderer:
@@ -31366,8 +31366,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 33, y: -107.6}
-  m_SizeDelta: {x: 24, y: 16}
+  m_AnchoredPosition: {x: 33, y: -105.6}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &875675609312848161
 CanvasRenderer:
@@ -35143,8 +35143,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -21, y: -107.6}
-  m_SizeDelta: {x: 24, y: 16}
+  m_AnchoredPosition: {x: -21, y: -105.6}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3126623369328305762
 CanvasRenderer:
@@ -37146,7 +37146,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0, y: 0}
-  m_SizeDelta: {x: 24, y: 16}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1285637136584100556
 CanvasRenderer:
@@ -37178,10 +37178,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 9
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 9
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -37539,7 +37539,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0, y: 0}
-  m_SizeDelta: {x: 24, y: 16}
+  m_SizeDelta: {x: 18, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1874788851560281905
 CanvasRenderer:
@@ -37571,10 +37571,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 9
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 9
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0

File diff suppressed because it is too large
+ 0 - 1012
Assets/Prefabs/UI/XHYZT/YZT.prefab


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


+ 20 - 11
Assets/Scripts/UI/UIView/YZT/WaterTrendPanel.cs

@@ -73,20 +73,20 @@ public class WaterTrendPanel : MonoBehaviour
 
     private void Awake()
     {
-        // Get today's date
-        DateTime today = DateTime.Today;
-
-        // Get the date 3 months ago
-        DateTime startDate = today.AddMonths(-3);
-
-        // Format the dates to string
-        startDateStr = startDate.ToString("yyyy-MM-dd");
-        endDateStr = today.ToString("yyyy-MM-dd");
+        // // Get today's date
+        // DateTime today = DateTime.Today;
+        //
+        // // Get the date 3 months ago
+        // DateTime startDate = today.AddMonths(-3);
+        //
+        // // Format the dates to string
+        // startDateStr = startDate.ToString("yyyy-MM-dd");
+        // endDateStr = today.ToString("yyyy-MM-dd");
 
         DatePicker_Start = this.transform.Find("linePanel/DatePicker_Start").GetComponent<DatePickerDropDownTextMeshPro>();
         DatePicker_End = this.transform.Find("linePanel/DatePicker_End").GetComponent<DatePickerDropDownTextMeshPro>();
-        DatePicker_Start.SetLabelText(startDateStr);
-        DatePicker_End.SetLabelText(endDateStr);
+        // DatePicker_Start.SetLabelText(startDateStr);
+        // DatePicker_End.SetLabelText(endDateStr);
 
         lineChartBtn.onClick.AddListener(() =>
         {
@@ -199,6 +199,15 @@ public class WaterTrendPanel : MonoBehaviour
 
     public async Task ShowTrend(string stcd, string name,int type)
     {
+        
+        string endTime = DateTime.Now.ToString("yyyy-MM-dd");
+        string startTime = DateTime.Now.AddMonths(-3).ToString("yyyy-MM-dd");
+
+        startDateStr = startTime;
+        endDateStr = endTime;
+        DatePicker_Start.SetLabelText(startTime);
+        DatePicker_End.SetLabelText(endTime);
+        
         currentType = type;
         if (type == 0)
         {

+ 3 - 1
Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -193,6 +193,7 @@ public class YZTLayer : YZTRootLayer
     public List<GameObject> region2LayerObj = new List<GameObject>();
     // Start is called before the first frame update
 
+    public GameObject waterTrendPanelOri;
     public WaterTrendPanel _waterTrendPanel;
 
     public Item0 item0Prefab;
@@ -219,8 +220,9 @@ public class YZTLayer : YZTRootLayer
     async void Awake()
     {
         viewMode = ViewMode.miniMap;
-        _waterTrendPanel = this.transform.Find("WaterTrendPanel").GetComponent<WaterTrendPanel>();
+        _waterTrendPanel = Instantiate(waterTrendPanelOri, this.transform).GetComponent<WaterTrendPanel>();
         _waterTrendPanel.Init();
+        _waterTrendPanel.gameObject.SetActive(false);
         HideMain();
         await InitData();
         Init();

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