diff --git a/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset b/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset index 31d1006c..c7c7a28f 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 00de415d..98daa848 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 4986c8b7..6e3ebcea 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 193fe8ae..46022876 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 c45b7491..07f945ed 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 73b7d629..3c300d48 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 8f730a09..0a69f3b4 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 0736bdee..c140326c 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 02480e8b..2ceb84e5 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 4f36563c..80ccb522 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 68dc2193..a806185b 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 57f25e4e..0b9812cc 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 5701dcc8..f9ac1a48 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 113b04ff..1f5a696c 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 7fa0f1a6..86b168c6 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_LuckyRobotsPlayerController.uasset b/Content/GameBP/BP_LuckyRobotsPlayerController.uasset index 22c215c2..12f5fc6f 100644 Binary files a/Content/GameBP/BP_LuckyRobotsPlayerController.uasset and b/Content/GameBP/BP_LuckyRobotsPlayerController.uasset differ diff --git a/Content/luckyBot/Luckywidget/ChildItems/WB_LogItem.uasset b/Content/luckyBot/Luckywidget/ChildItems/WB_LogItem.uasset index ffe64f1c..d7a00981 100644 Binary files a/Content/luckyBot/Luckywidget/ChildItems/WB_LogItem.uasset and b/Content/luckyBot/Luckywidget/ChildItems/WB_LogItem.uasset differ diff --git a/Content/luckyBot/Luckywidget/WB_GameWidget.uasset b/Content/luckyBot/Luckywidget/WB_GameWidget.uasset index d9672c3d..94af03a0 100644 Binary files a/Content/luckyBot/Luckywidget/WB_GameWidget.uasset and b/Content/luckyBot/Luckywidget/WB_GameWidget.uasset differ diff --git a/Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp b/Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp index 51b006b7..1d6edd88 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); + DoLogItemAdd("Receive", SendValue, 0, ELogItemType::Debug); } -void ULuckyRobotsGameInstance::DoLogItemAdd(FString Topic, FString MsgText, int Type) +void ULuckyRobotsGameInstance::DoLogItemAdd(FString Topic, FString MsgText, int Type, ELogItemType LogItemType) { if (GameUserWidget) { - GameUserWidget->DoLogItemAdd(Topic, MsgText, Type); + GameUserWidget->DoLogItemAdd(Topic, MsgText, Type, LogItemType); } } diff --git a/Source/Luckyrobots/Public/GameUserWidget.h b/Source/Luckyrobots/Public/GameUserWidget.h index e8436a52..4e1dd952 100644 --- a/Source/Luckyrobots/Public/GameUserWidget.h +++ b/Source/Luckyrobots/Public/GameUserWidget.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "Blueprint/UserWidget.h" +#include "SharedDef.h" #include "GameUserWidget.generated.h" /** @@ -19,7 +20,7 @@ protected: public: UFUNCTION(BlueprintImplementableEvent) - void DoLogItemAdd(const FString& Topic, const FString& MsgText,int Type); + void DoLogItemAdd(const FString& Topic, const FString& MsgText,int Type, ELogItemType LogItemType); UFUNCTION(BlueprintImplementableEvent) void DoRefreshListView(); diff --git a/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h b/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h index cc635968..3183a3b7 100644 --- a/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h +++ b/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h @@ -51,7 +51,7 @@ public: void DoSendMessage(FString SendValue); UFUNCTION(BlueprintCallable) - void DoLogItemAdd(FString Topic, FString MsgText, int Type); + void DoLogItemAdd(FString Topic, FString MsgText, int Type, ELogItemType LogItemType); UFUNCTION(BlueprintCallable) void SwitchGamePaused(); diff --git a/Source/Luckyrobots/Public/SharedDef.h b/Source/Luckyrobots/Public/SharedDef.h index 511290be..dc80e63c 100644 --- a/Source/Luckyrobots/Public/SharedDef.h +++ b/Source/Luckyrobots/Public/SharedDef.h @@ -108,7 +108,14 @@ enum class ESaveDataType : uint8 none UMETA(DisplayName = "none") }; - +UENUM(BlueprintType) +enum class ELogItemType : uint8 +{ + Debug UMETA(DisplayName = "Debug"), + War UMETA(DisplayName = "War"), + Error UMETA(DisplayName = "Error"), + Consol UMETA(DisplayName = "Consol") +}; USTRUCT(BlueprintType) struct FRobotData : public FTableRowBase {