融合

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs

@@ -28,9 +28,9 @@ namespace Adam
 
         public void OnGo()
         {
-
             string sceneInfo = ExamusersController.Instance.GetSceneInfoByUseNo(userID.text);
             GlobalFlag.userId = userID.text;
+            Debug.Log(GlobalFlag.userId);
             string[] tt = ToolUtility.GetInfo(sceneInfo, '_');
             SceneInfoData sceneInfoData = new SceneInfoData(tt[0], tt[1], tt[2]);
             GlobalFlag.sceneData = sceneInfoData;

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Views/ThreeTransformerPhotovoltaicView.cs

@@ -16,22 +16,25 @@ namespace Views
 {
     public class ThreeTransformerPhotovoltaicView : MonoBehaviour
     {
-        public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=rdjdydl&bianhao=";
-        public string trainStateUrl;
+        public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=zhengchang&bianhao=";
+        public string trainStateUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=isright&bianhao=";
         public SpriteRenderer spriteRenderer;
         public TextMesh textMesh;
         public string isFD;
         public Sprite[] sprites;
         public List<string> infos = new List<string>();
+        public ThreeTransformerPhotovoltaicData ttpData;
+        public TrainState trainData;
         // Use this for initialization
         private async void Start()
         {
             string _url = url + GlobalFlag.userId;
             string trainUrl = trainStateUrl + GlobalFlag.userId;
             Debug.Log(_url);
-            ThreeTransformerPhotovoltaicData ttpData = await AsyncWebReq.Get<ThreeTransformerPhotovoltaicData>(_url);
+            ttpData = await AsyncWebReq.Get<ThreeTransformerPhotovoltaicData>(_url);
             infos = ttpData.data.rdj.ToList();
-            TrainState trainData = await AsyncWebReq.Get<TrainState>(trainUrl);
+            trainData = await AsyncWebReq.Get<TrainState>(trainUrl);
+            Debug.Log(trainData);
             if (trainData.message == "正常")
             {
                 infos.Add(ttpData.data.qxA);
@@ -41,11 +44,13 @@ namespace Views
                 infos.Add(ttpData.data.qyB);
                 infos.Add(ttpData.data.qyC);
             }
-            else 
+            else
             {
-                foreach (string info in ExamusersController.Instance.GetABCcurrentAndvoltage())
+                List<string> listTemp = ExamusersController.Instance.GetABCcurrentAndvoltage();
+                foreach (string info in listTemp)
                 {
                     infos.Add(info);
+                    Debug .Log (info);
                 }
             }
         }

Electrical_inspectionCompetitionSystem/Packages/packages-lock.json

@@ -35,12 +35,12 @@
       "source": "builtin",
       "dependencies": {
         "com.unity.ide.visualstudio": "2.0.16",
-        "com.unity.ide.rider": "3.0.16",
+        "com.unity.ide.rider": "3.0.15",
         "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.1.1",
         "com.unity.test-framework": "1.1.31",
-        "com.unity.testtools.codecoverage": "1.2.2"
+        "com.unity.testtools.codecoverage": "1.0.1"
       }
     },
     "com.unity.ide.rider": {
@@ -92,7 +92,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.services.core": {
-      "version": "1.6.0",
+      "version": "1.4.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -121,7 +121,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.2",
+      "version": "1.0.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {