修改配置包

Assets/_MrCs/Scripts/Manager/GameLocal.cs

@@ -106,6 +106,7 @@ public enum Place
     Guangdong_Meizhou_Meixian_TianhongShangchang = 61,
     Beijing_Tongzhou_Luyijie_XiangrikuiGuangchang = 62,
     Ningxia_Yinchuang_Shizuishan_WandaGuangchang = 63,
+    Jilin_Jilin_Chuangying_Zhongdongxinshenghuo = 64,
 }
 
 public class GameLocal : MonoBehaviour
@@ -128,10 +129,7 @@ public class GameLocal : MonoBehaviour
     [Header("场地")]
     public Place place = Place.Company1Floor;
     // 总游玩时长
-<<<<<<< HEAD
-=======
     [NonSerialized]
->>>>>>> origin/main
     public int vistAllTime = (int)(60 * 10f);
     
     public float curGameTime = 0;

Assets/sucai/Materials/09 - Defau34324lt.mat

@@ -83,7 +83,9 @@ Material:
     m_Ints: []
     m_Floats:
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
@@ -92,6 +94,7 @@ Material:
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.14142135
@@ -106,6 +109,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1

ProjectSettings/EditorBuildSettings.asset

@@ -5,7 +5,7 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
+  - enabled: 0
     path: Assets/_MrCs/Scenes/Company1Floor.unity
     guid: 386a8fdea01af8a4e8d4a9835407ddec
   - enabled: 0
@@ -200,12 +200,9 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/_MrCs/Scenes/Jiangxi_Ganzhou_Zhanggong_GanzhouShucheng.unity
     guid: 88b3f0f92054e5a449b0e95e2fc5180f
-  - enabled: 0
+  - enabled: 1
     path: Assets/_MrCs/Scenes/Guangdong_Meizhou_Meixian_TianhongShangchang.unity
     guid: a51c36fe32d501f4887003b4521c6b65
-  - enabled: 1
-    path: Assets/_MrCs/Scenes/Ningxia_Yinchuang_Shizuishan_WandaGuangchang.unity
-    guid: 1fb7aeee4577084409bb04e737734dbe
   m_configObjects:
     Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
       type: 2}

ProjectSettings/ProjectSettings.asset

@@ -13,11 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: pineappletech
-<<<<<<< HEAD
-  productName: "\u706B\u529B\u5BF9\u51B3_\u77F3\u5634\u5C71"
-=======
-  productName: "\u706B\u529B\u5BF9\u51B3_\u6D4B\u8BD5"
->>>>>>> origin/main
+  productName: "\u706B\u529B\u5BF9\u51B3"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -167,11 +163,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-<<<<<<< HEAD
-    Android: com.pineappletech.mrcs.ningxiayinchuangshizuishanwandaguangchang
-=======
-    Android: com.pineappletech.mrcs.gongsi1louceshi
->>>>>>> origin/main
+    Android: com.pineappletech.mrcs.guangdongmeizhoumeixiantianhongguangchang
     Standalone: com.DefaultCompany.com.unity.template.ar
   buildNumber:
     Standalone: 0