diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 72fd62f3..a01e1749 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -23049,7 +23049,7 @@ PrefabInstance: - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} @@ -23099,7 +23099,7 @@ PrefabInstance: - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalScale.x - value: 10 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} @@ -23109,7 +23109,7 @@ PrefabInstance: - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalScale.z - value: 10 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 88e6d216..d775bac7 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -34,7 +34,6 @@ public class GameManager : MonoSingleton<GameManager> SyncCreateRoom.getroomusersRequset += OnGetRoomUsers; SyncCreateRoom.send2roomRequset += OnRoomInfo; SyncPlayerTransform spt = Instantiate(playerTransformPrefab); - spt.GetComponent<Camera>().cullingMask = ~(1 << 15); spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), true); currentSpt = spt; ToolsBootstrap.Instance.SetCameraInfo(spt); @@ -205,7 +204,7 @@ public class GameManager : MonoSingleton<GameManager> if (!userIds.Contains(userId)) { SyncPlayerTransform spt = Instantiate(playerTransformPrefab); - //spt.GetComponent<Camera>().cullingMask = 0 << 15; + spt.GetComponent<Camera>().cullingMask = ~(1 << 15); //0 red 1 blue if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0") { @@ -367,6 +366,7 @@ 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") {