Merge remote-tracking branch 'origin/main' into main_ZYT

# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset

Assets/DC/场地/保卫金陵_安徽宿州.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 904142398639b5b48b37f78b6ce910c3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/DC/场地/保卫金陵_绍兴嵊州.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_DefendNJ/Scenes/Anhui_Suzhou_Yueshan_Guchengshangyejie.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3e32348f02568284193bf2d26d81663e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_DefendNJ/Scenes/Company1Floor.unity

@@ -9643,7 +9643,7 @@ MonoBehaviour:
   IncludeChildColliders: 0
   RuntimeFollower: {fileID: 0}
   colliderMaxDistance: 100
-  lastTimeMaxDistanceCalced: 638947754661470088
+  lastTimeMaxDistanceCalced: 638948461844219348
 --- !u!82 &675942809
 AudioSource:
   m_ObjectHideFlags: 0
@@ -19009,6 +19009,37 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!1 &1171519834
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1171519835}
+  m_Layer: 0
+  m_Name: "\u539F\u70B9"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1171519835
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1171519834}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1183671578
 GameObject:
   m_ObjectHideFlags: 0
@@ -31268,3 +31299,4 @@ SceneRoots:
   - {fileID: 1262183438}
   - {fileID: 2071473052}
   - {fileID: 754917628}
+  - {fileID: 1171519835}

Assets/_DefendNJ/Scenes/Liaoning_AnShan_Lishan_Dayuecheng.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6fbdad0310441094a8abaef5f607549a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 526bb168d35701b4e93732c35c91281f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_DefendNJ/Scripts/GameLocal.cs

@@ -135,8 +135,6 @@ public class GameLocal : MonoBehaviour
             authInfo.deviceSn = GetSn();
             authInfo.startAt = ConvertTimestampToDateTime(GetTimestamp()) + "";
             authInfo.shop = 0;
-            authInfo.shop = (int)place;
-            
 #if !UNITY_EDITOR && UNITY_ANDROID && PICO
             if (place == Place.Yangzhou_Hanjiang_TansuoZhongxin_wai)
                 authInfo.shop = 5;