Merge branch 'main' of https://luckyrobots.com/luckyrobots/LuckyRobotsUnreal into martin2

Reviewed-on: #10

Source/Luckyrobots/Private/GameUserWidget.cpp

@@ -0,0 +1,17 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "GameUserWidget.h"
+#include "LuckyRobotsFunctionLibrary.h"
+#include "LuckyRobotsGameInstance.h"
+
+void UGameUserWidget::NativeConstruct()
+{
+	Super::NativeConstruct();
+
+	ULuckyRobotsGameInstance* LuckyRobotsGameInstance = ULuckyRobotsFunctionLibrary::GetLuckyRobotsGameInstance(this);
+	if (LuckyRobotsGameInstance)
+	{
+		LuckyRobotsGameInstance->GameUserWidget = this;
+	}
+}

Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp

@@ -2,6 +2,42 @@
 
 
 #include "LuckyRobotsGameInstance.h"
+#include "LuckyRobotsGameState.h"
+#include "Kismet/GameplayStatics.h"
+#include "GameUserWidget.h"
+
+void ULuckyRobotsGameInstance::DoSendMessage(FString SendValue)
+{
+	ALuckyRobotsGameState* LuckyRobotsGameState = Cast<ALuckyRobotsGameState>(UGameplayStatics::GetGameState(this));
+	if (LuckyRobotsGameState)
+	{
+		LuckyRobotsGameState->DoSendMessage(SendValue);
+	}
+
+	DoLogItemAdd("Receive", SendValue, 0);
+}
+
+void ULuckyRobotsGameInstance::DoLogItemAdd(FString Topic, FString MsgText, int Type)
+{
+	if (GameUserWidget)
+	{
+		GameUserWidget->DoLogItemAdd(Topic, MsgText, Type);
+	}
+}
+
+void ULuckyRobotsGameInstance::SwitchGamePaused()
+{
+	UGameplayStatics::SetGamePaused(this, !UGameplayStatics::IsGamePaused(this));
+
+	if (UGameplayStatics::IsGamePaused(this))
+	{
+		UKismetSystemLibrary::ExecuteConsoleCommand(this, "r.SceneRendering 0");
+	}
+	else
+	{
+		UKismetSystemLibrary::ExecuteConsoleCommand(this, "r.SceneRendering 1");
+	}
+}
 
 void ULuckyRobotsGameInstance::ClearTaskList()
 {
@@ -79,4 +115,21 @@ void ULuckyRobotsGameInstance::ReSetTaskList()
 TArray<FGoalsTaskData> ULuckyRobotsGameInstance::GetTaskList()
 {
 	return TaskList;
-}
+}
+
+void ULuckyRobotsGameInstance::DoSetTempTaskValueChange(bool IsClear)
+{
+	if (IsClear)
+	{
+		ClearTaskList();
+	}
+	else
+	{
+		AddTask(TempTask);
+	}
+
+	if (GameUserWidget)
+	{
+		GameUserWidget->DoRefreshListView();
+	}
+}

Source/Luckyrobots/Public/GameUserWidget.h

@@ -0,0 +1,26 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Blueprint/UserWidget.h"
+#include "GameUserWidget.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class LUCKYROBOTS_API UGameUserWidget : public UUserWidget
+{
+	GENERATED_BODY()
+
+protected:
+	virtual void NativeConstruct();
+
+public:
+	UFUNCTION(BlueprintImplementableEvent)
+	void DoLogItemAdd(const FString& Topic, const FString& MsgText,int Type);
+
+	UFUNCTION(BlueprintImplementableEvent)
+	void DoRefreshListView();
+};

Source/Luckyrobots/Public/LuckyRobotsGameInstance.h

@@ -8,6 +8,7 @@
 #include "LuckyRobotsGameInstance.generated.h"
 
 class USIOJsonValue;
+class UGameUserWidget;
 /**
  * 
  */
@@ -39,10 +40,23 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	FGoalsTaskData TempTask;
 
-public:
-	UFUNCTION(BlueprintImplementableEvent)
-	void DoGetDispatch(const FString& EventName, USIOJsonValue* EventData);
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UGameUserWidget* GameUserWidget;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	TArray<FLuckyCode> LuckyCodeList;
+
+public:
+	UFUNCTION(BlueprintCallable)
+	void DoSendMessage(FString SendValue);
+
+	UFUNCTION(BlueprintCallable)
+	void DoLogItemAdd(FString Topic, FString MsgText, int Type);
+
+	UFUNCTION(BlueprintCallable)
+	void SwitchGamePaused();
+
+public:
 	UFUNCTION(BlueprintCallable)
 	void ClearTaskList();
 
@@ -69,4 +83,11 @@ public:
 
 	UFUNCTION(BlueprintPure)
 	TArray<FGoalsTaskData> GetTaskList();
+
+	UFUNCTION(BlueprintCallable)
+	void DoSetTempTaskValueChange(bool IsClear);
+
+public:
+	UFUNCTION(BlueprintImplementableEvent)
+	void DoGetDispatch(const FString& EventName, USIOJsonValue* EventData);
 };

Source/Luckyrobots/Public/SharedDef.h

@@ -98,6 +98,17 @@ enum class EGoalType : uint8
 	Place 							UMETA(DisplayName = "Place")
 };
 
+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")
+};
+
+
 USTRUCT(BlueprintType)
 struct FRobotData : public FTableRowBase
 {
@@ -358,3 +369,21 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	bool bIsActive;
 };
+
+USTRUCT(BlueprintType)
+struct FLuckyCode : public FTableRowBase
+{
+	GENERATED_BODY()
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	int ID;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	FString Code;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	float Time;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	bool bCallback;
+};