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

# Conflicts:
#	Assets/DC/山东潍坊青州泰华城地形(小小幻宠）.prefab.meta
#	Assets/FR2_Cache.asset
#	Assets/Scripts/GameManager.cs
#	Assets/_MechanicalAge/Resources/~$银河守护者-山东济宁_万汇城_内.xlsm.meta
#	Assets/_MechanicalAge/Resources/~$银河守护者-湖北襄阳科技馆.xlsm.meta
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset

Assets/Scripts/GameManager.cs

@@ -34,6 +34,7 @@ public enum GamePlace
     Yangzhou_Hanjiang_TansuoZhongxin_wai=-5,
     Shandong_Jining_Wanhuicheng_nei=-9,
     Shandong_Langfang_QingzhouTaihuacheng=10,
+    Hubei_Xiangyang_Kejiguan=11,
 }
 
 public class GameManager : NetworkBehaviour
@@ -876,9 +877,15 @@ public class GameManager : NetworkBehaviour
         {
             EnergyPump.transform.position = new Vector3(0,0,2f);
         }
+<<<<<<< HEAD
         if (GameInit.Ins.gamePlace == GamePlace.Shandong_Langfang_QingzhouTaihuacheng)
         {
             EnergyPump.transform.position = new Vector3(7.36f,0,7.58f);
+=======
+        if (GameInit.Ins.gamePlace == GamePlace.Hubei_Xiangyang_Kejiguan)
+        {
+            EnergyPump.transform.position = new Vector3(0,0,5f);
+>>>>>>> origin/main
         }
         EnergyPumpTag++;
         EnergyPump.GetComponent<EnergyPump>().Init(EnergyPumpTag);