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

Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

This commit is contained in:
yulong 2024-01-29 13:44:07 +08:00
parent 483fa93058 2da0c9d838
commit f01a5b0f3f
4 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741}
m_IndirectSpecularColor: {r: 0.030100383, g: 0.03369107, b: 0.03534769, a: 1}
m_IndirectSpecularColor: {r: 0.16230017, g: 0.30613676, b: 0.6693658, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -6755,7 +6755,6 @@ MonoBehaviour:
prefabItem: {fileID: 7985558213978141209, guid: c4c52f318e5c8074780b18c3419b7fb5,
type: 3}
model: {fileID: 0}
huoPaoCtrls: []
modelname_text: {fileID: 0}
isDragWRJ: 1
deviceID:
@ -38788,7 +38787,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &754191142
RectTransform:
m_ObjectHideFlags: 0
@ -50253,7 +50252,6 @@ GameObject:
m_Component:
- component: {fileID: 1378295489}
- component: {fileID: 1378295488}
- component: {fileID: 1378295487}
m_Layer: 0
m_Name: SatelliteImagery
m_TagString: Untagged
@ -50261,14 +50259,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &1378295487
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1378295486}
m_Enabled: 1
--- !u!20 &1378295488
Camera:
m_ObjectHideFlags: 0
@ -62159,7 +62149,7 @@ PrefabInstance:
- target: {fileID: 2844544340460311774, guid: c3d92615a09597d46aa740923029c15d,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3691389793902075663, guid: c3d92615a09597d46aa740923029c15d,
type: 3}
@ -62239,7 +62229,7 @@ PrefabInstance:
- target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -42.02
value: -0.000061035156
objectReference: {fileID: 0}
- target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d,
type: 3}
@ -62249,7 +62239,7 @@ PrefabInstance:
- target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d,
type: 3}
propertyPath: m_SizeDelta.y
value: -84.03992
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d,
type: 3}
@ -62309,7 +62299,7 @@ PrefabInstance:
- target: {fileID: 6877681873123360158, guid: c3d92615a09597d46aa740923029c15d,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7799910916288438750, guid: c3d92615a09597d46aa740923029c15d,
type: 3}
@ -62397,11 +62387,11 @@ RectTransform:
m_Father: {fileID: 1719983406}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 337, y: 499.2}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -53, y: 502}
m_SizeDelta: {x: 138, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1594140421
MonoBehaviour:
m_ObjectHideFlags: 0
@ -65965,7 +65955,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 42535375
randSeed: 47800140
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
@ -73079,7 +73069,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.00009918213, y: -0.000047683716}
m_AnchoredPosition: {x: -0.00012207031, y: -0.000047683716}
m_SizeDelta: {x: 322.00043, y: 95.66644}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1972282668

33
Assets/Zion/Scripts/Adam/Components/PostureController.cs
View File

@ -89,24 +89,27 @@ public class PostureController : MonoBehaviour
obj.selfBtn.onClick.AddListener(() =>
{
if (objName.Contains("电子侦察无人机"))
if (redOrBlue == 0)
{
redShowImage.transform.parent.GetComponent<Mask>().enabled = true;
if (objName.Contains("电子侦察无人机"))
{
redShowImage.transform.parent.GetComponent<Mask>().enabled = true;
}
else
{
redShowImage.transform.parent.GetComponent<Mask>().enabled = false;
}
}
else
if (redOrBlue == 1)
{
redShowImage.transform.parent.GetComponent<Mask>().enabled = false;
}
if (objName.Contains("频谱探测") || objName.Contains("雷达"))
{
blueShowImage.transform.parent.GetComponent<Mask>().enabled = true;
}
else
{
blueShowImage.transform.parent.GetComponent<Mask>().enabled = false;
if (objName.Contains("频谱探测") || objName.Contains("雷达"))
{
blueShowImage.transform.parent.GetComponent<Mask>().enabled = true;
}
else
{
blueShowImage.transform.parent.GetComponent<Mask>().enabled = false;
}
}
OnDeviceBtn(id, redOrBlue);
});

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

@ -10,7 +10,6 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
{
public GameObject prefabItem;
public GameObject model;
public HuoPaoController[] huoPaoCtrls;
public Text modelname_text;
public bool isDragWRJ = true;
public string deviceID;

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

@ -77,7 +77,7 @@ public class GameManager : MonoSingleton<GameManager>
spt.transform.position = redSpawnPos.position;
spt.transform.eulerAngles = redSpawnPos.eulerAngles;
spt.gameObject.SetActive(true);
spt.GetComponent<Camera>().cullingMask = ~(1 << 12);
spt.GetComponent<Camera>().cullingMask = ~(1 << 12) + ~(1 << 16) + ~(1 << 17) + ~(1 << 18) + ~(1 << 19) + ~(1 << 20) + ~(1 << 21) + ~(1 << 22);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
AdamThinkDevicesData.DataItem diTemp = UIBootstrap.Instance.GetDeviceByName("蜂群无人机");
if (diTemp.device_count > 0)
@ -107,7 +107,7 @@ public class GameManager : MonoSingleton<GameManager>
spt.transform.position = blueSpawnPos.position;
spt.transform.eulerAngles = blueSpawnPos.eulerAngles;
spt.gameObject.SetActive(true);
spt.GetComponent<Camera>().cullingMask = ~(1 << 11);
spt.GetComponent<Camera>().cullingMask = ~(1 << 11) + ~(1 << 16) + ~(1 << 17) + ~(1 << 18) + ~(1 << 19) + ~(1 << 20) + ~(1 << 21) + ~(1 << 22);
if (UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count > 0)
{
for (int i = 0; i < UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count; i++)