迁移新的地图

Config/DefaultEngine.ini

@@ -2,34 +2,20 @@
 GameName=TetreeseDemo
 
 [/Script/EngineSettings.GameMapsSettings]
-<<<<<<< HEAD
-EditorStartupMap=/Game/Maps/Map002.Map002
-LocalMapOptions=
-TransitionMap=None
-bUseSplitscreen=True
-TwoPlayerSplitscreenLayout=Horizontal
-ThreePlayerSplitscreenLayout=FavorTop
-FourPlayerSplitscreenLayout=Grid
-bOffsetPlayerGamepadIds=False
-GameInstanceClass=/Script/Engine.GameInstance
-GameDefaultMap=/Game/Maps/Map002.Map002
-ServerDefaultMap=/Engine/Maps/Entry.Entry
-GlobalDefaultGameMode=None
-=======
-EditorStartupMap=/Game/Maps/Map007.Map007
-GameDefaultMap=/Game/Maps/Map007.Map007
+EditorStartupMap=/Game/Maps/MenuMap.MenuMap
+GameDefaultMap=/Game/Maps/MenuMap.MenuMap
 TransitionMap=
 bUseSplitscreen=True
 TwoPlayerSplitscreenLayout=Horizontal
 ThreePlayerSplitscreenLayout=FavorTop
 GlobalDefaultGameMode=/Game/BP/VRGameMode.VRGameMode_C
->>>>>>> fe3e73ccf9f70de20e6a3d3c86c2ae9cd4a6adf0
 GlobalDefaultServerGameMode=None
 
 [/Script/IOSRuntimeSettings.IOSRuntimeSettings]
 MinimumiOSVersion=IOS_12
 RemoteServerName=192.168.1.185
 RSyncUsername=killf
+bDisableHTTPS=True
 
 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
@@ -140,5 +126,4 @@ LowSampleRate=12000.000000
 MinSampleRate=8000.000000
 CompressionQualityModifier=1.000000
 AutoStreamingThreshold=0.000000
-SoundCueCookQualityIndex=-1
-
+SoundCueCookQualityIndex=-1