Ver código fonte

我他妈服了,被冲掉了大屏代码

lantiannb 4 meses atrás
pai
commit
a86f820fb7

Diferenças do arquivo suprimidas por serem muito extensas
+ 143 - 98
Assets/Scene 1.unity


+ 1 - 0
Assets/Scripts/HttpHelper.cs

@@ -378,6 +378,7 @@ public class HttpHelper : MonoBehaviour
            // Debug.Log(www.text);
             GlobalData.floodStorageArea =
                 JsonConvert.DeserializeObject<FloodStorageArea>(www.text.ToString());
+            GlobalData.floodStorageArea.done = true;
             www.Dispose();
             //Debug.Log(GlobalData.floodStorageArea.pumpStations.value);
         }

+ 29 - 69
Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -90,6 +90,8 @@ public class FloodStorageArea
     public ValueWithDescription gateStations;
     public ValueWithDescription pumpStations;
     public ValueWithDescription drainageStations;
+
+    public bool done = false;
 }
 
 
@@ -518,7 +520,6 @@ public class BigScreenLayer : MonoBehaviour
 
         swValue1.text = swH.ToString();
         swValue2.text = GlobalData.qXZDatas[qxIndex].dropSum6.ToString();
-        //swValue3.text = GlobalData.locationWeatherData[index].temperature.ToString();
         string we = GlobalData.sWZDatas[swIndex].wth.ToString();
         string weatherText = "";
         switch (we)
@@ -540,38 +541,36 @@ public class BigScreenLayer : MonoBehaviour
                 break;
         }
         swValue4.text = weatherText;
-        //swValue5.text = GlobalData.locationWeatherData[index].floodDischarge.ToString();
+
     }
 
     private async Task InitFloodAreaData()
         {
-            //Debug.Log(111111111);
-            await new WaitUntil(() =>
-            {
-                if (GlobalData.floodStorageArea.pumpStations != null)
-                    return GlobalData.floodStorageArea.pumpStations.value > 0;
-                return false;
-            });
-            //Debug.Log(111111111);
-            floodStorageAreaData[0].text = GlobalData.floodStorageArea.area.value + "km²";
-            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].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;
-            floodStorageAreaData[4].text = GlobalData.floodStorageArea.operationStandard.value + "级";
-            floodStorageAreaData[4].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.operationStandard.description;
-            floodStorageAreaData[5].text = GlobalData.floodStorageArea.safetyZones.value + "项";
-            floodStorageAreaData[5].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.safetyZones.description;
-            floodStorageAreaData[6].text = GlobalData.floodStorageArea.gateStations.value + "项";
-            floodStorageAreaData[6].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.gateStations.description;
-            floodStorageAreaData[7].text = GlobalData.floodStorageArea.pumpStations.value + "项";
-            floodStorageAreaData[7].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.pumpStations.description;
-            floodStorageAreaData[8].text = GlobalData.floodStorageArea.drainageStations.value + "项";
-            floodStorageAreaData[8].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.drainageStations.description;
-        }
+        await new WaitUntil(() =>
+        {
+            Debug.Log(GlobalData.floodStorageArea.done);
+            return GlobalData.floodStorageArea.done;
+        });
+
+        floodStorageAreaData[0].text = GlobalData.floodStorageArea.area.value + "km²";
+        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].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;
+        floodStorageAreaData[4].text = GlobalData.floodStorageArea.operationStandard.value + "级";
+        floodStorageAreaData[4].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.operationStandard.description;
+        floodStorageAreaData[5].text = GlobalData.floodStorageArea.safetyZones.value + "项";
+        floodStorageAreaData[5].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.safetyZones.description;
+        floodStorageAreaData[6].text = GlobalData.floodStorageArea.gateStations.value + "项";
+        floodStorageAreaData[6].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.gateStations.description;
+        floodStorageAreaData[7].text = GlobalData.floodStorageArea.pumpStations.value + "项";
+        floodStorageAreaData[7].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.pumpStations.description;
+        floodStorageAreaData[8].text = GlobalData.floodStorageArea.drainageStations.value + "项";
+        floodStorageAreaData[8].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.drainageStations.description;
+    }
         private async Task InitFloodGateData()
         {
             await new WaitUntil(() =>
@@ -635,46 +634,7 @@ public class BigScreenLayer : MonoBehaviour
                 floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = taokouData[i].opening_degree * 0.01 + "m";
                 floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = taokouData[i].gate_breakdown ? "故障" : "正常";
             }
-            // for (int i = 0; i < GlobalData.floorGateData.BuYuan.FloodGates.Length; i++)
-            // {
-            //     GameObject floodGateDataObj = Instantiate(floodDataPrefab);
-            //     floodGateDataObj.transform.SetParent(floodLists[0].transform);
-            //     floodGateDataObj.transform.localScale = Vector3.one;
-            //     floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
-            //     floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].IsOpen ? "开启" : "关闭";
-            //     floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].CurrentFlow + "m³/s";
-            //     floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.CurrentWaterLevel + "m";
-            //     floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].CurrentOpening + "°";
-            //     switch (GlobalData.floorGateData.BuYuan.FloodGates[i].Status)
-            //     {
-            //         case 0:
-            //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "故障";
-            //             break;
-            //         case 1:
-            //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "正常";
-            //             break;
-            //     }
-            // }
-            // for (int i = 0; i < GlobalData.floorGateData.TaoKou.FloodGates.Length; i++)
-            // {
-            //     GameObject floodGateDataObj = Instantiate(floodDataPrefab);
-            //     floodGateDataObj.transform.SetParent(floodLists[1].transform);
-            //     floodGateDataObj.transform.localScale = Vector3.one;
-            //     floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
-            //     floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].IsOpen ? "开启" : "关闭";
-            //     floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].CurrentFlow + "m³/s";
-            //     floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.CurrentWaterLevel + "m";
-            //     floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].CurrentOpening + "°";
-            //     switch (GlobalData.floorGateData.TaoKou.FloodGates[i].Status)
-            //     {
-            //         case 0:
-            //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "故障";
-            //             break;
-            //         case 1:
-            //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "正常";
-            //             break;
-            //     }
-            // }
+
             List<double> doubles = new List<double>();
             doubles.Add(90);
             doubles.Add(100);

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff