This commit is contained in:
parent
b23c788ecd
commit
14a80ed1bd
|
@ -20,7 +20,7 @@ public class Mastermanagement : MonoBehaviour
|
|||
private IEnumerator WaitGetAllDevice()
|
||||
{
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
Debug.Log("wew");
|
||||
|
||||
weapongames = DeviceManager.Instance.GetPlayerDecive1();
|
||||
if (weapongames.Count > 0)
|
||||
{
|
||||
|
|
|
@ -157,6 +157,7 @@ public class GameManager : MonoSingleton<GameManager>
|
|||
|
||||
tenkokuModule.mainCamera = spt.transform;
|
||||
AddPlayers(spt);
|
||||
DeviceManager.Instance.isStartRehearsing = GlobalFlag.isStartRehearsing;
|
||||
}
|
||||
|
||||
|
||||
|
@ -306,6 +307,7 @@ public class GameManager : MonoSingleton<GameManager>
|
|||
if (GlobalFlag.currentUser.role_code == "04")
|
||||
{
|
||||
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])))
|
||||
{
|
||||
SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
|
||||
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
|
||||
//0 red 1 blue
|
||||
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
|
||||
{
|
||||
|
|
|
@ -313,7 +313,8 @@ public class EquipmentCommon : MonoBehaviour
|
|||
}
|
||||
}
|
||||
|
||||
IEnumerator UnmannedAerialVehicleAddBao(UnmannedAerialVehicle unmannedAerialVehicle) {
|
||||
IEnumerator UnmannedAerialVehicleAddBao(UnmannedAerialVehicle unmannedAerialVehicle)
|
||||
{
|
||||
yield return new WaitForSeconds(0.6f);
|
||||
unmannedAerialVehicle.AddBao(false);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue