最后同步

u3d-ShanDongVirtualPowerPlant/Assets/Adam/Prefabs/InfoItemNew.prefab

@@ -125,6 +125,22 @@ PrefabInstance:
       propertyPath: m_Name
       value: InfoItem
       objectReference: {fileID: 0}
+    - target: {fileID: 2598300247444052504, guid: beebee9dfeefa33439307554aabd320f,
+        type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: b8d4664f5fbc53a42894922de3bc7f8c,
+        type: 2}
+    - target: {fileID: 2598300247444052504, guid: beebee9dfeefa33439307554aabd320f,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 2100000, guid: 0e75a335f2fb83444b271bc84739f316, type: 2}
+    - target: {fileID: 2598300247444052504, guid: beebee9dfeefa33439307554aabd320f,
+        type: 3}
+      propertyPath: m_hasFontAssetChanged
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3360560048676891413, guid: beebee9dfeefa33439307554aabd320f,
         type: 3}
       propertyPath: m_Pivot.x

u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main.unity

@@ -59092,7 +59092,7 @@ PrefabInstance:
     - target: {fileID: 2598300247444052504, guid: beebee9dfeefa33439307554aabd320f,
         type: 3}
       propertyPath: m_text
-      value: "\u4E34\u6C82\u5E02"
+      value: "\u8398\u53BF"
       objectReference: {fileID: 0}
     - target: {fileID: 2598300247444052504, guid: beebee9dfeefa33439307554aabd320f,
         type: 3}
@@ -75192,7 +75192,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1352919384
 RectTransform:
   m_ObjectHideFlags: 0
@@ -90073,7 +90073,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   head: Basicc2FiZXI6c2FiZXJfc2VjcmV0
-  token: ' bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI3OTEyMTQiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbWluIiwiYXZhdGFyIjoiIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iXSwiY2xpZW50X2lkIjoic2FiZXIiLCJyb2xlX25hbWUiOiJhZG1pbiIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJheW1heCIsInBvc3RfaWQiOiIxNzgwNDc5NzgwMTM5ODMxMjk3IiwidXNlcl9pZCI6IjE3ODA0Nzk3ODA2ODkyODUxMjIiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMiIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiJhZG1pbiIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIiLCJleHQiOiJ7XCJ1c2VyVHlwZVwiOlwiYWRtaW5cIixcInVzZXJJZFwiOjE3ODA0Nzk3ODA2ODkyODUxMjJ9In0sImV4cCI6MTcyMTIwNTY3NCwiZGVwdF9pZCI6IjE3ODA0Nzk3ODAwMjY1ODUwOTAiLCJqdGkiOiJiNTNmZTg5Mi05NGFkLTQ1OGUtYWQ2Yi01ZWUyNzdlMWVhYTkiLCJhY2NvdW50IjoiYWRtaW4ifQ.iFfR6fKOdwXKnZqLW5exdiRVK4WV6bmDPBWhIh4AnKk'
+  token: bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI3OTEyMTQiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbWluIiwiYXZhdGFyIjoiIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iXSwiY2xpZW50X2lkIjoic2FiZXIiLCJyb2xlX25hbWUiOiJhZG1pbiIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJheW1heCIsInBvc3RfaWQiOiIxNzgwNDc5NzgwMTM5ODMxMjk3IiwidXNlcl9pZCI6IjE3ODA0Nzk3ODA2ODkyODUxMjIiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMiIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiJhZG1pbiIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIiLCJleHQiOiJ7XCJ1c2VyVHlwZVwiOlwiYWRtaW5cIixcInVzZXJJZFwiOjE3ODA0Nzk3ODA2ODkyODUxMjJ9In0sImV4cCI6MTcyMTYyMjI4OSwiZGVwdF9pZCI6IjE3ODA0Nzk3ODAwMjY1ODUwOTAiLCJqdGkiOiIwYTc4YTFlMS03ZGNiLTQ1N2UtYTQxMC1hMDdmOGJkMGVjOWIiLCJhY2NvdW50IjoiYWRtaW4ifQ.cmDCPikK-6qV7H6lSg8h3riJb9qSUhPoObtqkOk6law
   onStation:
     m_PersistentCalls:
       m_Calls: []

u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/DataController.cs

@@ -73,6 +73,7 @@ public class DataController : MonoSingleton<DataController>
         Bootstrap.Instance.webAdapter.onStartRequest.AddListener(OnInit);
     }
 
+    //test
     public void TEstStation(int index)
     {
         SwitchStation(index);
@@ -81,7 +82,7 @@ public class DataController : MonoSingleton<DataController>
     {
         OnInit();
     }
-
+    //test
     private async void OnInit()
     {
         await UniTask.Delay(1);

u3d-ShanDongVirtualPowerPlant/Assets/StreamingAssets/Config/WebAddress.json

@@ -1,6 +1,6 @@
 {
-	"地图弹出框": "http://vpp.shiyuancloud.com:1443/api/vpp-operation-service/screen/mapRegionSummary/",
+	"地图弹出框": "http://192.168.0.31/vpp/api/vpp-operation-service/screen/mapRegionSummary/",
-	"地图信息汇总": "http://vpp.shiyuancloud.com:1443/api/vpp-operation-service/screen/mapRegionStatistics/",
+	"地图信息汇总": "http:////192.168.0.31/vpp/api/vpp-operation-service/screen/mapRegionStatistics/",
-	"地图企业用户资源": "http://vpp.shiyuancloud.com:1443/api/vpp-operation-service/screen/mapRegionCons/"
+	"地图企业用户资源": "http:////192.168.0.31/vpp/api/vpp-operation-service/screen/mapRegionCons/"
 	
 }