Skip to content

Commit 9cd1b21

Browse files
author
wuhao
committed
Modify some properties
1 parent 33ec5fe commit 9cd1b21

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

Assets/DataMesh/ARModule/Network/Scritps/CollaborationManager.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public class CollaborationManager : DataMesh.AR.MEHoloModuleSingleton<Collaborat
8282

8383
public EnterRoomResult enterRoomResult { get; private set; }
8484
public string errorString { get; private set; }
85+
public long roomInitTime { get; private set; }
8586

8687
protected override void Awake()
8788
{
@@ -106,6 +107,7 @@ void Update()
106107
protected override void _Init()
107108
{
108109
clientId = SystemInfo.deviceUniqueIdentifier;
110+
Debug.Log("client=" + clientId);
109111

110112
clientId = MD5Hash.Hash(Encoding.UTF8.GetBytes(clientId));
111113
Debug.Log("client=" + clientId);
@@ -275,13 +277,12 @@ private void SendEnterRoom()
275277
enterRoomResult = EnterRoomResult.SocketCreateError;
276278
errorString = e.ToString();
277279
}
278-
if (enterRoomResult == EnterRoomResult.Waiting)
279-
{
280-
if (cbEnterRoom != null)
281-
cbEnterRoom();
282280

283-
enterRoomResult = EnterRoomResult.EnterRoomSuccess;
284-
}
281+
roomInitTime = enterRoomResponse.InitRoomTime;
282+
enterRoomResult = EnterRoomResult.EnterRoomSuccess;
283+
284+
if (cbEnterRoom != null)
285+
cbEnterRoom();
285286
}
286287
else
287288
{

Assets/DataMesh/ARModule/Plugins/x64/HoloLensXboxController.dll.meta

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/DataMesh/ARModule/Plugins/x86/HoloLensXboxController.dll.meta

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)