From c66adcaadc84e764f8b904fed2c86a6c6649700b Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Thu, 23 Nov 2023 10:07:37 +0800
Subject: [PATCH] q

---
 Assets/GameAssets/Models/装饰模型/树木.meta | 8 --------
 Assets/StreamingAssets.meta                 | 8 --------
 Assets/Zion/Scripts/Adam/GameManager.cs     | 4 ++--
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 Assets/GameAssets/Models/装饰模型/树木.meta
 delete mode 100644 Assets/StreamingAssets.meta

diff --git a/Assets/GameAssets/Models/装饰模型/树木.meta b/Assets/GameAssets/Models/装饰模型/树木.meta
deleted file mode 100644
index c323ff99..00000000
--- a/Assets/GameAssets/Models/装饰模型/树木.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d174948813452c644abed14232cddd9a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta
deleted file mode 100644
index 809ab66b..00000000
--- a/Assets/StreamingAssets.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2867c644cac2f7b488d4acbc11bd2ea4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs
index b384afd3..9faeca94 100644
--- a/Assets/Zion/Scripts/Adam/GameManager.cs
+++ b/Assets/Zion/Scripts/Adam/GameManager.cs
@@ -52,7 +52,7 @@ public class GameManager : MonoSingleton<GameManager>
         //0 red  1 blue
         if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
         {
-            spt.GetComponent<Camera>().cullingMask = ~(1 << 11);
+            spt.GetComponent<Camera>().cullingMask = ~(1 << 12);
 
             if (UIBootstrap.Instance.GetDeviceByName("蜂群无人机").device_count > 0)
             {
@@ -66,7 +66,7 @@ public class GameManager : MonoSingleton<GameManager>
         }
         else
         {
-            spt.GetComponent<Camera>().cullingMask = ~(1 << 12);
+            spt.GetComponent<Camera>().cullingMask = ~(1 << 11);
             if (UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count > 0)
             {
                 for (int i = 0; i < UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count; i++)