Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

2024-02-19 17:50:42 +08:00 · 2024-02-19 17:50:42 +08:00 · db416cbfd5
parent 2690ae1cfb e23b558a22
commit db416cbfd5
4 changed files with 5 additions and 3 deletions
--- a/Assets/StreamingAssets/IPPort.txt
+++ b/Assets/StreamingAssets/IPPort.txt
@ -1 +1 @@
-127.0.0.1:48888
+172.16.1.254:48888
--- a/Assets/StreamingAssets/confing.txt
+++ b/Assets/StreamingAssets/confing.txt
@ -1 +1 @@
-127.0.0.1
+172.16.1.156
--- a/Assets/StreamingAssets/mqttConfig.json
+++ b/Assets/StreamingAssets/mqttConfig.json
@ -1 +1 @@
-{"ip":"172.16.1.120","port":54232,"userName":"server1234","passwd":"123456"}
+{"ip":"172.16.1.156","port":54232,"userName":"server1234","passwd":"123456"}
--- a/Assets/Zion/Scenes/InitConnect.unity
+++ b/Assets/Zion/Scenes/InitConnect.unity
@ -212,6 +212,8 @@ MonoBehaviour:
    data: []
  loadingPanel: {fileID: 460561659324528917, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
    type: 3}
+  go: {fileID: 0}
+  loadTem: {fileID: 0}
 --- !u!1 &2132962757
 GameObject:
  m_ObjectHideFlags: 0