diff --git a/Content/Character/BP_BazarCustomer.uasset b/Content/Character/BP_BazarCustomer.uasset index f4b6d8ae..dd583b29 100644 --- a/Content/Character/BP_BazarCustomer.uasset +++ b/Content/Character/BP_BazarCustomer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b2526f524a703cc2f0801ac2289870ee0a9bdc8c968b8ac24420df5a402e87e -size 44386 +oid sha256:68b5d0c62b908ae7093dbd7d130e606808b183307a33aceadf83144d6ba9f2f1 +size 46107 diff --git a/Content/Character/BP_BazarStaticCustomer.uasset b/Content/Character/BP_BazarStaticCustomer.uasset new file mode 100644 index 00000000..6e01a228 --- /dev/null +++ b/Content/Character/BP_BazarStaticCustomer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:702cd22391e6c083d2370dbcb649e98ac5e565f68f64363b50e0084a53f01a2e +size 25946 diff --git a/Content/Scripts/BP_TimeOfDay.uasset b/Content/Scripts/BP_TimeOfDay.uasset index cb63e5bb..d25a8091 100644 --- a/Content/Scripts/BP_TimeOfDay.uasset +++ b/Content/Scripts/BP_TimeOfDay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7786258f649b4e7ee4a87c4692deada4c11ae7d01ac48fc280c91d9cd97d1056 -size 484658 +oid sha256:b17ac194a362a1cbe585908645c6fca67de1c3a84a95640e73ed373b68fed2e2 +size 489648 diff --git a/Content/Scripts/Bazar/BP_BazarNpcSpawnerComponent.uasset b/Content/Scripts/Bazar/BP_BazarNpcSpawnerComponent.uasset index 5c8ac3ba..eddd8061 100644 --- a/Content/Scripts/Bazar/BP_BazarNpcSpawnerComponent.uasset +++ b/Content/Scripts/Bazar/BP_BazarNpcSpawnerComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d59f255728ed560a3ae0ff9dea16503b8f1913c8517b14b2dd39394d5e285453 -size 217746 +oid sha256:14416569ae9e294608ea10f4baf2fd66c4c610a5f9add90b8ccf281d4a58a887 +size 217267 diff --git a/Content/Scripts/Bazar/BP_BazarSellingStand.uasset b/Content/Scripts/Bazar/BP_BazarSellingStand.uasset index d61c8a25..f5b930ec 100644 --- a/Content/Scripts/Bazar/BP_BazarSellingStand.uasset +++ b/Content/Scripts/Bazar/BP_BazarSellingStand.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf9fdfca70e82712c66415ebd61724c141f03c32d88544b6dc4e42c520c6a663 -size 315762 +oid sha256:0ca6a52a34a6a4991a4b6b2612958a7e135d30fb70214db7e53f339fb4ccdbe4 +size 445341 diff --git a/Content/Scripts/Bazar/WBP_BazarScreen.uasset b/Content/Scripts/Bazar/WBP_BazarScreen.uasset index 732c7f02..8a1105ee 100644 --- a/Content/Scripts/Bazar/WBP_BazarScreen.uasset +++ b/Content/Scripts/Bazar/WBP_BazarScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e069817f9c56900a4c48049d3b9209da3680dcb9ef117e938123b0c6916de09 -size 77555 +oid sha256:14a1e863df0644ff05891c50a16c3aa8bcc5a588cf7009615959745632d53001 +size 98437 diff --git a/Content/ThirdPersonBP/Blueprints/MainPlayerController.uasset b/Content/ThirdPersonBP/Blueprints/MainPlayerController.uasset index 856ddae1..adcd5155 100644 --- a/Content/ThirdPersonBP/Blueprints/MainPlayerController.uasset +++ b/Content/ThirdPersonBP/Blueprints/MainPlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c76fdacce779bb2d95d234eb87785d103cce00d8c7fd316c7bf1afdd51ba2180 -size 74939 +oid sha256:1ed82e4f24b2a367b23f03b93c8839c25e5beac9834e345a25272ccb6d909751 +size 74975 diff --git a/Content/UI/EInputContextUI.uasset b/Content/UI/EInputContextUI.uasset index 3bad68b9..bc5e0615 100644 --- a/Content/UI/EInputContextUI.uasset +++ b/Content/UI/EInputContextUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f1083a76c02098f2c96ddf184d95818632c795a93556e29d5859476ab85fad3 -size 2891 +oid sha256:2eb9e578c8e937be6013d2d0c86b4f02b512640dafb271cafacfc9ba09c05833 +size 3623 diff --git a/Content/UI/MainUI.uasset b/Content/UI/MainUI.uasset index 56070299..f1dca602 100644 --- a/Content/UI/MainUI.uasset +++ b/Content/UI/MainUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3f47460f5f4ae5dcd2d2612b8446eeee02393b7c0b81b96cb0ef3d277d95f9e -size 600192 +oid sha256:729c84abf8a4e5f807e94e064ef910966daca80f308180f84908a2af25b529bc +size 627372 diff --git a/Content/UI/Modules/ActionInputs/WBP_ScreenActionInputs.uasset b/Content/UI/Modules/ActionInputs/WBP_ScreenActionInputs.uasset index fd68f2d7..a7421e31 100644 --- a/Content/UI/Modules/ActionInputs/WBP_ScreenActionInputs.uasset +++ b/Content/UI/Modules/ActionInputs/WBP_ScreenActionInputs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21849c0f61933399fef892224707fbea8d5e9e5710c63ceae3af9c2825b6ca6e -size 129038 +oid sha256:69e9f4019a5de3642fde830c9602c4ebdb31320fbb7829538cd62e726c981a65 +size 136998 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/7/1H/8FRC7HVBN4R8ZU9AAM1N1W.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/7/1H/8FRC7HVBN4R8ZU9AAM1N1W.uasset index 92225166..7fa7942c 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/7/1H/8FRC7HVBN4R8ZU9AAM1N1W.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/7/1H/8FRC7HVBN4R8ZU9AAM1N1W.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbae940e493b0d3522a44d2c2c938077d0d9c156b0a0fc06867413e4bdfebbab -size 12996 +oid sha256:61cbb8ce7cf759d7611e4c597c806b6913be4f62bb5c17cdb56cabac44064255 +size 13431 diff --git a/Source/ProjectEleri/Private/EleriPlayerController.cpp b/Source/ProjectEleri/Private/EleriPlayerController.cpp index dca324c9..4f88db3f 100644 --- a/Source/ProjectEleri/Private/EleriPlayerController.cpp +++ b/Source/ProjectEleri/Private/EleriPlayerController.cpp @@ -1150,6 +1150,11 @@ UEleriBaseWidget* AEleriPlayerController::OpenBazarWindow() { return MainGameUI->GetBazarWidget(); } +void AEleriPlayerController::ToggleBazarInput(bool bActive) +{ + +} + void AEleriPlayerController::OnInteract(const FInputActionValue &Value) { if (!IsValid(PlayerCharacter)) diff --git a/Source/ProjectEleri/Public/EleriPlayerController.h b/Source/ProjectEleri/Public/EleriPlayerController.h index 0a04397d..a5d6e9bb 100644 --- a/Source/ProjectEleri/Public/EleriPlayerController.h +++ b/Source/ProjectEleri/Public/EleriPlayerController.h @@ -357,9 +357,12 @@ public: UFUNCTION(BlueprintCallable) UCalendarScreen* OpenCalendarWindow(); + // Bazar UFUNCTION(BlueprintCallable) UEleriBaseWidget* OpenBazarWindow(); - + UFUNCTION(BlueprintCallable) + void ToggleBazarInput(bool bActive); + void OnInteract(const FInputActionValue& Value); void OnInteractExit(const FInputActionValue& Value); void OnHarvestSeed(const FInputActionValue& Value); diff --git a/Source/ProjectEleri/Public/UI/MainGameWidget.h b/Source/ProjectEleri/Public/UI/MainGameWidget.h index 15e6df71..2f2b7f81 100644 --- a/Source/ProjectEleri/Public/UI/MainGameWidget.h +++ b/Source/ProjectEleri/Public/UI/MainGameWidget.h @@ -41,6 +41,9 @@ class PROJECTELERI_API UMainGameWidget : public UEleriBaseWidget public: UPROPERTY(EditAnywhere, BlueprintReadWrite) bool bVisible; + + UFUNCTION(BlueprintCallable, BlueprintImplementableEvent) + void FadeScreenByTime(float FadeTime = 1.f, float BlankScreenTime = 1.f); UFUNCTION(BlueprintCallable) void TogglePlaceableUI(bool bEnabled); @@ -48,7 +51,7 @@ public: UFUNCTION() void SwitchKeybindsDisplay(int32 Index); - UFUNCTION(BlueprintImplementableEvent) + UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) void ToggleGameMenu(bool bNewVisible); UFUNCTION(BlueprintCallable, BlueprintPure)