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

提交

This commit is contained in:
账号名 2023-11-27 17:28:45 +08:00
parent 09d0f968b0
commit 698654da2d
11 changed files with 758 additions and 7835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
Assets/Resources/UIPanel/ZonghePanel.prefab
View File

@ -1,5 +1,84 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1377273662276397327
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2749229568427398243}
- component: {fileID: 253091902869605584}
- component: {fileID: 4136278468613453465}
m_Layer: 0
m_Name: txt-view (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2749229568427398243
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1377273662276397327}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6368481658935522810}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 414.4271, y: -25}
m_SizeDelta: {x: 768.8542, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &253091902869605584
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1377273662276397327}
m_CullTransparentMesh: 0
--- !u!114 &4136278468613453465
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1377273662276397327}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "2023.10.18 12:35:30 \u5730\u9762\u9632\u7A7A\u70AE1 <color=red>\u51FB\u6BC1</color>
\u65E0\u4EBA\u8702\u7FA41 10\u67B6\u65E0\u4EBA\u673A\n\n"
--- !u!1 &6368481657896172611
GameObject:
m_ObjectHideFlags: 0
@ -1056,7 +1135,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6368481658194815323
RectTransform:
m_ObjectHideFlags: 0
@ -1069,11 +1148,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6368481658935522810}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 414.4271, y: -145}
m_SizeDelta: {x: 768.8542, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6368481658194815321
@ -1380,85 +1459,6 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1.01%
--- !u!1 &6368481658237666201
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6368481658237666182}
- component: {fileID: 6368481658237666180}
- component: {fileID: 6368481658237666183}
m_Layer: 0
m_Name: txt-view
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6368481658237666182
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6368481658237666201}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6368481658935522810}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 768.8542, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6368481658237666180
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6368481658237666201}
m_CullTransparentMesh: 0
--- !u!114 &6368481658237666183
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6368481658237666201}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "2023.10.18 12:35:30 \u5730\u9762\u9632\u7A7A\u70AE1 <color=red>\u51FB\u6BC1</color>
\u65E0\u4EBA\u8702\u7FA41 10\u67B6\u65E0\u4EBA\u673A\n\n"
--- !u!1 &6368481658239545658
GameObject:
m_ObjectHideFlags: 0
@ -1554,7 +1554,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6368481658240545363
RectTransform:
m_ObjectHideFlags: 0
@ -1567,11 +1567,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6368481658935522810}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 414.4271, y: -55}
m_SizeDelta: {x: 768.8542, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6368481658240545361
@ -2770,6 +2770,7 @@ GameObject:
- component: {fileID: 6368481658635677622}
- component: {fileID: 6368481658635677620}
- component: {fileID: 6368481658635677623}
- component: {fileID: 8279468420044601306}
m_Layer: 0
m_Name: ZonghePanel
m_TagString: Untagged
@ -2837,6 +2838,22 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8279468420044601306
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6368481658635677769}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 78b73b2bcdd3caa4d89d1478ecfc281d, type: 3}
m_Name:
m_EditorClassIdentifier:
Content: {fileID: 6368481658935522810}
txtViewPrefab: {fileID: 5860784552480889033, guid: 732347052eb767348954eb70e9d810f2,
type: 3}
NumberOfAcceptances: 0
--- !u!1 &6368481658647365114
GameObject:
m_ObjectHideFlags: 0
@ -3781,11 +3798,11 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6368481658237666182}
- {fileID: 6368481658240545363}
- {fileID: 6368481659625411362}
- {fileID: 6368481658972476370}
- {fileID: 6368481658194815323}
- {fileID: 2749229568427398243}
m_Father: {fileID: 6368481659376724210}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4002,7 +4019,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6368481658972476370
RectTransform:
m_ObjectHideFlags: 0
@ -4015,11 +4032,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6368481658935522810}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 414.4271, y: -115}
m_SizeDelta: {x: 768.8542, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6368481658972476368
@ -6538,7 +6555,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6368481659625411362
RectTransform:
m_ObjectHideFlags: 0
@ -6551,11 +6568,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6368481658935522810}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 414.4271, y: -85}
m_SizeDelta: {x: 768.8542, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6368481659625411360

80
Assets/Resources/UIPanel/txt-view.prefab Normal file
View File

@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5860784552480889033
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5860784552480889046}
- component: {fileID: 5860784552480889044}
- component: {fileID: 5860784552480889047}
m_Layer: 0
m_Name: txt-view
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5860784552480889046
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5860784552480889033}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 414.4271, y: -25}
m_SizeDelta: {x: 768.8542, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5860784552480889044
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5860784552480889033}
m_CullTransparentMesh: 0
--- !u!114 &5860784552480889047
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5860784552480889033}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:

7
Assets/Resources/UIPanel/txt-view.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 732347052eb767348954eb70e9d810f2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8116
Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
View File

File diff suppressed because it is too large Load Diff

69
Assets/Zion/Scripts/Adam/Data/ThinkDevicesData.cs
View File

@ -125,4 +125,73 @@ namespace AdamThinkDevicesData
/// </summary>
public List<DataItem> data ;
}
public class UploadLogMain
{
/// <summary>
///
/// </summary>
public string PracticeId;
/// <summary>
///
/// </summary>
public string ThinkId;
/// <summary>
/// 日志1
/// </summary>
public string log;
}
public class ReceivingLog
{
/// <summary>
///
/// </summary>
public string id;
/// <summary>
///
/// </summary>
public string PracticeId;
/// <summary>
///
/// </summary>
public string ThinkId;
/// <summary>
/// 日志1
/// </summary>
public string log;
/// <summary>
///
/// </summary>
public string create_time;
/// <summary>
///
/// </summary>
public string r1;
/// <summary>
///
/// </summary>
public string r2;
/// <summary>
///
/// </summary>
public string r3;
}
public class ReceivingLogMain
{
/// <summary>
///
/// </summary>
public string state;
/// <summary>
///
/// </summary>
public string message;
/// <summary>
///
/// </summary>
public List<ReceivingLog> data;
}
}

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

@ -63,7 +63,8 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
void Add()
{
string currentTime = System.DateTime.Now.ToString();
Debug.Log("当前时间：" + currentTime);
}
private void OnRay(GameObject target)
{

3
Assets/Zion/Scripts/AddConfing.cs
View File

@ -6,6 +6,9 @@ using UnityEngine;
using UnityEngine.Networking;
using static InterfaceManager;
/// <summary>
/// 初始化接口IP 端口
/// </summary>
public class AddConfing : MonoBehaviour
{
private static string ipSetting = "IPPort.txt";

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

@ -126,8 +126,15 @@ public static class InterfaceManager
/// 添加设备并返回设备ID
/// </summary>
public static string Url_AddDeviceAndGetDeviceId { get => IpAddress + "/Handler/Thinkingfile.ashx?action=addpracticedevicedetail"; }
/// <summary>
/// 添加房间作战日志
/// </summary>
public static string Url_Addpracticelog { get => IpAddress + "/Handler/Practice.ashx?action=addpracticelog"; }
/// <summary>
/// 查询房间作战日志
/// </summary>
public static string Url_Querypracticelog { get => IpAddress + "/Handler/Practice.ashx?action=querypracticelog&PracticeId="; }
//public static string UrlLogin { get => IpAddress+"http://111.229.30.246:48888"; }
#endregion
public static string GetLocalTxt(string path)

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

@ -131,6 +131,7 @@ public class EquipmentCommon : MonoBehaviour
deviceID = returnID.data;
string msg = $"send2room {equipmentCommon.equipmentType},{transform.position.ToString().Replace(" ", "").Replace("(", "").Replace(")", "")},{transform.eulerAngles.ToString().Replace(" ", "").Replace("(", "").Replace(")", "") + "," + deviceID}";
_ = SyncCreateRoom.SendMessageAsync(msg);
UploadLog(deviceID);
}));
}
@ -159,6 +160,30 @@ public class EquipmentCommon : MonoBehaviour
}
}
/// <summary>
///上传日志
/// </summary>
/// <param name="deviceID"></param>
public void UploadLog(string deviceID)
{
string currentTime = System.DateTime.Now.ToString();
List<UploadLogMain> uploadLogMains = new List<UploadLogMain>();
UploadLogMain uploadLogMain = new UploadLogMain();
uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID;
uploadLogMain.ThinkId = GlobalFlag.currentThinkId;
string log = currentTime + " " + equipmentType + "(" + deviceID + ")" + "< color = red > 生成 </ color >";
uploadLogMain.log = log;
uploadLogMains.Add(uploadLogMain);
string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains);
WWWForm wWWForm = new WWWForm();
wWWForm.AddField("wWWForm", uploadLogMainJson);
StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data => {
Debug.Log(data);
}));
}
/// <summary>
/// 已有路径
/// </summary>

53
Assets/Zion/Scripts/SituationDisplay.cs Normal file
View File

@ -0,0 +1,53 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using AdamThinkDevicesData;
using static InterfaceManager;
using Newtonsoft.Json;
using UnityEngine.UI;
/// <summary>
/// 态势显示
/// </summary>
public class SituationDisplay : MonoBehaviour
{
/// <summary>
///
/// </summary>
public Transform Content;
/// <summary>
/// 预制体
/// </summary>
public GameObject txtViewPrefab;
/// <summary>
/// 接收条数
/// </summary>
public int NumberOfAcceptances = 0;
// Start is called before the first frame update
void Start()
{
Debug.Log(GlobalFlag.currentThinkId);
Debug.Log(GlobalFlag.practiceSubjectID);
StartCoroutine(GetString(Url_Querypracticelog, 5, data => {
Debug.Log(data);
ReceivingLogMain receivingLogMain = new ReceivingLogMain();
receivingLogMain = JsonConvert.DeserializeObject<ReceivingLogMain>(data);
for (int i = NumberOfAcceptances; i < receivingLogMain.data.Count; i++)
{
NumberOfAcceptances++;
GameObject txtView = Instantiate(txtViewPrefab, Content);
Text _text = txtView.GetComponentInChildren<Text>();
_text.text = receivingLogMain.data[i].log;
txtView.transform.SetAsFirstSibling();
txtView.SetActive(true);
}
}));
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/Zion/Scripts/SituationDisplay.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 78b73b2bcdd3caa4d89d1478ecfc281d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: