Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane
This commit is contained in:
commit
6d09d8ef8a
|
@ -248,6 +248,7 @@ public class View_Panel2 : XUIPanel
|
||||||
|
|
||||||
public void OnRegisterFunction()
|
public void OnRegisterFunction()
|
||||||
{
|
{
|
||||||
|
//AdamSync.SyncCreateRoom.joinRoomRequset -= OnJoinRoom;
|
||||||
//AdamSync.SyncCreateRoom.createRoomRequset += OnCreateRoom;
|
//AdamSync.SyncCreateRoom.createRoomRequset += OnCreateRoom;
|
||||||
AdamSync.SyncCreateRoom.joinRoomRequset += OnJoinRoom;
|
AdamSync.SyncCreateRoom.joinRoomRequset += OnJoinRoom;
|
||||||
//AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
|
//AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
|
||||||
|
@ -855,14 +856,14 @@ public class View_Panel2 : XUIPanel
|
||||||
{
|
{
|
||||||
Debug.Log("OnDisable");
|
Debug.Log("OnDisable");
|
||||||
//AdamSync.SyncCreateRoom.createRoomRequset -= OnCreateRoom;
|
//AdamSync.SyncCreateRoom.createRoomRequset -= OnCreateRoom;
|
||||||
AdamSync.SyncCreateRoom.joinRoomRequset += OnJoinRoom;
|
//AdamSync.SyncCreateRoom.joinRoomRequset -= OnJoinRoom;
|
||||||
//AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
|
//AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
|
||||||
}
|
}
|
||||||
private void OnDestory()
|
private void OnDestory()
|
||||||
{
|
{
|
||||||
Debug.Log("OnDestory");
|
Debug.Log("OnDestory");
|
||||||
//AdamSync.SyncCreateRoom.createRoomRequset -= OnCreateRoom;
|
//AdamSync.SyncCreateRoom.createRoomRequset -= OnCreateRoom;
|
||||||
AdamSync.SyncCreateRoom.joinRoomRequset -= OnJoinRoom;
|
//AdamSync.SyncCreateRoom.joinRoomRequset -= OnJoinRoom;
|
||||||
//AdamSync.SyncCreateRoom.getRoomsRequset -= OnGetRooms;
|
//AdamSync.SyncCreateRoom.getRoomsRequset -= OnGetRooms;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue