This commit is contained in:
parent
3fae2be142
commit
42ea8a8e5a
|
@ -36,7 +36,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -12.5, y: -13}
|
||||
m_SizeDelta: {x: 18, y: 18}
|
||||
m_SizeDelta: {x: 12, y: 12}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4693166053314096328
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -556,10 +556,14 @@ public class View_Panel2 : XUIPanel
|
|||
UIBootstrap.Instance.GetAllDeviceData();
|
||||
//Debug.Log(" roomItem.nameID==" + roomItem.name);
|
||||
CreateSubjectItem(currentRoomData.data);
|
||||
});
|
||||
});
|
||||
|
||||
roomItem.transform.Find("close_btn").GetComponent<Button>().onClick.AddListener(async () =>
|
||||
{
|
||||
currentRoomData = await AsyncWebReq.Get<RSData.RoomSubjectData>(Url_QueryPracticeSubject + roomId);
|
||||
string url = Url_Practice + roomItem.name;
|
||||
Debug.Log("url:" + url);
|
||||
currentRoomData = await AsyncWebReq.Get<RSData.RoomSubjectData>(url);
|
||||
GameObject.Destroy(roomItem.gameObject);
|
||||
});
|
||||
}
|
||||
public RSData.SubjectInfo currentSubjectInfo = new RSData.SubjectInfo();
|
||||
|
|
|
@ -175,9 +175,9 @@ public class DeviceManager : MonoSingleton<DeviceManager>
|
|||
/// </summary>
|
||||
/// <param name="data"></param>
|
||||
/// <returns></returns>
|
||||
public void GetSend2roomMsg(byte[] tt)
|
||||
public void GetSend2roomMsg(byte[] _data)
|
||||
{
|
||||
string data = Encoding.UTF8.GetString(tt).Replace("send2room", "");
|
||||
string data = Encoding.UTF8.GetString(_data).Replace("send2room", "");
|
||||
string[] info = data.Split(',');
|
||||
if (info.Length < 2) return;
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ public static class InterfaceManager
|
|||
/// <summary>
|
||||
/// 获取所有得房间信息
|
||||
/// </summary>
|
||||
public static string Url_RoomList { get => IpAddress + "/Handler/Practice.ashx?action=query&state=0,1,2"; }
|
||||
public static string Url_RoomList { get => IpAddress + "/Handler/Practice.ashx?action=query&state=0,1"; }
|
||||
/// <summary>
|
||||
/// 学员信息
|
||||
/// </summary>
|
||||
|
@ -148,6 +148,10 @@ public static class InterfaceManager
|
|||
/// </summary>
|
||||
public static string Url_delete { get => IpAddress + "/Handler/Thinkingfile.ashx?action=deletedevice"; }
|
||||
/// <summary>
|
||||
/// 删除房间
|
||||
/// </summary>
|
||||
public static string Url_Practice { get => IpAddress + "/Handler/Practice.ashx?action=updatestate&state=2&Id="; }
|
||||
/// <summary>
|
||||
/// 用户退出
|
||||
/// </summary>
|
||||
//public static string Url_Exit { get => IpAddress + "/Handler/User.ashx?action=exit&login_name="; }
|
||||
|
|
|
@ -419,11 +419,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour
|
|||
/// <returns></returns>
|
||||
protected string GetSyncData()
|
||||
{
|
||||
|
||||
Debug.Log("目标点位..:" + targetPoint.position);
|
||||
return string.Format("{0},{1},{2},{3},{4}", "Lasing", equipmentCommon.deviceID, targetPoint.position.x, targetPoint.position.y, targetPoint.position.z);
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in New Issue