diff --git a/Content/Blueprint/Core/BP_AllSenario.uasset b/Content/Blueprint/Core/BP_AllSenario.uasset index 67e20fd8..274f5fea 100644 Binary files a/Content/Blueprint/Core/BP_AllSenario.uasset and b/Content/Blueprint/Core/BP_AllSenario.uasset differ diff --git a/Content/Blueprint/Core/BP_ToHoldItem.uasset b/Content/Blueprint/Core/BP_ToHoldItem.uasset index edddeb18..1d9db62a 100644 Binary files a/Content/Blueprint/Core/BP_ToHoldItem.uasset and b/Content/Blueprint/Core/BP_ToHoldItem.uasset differ diff --git a/Content/Blueprint/DATA/Enums/EItemType.uasset b/Content/Blueprint/DATA/Enums/EItemType.uasset deleted file mode 100644 index 195cffd0..00000000 Binary files a/Content/Blueprint/DATA/Enums/EItemType.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/EListGroupModels.uasset b/Content/Blueprint/DATA/Enums/EListGroupModels.uasset deleted file mode 100644 index c665f89f..00000000 Binary files a/Content/Blueprint/DATA/Enums/EListGroupModels.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/ESenarioEnum.uasset b/Content/Blueprint/DATA/Enums/ESenarioEnum.uasset deleted file mode 100644 index 8a7751d5..00000000 Binary files a/Content/Blueprint/DATA/Enums/ESenarioEnum.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/datatables/DT_Item.uasset b/Content/Blueprint/DATA/datatables/DT_Item.uasset deleted file mode 100644 index c9d74550..00000000 Binary files a/Content/Blueprint/DATA/datatables/DT_Item.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/EJsonTypeStruct.uasset b/Content/Blueprint/DATA/structures/EJsonTypeStruct.uasset deleted file mode 100644 index 6c53e15d..00000000 Binary files a/Content/Blueprint/DATA/structures/EJsonTypeStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FItemStrucT.uasset b/Content/Blueprint/DATA/structures/FItemStrucT.uasset deleted file mode 100644 index d9d1730c..00000000 Binary files a/Content/Blueprint/DATA/structures/FItemStrucT.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FLuckyCodeStruct.uasset b/Content/Blueprint/DATA/structures/FLuckyCodeStruct.uasset deleted file mode 100644 index 6783053a..00000000 Binary files a/Content/Blueprint/DATA/structures/FLuckyCodeStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset b/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset index a4cb34ca..d4011b75 100644 Binary files a/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset and b/Content/Blueprint/RobotPawnActors/BP_DroneRobot.uasset differ diff --git a/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset b/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset index 2eeebe38..8589a4c5 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/vehicle/StretchRobot_vehicle_BP.uasset b/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset index 02c33629..096dfad7 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/Datatable/DT_HoldItem.uasset b/Content/GameBP/Datatable/DT_HoldItem.uasset new file mode 100644 index 00000000..1d3dddc6 Binary files /dev/null and b/Content/GameBP/Datatable/DT_HoldItem.uasset differ diff --git a/Content/Blueprint/DATA/datatables/DT_RichTextBlock.uasset b/Content/GameBP/Datatable/DT_RichTextBlock.uasset similarity index 95% rename from Content/Blueprint/DATA/datatables/DT_RichTextBlock.uasset rename to Content/GameBP/Datatable/DT_RichTextBlock.uasset index a9ec0ae3..6887bbff 100644 Binary files a/Content/Blueprint/DATA/datatables/DT_RichTextBlock.uasset and b/Content/GameBP/Datatable/DT_RichTextBlock.uasset differ diff --git a/Content/Map/SelectLevel.umap b/Content/Map/SelectLevel.umap index 01731c67..c18069df 100644 Binary files a/Content/Map/SelectLevel.umap and b/Content/Map/SelectLevel.umap differ diff --git a/Content/luckyBot/Luckywidget/WB_GameWidget.uasset b/Content/luckyBot/Luckywidget/WB_GameWidget.uasset index 21c28c6b..1d7ee99b 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/menu/WB_AllRandom.uasset b/Content/luckyBot/Luckywidget/menu/WB_AllRandom.uasset index a5f48e0c..6abeecdb 100644 Binary files a/Content/luckyBot/Luckywidget/menu/WB_AllRandom.uasset and b/Content/luckyBot/Luckywidget/menu/WB_AllRandom.uasset differ diff --git a/Source/Luckyrobots/Public/SharedDef.h b/Source/Luckyrobots/Public/SharedDef.h index 806a04b0..096a2e5a 100644 --- a/Source/Luckyrobots/Public/SharedDef.h +++ b/Source/Luckyrobots/Public/SharedDef.h @@ -119,6 +119,7 @@ enum class ELogItemType : uint8 UENUM(BlueprintType) enum class EFurniture : uint8 { + None UMETA(DisplayName = "None"), Sofas UMETA(DisplayName = "Sofas"), Chairs UMETA(DisplayName = "Chairs"), Tables UMETA(DisplayName = "Tables"), @@ -133,6 +134,7 @@ enum class EFurniture : uint8 UENUM(BlueprintType) enum class EDecoration : uint8 { + None UMETA(DisplayName = "None"), Carpets UMETA(DisplayName = "Carpets"), Paintings UMETA(DisplayName = "Paintings"), Vases UMETA(DisplayName = "Vases"), @@ -153,6 +155,7 @@ enum class EDecoration : uint8 UENUM(BlueprintType) enum class EKitchenware : uint8 { + None UMETA(DisplayName = "None"), Plates UMETA(DisplayName = "Plates"), Glasses UMETA(DisplayName = "Glasses"), Cutlery UMETA(DisplayName = "Cutlery"), @@ -165,6 +168,7 @@ enum class EKitchenware : uint8 UENUM(BlueprintType) enum class EElectronics : uint8 { + None UMETA(DisplayName = "None"), Television UMETA(DisplayName = "Television"), LargeAppliances UMETA(DisplayName = "Large Appliances"), Oven UMETA(DisplayName = "Oven"), @@ -177,6 +181,7 @@ enum class EElectronics : uint8 UENUM(BlueprintType) enum class EBathroom : uint8 { + None UMETA(DisplayName = "None"), Towels UMETA(DisplayName = "Towels"), SoapDispenser UMETA(DisplayName = "Soap Dispenser"), ShowerCurtains UMETA(DisplayName = "Shower Curtains"), @@ -194,6 +199,23 @@ enum class EItemCategory : uint8 Bathroom UMETA(DisplayName = "Bathroom") }; +UENUM(BlueprintType) +enum class EHoldItemType : uint8 +{ + None UMETA(DisplayName = "None"), + HoldObject UMETA(DisplayName = "Hold Object"), + DontTouch UMETA(DisplayName = "Don't Touch") +}; + +UENUM(BlueprintType) +enum class EScenarioEnum : uint8 +{ + None UMETA(DisplayName = "None"), + TidyUp UMETA(DisplayName = "Tidy Up"), + Draw UMETA(DisplayName = "Draw"), + StoveOff UMETA(DisplayName = "Stove Off") +}; + USTRUCT(BlueprintType) struct FRobotData : public FTableRowBase { @@ -525,11 +547,11 @@ public: FSelectableItemData() : ID(0) , Category(EItemCategory::Furniture) - , FurnitureType(EFurniture::Sofas) - , DecorationType(EDecoration::Carpets) - , KitchenwareType(EKitchenware::Plates) - , ElectronicsType(EElectronics::Television) - , BathroomType(EBathroom::Towels) + , FurnitureType(EFurniture::None) + , DecorationType(EDecoration::None) + , KitchenwareType(EKitchenware::None) + , ElectronicsType(EElectronics::None) + , BathroomType(EBathroom::None) , Name(TEXT("")) , Icon(nullptr) , Mesh(nullptr) @@ -538,4 +560,47 @@ public: , Transform(FTransform::Identity) { } +}; + +USTRUCT(BlueprintType) +struct FHoldItemStruct : public FTableRowBase +{ + GENERATED_BODY() + +public: + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + int32 ID; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + FString Name; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + TSoftObjectPtr Icon; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + TSoftObjectPtr Mesh; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + FString Description; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + EHoldItemType Type; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + EScenarioEnum ScenarioEnum; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + FTransform Transform; + + FHoldItemStruct() + : ID(0) + , Name(TEXT("")) + , Icon(nullptr) + , Mesh(nullptr) + , Description(TEXT("")) + , Type(EHoldItemType::None) + , ScenarioEnum(EScenarioEnum::None) + , Transform(FTransform::Identity) + { + } }; \ No newline at end of file