融合

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

@@ -30,11 +30,9 @@ namespace Views
         {
             string _url = url + GlobalFlag.userId;
             string trainUrl = trainStateUrl + GlobalFlag.userId;
-            Debug.Log(_url);
             ttpData = await AsyncWebReq.Get<ThreeTransformerPhotovoltaicData>(_url);
             infos = ttpData.data.rdj.ToList();
             trainData = await AsyncWebReq.Get<TrainState>(trainUrl);
-            Debug.Log(trainData);
             if (trainData.message == "正常")
             {
                 infos.Add(ttpData.data.qxA);

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab

@@ -10408,7 +10408,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
@@ -10638,6 +10638,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
+      propertyPath: trainStateUrl
+      value: http://111.229.30.246:10013/Handler/Taiqu.ashx?action=isright&bianhao=
+      objectReference: {fileID: 0}
     - target: {fileID: 4301222307786538279, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
       propertyPath: sprites.Array.size
       value: 25

Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity

@@ -54377,8 +54377,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1425909734}
-  m_LocalRotation: {x: 0.036638454, y: 0.94280463, z: -0.31224412, w: 0.110818714}
-  m_LocalPosition: {x: 92.73303, y: 18.33218, z: 339.1505}
+  m_LocalRotation: {x: 0.4913407, y: 0.50844175, z: -0.4895821, w: 0.51027524}
+  m_LocalPosition: {x: 102.57213, y: 38.529068, z: 311.40488}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -82003,6 +82003,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!33 &103665586572150244
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -83358,6 +83359,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!4 &554189251323931875
 Transform:
   m_ObjectHideFlags: 0
@@ -83485,6 +83487,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!1 &590723110959959151
 GameObject:
   m_ObjectHideFlags: 0
@@ -84389,6 +84392,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!23 &832619338999474934
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -85104,6 +85108,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!4 &984881775158257347
 Transform:
   m_ObjectHideFlags: 0
@@ -85137,6 +85142,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!33 &986493321439845694
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -85765,6 +85771,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!4 &1127675622180248741
 Transform:
   m_ObjectHideFlags: 0
@@ -86385,6 +86392,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!33 &1254889740818102185
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -93966,6 +93974,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!23 &2498195703580325393
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -94438,6 +94447,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!23 &2598389080269526869
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -95095,6 +95105,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!1 &2739453376186451831
 GameObject:
   m_ObjectHideFlags: 0
@@ -95225,6 +95236,7 @@ MonoBehaviour:
   linearMeasure: 0
   floats: []
   Fuan: 0
+  unit: 
 --- !u!1 &2768174694713984503
 GameObject:
   m_ObjectHideFlags: 0

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": {