diff --git a/Content/Blueprint/Core/BP_3DtextHelp.uasset b/Content/Blueprint/Core/BP_3DtextHelp.uasset index fdf86bd5..1b3ec85e 100644 Binary files a/Content/Blueprint/Core/BP_3DtextHelp.uasset and b/Content/Blueprint/Core/BP_3DtextHelp.uasset differ diff --git a/Content/Blueprint/Core/BP_DrawrCabin.uasset b/Content/Blueprint/Core/BP_DrawrCabin.uasset index 081ce9c7..c372f4d0 100644 Binary files a/Content/Blueprint/Core/BP_DrawrCabin.uasset and b/Content/Blueprint/Core/BP_DrawrCabin.uasset differ diff --git a/Content/Blueprint/Core/BP_LampButton.uasset b/Content/Blueprint/Core/BP_LampButton.uasset index 2622e3d0..3a238c6b 100644 Binary files a/Content/Blueprint/Core/BP_LampButton.uasset and b/Content/Blueprint/Core/BP_LampButton.uasset differ diff --git a/Content/Blueprint/Core/BP_NaviSplineCreator.uasset b/Content/Blueprint/Core/BP_NaviSplineCreator.uasset index ddee49c2..83104b11 100644 Binary files a/Content/Blueprint/Core/BP_NaviSplineCreator.uasset and b/Content/Blueprint/Core/BP_NaviSplineCreator.uasset differ diff --git a/Content/Blueprint/Core/BP_StoveButton.uasset b/Content/Blueprint/Core/BP_StoveButton.uasset index 5b727728..2c048adf 100644 Binary files a/Content/Blueprint/Core/BP_StoveButton.uasset and b/Content/Blueprint/Core/BP_StoveButton.uasset differ diff --git a/Content/Blueprint/Core/BP_ToHoldItem.uasset b/Content/Blueprint/Core/BP_ToHoldItem.uasset index a7cf5b77..ff77c723 100644 Binary files a/Content/Blueprint/Core/BP_ToHoldItem.uasset and b/Content/Blueprint/Core/BP_ToHoldItem.uasset differ diff --git a/Content/Blueprint/Core/BP_allObjectCreate.uasset b/Content/Blueprint/Core/BP_allObjectCreate.uasset index c38de37c..0ff17306 100644 Binary files a/Content/Blueprint/Core/BP_allObjectCreate.uasset and b/Content/Blueprint/Core/BP_allObjectCreate.uasset differ diff --git a/Content/Blueprint/Core/BP_drawing.uasset b/Content/Blueprint/Core/BP_drawing.uasset index 99c27a6f..1f08d043 100644 Binary files a/Content/Blueprint/Core/BP_drawing.uasset and b/Content/Blueprint/Core/BP_drawing.uasset differ diff --git a/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset b/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset index 573c9659..b3fd5a9f 100644 Binary files a/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset and b/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset b/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset index b2a634c0..9d14c32d 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset and b/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_HumanoidRobot.uasset b/Content/Blueprint/RobotPawnActors/BP_HumanoidRobot.uasset index f57a7a64..09825518 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_HumanoidRobot.uasset and b/Content/Blueprint/RobotPawnActors/BP_HumanoidRobot.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_MujocoBostonDynamicsSpotWithArm.uasset b/Content/Blueprint/RobotPawnActors/BP_MujocoBostonDynamicsSpotWithArm.uasset index 2e6755f8..e2290a6a 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_MujocoBostonDynamicsSpotWithArm.uasset and b/Content/Blueprint/RobotPawnActors/BP_MujocoBostonDynamicsSpotWithArm.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_MujocoUnitreeGo2.uasset b/Content/Blueprint/RobotPawnActors/BP_MujocoUnitreeGo2.uasset index 4da4dae9..59a4eeff 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_MujocoUnitreeGo2.uasset and b/Content/Blueprint/RobotPawnActors/BP_MujocoUnitreeGo2.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_PuralinkRobot.uasset b/Content/Blueprint/RobotPawnActors/BP_PuralinkRobot.uasset index 59e2bd48..e7fa58cb 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_PuralinkRobot.uasset and b/Content/Blueprint/RobotPawnActors/BP_PuralinkRobot.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_RevoluteRobot.uasset b/Content/Blueprint/RobotPawnActors/BP_RevoluteRobot.uasset index 3d5ecd52..2a3fa1c0 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_RevoluteRobot.uasset and b/Content/Blueprint/RobotPawnActors/BP_RevoluteRobot.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_WheeledRobot.uasset b/Content/Blueprint/RobotPawnActors/BP_WheeledRobot.uasset index d2ea89de..28af7541 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_WheeledRobot.uasset and b/Content/Blueprint/RobotPawnActors/BP_WheeledRobot.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_mujokoArm.uasset b/Content/Blueprint/RobotPawnActors/BP_mujokoArm.uasset index 9855876a..281603a3 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_mujokoArm.uasset and b/Content/Blueprint/RobotPawnActors/BP_mujokoArm.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset b/Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset index 13a7181f..194d2cbe 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset and b/Content/Blueprint/RobotPawnActors/BP_mujokoStretch.uasset differ diff --git a/Content/Blueprint/component/BPC_DataTrasnfer.uasset b/Content/Blueprint/component/BPC_DataTrasnfer.uasset index 6924cbcc..ef411136 100644 Binary files a/Content/Blueprint/component/BPC_DataTrasnfer.uasset and b/Content/Blueprint/component/BPC_DataTrasnfer.uasset differ diff --git a/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset b/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset index b4cdd2a2..5b55f4ce 100644 Binary files a/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset and b/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset differ diff --git a/Content/Blueprint/oldRobotsBP/BP_WheeledRobot.uasset b/Content/Blueprint/oldRobotsBP/BP_WheeledRobot.uasset index b9aebf75..4227127f 100644 Binary files a/Content/Blueprint/oldRobotsBP/BP_WheeledRobot.uasset and b/Content/Blueprint/oldRobotsBP/BP_WheeledRobot.uasset differ diff --git a/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset b/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset index e1c8e2e8..67719287 100644 Binary files a/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset and b/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset differ diff --git a/Content/GameBP/Core/BP_LuckyRobotsGameInstance.uasset b/Content/GameBP/Core/BP_LuckyRobotsGameInstance.uasset index 4cb30154..9bc56fea 100644 Binary files a/Content/GameBP/Core/BP_LuckyRobotsGameInstance.uasset and b/Content/GameBP/Core/BP_LuckyRobotsGameInstance.uasset differ diff --git a/Content/GameBP/Datatable/SelectableItemData/DT_Furniture.uasset b/Content/GameBP/Datatable/SelectableItemData/DT_Furniture.uasset index 1e2571ae..69447587 100644 Binary files a/Content/GameBP/Datatable/SelectableItemData/DT_Furniture.uasset and b/Content/GameBP/Datatable/SelectableItemData/DT_Furniture.uasset differ diff --git a/Content/GameBP/Menus/WB_MainScreen.uasset b/Content/GameBP/Menus/WB_MainScreen.uasset index 4b597b54..16765213 100644 Binary files a/Content/GameBP/Menus/WB_MainScreen.uasset and b/Content/GameBP/Menus/WB_MainScreen.uasset differ diff --git a/Content/GameBP/UI/Settings/WB_CaptureSettings.uasset b/Content/GameBP/UI/Settings/WB_CaptureSettings.uasset index 72fd9dad..c33d4f78 100644 Binary files a/Content/GameBP/UI/Settings/WB_CaptureSettings.uasset and b/Content/GameBP/UI/Settings/WB_CaptureSettings.uasset differ diff --git a/Content/GameBP/UI/WB_GameWidget.uasset b/Content/GameBP/UI/WB_GameWidget.uasset index 94bbc6d6..bbb955d3 100644 Binary files a/Content/GameBP/UI/WB_GameWidget.uasset and b/Content/GameBP/UI/WB_GameWidget.uasset differ diff --git a/Content/luckyBot/Luckywidget/ChildItems/FLogItemStruct.uasset b/Content/luckyBot/Luckywidget/ChildItems/FLogItemStruct.uasset deleted file mode 100644 index 75f023c7..00000000 Binary files a/Content/luckyBot/Luckywidget/ChildItems/FLogItemStruct.uasset and /dev/null differ diff --git a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset index eb6c3d75..15dcbc60 100644 Binary files a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset and b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset differ diff --git a/Content/luckyBot/blueprint/EHoldHand.uasset b/Content/luckyBot/blueprint/EHoldHand.uasset deleted file mode 100644 index 33a6a76a..00000000 Binary files a/Content/luckyBot/blueprint/EHoldHand.uasset and /dev/null differ diff --git a/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp b/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp index 8f7719c5..3f6e548d 100644 --- a/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp +++ b/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp @@ -6,6 +6,9 @@ #include "Kismet/GameplayStatics.h" #include "UI/GameUserWidget.h" #include "Kismet/KismetSystemLibrary.h" +#include "GameFramework/GameUserSettings.h" +#include "Kismet/KismetMathLibrary.h" +#include "FunctionLibraries/LuckyRobotsFunctionLibrary.h" void ULuckyRobotsGameInstance::DoSendMessage(const FString& SendValue) { @@ -133,6 +136,85 @@ void ULuckyRobotsGameInstance::DoSetTempTaskValueChange(bool bIsClear) } } +void ULuckyRobotsGameInstance::DoResolutionChange(bool bIsFullscreen) +{ + UGameUserSettings* GameUserSettings = UGameUserSettings::GetGameUserSettings(); + if (!GameUserSettings) + { + return; + } + + FIntPoint LastResolution = FIntPoint(1280, 720); + if (bIsFullscreen) + { + TArray SupportedResolutions; + if (UKismetSystemLibrary::GetSupportedFullscreenResolutions(SupportedResolutions)) + { + if (SupportedResolutions.Num() > 0) + { + LastResolution = SupportedResolutions.Last(); + } + } + } + else + { + FString PlatformName = UGameplayStatics::GetPlatformName(); + if(PlatformName == "Linux") + { + LastResolution = FIntPoint(720, 405); + } + else if (PlatformName == "Mac") + { + LastResolution = FIntPoint(720, 405); + } + else if(PlatformName == "Windows") + { + LastResolution = FIntPoint(1280, 720); + } + } + GameUserSettings->SetScreenResolution(LastResolution); + GameUserSettings->SetFullscreenMode(bIsFullscreen ? EWindowMode::Fullscreen : EWindowMode::Windowed); + GameUserSettings->ApplyResolutionSettings(false); + +} + +FString ULuckyRobotsGameInstance::DoRandomString(FString StartString) +{ + FString TempString = ""; + for (int32 Index = 0; Index < 7; Index++) + { + int32 RandomIndex = UKismetMathLibrary::RandomInteger(AlphabetForRandomList.Num()); + if (AlphabetForRandomList.IsValidIndex(RandomIndex)) + { + TempString.Append(AlphabetForRandomList[RandomIndex]); + } + } + + return StartString + "#" + TempString; +} + +void ULuckyRobotsGameInstance::UpdateQualitySettings() +{ + if (UGameUserSettings* GameUserSettings = GEngine->GetGameUserSettings()) + { + GameUserSettings->SetOverallScalabilityLevel(static_cast(CurrentSelectQuality)); + GameUserSettings->SaveSettings(); + GameUserSettings->ApplySettings(true); + } +} + +void ULuckyRobotsGameInstance::DoQualitySettings(int32 Quality, bool Auto) +{ + if (Auto) + { + bIsFirstOpenGame = false; + } + else + { + UpdateQualitySettings(); + } +} + void ULuckyRobotsGameInstance::SetCurrentFolderName(const FString& FolderName) { CurrentCaptureSettingsData.FolderName = FText::FromString(FolderName); @@ -292,3 +374,13 @@ int32 ULuckyRobotsGameInstance::GetCurrentCaptureNumber() const { return FCString::Atoi(*CurrentCaptureSettingsData.NumberOfCaptures.ToString()); } + +void ULuckyRobotsGameInstance::SetWidgetTotalHit(int32 Value) +{ + WidgetTotalHit = Value; +} + +int32 ULuckyRobotsGameInstance::GetWidgetTotalHit() const +{ + return WidgetTotalHit; +} \ No newline at end of file diff --git a/Source/Luckyrobots/Private/FunctionLibraries/LuckyRobotsFunctionLibrary.cpp b/Source/Luckyrobots/Private/FunctionLibraries/LuckyRobotsFunctionLibrary.cpp index cacce306..c123fa17 100644 --- a/Source/Luckyrobots/Private/FunctionLibraries/LuckyRobotsFunctionLibrary.cpp +++ b/Source/Luckyrobots/Private/FunctionLibraries/LuckyRobotsFunctionLibrary.cpp @@ -64,12 +64,7 @@ void ULuckyRobotsFunctionLibrary::UpdateQualitySettings(const UObject* WorldCont { if (ULuckyRobotsGameInstance* GameInstance = GetLuckyRobotsGameInstance(WorldContextObject)) { - if (UGameUserSettings* GameUserSettings = GEngine->GetGameUserSettings()) - { - GameUserSettings->SetOverallScalabilityLevel(static_cast(GameInstance->CurrentSelectQuality)); - GameUserSettings->SaveSettings(); - GameUserSettings->ApplySettings(true); - } + GameInstance->UpdateQualitySettings(); } } diff --git a/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h b/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h index 651db9b6..8b101327 100644 --- a/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h +++ b/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h @@ -40,11 +40,37 @@ public: UDataTable* BathroomDataTable; public: + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Config") + TArray AlphabetForRandomList; + +public: + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Resulation") bool bIsFirstOpenGame; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "WebSocket") + bool bIsStartConnect; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + ESaveDataType SelectSaveDataType; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) bool bIsDebug; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) bool bIsWidgetTestMode; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) bool bIsShowPath; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + int32 WidgetTotalHit; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool bInfiniteTime; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float FastEndTaskTime = 180.0f; + public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") bool bIsCapture; @@ -143,6 +169,17 @@ public: UFUNCTION(BlueprintCallable) void DoSetTempTaskValueChange(bool bIsClear); + UFUNCTION(BlueprintCallable, Category = "Resolution") + void DoResolutionChange(bool bIsFullscreen); + + UFUNCTION(BlueprintCallable) + FString DoRandomString(FString StartString); + + UFUNCTION(BlueprintCallable) + void UpdateQualitySettings(); + + UFUNCTION(BlueprintCallable) + void DoQualitySettings(int32 Quality, bool Auto); public: UFUNCTION(BlueprintCallable) void SetCurrentFolderName(const FString& FolderName); @@ -241,6 +278,13 @@ public: UFUNCTION(BlueprintPure) int32 GetCurrentCaptureNumber() const; +public: + UFUNCTION(BlueprintCallable) + void SetWidgetTotalHit(int32 Value); + + UFUNCTION(BlueprintPure) + int32 GetWidgetTotalHit() const; + public: UFUNCTION(BlueprintImplementableEvent) void DoGetDispatch(const FString& EventName, USIOJsonValue* EventData); diff --git a/Source/Luckyrobots/Public/SharedDef.h b/Source/Luckyrobots/Public/SharedDef.h index b56606db..429d62c9 100644 --- a/Source/Luckyrobots/Public/SharedDef.h +++ b/Source/Luckyrobots/Public/SharedDef.h @@ -100,11 +100,11 @@ enum class EGoalType : uint8 UENUM(BlueprintType) enum class ESaveDataType : uint8 { - file UMETA(DisplayName = "file"), - webserver UMETA(DisplayName = "webserver"), - http UMETA(DisplayName = "http"), - debug UMETA(DisplayName = "debug"), - none UMETA(DisplayName = "none") + None UMETA(DisplayName = "None"), + File UMETA(DisplayName = "File"), + Webserver UMETA(DisplayName = "Webserver"), + Http UMETA(DisplayName = "Http"), + Debug UMETA(DisplayName = "Debug") }; UENUM(BlueprintType)