diff --git a/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset b/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset index e8a4937d..6ea6291c 100644 Binary files a/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset and b/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset differ diff --git a/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset b/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset index c7c7a28f..a4cb34ca 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 98daa848..9aaaf836 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 6e3ebcea..1ca505ec 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 46022876..cda9e89f 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 07f945ed..1eb65cac 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 3c300d48..726ea24c 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 0a69f3b4..67cccb51 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 c140326c..d17ce0ca 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 2ceb84e5..da87455f 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_Capture.uasset b/Content/Blueprint/component/BPC_Capture.uasset index 80ccb522..170bc406 100644 Binary files a/Content/Blueprint/component/BPC_Capture.uasset and b/Content/Blueprint/component/BPC_Capture.uasset differ diff --git a/Content/Blueprint/component/BPC_DataTrasnfer.uasset b/Content/Blueprint/component/BPC_DataTrasnfer.uasset index a806185b..384943b5 100644 Binary files a/Content/Blueprint/component/BPC_DataTrasnfer.uasset and b/Content/Blueprint/component/BPC_DataTrasnfer.uasset differ diff --git a/Content/Blueprint/component/BPC_NaviPoint.uasset b/Content/Blueprint/component/BPC_NaviPoint.uasset index 0b9812cc..175bfe9f 100644 Binary files a/Content/Blueprint/component/BPC_NaviPoint.uasset and b/Content/Blueprint/component/BPC_NaviPoint.uasset differ diff --git a/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset b/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset index f9ac1a48..2eeebe38 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 1f5a696c..e2e915cd 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 86b168c6..02a9eebe 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/BP_LuckyRobotsLibrary.uasset b/Content/GameBP/BP_LuckyRobotsLibrary.uasset index 115d6089..dfa01397 100644 Binary files a/Content/GameBP/BP_LuckyRobotsLibrary.uasset and b/Content/GameBP/BP_LuckyRobotsLibrary.uasset differ diff --git a/Content/luckyBot/Luckywidget/WB_GameWidget.uasset b/Content/luckyBot/Luckywidget/WB_GameWidget.uasset index 94af03a0..83b21fc3 100644 Binary files a/Content/luckyBot/Luckywidget/WB_GameWidget.uasset and b/Content/luckyBot/Luckywidget/WB_GameWidget.uasset differ diff --git a/Content/luckyBot/Luckywidget/WB_MainScreen.uasset b/Content/luckyBot/Luckywidget/WB_MainScreen.uasset index 90c35a4b..92872245 100644 Binary files a/Content/luckyBot/Luckywidget/WB_MainScreen.uasset and b/Content/luckyBot/Luckywidget/WB_MainScreen.uasset differ diff --git a/Source/Luckyrobots/Private/CaptureSettingsUserWidget.cpp b/Source/Luckyrobots/Private/CaptureSettingsUserWidget.cpp new file mode 100644 index 00000000..d0c258be --- /dev/null +++ b/Source/Luckyrobots/Private/CaptureSettingsUserWidget.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "CaptureSettingsUserWidget.h" + diff --git a/Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp b/Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp index 1d6edd88..4dccde57 100644 --- a/Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp +++ b/Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp @@ -14,14 +14,14 @@ void ULuckyRobotsGameInstance::DoSendMessage(FString SendValue) LuckyRobotsGameState->DoSendMessage(SendValue); } - DoLogItemAdd("Receive", SendValue, 0, ELogItemType::Debug); + DoLogItemAdd("Receive", SendValue, ELogItemType::Debug); } -void ULuckyRobotsGameInstance::DoLogItemAdd(FString Topic, FString MsgText, int Type, ELogItemType LogItemType) +void ULuckyRobotsGameInstance::DoLogItemAdd(FString Topic, FString MsgText, ELogItemType LogItemType) { if (GameUserWidget) { - GameUserWidget->DoLogItemAdd(Topic, MsgText, Type, LogItemType); + GameUserWidget->DoLogItemAdd(Topic, MsgText, LogItemType); } } diff --git a/Source/Luckyrobots/Public/CaptureSettingsUserWidget.h b/Source/Luckyrobots/Public/CaptureSettingsUserWidget.h new file mode 100644 index 00000000..cfe802ae --- /dev/null +++ b/Source/Luckyrobots/Public/CaptureSettingsUserWidget.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Blueprint/UserWidget.h" +#include "CaptureSettingsUserWidget.generated.h" + +/** + * + */ +UCLASS() +class LUCKYROBOTS_API UCaptureSettingsUserWidget : public UUserWidget +{ + GENERATED_BODY() + +}; diff --git a/Source/Luckyrobots/Public/GameUserWidget.h b/Source/Luckyrobots/Public/GameUserWidget.h index 4e1dd952..848e24fd 100644 --- a/Source/Luckyrobots/Public/GameUserWidget.h +++ b/Source/Luckyrobots/Public/GameUserWidget.h @@ -20,7 +20,7 @@ protected: public: UFUNCTION(BlueprintImplementableEvent) - void DoLogItemAdd(const FString& Topic, const FString& MsgText,int Type, ELogItemType LogItemType); + void DoLogItemAdd(const FString& Topic, const FString& MsgText, ELogItemType LogItemType); UFUNCTION(BlueprintImplementableEvent) void DoRefreshListView(); diff --git a/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h b/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h index 3183a3b7..3b74d424 100644 --- a/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h +++ b/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h @@ -24,6 +24,41 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Config") UDataTable* LevelDataTable; +//public: +// bool bIsFirstOpenGame; +// +// bool bIsDebug; +// bool bIsWidgetTestMode; +// bool bIsShowPath; +// +//public: +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// bool bIsCapture; +// +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// bool bIsCaptureHand; +// +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// bool bIsCaptureHead; +// +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// bool bScenarioCapture; +// +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// bool bIsMouseOpen; +// +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// bool bIschange; +// +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// int PerSecond; +// +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// FTransform TargetPosition; +// +// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Capture") +// FCaptureSettingsData CaptureSettingsData; +// public: UPROPERTY(EditAnywhere, BlueprintReadWrite) ERobotsName CurrentSelectRobot = ERobotsName::None; @@ -51,7 +86,7 @@ public: void DoSendMessage(FString SendValue); UFUNCTION(BlueprintCallable) - void DoLogItemAdd(FString Topic, FString MsgText, int Type, ELogItemType LogItemType); + void DoLogItemAdd(FString Topic, FString MsgText, ELogItemType LogItemType); UFUNCTION(BlueprintCallable) void SwitchGamePaused(); diff --git a/Source/Luckyrobots/Public/SharedDef.h b/Source/Luckyrobots/Public/SharedDef.h index dc80e63c..639c0bf1 100644 --- a/Source/Luckyrobots/Public/SharedDef.h +++ b/Source/Luckyrobots/Public/SharedDef.h @@ -269,7 +269,6 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) FText WritesPerSec = FText::FromString("1"); - UPROPERTY(EditAnywhere, BlueprintReadWrite) bool IsScenario;