diff --git a/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset b/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset index e39ac53f..271c7d58 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/Menus/WB_MainScreen.uasset b/Content/GameBP/Menus/WB_MainScreen.uasset index a37bef86..e06940b8 100644 Binary files a/Content/GameBP/Menus/WB_MainScreen.uasset and b/Content/GameBP/Menus/WB_MainScreen.uasset differ diff --git a/Plugins/SocketIOClient/Source/SIOJson/Public/SIOJRequestJSON.h b/Plugins/SocketIOClient/Source/SIOJson/Public/SIOJRequestJSON.h index c4fd92b6..7353a0a4 100644 --- a/Plugins/SocketIOClient/Source/SIOJson/Public/SIOJRequestJSON.h +++ b/Plugins/SocketIOClient/Source/SIOJson/Public/SIOJRequestJSON.h @@ -73,11 +73,11 @@ public: /** Generate a delegates for callback events */ -DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnRequestComplete, class USIOJRequestJSON*, Request); -DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnRequestFail, class USIOJRequestJSON*, Request); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FSIOJOnRequestComplete, class USIOJRequestJSON*, Request); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FSIOJOnRequestFail, class USIOJRequestJSON*, Request); -DECLARE_MULTICAST_DELEGATE_OneParam(FOnStaticRequestComplete, class USIOJRequestJSON*); -DECLARE_MULTICAST_DELEGATE_OneParam(FOnStaticRequestFail, class USIOJRequestJSON*); +DECLARE_MULTICAST_DELEGATE_OneParam(FSIOJOnStaticRequestComplete, class USIOJRequestJSON*); +DECLARE_MULTICAST_DELEGATE_OneParam(FSIOJOnStaticRequestFail, class USIOJRequestJSON*); /** @@ -216,17 +216,17 @@ private: public: /** Event occured when the request has been completed */ UPROPERTY(BlueprintAssignable, Category = "SIOJ|Event") - FOnRequestComplete OnRequestComplete; + FSIOJOnRequestComplete OnRequestComplete; /** Event occured when the request wasn't successfull */ UPROPERTY(BlueprintAssignable, Category = "SIOJ|Event") - FOnRequestFail OnRequestFail; + FSIOJOnRequestFail OnRequestFail; /** Event occured when the request has been completed */ - FOnStaticRequestComplete OnStaticRequestComplete; + FSIOJOnStaticRequestComplete OnStaticRequestComplete; /** Event occured when the request wasn't successfull */ - FOnStaticRequestFail OnStaticRequestFail; + FSIOJOnStaticRequestFail OnStaticRequestFail; ////////////////////////////////////////////////////////////////////////// diff --git a/Source/Luckyrobots/Private/Menus/MainScreenUserWidget.cpp b/Source/Luckyrobots/Private/Menus/MainScreenUserWidget.cpp index 6e101190..c00a04f2 100644 --- a/Source/Luckyrobots/Private/Menus/MainScreenUserWidget.cpp +++ b/Source/Luckyrobots/Private/Menus/MainScreenUserWidget.cpp @@ -10,6 +10,14 @@ void UMainScreenUserWidget::NativeConstruct() { Super::NativeConstruct(); InitData(); + + BPSendReadyJson(); + BPGetdataHTTP(); + if (ULuckyRobotsGameInstance* GameInstance = Cast(GetGameInstance())) + { + GameInstance->bIsFirstOpenGame = false; + GameInstance->DoResolutionChange(bIsFullScreen); + } } void UMainScreenUserWidget::InitData() diff --git a/Source/Luckyrobots/Public/Menus/MainScreenUserWidget.h b/Source/Luckyrobots/Public/Menus/MainScreenUserWidget.h index d8c7e311..c534688b 100644 --- a/Source/Luckyrobots/Public/Menus/MainScreenUserWidget.h +++ b/Source/Luckyrobots/Public/Menus/MainScreenUserWidget.h @@ -28,6 +28,12 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) int32 CurrentQualityIndex; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool bIsFullScreen = true; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + TSoftObjectPtr CurrentSelectLevelObject; + public: UFUNCTION(BlueprintCallable) void InitData(); @@ -73,4 +79,8 @@ public: void BPUpdateSelectLevel(); UFUNCTION(BlueprintImplementableEvent) void BPUpdateSelectQuality(); + UFUNCTION(BlueprintImplementableEvent) + void BPSendReadyJson(); + UFUNCTION(BlueprintImplementableEvent) + void BPGetdataHTTP(); };