接口修改

FlightSimulation/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini

@@ -131,16 +131,14 @@ LastExecutedLaunchName=DESKTOP-5MSME56
 LastExecutedPIEPreviewDevice=
 DeviceToEmulate=
 PIESafeZoneOverride=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000)
-<<<<<<< HEAD
 MultipleInstancePositions=(X=109,Y=119)
-NewWindowWidth=2554
-NewWindowHeight=992
-=======
 MultipleInstancePositions=(X=0,Y=0)
+NewWindowWidth=2554
 NewWindowWidth=1920
+NewWindowHeight=992
 NewWindowHeight=1080
+None=======
 LastExecutedPlayModeType=PlayMode_InNewProcess
->>>>>>> 743f30cbb9a1a4b2df74940cfa15d8f16c77172f
 
 [/Script/UnrealEd.LevelEditorViewportSettings]
 FlightCameraControlExperimentalNavigation=False
@@ -178,7 +176,7 @@ CameraSpeedScalar=128.000000
 
 [EditorStartup]
 LastLevel=/Game/Maps/CesiumMap
-LastLevel=/Game/Maps/CesiumMap
+LastLevel=/Game/Maps/TestMap
 None=======
 
 [ModuleFileTracking]
@@ -1331,11 +1329,9 @@ SunPosition.LastCompileMethod=External
 CesiumEditor.TimeStamp=2025.02.17-10.58.23
 CesiumEditor.LastCompileMethod=External
 WarplanePlugin.TimeStamp=2025.02.16-11.48.30
-<<<<<<< HEAD
 WarplanePlugin.TimeStamp=2025.02.17-12.45.36
-=======
 WarplanePlugin.TimeStamp=2025.02.17-17.14.22
->>>>>>> 743f30cbb9a1a4b2df74940cfa15d8f16c77172f
+None=======
 None=======
 None=======
 WarplanePlugin.LastCompileMethod=External
@@ -1425,24 +1421,23 @@ TurnkeyIO.TimeStamp=2025.02.11-08.57.15
 TurnkeyIO.LastCompileMethod=Unknown
 UATHelper.TimeStamp=2025.02.11-08.57.15
 UATHelper.LastCompileMethod=Unknown
-<<<<<<< HEAD
 UEDMPlugin.TimeStamp=2025.02.17-10.57.33
 UEDMPlugin.LastCompileMethod=External
 
 [AssetEditorSubsystem]
 CleanShutdown=True
+CleanShutdown=True
 DebuggerAttached=True
-=======
+DebuggerAttached=False
+None=======
+None=======
+None=======
 UEDMPlugin.TimeStamp=2025.02.18-00.28.01
 UEDMPlugin.LastCompileMethod=External
-
-[AssetEditorSubsystem]
-CleanShutdown=False
-DebuggerAttached=False
->>>>>>> 743f30cbb9a1a4b2df74940cfa15d8f16c77172f
 RecentAssetEditors=BlueprintEditor
-RecentAssetEditors=
+RecentAssetEditors=BlueprintEditor
-RecentAssetEditors=
+RecentAssetEditors=BlueprintEditor
+RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=DataTableEditor
@@ -1452,7 +1447,6 @@ RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=BlueprintEditor
-RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=WidgetBlueprintEditor
 RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=DataTableEditor
@@ -1465,14 +1459,9 @@ RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=BlueprintEditor
 RecentAssetEditors=
 RecentAssetEditors=
-None=======
+OpenAssetsAtExit=/Game/BluePrints/Warcraft/BP_WarcraftBase.BP_WarcraftBase
-<<<<<<< HEAD
-OpenAssetsAtExit=/Game/BluePrints/Data/DT_TestTrackTable.DT_TestTrackTable
 OpenAssetsAtExit=/Game/BluePrints/BP_TrackActor.BP_TrackActor
-OpenAssetsAtExit=/Game/BluePrints/BP_WarcraftSettingGameMode.BP_WarcraftSettingGameMode
+OpenAssetsAtExit=/Game/BluePrints/BP_CombatGameMode.BP_CombatGameMode
-=======
-OpenAssetsAtExit=/Game/BluePrints/BP_PixStreamActor.BP_PixStreamActor
->>>>>>> 743f30cbb9a1a4b2df74940cfa15d8f16c77172f
 
 [RootWindow]
 ScreenPosition=X=1185.000 Y=186.000
@@ -1513,15 +1502,13 @@ RecentsFiles=C:/Program Files/Epic Games/UE_5.4/Engine/Plugins/Animation/Control
 RecentsFiles=D:/UE/UE_5.4/Engine/Plugins/Animation/ControlRig/Content/Python/init_unreal.py
 
 [MRU]
-<<<<<<< HEAD
 MRUItem0=/Game/Maps/CesiumMap
-MRUItem1=/Game/Maps/WarcraftTestMap
-MRUItem2=/Game/Maps/TestMap
-=======
 MRUItem0=/Game/Maps/TestMap
+MRUItem1=/Game/Maps/WarcraftTestMap
 MRUItem1=/Game/Maps/CesiumMap
+MRUItem2=/Game/Maps/TestMap
 MRUItem2=/Game/Maps/WarcraftTestMap
->>>>>>> 743f30cbb9a1a4b2df74940cfa15d8f16c77172f
+None=======
 
 [/Script/UnrealEd.PersonaOptions]
 bAutoAlignFloorToMesh=True
@@ -1795,6 +1782,7 @@ PixelStreamingSettings=EnhancedInputDeveloperSettings.Modifier Default Values.In
 BP_PixStreamActor_C=PropertyWrapper.DefaultValueCategory.FlyPosArray,CesiumCartographicPolygon.Cesium.PositionLatitudeLongitudeHeight,CesiumCartographicPolygon.Cesium.PositionEarthCenteredEarthFixed,CesiumCartographicPolygon.Cesium.RotationEastSouthUp
 K2Node_BreakStruct=PropertyWrapper.DefaultValueCategory.FlyPosArray,CesiumCartographicPolygon.Cesium.PositionLatitudeLongitudeHeight,CesiumCartographicPolygon.Cesium.PositionEarthCenteredEarthFixed,CesiumCartographicPolygon.Cesium.RotationEastSouthUp
 K2Node_FunctionResult=PropertyWrapper.DefaultValueCategory.FlyPosArray,CesiumCartographicPolygon.Cesium.PositionLatitudeLongitudeHeight,CesiumCartographicPolygon.Cesium.PositionEarthCenteredEarthFixed,CesiumCartographicPolygon.Cesium.RotationEastSouthUp
+TrackActor=PropertyWrapper.DefaultValueCategory.FlyPosArray,CesiumCartographicPolygon.Cesium.PositionLatitudeLongitudeHeight,CesiumCartographicPolygon.Cesium.PositionEarthCenteredEarthFixed,CesiumCartographicPolygon.Cesium.RotationEastSouthUp
 
 [ContentBrowser]
 ContentBrowserDrawer.SourcesExpanded=True
@@ -1809,7 +1797,7 @@ ContentBrowserDrawer.VerticalSplitter.SlotSize1=0.795816839
 ContentBrowserDrawer.FavoriteSplitter.SlotSize0=0.200000003
 ContentBrowserDrawer.FavoriteSplitter.SlotSize1=0.800000012
 ContentBrowserDrawer.FavoriteSplitter.SlotSize2=0.400000006
-ContentBrowserDrawer.SelectedPaths=/Game/BluePrints
+ContentBrowserDrawer.SelectedPaths=/Game
 ContentBrowserDrawer.PluginFilters=
 ContentBrowserDrawer.Favorites.SelectedPaths=
 FavoritePaths=
@@ -1817,17 +1805,17 @@ ContentBrowserDrawer.SelectedCollections=
 ContentBrowserDrawer.ExpandedCollections=
 ContentBrowserDrawer.ThumbnailSize=2
 ContentBrowserDrawer.CurrentViewType=1
+ContentBrowserDrawer.JumpMRU=/All/Game
 ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints
+ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints/Warcraft
 ContentBrowserDrawer.JumpMRU=/All/Game/Maps
 ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints/Data
 ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints/Core
-ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints/Warcraft
 ContentBrowserDrawer.JumpMRU=/All/Game/PathTracer
 ContentBrowserDrawer.JumpMRU=/All/Game/PathTracer/Blueprints
 ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints/UI
 ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints/Test
 ContentBrowserDrawer.JumpMRU=/All/Game/CesiumSettings
-ContentBrowserDrawer.JumpMRU=/All/Game
 ContentBrowserDrawer.JumpMRU=/All/Game/FTPS_Online/Aircrafts/Mig29/meshes
 ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints/UI/Picture/ServerPic
 ContentBrowserDrawer.JumpMRU=/All/Game/BluePrints/UI/Picture
@@ -1910,36 +1898,15 @@ SequencerAssetPicker.ThumbnailSize=2
 SequencerAssetPicker.CurrentViewType=0
 
 [AssetEditorSubsystemRecents]
-<<<<<<< HEAD
+MRUItem0=/Game/BluePrints/BP_CombatGameMode
-MRUItem0=/Game/BluePrints/BP_WarcraftSettingGameMode
+MRUItem1=/Game/BluePrints/BP_TrackActor
-MRUItem1=/Game/Maps/CesiumMap
+MRUItem2=/Game/BluePrints/Warcraft/BP_WarcraftBase
-MRUItem2=/Game/Maps/WarcraftTestMap
+MRUItem3=/Game/BluePrints/BP_FighterDisplay
-MRUItem3=/Game/BluePrints/BP_TrackActor
+MRUItem4=/Game/BluePrints/BP_PixStreamActor
-MRUItem4=/Game/Maps/TestMap
+MRUItem5=/Game/BluePrints/Core/BPI_GameModeInterface
-MRUItem5=/Game/BluePrints/Data/DT_TestTrackTable
+MRUItem6=/Game/Maps/CesiumMap
-MRUItem6=/Game/BluePrints/Core/BPI_GameModeInterface
+MRUItem7=/Game/PathTracer/Blueprints/BP_PathTracer
-MRUItem7=/Game/BluePrints/Warcraft/BP_WarcraftBase
+MRUItem8=/Game/BluePrints/Core/BPI_FlyInterface
-MRUItem8=/Game/BluePrints/BP_CombatGameMode
-MRUItem9=/Game/BluePrints/BP_PixStreamActor
-MRUItem10=/Game/PathTracer/Blueprints/BP_PathTracer
-MRUItem11=/Game/BluePrints/Core/BPI_FlyInterface
-MRUItem12=/Game/BluePrints/BP_FighterDisplay
-MRUItem13=/Game/BluePrints/UI/WBP_CombatUI
-MRUItem14=/Game/BluePrints/Test/TestActor
-MRUItem15=/Game/BluePrints/Data/DT_WarcraftDataTable
-MRUItem16=/Game/BluePrints/UI/WBP_WarcraftSetting
-MRUItem17=/Game/BluePrints/Core/BPI_PawnInterface
-MRUItem18=/Game/FTPS_Online/Aircrafts/Mig29/meshes/sk_Jet
-=======
-MRUItem0=/Game/BluePrints/BP_PixStreamActor
-MRUItem1=/Game/BluePrints/Warcraft/BP_WarcraftBase
-MRUItem2=/Game/BluePrints/BP_TrackActor
-MRUItem3=/Game/BluePrints/Core/BPI_GameModeInterface
-MRUItem4=/Game/BluePrints/BP_CombatGameMode
-MRUItem5=/Game/Maps/CesiumMap
-MRUItem6=/Game/PathTracer/Blueprints/BP_PathTracer
-MRUItem7=/Game/BluePrints/Core/BPI_FlyInterface
-MRUItem8=/Game/BluePrints/BP_FighterDisplay
 MRUItem9=/Game/BluePrints/UI/WBP_CombatUI
 MRUItem10=/Game/BluePrints/Test/TestActor
 MRUItem11=/Game/BluePrints/BP_WarcraftSettingGameMode
@@ -1950,7 +1917,6 @@ MRUItem15=/Game/BluePrints/Core/BPI_PawnInterface
 MRUItem16=/Game/BluePrints/Data/DT_TestTrackTable
 MRUItem17=/Game/FTPS_Online/Aircrafts/Mig29/meshes/sk_Jet
 MRUItem18=/Game/Maps/TestMap
->>>>>>> 743f30cbb9a1a4b2df74940cfa15d8f16c77172f
 MRUItem19=/Game/BluePrints/BP_GuidedMissile
 MRUItem20=/Game/BluePrints/UI/WBP_WarcraftUI
 MRUItem21=/Game/BluePrints/BP_PathTracer_Child_Base
@@ -3187,6 +3153,7 @@ K2Node_Message.Graph=True
 K2Node_VariableSet.Events=True
 BP_CombatGameMode_C.默认=True
 None=======
+None=======
 OpenColorIOSettings.Transform=True
 PixelStreamingSettings.PixelStreaming=True
 EditorKeyboardShortcutSettings.PixelStreaming=True
@@ -3213,7 +3180,6 @@ PixelStreamingInput.Activation=True
 PixelStreamingInput.Cooking=True
 PixelStreamingInput.Events=True
 BP_WarcraftBase_C.Default=True
-<<<<<<< HEAD
 CesiumIonRasterOverlay.Cesium=True
 CesiumIonRasterOverlay.Tags=True
 CesiumIonRasterOverlay.Activation=True
@@ -3223,7 +3189,6 @@ Cesium3DTilesetRoot.Rendering=True
 Cesium3DTilesetRoot.Tags=True
 Cesium3DTilesetRoot.Activation=True
 Cesium3DTilesetRoot.Cooking=True
-=======
 BP_TrackActor_C.Default=True
 BP_PixStreamActor_C.TransformCommon=True
 BP_PixStreamActor_C.Networking=True
@@ -3243,7 +3208,6 @@ ActorUEJSComponent.ComponentReplication=True
 ActorUEJSComponent.Activation=True
 ActorUEJSComponent.Cooking=True
 ActorUEJSComponent.Events=True
->>>>>>> 743f30cbb9a1a4b2df74940cfa15d8f16c77172f
 
 [DetailPropertyExpansion]
 BP_Warcraft_C=
@@ -3500,21 +3464,19 @@ ContentWidget="\"Object\" \"Object.Render Transform.RenderTransform\" "
 ActorSequenceComponent="\"Object\" "
 Slider="\"Object\" "
 None=======
+None=======
 OpenColorIOSettings="\"Object\" "
 PixelStreamingSettings="\"Object\" "
 RecastNavMesh="\"Object\" "
 NavigationData="\"Object\" "
 PixelStreamingInput="\"Object\" "
-<<<<<<< HEAD
+BP_TrackActor_C=
-BP_TrackActor_C="\"Object.FlightTracker.TrapezeLocation\" "
+TrackActor=
-TrackActor="\"Object.FlightTracker.TrapezeLocation\" "
 CesiumIonRasterOverlay="\"Object\" "
 CesiumRasterOverlay="\"Object\" "
 Cesium3DTilesetRoot="\"Object\" "
-=======
 UEJSActorComponent="\"Object\" "
 ActorUEJSComponent="\"Object\" "
->>>>>>> 743f30cbb9a1a4b2df74940cfa15d8f16c77172f
 
 [PlacementMode]
 RecentlyPlaced=/Game/BluePrints/BP_PixStreamActor.BP_PixStreamActor;
@@ -3586,8 +3548,8 @@ bHostFindInBlueprintsInGlobalTab=True
 bNavigateToNativeFunctionsFromCallNodes=True
 bDoubleClickNavigatesToParent=True
 bEnableTypePromotion=True
-TypePromotionPinDenyList=text
 TypePromotionPinDenyList=string
+TypePromotionPinDenyList=text
 BreakpointReloadMethod=RestoreAll
 bEnablePinValueInspectionTooltips=True
 bEnableNamespaceEditorFeatures=True