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

2323

This commit is contained in:
YangHua 2023-11-23 13:48:13 +08:00
parent e8ea3bf412
commit f528183dc2
3 changed files with 55 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat vendored
View File

@ -32,8 +32,8 @@ Material:
- _dispStrength: 1 - _dispStrength: 1
- _overBright: 1 - _overBright: 1
m_Colors: m_Colors:
- _AmbientTint: {r: 1, g: 1, b: 1, a: 1} - _AmbientTint: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2} - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003}
- _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _PrimaryTint: {r: 1, g: 1, b: 1, a: 1} - _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 1} - _TintColor: {r: 1, g: 1, b: 1, a: 1}

2
Assets/Zion/Scenes/InitConnect.unity
View File

@ -236,7 +236,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
isLinkAgain: 0 isLinkAgain: 0
serverIP: 172.20.10.5 serverIP: 192.168.6.63
port: 12345 port: 12345
--- !u!4 &2132962759 --- !u!4 &2132962759
Transform: Transform:

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

@ -189,16 +189,16 @@ public class GameManager : MonoSingleton<GameManager>
} }
break; break;
case "无人机List": case "无人机List":
SpawnDevice(wrjDrag.prefabItem, data); SpawnDevice(wrjDrag.prefabItem, data[7]);
break; break;
case "地面无线电干扰": case "地面无线电干扰":
SpawnDevice(wxdDrag.prefabItem, data); SpawnDevice(wxdDrag.prefabItem, data[7]);
break; break;
case "探测雷达": case "探测雷达":
SpawnDevice(ldDrag.prefabItem, data); SpawnDevice(ldDrag.prefabItem, data[7]);
break; break;
case "激光火控平台": case "激光火控平台":
SpawnDevice(hpDrag.prefabItem, data); SpawnDevice(hpDrag.prefabItem, data[7]);
break; break;
case "Stop": case "Stop":
GlobalFlag.isStartRehearsing = false; GlobalFlag.isStartRehearsing = false;
@ -206,7 +206,7 @@ public class GameManager : MonoSingleton<GameManager>
{ {
DeviceManager.Instance.devices[i].isStartRehearsing = false; DeviceManager.Instance.devices[i].isStartRehearsing = false;
} }
break; break;
case "EndDeduction": case "EndDeduction":
GlobalFlag.isStartRehearsing = false; GlobalFlag.isStartRehearsing = false;
@ -224,19 +224,58 @@ public class GameManager : MonoSingleton<GameManager>
} }
} }
public void SpawnDevice(GameObject devicePrefab, string[] data = null, string deviceID = null)
//}
/// <summary>
/// 获取别的客户端生成得设备
/// </summary>
/// <param name="devicePrefab"></param>
/// <param name="data"></param>
/// <param name="deviceID"></param>
public async void SpawnDevice(GameObject devicePrefab = null, string deviceID = null)
{ {
GameObject obj = Instantiate(devicePrefab); DeviceData deviceData = await AsyncWebReq.Get<DeviceData>("http://111.229.30.246:48888/Handler/Thinkingfile.ashx?action=querypracticedevicedetail&PracticeId=" + GlobalFlag.roomID + "&PracticeSubjectId=" + GlobalFlag.practiceSubjectID);
if (string.IsNullOrEmpty(deviceID)) if (devicePrefab != null && deviceID != null)
{ {
obj.transform.position = new Vector3(float.Parse(data[1]), float.Parse(data[2]), float.Parse(data[3])); for (int i = 0; i < deviceData.data.Count; i++)
obj.transform.eulerAngles = new Vector3(float.Parse(data[4]), float.Parse(data[5]), float.Parse(data[6])); {
obj.GetComponent<EquipmentCommon>().deviceID = data[7]; if (deviceData.data[i].id == deviceID)
{
SpawnDevice(devicePrefab, deviceData.data[i]);
}
}
} }
else else
{ {
obj.GetComponent<EquipmentCommon>().deviceID = deviceID; for (int i = 0; i < deviceData.data.Count; i++)
{
switch (deviceData.data[i].device_name)
{
case "无人机List":
SpawnDevice(wrjDrag.prefabItem, deviceData.data[i]);
break;
case "地面无线电干扰":
SpawnDevice(wxdDrag.prefabItem, deviceData.data[i]);
break;
case "探测雷达":
SpawnDevice(ldDrag.prefabItem, deviceData.data[i]);
break;
case "激光火控平台":
SpawnDevice(hpDrag.prefabItem, deviceData.data[i]);
break;
}
}
} }
}
public void SpawnDevice(GameObject obj, AdamThinkDevicesData.DataItem data)
{
GameObject device = Instantiate(obj);
device.GetComponent<EquipmentCommon>().deviceID = data.id;
device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para);
} }
private void OnGetRoomUsers(string obj) private void OnGetRoomUsers(string obj)
@ -260,37 +299,12 @@ public class GameManager : MonoSingleton<GameManager>
} }
} }
OnGetRoomDevice(); SpawnDevice();
string msg = $"send2room online,{ulong.Parse(GlobalFlag.currentUser.user_id)},{GlobalFlag.currentUser.login_name},{ulong.Parse(GlobalFlag.roomID)}"; string msg = $"send2room online,{ulong.Parse(GlobalFlag.currentUser.user_id)},{GlobalFlag.currentUser.login_name},{ulong.Parse(GlobalFlag.roomID)}";
_ = SyncCreateRoom.SendMessageAsync(msg); _ = SyncCreateRoom.SendMessageAsync(msg);
} }
/// <summary>
/// 获取 当前房间-当前科目里的所有设备
/// </summary>
public async void OnGetRoomDevice()
{
DeviceData deviceData = await AsyncWebReq.Get<DeviceData>("http://111.229.30.246:48888/Handler/Thinkingfile.ashx?action=querypracticedevicedetail&PracticeId=" + GlobalFlag.roomID + "&PracticeSubjectId=" + GlobalFlag.practiceSubjectID);
for (int i = 0; i < deviceData.data.Count; i++)
{
switch (deviceData.data[i].device_name)
{
case "无人机List":
SpawnDevice(wrjDrag.prefabItem, null, deviceData.data[i].id);
break;
case "地面无线电干扰":
SpawnDevice(wxdDrag.prefabItem, null, deviceData.data[i].id);
break;
case "探测雷达":
SpawnDevice(ldDrag.prefabItem, null, deviceData.data[i].id);
break;
case "激光火控平台":
SpawnDevice(hpDrag.prefabItem, null, deviceData.data[i].id);
break;
}
}
}
public void SetWeatherValue() public void SetWeatherValue()