Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane
This commit is contained in:
commit
db416cbfd5
|
@ -1 +1 @@
|
||||||
127.0.0.1:48888
|
172.16.1.254:48888
|
|
@ -1 +1 @@
|
||||||
127.0.0.1
|
172.16.1.156
|
|
@ -1 +1 @@
|
||||||
{"ip":"172.16.1.120","port":54232,"userName":"server1234","passwd":"123456"}
|
{"ip":"172.16.1.156","port":54232,"userName":"server1234","passwd":"123456"}
|
|
@ -212,6 +212,8 @@ MonoBehaviour:
|
||||||
data: []
|
data: []
|
||||||
loadingPanel: {fileID: 460561659324528917, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
|
loadingPanel: {fileID: 460561659324528917, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
go: {fileID: 0}
|
||||||
|
loadTem: {fileID: 0}
|
||||||
--- !u!1 &2132962757
|
--- !u!1 &2132962757
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
Loading…
Reference in New Issue