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

添加deviceID和isplayer逻辑

This commit is contained in:
YangHua 2023-11-21 17:02:54 +08:00
parent 1b5d1407b6
commit dc2e2e349f
8 changed files with 69 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab
View File

@ -48,8 +48,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0afac659d8be281448f9ecd22f828b72, type: 3}
m_Name:
m_EditorClassIdentifier:
equipmentCommon: {fileID: 0}
selectedSide: 1
equipmentType: "\u5730\u9762\u65E0\u7EBF\u7535\u5E72\u6270"
replaceInfo: \
--- !u!114 &625513913607457923
MonoBehaviour:
m_ObjectHideFlags: 0
@ -62,7 +64,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7fbad120748f7254b86c62b691a75f57, type: 3}
m_Name:
m_EditorClassIdentifier:
msg: "{\"state\":true,\"message\":\"\",\"data\":[{\"id\":\"1700269137164001\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u5E72\u6270\u9891\u7387:\",\"para_type\":\"\",\"para_value\":\"3\",\"para_unit\":\"\\\"\\\"\",\"r1\":\"\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269137164002\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u5E72\u6270\u6A21\u5F0F:\",\"para_type\":\"\",\"para_value\":\"0\",\"para_unit\":\"\\\"\\\"\",\"r1\":\"\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269137164003\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u53D1\u5C04\u529F\u7387:\",\"para_type\":\"\",\"para_value\":\"2\",\"para_unit\":\"\\\"\\\"\",\"r1\":\"\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269137164004\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u5E72\u6270\u89D2\u5EA6:\",\"para_type\":\"\",\"para_value\":\"37\",\"para_unit\":\"\u5EA6\",\"r1\":\"37\u5EA6\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269137164005\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u5E72\u6270\u8DDD\u79BB:\",\"para_type\":\"\",\"para_value\":\"2\",\"para_unit\":\"km\",\"r1\":\"2km\",\"r2\":\"\",\"r3\":\"\"}]}"
equipmentCommon: {fileID: 0}
InterferingFrequency:
InterferenceMode:
TransmittedPower:

40
Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
View File

@ -3080,8 +3080,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0afac659d8be281448f9ecd22f828b72, type: 3}
m_Name:
m_EditorClassIdentifier:
equipmentCommon: {fileID: 0}
selectedSide: 1
equipmentType: "\u63A2\u6D4B\u96F7\u8FBE"
replaceInfo: \
--- !u!95 &3977472425108262601
Animator:
serializedVersion: 3
@ -3126,44 +3128,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8d431a7d95f5da7448bc421314544f20, type: 3}
m_Name:
m_EditorClassIdentifier:
equipmentCommon: {fileID: 0}
interval: 5
msg: "{ \"state\":true, \"message\":\"\", \"data\":[ {
\"id\":\"1700269137132001\", \"think_device_id\":\"1700269136819001\",
\"para_name\":\"\u8F6C\u53F0\u8F6C\u901F:\", \"para_type\":\"\",
\"para_value\":\"3\", \"para_unit\":\"s/\u5708\", \"r1\":\"3s/\u5708\",
\"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132002\",
\"think_device_id\":\"1700269136819001\", \"para_name\":\"\u63A2\u6D4B\u8DDD\u79BB:\",
\"para_type\":\"\", \"para_value\":\"1\", \"para_unit\":\"km\",
\"r1\":\"1km\", \"r2\":\"\", \"r3\":\"\" },
{ \"id\":\"1700269137132003\", \"think_device_id\":\"1700269136819001\",
\"para_name\":\"\u8FD1\u76F2\u533A:\", \"para_type\":\"\",
\"para_value\":\"100\", \"para_unit\":\"m\", \"r1\":\"100m\",
\"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132004\",
\"think_device_id\":\"1700269136819001\", \"para_name\":\"\u6279\u91CF\u6807\u5904\u7406\u80FD\u529B:\",
\"para_type\":\"\", \"para_value\":\"10\", \"para_unit\":\"\u4E2A\",
\"r1\":\"10\u4E2A\", \"r2\":\"\", \"r3\":\"\"
}, { \"id\":\"1700269137132005\", \"think_device_id\":\"1700269136819001\",
\"para_name\":\"\u63A2\u6D4B\u6210\u529F\u7387:\", \"para_type\":\"\",
\"para_value\":\"90\", \"para_unit\":\"%\", \"r1\":\"90%\",
\"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132006\",
\"think_device_id\":\"1700269136819001\", \"para_name\":\"\u6700\u5C0F\u63A2\u6D4B\u901F\u5EA6:\",
\"para_type\":\"\", \"para_value\":\"5\", \"para_unit\":\"m/s\",
\"r1\":\"5m/s\", \"r2\":\"\", \"r3\":\"\" },
{ \"id\":\"1700269137132007\", \"think_device_id\":\"1700269136819001\",
\"para_name\":\"\u8DDD\u79BB\u5206\u8FA8\u7387:\", \"para_type\":\"\",
\"para_value\":\"3\", \"para_unit\":\"km\", \"r1\":\"3km\",
\"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132008\",
\"think_device_id\":\"1700269136819001\", \"para_name\":\"\u65B9\u4F4D\u5206\u8FA8\u7387:\",
\"para_type\":\"\", \"para_value\":\"4\", \"para_unit\":\"km\",
\"r1\":\"4km\", \"r2\":\"\", \"r3\":\"\" },
{ \"id\":\"1700269137132009\", \"think_device_id\":\"1700269136819001\",
\"para_name\":\"\u65B9\u4F4D\u6CE2\u675F\u5BBD\u5EA6:\", \"para_type\":\"\",
\"para_value\":\"1\", \"para_unit\":\"\u5EA6\", \"r1\":\"1\u5EA6\",
\"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132010\",
\"think_device_id\":\"1700269136819001\", \"para_name\":\"\u4FEF\u4EF0\u6CE2\u675F\u5BBD\u5EA6:\",
\"para_type\":\"\", \"para_value\":\"1\", \"para_unit\":\"\u5EA6\",
\"r1\":\"1\u5EA6\", \"r2\":\"\", \"r3\":\"\"
} ] }"
RadarUiPrefab: {fileID: 7762499635175313733, guid: 7e88b9d523521594fbaa4c39573d9a7f,
type: 3}
RadarUi: {fileID: 0}

2
Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
View File

@ -449,8 +449,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0afac659d8be281448f9ecd22f828b72, type: 3}
m_Name:
m_EditorClassIdentifier:
equipmentCommon: {fileID: 0}
selectedSide: 0
equipmentType: "\u65E0\u4EBA\u673AList"
replaceInfo: \
--- !u!65 &41106886
BoxCollider:
m_ObjectHideFlags: 0

19
Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab
View File

@ -9953,8 +9953,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0afac659d8be281448f9ecd22f828b72, type: 3}
m_Name:
m_EditorClassIdentifier:
equipmentCommon: {fileID: 0}
selectedSide: 1
equipmentType: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0"
replaceInfo: \
--- !u!65 &7615181139496386334
BoxCollider:
m_ObjectHideFlags: 0
@ -9993,23 +9995,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 454a4db18ba8e38409491fa714240ae3, type: 3}
m_Name:
m_EditorClassIdentifier:
equipmentCommon: {fileID: 0}
interval: 5
msg: "{ \"state\":true, \"message\":\"\", \"data\":[ {
\"id\":\"1700269137180001\", \"think_device_id\":\"1700269136819004\",
\"para_name\":\"\u50A8\u80FD\u95F4\u9694\u65F6\u95F4\uFF1A\", \"para_type\":\"\",
\"para_value\":\"1\", \"para_unit\":\"s\", \"r1\":\"1s\",
\"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137180002\",
\"think_device_id\":\"1700269136819004\", \"para_name\":\"\u6BC1\u4F24\u76EE\u6807\u7D2F\u79EF\u4F5C\u7528\u65F6\u95F4:\",
\"para_type\":\"\", \"para_value\":\"3\", \"para_unit\":\"s\",
\"r1\":\"3s\", \"r2\":\"\", \"r3\":\"\" },
{ \"id\":\"1700269137180003\", \"think_device_id\":\"1700269136819004\",
\"para_name\":\"\u5E72\u6270\u8DDD\u79BB\uFF1A\", \"para_type\":\"\",
\"para_value\":\"0\", \"para_unit\":\"km\", \"r1\":\"0.1km\",
\"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137180004\",
\"think_device_id\":\"1700269136819004\", \"para_name\":\"\u5E72\u6270\u89D2\u5EA6\uFF1A\",
\"para_type\":\"\", \"para_value\":\"0\", \"para_unit\":\"\u5EA6\",
\"r1\":\"0\u5EA6\", \"r2\":\"\", \"r3\":\"\"
} ] }"
StorageIntervalTime:
CumulativeActionTimeOfDamageTarget:
InterferenceDistance:

2
Assets/Zion/Scripts/Adam/DragController.cs
View File

@ -14,6 +14,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
public Text modelname_text;
public bool isDragWRJ = true;
public string deviceID;
public bool isPlayer = false;
public void OnBeginDrag(PointerEventData eventData)
{
if (model == null)
@ -37,6 +38,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
{
if (model != null)
{
model.GetComponent<EquipmentCommon>().isPlayer = true;
model.GetComponent<EquipmentCommon>().isStartRehearsing = GlobalFlag.isStartRehearsing;
List<List_paraItem> temp = UIBootstrap.Instance.GetListParaItemById(deviceID);

2
Assets/Zion/Scripts/Adam/GameManager.cs
View File

@ -56,6 +56,7 @@ public class GameManager : MonoBehaviour
for (int i = 0; i < UIBootstrap.Instance.GetDeviceByName("蜂群无人机").device_count; i++)
{
DragController wrj = Instantiate(wrjDrag, dviceContent);
wrj.isPlayer = true;
wrj.deviceID = UIBootstrap.Instance.GetDeviceByName("蜂群无人机").id;
}
}
@ -170,6 +171,7 @@ public class GameManager : MonoBehaviour
GameObject obj = Instantiate(deviceDragBtn.model);
obj.transform.position = new Vector3(float.Parse(data[1]), float.Parse(data[2]), float.Parse(data[3]));
obj.transform.eulerAngles = new Vector3(float.Parse(data[4]), float.Parse(data[5]), float.Parse(data[6]));
obj.GetComponent<EquipmentCommon>().deviceID = data[7];
}
private void OnGetRoomUsers(string obj)

29
Assets/Zion/Scripts/Adam/Utility/Net/AsyncWebReq.cs
View File

@ -5,6 +5,7 @@ using System.Text;
using System.Collections.Generic;
using Newtonsoft.Json;
using System.Collections;
/// <summary>
/// 异步封装unityWebRequest请求
@ -55,11 +56,37 @@ public static class AsyncWebReq
return request;
}
public static IEnumerator PostData2(string url, Dictionary<string, string> keyValuePairs, System.Action<string> action=null)
{
WWWForm form = new WWWForm();
foreach (var item in keyValuePairs)
{
form.AddField(item.Key, item.Value);//把字典的键值对存到from
//Debug.LogError(item.Key + " " + item.Value);
}
UnityWebRequest request = UnityWebRequest.Post(url, form);
yield return request.SendWebRequest();//发送请求
if (request.isNetworkError || request.isHttpError)
{
Debug.Log("cannot get data:" + request.responseCode);
action(null);
}
else
{
if (!string.IsNullOrEmpty(request.downloadHandler.text))
action(request.downloadHandler.text);
else
action(null);
}
}
private static void AttachHeader(UnityWebRequest request, string key, string value)
{
request.SetRequestHeader(key, value);
}
/// <summary>
/// 请求类型
/// </summary>

33
Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
View File

@ -22,6 +22,8 @@ public class EquipmentCommon : MonoBehaviour
public static List<EquipmentCommon> equipmentCommons = new List<EquipmentCommon>();
public string equipmentType = "";
private bool _isStartRehearsing = false;
public string deviceID;
public bool isPlayer = false;
// 布尔值变化时触发的事件
public event System.Action<bool> OnActivationChanged;
@ -83,22 +85,39 @@ public class EquipmentCommon : MonoBehaviour
}
}
public char replaceInfo;
public Dictionary<string, string> replaceInfoDic = new Dictionary<string, string>();
//public void ResultsInfo(bool b, string s)
//{
// Debug.Log(s);
// ReturnDeviceID result = JsonConvert.DeserializeObject<ReturnDeviceID>(s);
// Debug.Log(result.data);
//}
/// <summary>
///
/// </summary>
/// <param name="weaponitemone"></param>
public async void FillInTheData(List<List_paraItem> weaponitemone)
public void FillInTheData(List<List_paraItem> weaponitemone)
{
if (!isPlayer) return;
if (equipmentCommon)
{
string paraListJson = JsonConvert.SerializeObject(weaponitemone);
string jsonData = paraListJson.Replace("\\", "");
ReturnDeviceID returnID = await AsyncWebReq.Post<ReturnDeviceID>("http://111.229.30.246:48888/Handler/Thinkingfile.ashx?action=addpracticedevicedetail&PracticeId=" + GlobalFlag.roomID + "&PracticeSubjectId=" + GlobalFlag.practiceSubjectID + "&device_name=" + equipmentCommon.equipmentType + "&para_list=" + jsonData, null);
string msg = $"send2room {equipmentCommon.equipmentType}+{transform.position.ToString().Replace(" ", "").Replace("(", "").Replace(")", "")}+{transform.eulerAngles.ToString().Replace(" ", "").Replace("(", "").Replace(")", "") + "," + returnID.data}";
Debug.Log(returnID.data);
_ = SyncCreateRoom.SendMessageAsync(msg);
replaceInfoDic.Add("PracticeId", GlobalFlag.roomID);
replaceInfoDic.Add("PracticeSubjectId", GlobalFlag.practiceSubjectID);
replaceInfoDic.Add("device_name", equipmentCommon.equipmentType);
replaceInfoDic.Add("para_list", paraListJson);
StartCoroutine(AsyncWebReq.PostData2("http://111.229.30.246:48888/Handler/Thinkingfile.ashx?action=addpracticedevicedetail", replaceInfoDic, ResultsInfo =>
{
ReturnDeviceID returnID = JsonConvert.DeserializeObject<ReturnDeviceID>(ResultsInfo);
deviceID = returnID.data;
string msg = $"send2room {equipmentCommon.equipmentType}+{transform.position.ToString().Replace(" ", "").Replace("(", "").Replace(")", "")}+{transform.eulerAngles.ToString().Replace(" ", "").Replace("(", "").Replace(")", "") + "," + returnID.data}";
_ = SyncCreateRoom.SendMessageAsync(msg);
}));
}
switch (equipmentType)
{
case "激光火控平台":