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:
账号名 2024-01-23 15:35:31 +08:00
parent 333d9f113f 20017077d1
commit db6a8584e1
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Temp/Scripts/Mastermanagement.cs
View File

@ -20,7 +20,7 @@ public class Mastermanagement : MonoBehaviour
public IEnumerator WaitGetAllDevice() public IEnumerator WaitGetAllDevice()
{ {
yield return new WaitForSeconds(0.1f); yield return new WaitForSeconds(0.1f);
Debug.Log("wew");
weapongames = DeviceManager.Instance.GetPlayerDecive1(); weapongames = DeviceManager.Instance.GetPlayerDecive1();
if (weapongames.Count > 0) if (weapongames.Count > 0)
{ {

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

@ -157,6 +157,7 @@ public class GameManager : MonoSingleton<GameManager>
tenkokuModule.mainCamera = spt.transform; tenkokuModule.mainCamera = spt.transform;
AddPlayers(spt); AddPlayers(spt);
DeviceManager.Instance.isStartRehearsing = GlobalFlag.isStartRehearsing;
} }
@ -306,6 +307,7 @@ public class GameManager : MonoSingleton<GameManager>
if (GlobalFlag.currentUser.role_code == "04") if (GlobalFlag.currentUser.role_code == "04")
{ {
currentSpt.GetComponent<Camera>().cullingMask = -1; currentSpt.GetComponent<Camera>().cullingMask = -1;
currentSpt.GetComponent<Camera>().cullingMask &= ~(1 << 15);
} }
} }
} }
@ -404,7 +406,6 @@ public class GameManager : MonoSingleton<GameManager>
if (!userIds.Contains(ulong.Parse(userInfo[0]))) if (!userIds.Contains(ulong.Parse(userInfo[0])))
{ {
SyncPlayerTransform spt = Instantiate(playerTransformPrefab); SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//0 red 1 blue //0 red 1 blue
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0") if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
{ {

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

@ -268,9 +268,9 @@ public class EquipmentCommon : MonoBehaviour
} }
break; break;
case "SingleDronePosition"://无人机攻击目标锁定 case "SingleDronePosition"://无人机攻击目标锁定
Debug.Log("接受...:"+data[0] +","+ data[1] + "," + data[2] + "," + data[3] + "," + data[4]); Debug.Log("接受...:" + data[0] + "," + data[1] + "," + data[2] + "," + data[3] + "," + data[4]);
UnmannedAerialVehicleManage unmannedAerialVehicleManage = GetComponent<UnmannedAerialVehicleManage>(); UnmannedAerialVehicleManage unmannedAerialVehicleManage = GetComponent<UnmannedAerialVehicleManage>();
if (unmannedAerialVehicleManage&& unmannedAerialVehicleManage.wrjModel== WRJModel.自杀式无人机) if (unmannedAerialVehicleManage && unmannedAerialVehicleManage.wrjModel == WRJModel.自杀式无人机)
{ {
for (int i = 0; i < unmannedAerialVehicleManage.unmannedAerialVehicles.Count; i++) for (int i = 0; i < unmannedAerialVehicleManage.unmannedAerialVehicles.Count; i++)
{ {
@ -319,7 +319,8 @@ public class EquipmentCommon : MonoBehaviour
} }
} }
IEnumerator UnmannedAerialVehicleAddBao(UnmannedAerialVehicle unmannedAerialVehicle) { IEnumerator UnmannedAerialVehicleAddBao(UnmannedAerialVehicle unmannedAerialVehicle)
{
yield return new WaitForSeconds(0.6f); yield return new WaitForSeconds(0.6f);
unmannedAerialVehicle.AddBao(false); unmannedAerialVehicle.AddBao(false);
} }