Merge remote-tracking branch 'origin/main_ZYT'

Assets/Scripts/Manager/GameManager.cs

@@ -150,6 +150,7 @@ public class GameManager : MonoBehaviour
         if(GameInit.Ins.gamePlace== GamePlace.Shandong_Jining_Shangchang_nei)
             loginInfo.shop = 9;
 #endif
+        //loginInfo.shop = 0;
         loginInfo.gameId = 5;
         string authJson = JsonUtility.ToJson(loginInfo);
         Debug.Log("发送数据 -> " + authJson);
@@ -344,6 +345,10 @@ public class GameManager : MonoBehaviour
         {
             EnergyPump.transform.position = pos;
         }
+        if (GameInit.Ins.gamePlace == GamePlace.Hunan_Jishou_Qianzhou_Tianhong)
+        {
+            EnergyPump.transform.position = new Vector3(2f, 0, 3f); 
+        }
         EnergyPumpTag++;
         EnergyPump.GetComponent<EnergyPump>().Init(EnergyPumpTag);
     }