yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1

This commit is contained in:
王志勋 2024-03-01 10:22:54 +08:00
parent 3fae2be142
commit 42ea8a8e5a
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Resources/UIPanel/generate_panl.prefab
View File

@ -36,7 +36,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -12.5, y: -13} 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} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4693166053314096328 --- !u!222 &4693166053314096328
CanvasRenderer: CanvasRenderer:

6
Assets/Temp/Scripts/View_Panel2.cs
View File

@ -557,9 +557,13 @@ public class View_Panel2 : XUIPanel
//Debug.Log(" roomItem.nameID==" + roomItem.name); //Debug.Log(" roomItem.nameID==" + roomItem.name);
CreateSubjectItem(currentRoomData.data); CreateSubjectItem(currentRoomData.data);
}); });
roomItem.transform.Find("close_btn").GetComponent<Button>().onClick.AddListener(async () => 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(); public RSData.SubjectInfo currentSubjectInfo = new RSData.SubjectInfo();

4
Assets/Zion/Scripts/Adam/DeviceManager.cs
View File

@ -175,9 +175,9 @@ public class DeviceManager : MonoSingleton<DeviceManager>
/// </summary> /// </summary>
/// <param name="data"></param> /// <param name="data"></param>
/// <returns></returns> /// <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(','); string[] info = data.Split(',');
if (info.Length < 2) return; if (info.Length < 2) return;

6
Assets/Zion/Scripts/InterfaceManager.cs
View File

@ -88,7 +88,7 @@ public static class InterfaceManager
/// <summary> /// <summary>
/// 获取所有得房间信息 /// 获取所有得房间信息
/// </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>
/// 学员信息 /// 学员信息
/// </summary> /// </summary>
@ -148,6 +148,10 @@ public static class InterfaceManager
/// </summary> /// </summary>
public static string Url_delete { get => IpAddress + "/Handler/Thinkingfile.ashx?action=deletedevice"; } public static string Url_delete { get => IpAddress + "/Handler/Thinkingfile.ashx?action=deletedevice"; }
/// <summary> /// <summary>
/// 删除房间
/// </summary>
public static string Url_Practice { get => IpAddress + "/Handler/Practice.ashx?action=updatestate&state=2&Id="; }
/// <summary>
/// 用户退出 /// 用户退出
/// </summary> /// </summary>
//public static string Url_Exit { get => IpAddress + "/Handler/User.ashx?action=exit&login_name="; } //public static string Url_Exit { get => IpAddress + "/Handler/User.ashx?action=exit&login_name="; }

3
Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs
View File

@ -419,11 +419,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour
/// <returns></returns> /// <returns></returns>
protected string GetSyncData() protected string GetSyncData()
{ {
Debug.Log("目标点位..:" + targetPoint.position); Debug.Log("目标点位..:" + targetPoint.position);
return string.Format("{0},{1},{2},{3},{4}", "Lasing", equipmentCommon.deviceID, targetPoint.position.x, targetPoint.position.y, targetPoint.position.z); return string.Format("{0},{1},{2},{3},{4}", "Lasing", equipmentCommon.deviceID, targetPoint.position.x, targetPoint.position.y, targetPoint.position.z);
} }
/// <summary> /// <summary>