SpotLight 与 Projector 交互

Source/Cut5/Interface/CutMainWidgetInterface.h

@@ -28,6 +28,9 @@ public:
 
 	virtual void OnUpdateVideo(FGuid UUID, int32 X, int32 Y, uint8* RawData) {};
 	virtual void OnUpdateLightArray(const TArray<FColor>& LightArray) {};
+	virtual void OnUpdateSpotLight(int32 Index, FColor LightColor) {};
+	virtual void OnUpdateProjector(int32 Index, bool bEnableProjector) {};
+	
 	virtual void OnUpdatePlayers(TSharedPtr<class IWidgetInterface> TrackBody, FColor PlayerColor) {};
 	virtual void OnAddNewTrack(ETrackType Type) {};
 	virtual void OnRemoveTrack(FGuid UUID) {};

Source/Cut5/Utils/Utils.h

@@ -33,7 +33,6 @@ public:
     };
 	static FString MainSaveFullPath()
 	{
-		GEngine->AddOnScreenDebugMessage(-1, 10.0f, FColor::Blue, FGlobalData::BasePath);
 		return FPaths::Combine(FGlobalData::BasePath, FGlobalData::CurrentProjectName, FGlobalData::CurrentProjectName + TEXT(".bin"));
 	};
 };

Source/Cut5/Widgets/DefineGlobal.h

@@ -60,6 +60,11 @@ public:
 	{
 		return Colors[FMath::RandRange(0, Colors.Num() - 1)];
 	}
+	static FString GetTimeData(int32 Frame)
+	{
+		FTimespan Timespan = FTimespan::FromSeconds(Frame / FGlobalData::GlobalFPS);
+		return FString::Printf(TEXT("%02d:%02d:%02d:%02d"), Timespan.GetHours(), Timespan.GetMinutes(), Timespan.GetSeconds(), Frame % static_cast<int>(FGlobalData::GlobalFPS));
+	};
 };
 enum class ETrackType
 {

Source/Cut5/Widgets/FX/SEffectCard.cpp

@@ -50,9 +50,9 @@ void SEffectCard::Construct(const FArguments& InArgs)
 	ChildSlot
 	[
 		SNew(SBox)
-		.WidthOverride(125.0f)
-		.HeightOverride(125.0f)
-		.Padding(10.0f)
+		.WidthOverride(76.0f)
+		.HeightOverride(76.0f)
+		// .Padding(0, 3, 3, 3)
 		[
 			SAssignNew(Overlay, SOverlay)
 			+ SOverlay::Slot()
@@ -115,6 +115,16 @@ void SEffectCard::Construct(const FArguments& InArgs)
 			+ SOverlay::Slot()
 			.VAlign(VAlign_Center)
 			.HAlign(HAlign_Center)
+			.Padding(0, 0, 0, 11.0f)
+			[
+				SNew(SImage)
+				.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("Card.png"), FVector2D(40.0, 40.0)))
+				.Visibility(EVisibility::HitTestInvisible)
+			]
+			+ SOverlay::Slot()	
+			.VAlign(VAlign_Bottom)
+			.HAlign(HAlign_Center)
+			.Padding(0, 0, 0, 11.0f)
 			[
 				SNew(SInlineEditableTextBlock)
 				.Visibility(GroupProperty->bIsDedicated ? CardProperty->bIsActive ? EVisibility::HitTestInvisible : EVisibility::Visible : EVisibility::Visible)
@@ -145,6 +155,7 @@ void SEffectCard::Construct(const FArguments& InArgs)
 				})
 
 			]
+
 		]
 		
 	];
@@ -162,6 +173,7 @@ void SEffectCard::ShowClosedButton(bool bShow)
 	if (bShow)
 	{
 		ClosedButton = SNew(SButton)
+			.ButtonStyle(FCoreStyle::Get(), "NoBorder")
 			.Content()
 			[
 				SNew(SImage)
@@ -234,23 +246,30 @@ TSharedPtr<SWidget> SEffectCard::GetPropertiesWidget()
 		GroupNames.Add(MakeShared<FString>(Group.GroupName));
 	}
 
+	FTextBlockStyle NormalText = FAppStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
+	NormalText.SetFontSize(13);
 		
 	PropertiesWidget = 
 	SNew(SVerticalBox)
 	+ SVerticalBox::Slot()
+	.Padding(0, 13, 0, 0)
 	[
 		SNew(SBox).HeightOverride(32).WidthOverride(214)
 		[
 			SNew(SHorizontalBox)
 			+ SHorizontalBox::Slot()
 			.SizeParam(FAuto())
+			.VAlign(VAlign_Center)
 			[
 				SNew(SBox)
 				.WidthOverride(62)
 				.HeightOverride(32)
+				.VAlign(VAlign_Center)
 				[
 					SNew(STextBlock)
 					.Text(FText::FromString(TEXT("名称")))
+					.Font(NormalText.Font)
+					.Justification(ETextJustify::Center)
 				]
 			]
 			+ SHorizontalBox::Slot()
@@ -291,19 +310,24 @@ TSharedPtr<SWidget> SEffectCard::GetPropertiesWidget()
 		]
 	]
 	+ SVerticalBox::Slot()
+	.Padding(0, 16, 0 ,0)
 	[
 		SNew(SBox).HeightOverride(32).WidthOverride(214)
 		[
 			SNew(SHorizontalBox)
 			+ SHorizontalBox::Slot()
 			.SizeParam(FAuto())
+			.VAlign(VAlign_Center)
 			[
 				SNew(SBox)
 				.WidthOverride(62)
 				.HeightOverride(32)
+				.VAlign(VAlign_Center)
 				[
 					SNew(STextBlock)
 					.Text(FText::FromString(TEXT("ID")))
+					.Font(NormalText.Font)
+					.Justification(ETextJustify::Center)
 				]
 			]
 			+ SHorizontalBox::Slot()
@@ -342,21 +366,32 @@ TSharedPtr<SWidget> SEffectCard::GetPropertiesWidget()
 		]
 	]
 	+ SVerticalBox::Slot()
+	.Padding(0, 16, 0 ,0)
 	[
 		SNew(SBox).HeightOverride(32).WidthOverride(214)
 		[
 			SNew(SHorizontalBox)
 			+ SHorizontalBox::Slot()
+			.SizeParam(FAuto())
+			.VAlign(VAlign_Center)
 			[
 				SNew(SBox)
-				.WidthOverride(136)
+				.VAlign(VAlign_Center)
+				.WidthOverride(62)
 				.HeightOverride(32)
 				[
 					SNew(STextBlock)
 					.Text(FText::FromString(TEXT("应用")))
+					.Font(NormalText.Font)
+					.Justification(ETextJustify::Center)
 				]
 			]
 			+ SHorizontalBox::Slot()
+			.SizeParam(FAuto())
+			[
+				SNew(SBox)
+				.WidthOverride(136)
+				.HeightOverride(32)
 				[
 					SAssignNew(GroupComboBox, SComboBox<TSharedPtr<FString>>)
 					.OptionsSource(&GroupNames)
@@ -410,6 +445,8 @@ TSharedPtr<SWidget> SEffectCard::GetPropertiesWidget()
 				
 					})
 				]
+				
+			]
 		]
 	];
 

Source/Cut5/Widgets/FX/SEffectCardGroup.cpp

@@ -50,7 +50,7 @@ void SEffectCardGroup::Construct(const FArguments& InArgs)
 	SetSavePath({TEXT("FX"), EffectCardGroup->GroupName + TEXT(".bin")});
 	
 	ChildSlot
-	.Padding(3)
+	.Padding(2, 0, 7, 0)
 	[
 		SNew(SBox)
 		.WidthOverride(250.0f)
@@ -106,22 +106,29 @@ void SEffectCardGroup::Construct(const FArguments& InArgs)
 			]
 		]
 	];
+	FTextBlockStyle NormalText = FAppStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
+	NormalText.SetFontSize(13);
 	PropertiesWidget =
 	SNew(SVerticalBox)
 	+ SVerticalBox::Slot()
+	.Padding(0, 13, 0, 0)
 	[
 		SNew(SBox).HeightOverride(32).WidthOverride(214)
 		[
 			SNew(SHorizontalBox)
 			+ SHorizontalBox::Slot()
 			.SizeParam(FAuto())
+			.VAlign(VAlign_Center)
 			[
 				SNew(SBox)
 				.WidthOverride(62)
 				.HeightOverride(32)
+				.VAlign(VAlign_Center)
 				[
 					SNew(STextBlock)
 					.Text(FText::FromString(TEXT("名称")))
+					.Font(NormalText.Font)
+					.Justification(ETextJustify::Center)
 				]
 			]
 			+ SHorizontalBox::Slot()
@@ -160,19 +167,24 @@ void SEffectCardGroup::Construct(const FArguments& InArgs)
 		]
 	]
 	+ SVerticalBox::Slot()
+	.Padding(0, 16, 0 ,0)
 	[
 		SNew(SBox).HeightOverride(32).WidthOverride(214)
 		[
 			SNew(SHorizontalBox)
 			+ SHorizontalBox::Slot()
 			.SizeParam(FAuto())
+			.VAlign(VAlign_Center)
 			[
 				SNew(SBox)
 				.WidthOverride(62)
 				.HeightOverride(32)
+				.VAlign(VAlign_Center)
 				[
 					SNew(STextBlock)
 					.Text(FText::FromString(TEXT("ID")))
+					.Font(NormalText.Font)
+					.Justification(ETextJustify::Center)
 				]
 			]
 			+ SHorizontalBox::Slot()
@@ -209,6 +221,90 @@ void SEffectCardGroup::Construct(const FArguments& InArgs)
 				]
 			]
 		]
+	]
+	+ SVerticalBox::Slot()
+	.Padding(0, 16, 0 ,0)
+	[
+		SNew(SBox).HeightOverride(32).WidthOverride(214)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.SizeParam(FAuto())
+			.VAlign(VAlign_Center)
+			[
+				SNew(SBox)
+				.VAlign(VAlign_Center)
+				.WidthOverride(62)
+				.HeightOverride(32)
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(TEXT("应用")))
+					.Font(NormalText.Font)
+					.Justification(ETextJustify::Center)
+				]
+			]
+			+ SHorizontalBox::Slot()
+			.SizeParam(FAuto())
+			[
+				SNew(SBox)
+				.WidthOverride(136)
+				.HeightOverride(32)
+				[
+					SAssignNew(GroupComboBox, SComboBox<TSharedPtr<FString>>)
+					.OptionsSource(&GroupNames)
+					.OnGenerateWidget_Lambda([this](TSharedPtr<FString> InItem)
+					{
+						return SNew(SHorizontalBox)
+						+ SHorizontalBox::Slot()
+						[
+							SNew(STextBlock).Text(FText::FromString(*InItem))
+						]
+						+ SHorizontalBox::Slot()
+						.HAlign(HAlign_Right)
+						[
+							SNew(SCheckBox)
+							.IsChecked(EffectCardGroup->UsedCurtains.Find(*InItem.Get()) != INDEX_NONE ? ECheckBoxState::Checked : ECheckBoxState::Unchecked)
+							.OnCheckStateChanged_Lambda([this, InItem](const ECheckBoxState& State)
+							{
+								if (State == ECheckBoxState::Checked)
+								{
+									EffectCardGroup->UsedCurtains.Add(*InItem.Get());
+								}
+								else
+								{
+									EffectCardGroup->UsedCurtains.Remove(*InItem.Get());
+								}
+
+
+							})
+						];
+				
+					})
+					[
+						SNew(STextBlock).Text_Lambda([this]()
+						{
+							if (EffectCardGroup->UsedCurtains.Num() > 1)
+							{
+								return FText::FromString(TEXT("多选"));
+							}
+							else if (EffectCardGroup->UsedCurtains.Num() == 1)
+							{
+								return FText::FromString(EffectCardGroup->UsedCurtains[0]);
+							}
+							else
+							{
+								return FText::FromString(TEXT("无"));
+							}
+						})
+					]
+					.OnSelectionChanged_Lambda([this](TSharedPtr<FString> InItem, ESelectInfo::Type SelectInfo)
+					{
+				
+					})
+				]
+				
+			]
+		]
 	];
 	PropertiesInterfaceGUID = EffectCardGroup->Guid;
 	CallRender();
@@ -232,8 +328,17 @@ void SEffectCardGroup::CallRender()
 	CardsInst.Empty();
 	GridPanel->ClearChildren();
 	GridPanel->AddSlot(GridPanel->GetChildren()->Num() % 3, GridPanel->GetChildren()->Num() / 3)
+	// .Padding(FMargin(3))
 	[
 		SNew(SBox)
+		// .Padding(3)
+		.WidthOverride(76)
+		.HeightOverride(76)
+		[
+			SNew(SOverlay)
+			+ SOverlay::Slot()
+			.HAlign(HAlign_Fill)
+			.VAlign(VAlign_Fill)
 			[
 				SNew(SButton)
 				.HAlign(HAlign_Fill)
@@ -245,7 +350,6 @@ void SEffectCardGroup::CallRender()
 					NewCard.Name = TEXT("未命名") + NewCard.Guid.ToString();
 
 					FUtils::CreateDefaultTimelineSave(FUtils::SingleCardFullPath(NewCard.Name), FTimelineInfo::ETimelineType::FX);
-				GEngine->AddOnScreenDebugMessage(-1, 10.0f, FColor::Red, FUtils::SingleCardFullPath(NewCard.Name));
 					{
 						FSaveModifier SaveModifier(FUtils::SingleCardFullPath(NewCard.Name));
 						SaveModifier.TimelineInfo.CurrentOpenFullPath = FUtils::SingleCardFullPath(NewCard.Name);
@@ -255,11 +359,21 @@ void SEffectCardGroup::CallRender()
 					MainInterface->AddNewCard(NewCard, EffectCardGroup->GroupName);
 					return FReply::Handled();
 				})
-			.ContentPadding(10.0)
-			[
-				SNew(STextBlock)
-				.Text(FText::FromString(TEXT("添加新特效卡")))
 			]
+			+ SOverlay::Slot()
+			.HAlign(HAlign_Fill)
+			.VAlign(VAlign_Fill)
+			[
+				SNew(SBox)
+				.WidthOverride(32)
+				.HeightOverride(32)
+				[
+					SNew(SImage)
+					.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath(TEXT("add-fill.png")), {32, 32}))
+					.Visibility(EVisibility::HitTestInvisible)
+				]
+			]
+
 		]
 	];
 	
@@ -273,6 +387,7 @@ void SEffectCardGroup::CallRender()
 			.GroupProperty(EffectCardGroup)
 			.CardGroupPtr(this);
 		GridPanel->AddSlot(GridPanel->GetChildren()->Num() % 3, GridPanel->GetChildren()->Num() / 3)
+		.Padding(FMargin(3))
 		[
 			NewCardInst.ToSharedRef()
 		];

Source/Cut5/Widgets/FX/SEffectCardGroup.h

@@ -7,6 +7,7 @@
 #include "Cut5/Interface/SaveInterface.h"
 #include "Cut5/Widgets/DefineGlobal.h"
 #include "Widgets/SCompoundWidget.h"
+#include "Widgets/Input/SComboBox.h"
 #include "Widgets/Layout/SGridPanel.h"
 #include "Widgets/Layout/SScrollBox.h"
 
@@ -59,6 +60,7 @@ public:
 
 
 	virtual FReply OnDrop(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override;
-
+	TArray<TSharedPtr<FString>> GroupNames;
+	TSharedPtr<SComboBox<TSharedPtr<FString>>> GroupComboBox;
 
 };

Source/Cut5/Widgets/SCustomInputPanel.cpp

@@ -48,7 +48,7 @@ void SCustomInputPanel::Construct(const FArguments& InArgs)
 	[
 
 		SNew(SBox)
-		.Padding(2)
+		.Padding(0, 0, 2, 0)
 		.WidthOverride(347)
 		.HeightOverride(489)
 		[
@@ -166,6 +166,7 @@ void SCustomInputPanel::Construct(const FArguments& InArgs)
 					]	
 				]
 				+ SVerticalBox::Slot()
+				.Padding(0, 0, 0, 13)
 				[
 					SAssignNew(Switcher, SWidgetSwitcher)
 					+ SWidgetSwitcher::Slot()

Source/Cut5/Widgets/SCutMainWindow.cpp

@@ -66,6 +66,11 @@ void SCutMainWindow::Construct(const FArguments& InArgs)
 		FPlatformMisc::RequestExit(true);
 	}));
 
+	FTextBlockStyle MainBarTextStyle = FAppStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
+	MainBarTextStyle.SetFontSize(17);
+	FTextBlockStyle TitleBarTextStyle = FAppStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
+	MainBarTextStyle.SetFontSize(15);
+	
 	
 	ChildSlot
 	[
@@ -89,13 +94,23 @@ void SCutMainWindow::Construct(const FArguments& InArgs)
 				+ SHorizontalBox::Slot()
 				.SizeParam(FAuto())
 				.Padding(16, 0, 0, 0)
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				[
+					SNew(SBox)
+					.HeightOverride(28)
+					.WidthOverride(28)
+					
 					[
 						SNew(SImage)
 						.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("EngineLogo.png"), {26, 26}))
 					]
+				]
 				+ SHorizontalBox::Slot()
-				.SizeParam(FAuto())
 				.Padding(32, 0, -32, 0)
+				.HAlign(HAlign_Fill)
+				.VAlign(VAlign_Center)
+				.SizeParam(FAuto())
 				[
 					SNew(SOverlay)
 					+ SOverlay::Slot()
@@ -107,6 +122,7 @@ void SCutMainWindow::Construct(const FArguments& InArgs)
 						[
 							SNew(STextBlock)
 							.Text(FText::FromString(TEXT("菜单 v")))
+							.Font(MainBarTextStyle.Font)
 						]
 						.OnClicked_Lambda([this]()
 						{
@@ -123,6 +139,42 @@ void SCutMainWindow::Construct(const FArguments& InArgs)
 						})
 					]
 				]
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Right)
+				[
+					SNew(SBox)
+					.WidthOverride(24)
+					.HeightOverride(24)
+					[
+						SNew(SImage)
+						.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("minus.png"), { 24, 24 }))
+					]
+				]
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Right)
+				[
+					SNew(SBox)
+					.WidthOverride(24)
+					.HeightOverride(24)
+					[
+						SNew(SImage)
+						.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("Max.png"), { 24, 24 }))
+					]
+				]
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Right)
+				[
+					SNew(SBox)
+					.WidthOverride(24)
+					.HeightOverride(24)
+					[
+						SNew(SImage)
+						.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("Close.png"), { 24, 24 }))
+					]
+				]
 			]
 		]
 
@@ -130,11 +182,6 @@ void SCutMainWindow::Construct(const FArguments& InArgs)
 		.HAlign(HAlign_Fill)
 		.VAlign(VAlign_Fill)
 		.Padding(16, 47, 16, 16)
-		[
-			SNew(SScaleBox)
-			.HAlign(HAlign_Fill)
-			.VAlign(VAlign_Fill)
-			.Stretch(EStretch::Fill)
 		[
 				SNew(SConstraintCanvas)
 				+ SConstraintCanvas::Slot()
@@ -167,34 +214,65 @@ void SCutMainWindow::Construct(const FArguments& InArgs)
 								.SizeParam(FAuto())
 								.HAlign(HAlign_Fill)
 								.VAlign(VAlign_Fill)
+								[
+									SNew(SBox)
+									.WidthOverride(269)
+									.HeightOverride(489)
+									.Padding(0, 0, 2, 0)
+									[
+										SNew(SOverlay)
+										+ SOverlay::Slot()
+										.HAlign(HAlign_Fill)
+										.VAlign(VAlign_Fill)
+										[
+											SNew(SImage)
+											.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("BackGround.png"), {}))
+										]
+										+ SOverlay::Slot()
+										.HAlign(HAlign_Fill)
+										.VAlign(VAlign_Fill)
 										[
 											SNew(SVerticalBox)
 											+ SVerticalBox::Slot()
 											.SizeParam(FAuto())
+											.Padding(0, 11, 0, 13)
 											[
 												SNew(SHorizontalBox)
 												+ SHorizontalBox::Slot()
+												.SizeParam(FAuto())
 												[
 													SNew(SButton)
-											.Text(FText::FromString(TEXT("设备列表")))
+													.ButtonStyle(FCoreStyle::Get(), "NoBorder")
 													.OnClicked_Lambda([this]()
 													{
 														PropertiesPanelSwitcher->SetActiveWidgetIndex(0);
 														return FReply::Handled();
 													})
+													[
+														SNew(STextBlock)
+														.Text(FText::FromString(TEXT("设备列表")))
+														.Font(TitleBarTextStyle.Font)
+													]
 												]
 												+ SHorizontalBox::Slot()
+												.SizeParam(FAuto())
 												[
 													SNew(SButton)
-											.Text(FText::FromString(TEXT("特效卡")))
+													.ButtonStyle(FCoreStyle::Get(), "NoBorder")
 													.OnClicked_Lambda([this]()
 													{
 														PropertiesPanelSwitcher->SetActiveWidgetIndex(1);
 														return FReply::Handled();
 													})
+													[
+														SNew(STextBlock)
+														.Text(FText::FromString(TEXT("特效卡")))
+														.Font(TitleBarTextStyle.Font)
+													]
 												]
 											]
 											+ SVerticalBox::Slot()
+											.Padding(0, 0, 2, 0)
 											[
 												SAssignNew(PropertiesPanelSwitcher, SWidgetSwitcher)
 												+ SWidgetSwitcher::Slot()
@@ -211,6 +289,10 @@ void SCutMainWindow::Construct(const FArguments& InArgs)
 												]
 											]
 										]
+										
+									]
+									
+								]
 								+ SHorizontalBox::Slot()
 								.HAlign(HAlign_Fill)
 								.VAlign(VAlign_Fill)
@@ -257,7 +339,7 @@ void SCutMainWindow::Construct(const FArguments& InArgs)
 						]
 					]
 				]
-			]
+			
 		]
 		
 		
@@ -292,6 +374,7 @@ void SCutMainWindow::Render()
 					FString NewName = TrackGroupInstance.GroupName + FString::FromInt(i);
 					TSharedPtr<SPlayerLight> PlayerLight = SNew(SPlayerLight).Name(NewName).TrackHead(TrackGroupInstance.Head);
 					(bSingle ? StatePanel->PlayerList1 : StatePanel->PlayerList2)->AddSlot()
+					.SizeParam(FAuto())
 					[
 						PlayerLight.ToSharedRef()
 					];
@@ -366,6 +449,23 @@ void SCutMainWindow::OnUpdatePlayers(TSharedPtr<class IWidgetInterface> TrackBod
 	}
 }
 
+void SCutMainWindow::OnUpdateProjector(int32 Index, bool bEnableProjector)
+{
+	if (StatePanel->Projector)
+	{
+		StatePanel->Projector->SetColorAndOpacity(bEnableProjector ? FLinearColor::White : FLinearColor::Black);
+	}
+}
+
+void SCutMainWindow::OnUpdateSpotLight(int32 Index, FColor LightColor)
+{
+	if (StatePanel->SpotLight)
+	{
+		StatePanel->SpotLight->SetColorAndOpacity(LightColor.ReinterpretAsLinear());
+	}
+	
+}
+
 void SCutMainWindow::OnAddNewTrack(ETrackType Type)
 {
 	ICutMainWidgetInterface::OnAddNewTrack(Type);

Source/Cut5/Widgets/SCutMainWindow.h

@@ -51,6 +51,8 @@ public:
 	virtual void OnUpdateVideo(FGuid UUID, int32 X, int32 Y, uint8* RawData) override;
 	virtual void OnUpdateLightArray(const TArray<FColor>& LightArray) override;
 	virtual void OnUpdatePlayers(TSharedPtr<class IWidgetInterface> TrackBody, FColor PlayerColor) override;
+	virtual void OnUpdateProjector(int32 Index, bool bEnableProjector) override;
+	virtual void OnUpdateSpotLight(int32 Index, FColor LightColor) override;
 	virtual void OnAddNewTrack(ETrackType Type) override;
 	virtual void OnRemoveTrack(FGuid Guid) override;
 	virtual void OnUpdateSound(uint8* Data, int32 Size) override;

Source/Cut5/Widgets/SCutTimeline.cpp

@@ -39,6 +39,8 @@ void SCutTimeline::UpdateCursorPosition(int32 Frame)
 			{
 				Interface.Body->Seek(Frame);
 			}
+			CurrentTimeData->SetText(FText::FromString(FGlobalData::GetTimeData(Frame) + " / "));
+			MaxTimeData->SetText(FText::FromString(FGlobalData::GetTimeData(FGlobalData::TrackLength)));
 		}
 		else
 		{
@@ -126,6 +128,7 @@ void SCutTimeline::Construct(const FArguments& InArgs)
 							[
 								SAssignNew(CurrentTimeData, STextBlock)
 								.Text(FText::FromString(TEXT("00:00:00:27 / ")))
+								.ColorAndOpacity(FColor(73, 192, 179, 255))
 							]
 							+ SHorizontalBox::Slot()
 							.AutoWidth()
@@ -187,6 +190,7 @@ void SCutTimeline::Construct(const FArguments& InArgs)
 						[
 							// Group
 							SAssignNew(TrackGroupScrollBox, SScrollBox)
+
 							.OnUserScrolled_Lambda([this](float ScrollValue)
 							{
 								TrackBodyScrollBox->SetScrollOffset(ScrollValue);
@@ -317,6 +321,8 @@ void SCutTimeline::Construct(const FArguments& InArgs)
 	AddNewTrackToGroup(TEXT("固定轨道"), LightArrayData);
 	FTrackData LightBarData(TEXT("灯带"), ETrackType::LightBarTrack);
 	AddNewTrackToGroup(TEXT("固定轨道"), LightBarData);
+	FTrackData LightBarData2(TEXT("灯带2"), ETrackType::LightBarTrack);
+	AddNewTrackToGroup(TEXT("固定轨道"), LightBarData);
 	FTrackData SpotLightData(TEXT("聚光灯"), ETrackType::SpotLightTrack);
 	AddNewTrackToGroup(TEXT("固定轨道"), SpotLightData);
 }
@@ -448,6 +454,7 @@ void SCutTimeline::RenderGroup()
 			.VAlign(VAlign_Fill)
 			.HeightOverride(FGlobalData::DefaultTrackHeight * (TrackGroups[i].GroupIsCollapsed ? 1 : TrackGroups[i].TrackDataArray.Num()))
 			.WidthOverride(24)
+			.Padding(8, 0, 0, 0)
 			[
 				SNew(SOverlay)
 				+ SOverlay::Slot()

Source/Cut5/Widgets/SPlayerLight.cpp

@@ -16,20 +16,29 @@ void SPlayerLight::Construct(const FArguments& InArgs)
 
 	ChildSlot
 	[
-		SNew(SScaleBox)
+			SNew(SBox)
+			.WidthOverride(56)
+			.HeightOverride(56)
 			[
 				SNew(SVerticalBox)
 				+ SVerticalBox::Slot()
+				[
+					SNew(SBox)
+					.WidthOverride(25)
+					.HeightOverride(25)
 					[
 						SAssignNew(PlayerLightImage, SImage)
 						.Image(SlateDynamicImageBrush)
 					]
+				]
 				+ SVerticalBox::Slot()
 				[
 					SNew(STextBlock)
 					.Text(FText::FromString(Name))
 				]
 			]
+
+
 	];
 
 }

Source/Cut5/Widgets/STimelineClip.cpp

@@ -247,6 +247,41 @@ void STimelineClip::Seek(int32 Frame)
 		}
 
 		break;
+	case ETrackType::SpotLightTrack:
+		{
+			const int32 Offset = Frame - ClipData->ClipStartFrame;
+			const int32 SeekMovieFrame = ClipData->VideoStartFrame + Offset;
+			if (ClipData->PresetType == EPresetType::NotAPresets)
+			{
+				if (SeekMovieFrame < ClipData->PlayerLightData.Num())
+				{
+					MainWidgetInterface->OnUpdateSpotLight(0, ClipData->PlayerLightData[SeekMovieFrame]);
+				}
+				break;
+			}
+			else if (ClipData->PresetType == EPresetType::Color)
+			{
+				MainWidgetInterface->OnUpdateSpotLight(0, ClipData->ClipColors[0].ToFColor(false));
+			}
+			else if (ClipData->PresetType == EPresetType::Gradient)
+			{
+				int32 Between = -1;
+				for (int32 i = 0; i < ClipData->Cursors.Num() - 1; i++)
+				{
+					if (SeekMovieFrame > ClipData->Cursors[i].CursorFrameOffset && SeekMovieFrame < ClipData->Cursors[i + 1].CursorFrameOffset)
+					{
+						Between = i;
+					}
+				}
+				if (Between != -1)
+				{
+					FLinearColor LinearColor = FLinearColor::Black;
+					LinearColor = FMath::Lerp(ClipData->Cursors[Between].Color, ClipData->Cursors[Between + 1].Color, (float)(SeekMovieFrame - ClipData->Cursors[Between].CursorFrameOffset) / (float)(ClipData->Cursors[Between + 1].CursorFrameOffset - ClipData->Cursors[Between].CursorFrameOffset));
+					MainWidgetInterface->OnUpdateSpotLight(0, LinearColor.ToFColor(false));
+					
+				}
+			}
+		}
 	case ETrackType::LightArrayTrack:
 		{
 			const int32 Offset = Frame - ClipData->ClipStartFrame;
@@ -325,9 +360,6 @@ void STimelineClip::Seek(int32 Frame)
 					MainWidgetInterface->OnUpdatePlayers(Body, LinearColor.ToFColor(false));
 					
 				}
-				
-			
-				
 			}
 
 		}
@@ -344,7 +376,7 @@ void STimelineClip::UpdatePosition(int32 StartFrame)
 		return;
 	}
 	const int32 NewPosX = StartFrame * FGlobalData::DefaultTimeTickSpace;
-	GEngine->AddOnScreenDebugMessage(-1, 10.0f, FColor::Red, FString::FromInt(NewPosX));
+
 	SetRenderTransform(FSlateRenderTransform(FVector2D(NewPosX, 0)));
 	ClipDataBox->SetWidthOverride((ClipData->ClipEndFrame - StartFrame) * FGlobalData::DefaultTimeTickSpace);
 	if (ClipData->ClipType == ETrackType::VideoTrack)
@@ -363,7 +395,7 @@ void STimelineClip::UpdatePosition(int32 StartFrame)
 		}
 	}
 	ClipData->ClipStartFrame = StartFrame;
-	GEngine->AddOnScreenDebugMessage(-1, 10.0f, FColor::Red, FString::FromInt(ClipData->ClipStartFrame));
+
 }
 
 void STimelineClip::UpdateLength(int32 EndFrame)
@@ -385,7 +417,7 @@ void STimelineClip::UpdateLength(int32 EndFrame)
 			
 		}
 	}
-	GEngine->AddOnScreenDebugMessage(-1, 10.0f, FColor::Red, FString::FromInt(ClipData->ClipEndFrame));
+
 }
 
 void STimelineClip::UpdateMove(int32 X, int32 DragOffset)

Source/Cut5/Widgets/STimelinePropertyPanel.cpp

@@ -17,6 +17,7 @@ void STimelinePropertyPanel::Construct(const FArguments& InArgs)
 	ChildSlot
 	[
 		SNew(SBox)
+		.Padding(0, 0, 2, 0)
 		.WidthOverride(269)
 		.HeightOverride(489)
 		[
@@ -32,6 +33,7 @@ void STimelinePropertyPanel::Construct(const FArguments& InArgs)
 			[
 				SNew(SScrollBox)
 				+ SScrollBox::Slot()
+				.SizeParam(FAuto())
 				[
 					SNew(SBox)
 					[
@@ -43,31 +45,7 @@ void STimelinePropertyPanel::Construct(const FArguments& InArgs)
 							SNew(SImage)
 							.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("BackGround.png"), {}))
 						]
-						+ SOverlay::Slot()
-						[
-							SNew(SBox)
-							.WidthOverride(236)
-							.HeightOverride(76)
-							[
-								SNew(SOverlay)
-								+ SOverlay::Slot()
-								.VAlign(VAlign_Center)
-								.HAlign(HAlign_Center)
-								[
-									SNew(SImage)
-								]
-								+ SOverlay::Slot()
-								.VAlign(VAlign_Bottom)
-								.HAlign(HAlign_Fill)
-								[
-									SNew(STextBlock)
-									.Text(FText::FromString(TEXT("角色组")))
-									.Justification(ETextJustify::Center)
-								]
 
-							]
-
-						]
 						+ SOverlay::Slot()
 						.HAlign(HAlign_Fill)
 						.VAlign(VAlign_Fill)
@@ -87,6 +65,35 @@ void STimelinePropertyPanel::Construct(const FArguments& InArgs)
 								return FReply::Handled();
 							})
 						]
+						+ SOverlay::Slot()
+						[
+							SNew(SBox)
+							.WidthOverride(236)
+							.HeightOverride(76)
+							[
+								SNew(SOverlay)
+								+ SOverlay::Slot()
+								.VAlign(VAlign_Fill)
+								.HAlign(HAlign_Fill)
+								[
+									SNew(SImage)
+									.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("CharacterGroup.png"), {}))
+									.Visibility(EVisibility::HitTestInvisible)
+								]
+								+ SOverlay::Slot()
+								.VAlign(VAlign_Bottom)
+								.HAlign(HAlign_Fill)
+								.Padding(0, 0, 0, 3)
+								[
+									SNew(STextBlock)
+									.Text(FText::FromString(TEXT("角色组")))
+									.Justification(ETextJustify::Center)
+									.Visibility(EVisibility::HitTestInvisible)
+								]
+						
+							]
+						
+						]
 		
 					]
 				]

Source/Cut5/Widgets/STrackBody.cpp

@@ -65,7 +65,7 @@ void STrackBody::Construct(const FArguments& InArgs)
 void STrackBody::CallRender()
 {
 	Overlay->ClearChildren();
-	GEngine->AddOnScreenDebugMessage(-1, 10.0f, FColor::Black, FString::Printf(TEXT("CallRender")));
+
 	SlateClips.Empty();
 	for (FClipData& TempClipData : TrackHead->TrackData.ClipData)
 	{
@@ -169,7 +169,7 @@ void STrackBody::DeleteUseLessClips()
 	{
 		if (!TrackHead->TrackData.ClipData[i].ResourcePropertyDataPtr->bIsValid)
 		{
-			GEngine->AddOnScreenDebugMessage(-1, 5.0f, FColor::Red, TEXT("DeleteUseLessClips"));
+
 		}
 	}
 }

Source/Cut5/Widgets/STrackHead.cpp

@@ -28,16 +28,21 @@ void STrackHead::Construct(const FArguments& InArgs)
 				.HAlign(HAlign_Center)
 				.VAlign(VAlign_Center)
 				.Padding(4, 4, 4, 4)
+				[
+					SNew(SBox)
+					.WidthOverride(24)
+					.HeightOverride(24)
 					[
 						Image.ToSharedRef()
 					]
-				+ SOverlay::Slot()
-				.HAlign(HAlign_Center)
-				.VAlign(VAlign_Center)
-				[
-					SNew(STextBlock)
-					.Text(FText::FromString(TrackData.TrackName))
 				]
+				// + SOverlay::Slot()
+				// .HAlign(HAlign_Center)
+				// .VAlign(VAlign_Center)
+				// [
+				// 	SNew(STextBlock)
+				// 	.Text(FText::FromString(TrackData.TrackName))
+				// ]
 
 			]
 		]

Source/Cut5/Widgets/StatePanel/SStatePanel.cpp

@@ -17,12 +17,14 @@ void SStatePanel::Construct(const FArguments& InArgs)
 {
 	SAssignNew(VideoPlayer, SVideoPlayer);
 	SAssignNew(LightArray, SLightArrayPanel);
+	FTextBlockStyle TextBlockStyle = FAppStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
+	TextBlockStyle.SetFontSize(17);
 	ChildSlot
 	[
 		SNew(SBox)
 		.HeightOverride(769)
 		.WidthOverride(489)
-		.Padding(2)
+		.Padding(0, 0, 2, 0)
 		[
 			SNew(SOverlay)
 			+ SOverlay::Slot()
@@ -41,12 +43,19 @@ void SStatePanel::Construct(const FArguments& InArgs)
 				.SizeParam(FAuto())
 				[
 					SNew(SBox)
+					.WidthOverride(769)
+					.HeightOverride(49)
 					[
 						SNew(SHorizontalBox)
 						+ SHorizontalBox::Slot()
+						.Padding(10, 0, 0, 0)
+						.HAlign(HAlign_Left)
+						.VAlign(VAlign_Center)
 						[
 							SNew(STextBlock)
 							.Text(FText::FromString(TEXT("预览")))
+							.Font(TextBlockStyle.Font)
+							.Justification(ETextJustify::Center)
 						]
 						+ SHorizontalBox::Slot()
 						[
@@ -62,25 +71,50 @@ void SStatePanel::Construct(const FArguments& InArgs)
 				]
 				+ SVerticalBox::Slot()
 				.SizeParam(FAuto())
+				.Padding(47, 0, 47, 0)
 				[
 					SNew(SBox)
-					.HeightOverride(125.0)
-					[
-						SAssignNew(PlayerList1, SHorizontalBox)
-					]
-				]
-				+ SVerticalBox::Slot()
-				[
-					SNew(SBox)
-					.MinDesiredHeight(500.0)
+					.HeightOverride(56.0)
+					.WidthOverride(690)
 					[
 						SNew(SOverlay)
 						+ SOverlay::Slot()
+						[
+							SNew(SImage)
+							.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("PlayerBar.png"), {}))
+						]
+						+ SOverlay::Slot()
+						[
+							SAssignNew(PlayerList1, SHorizontalBox)
+						]
+						
+					]
+				]
+				+ SVerticalBox::Slot()
+				.SizeParam(FStretch(1.0))
+
+				[
+					SNew(SBox)
+					.HeightOverride(296)
+					.WidthOverride(469)
+					[
+						SNew(SOverlay)
+						+ SOverlay::Slot()
+						[
+							SNew(SBox)
+							.HeightOverride(296)
+							.WidthOverride(469)
+							.HAlign(HAlign_Center)
+							.VAlign(VAlign_Center)
 							[
 								SAssignNew(ShowSwitcher, SWidgetSwitcher)
 								+ SWidgetSwitcher::Slot()
+								.HAlign(HAlign_Center)
+								.VAlign(VAlign_Center)
 								[
 									SAssignNew(MainShow, SBox)
+									.HeightOverride(296)
+									.WidthOverride(469)
 									[
 										VideoPlayer.ToSharedRef()
 									]
@@ -92,6 +126,9 @@ void SStatePanel::Construct(const FArguments& InArgs)
 										LightArray.ToSharedRef()
 									]
 								]
+							]
+							
+							
 	
 						]
 						+ SOverlay::Slot()
@@ -140,12 +177,24 @@ void SStatePanel::Construct(const FArguments& InArgs)
 				]
 				+ SVerticalBox::Slot()
 				.SizeParam(FAuto())
+				.Padding(47, 0, 47, 0)
 				[
 					SNew(SBox)
-					.HeightOverride(125.0)
+					.HeightOverride(56.0)
+					.WidthOverride(690)
+					[
+						SNew(SOverlay)
+						+ SOverlay::Slot()
+						[
+							SNew(SImage)
+							.Image(FUtils::GetBrushFromImage(FUtils::GetResourcesPath("PlayerBar.png"), {}))
+						]
+						+ SOverlay::Slot()
 						[
 							SAssignNew(PlayerList2, SHorizontalBox)
 						]
+							
+					]
 				]
 			]
 			

Source/Cut5/Widgets/StatePanel/SVideoPlayer.cpp

@@ -12,17 +12,13 @@ void SVideoPlayer::Construct(const FArguments& InArgs)
 {
 
 	ChildSlot
-	[
-		SNew(SScaleBox)
-		.Stretch(EStretch::ScaleToFit)
 	[
 		SNew(SBox)
-			.WidthOverride(1920)
-			.HeightOverride(1080)
+		.WidthOverride(469)
+		.HeightOverride(296)
 		[
 			SAssignNew(VideoImage, SImage)
 		]
-		]
 	];