diff --git a/Content/Blueprint/Core/BP_NaviSplineCreator.uasset b/Content/Blueprint/Core/BP_NaviSplineCreator.uasset index 59e5850d..0450671d 100644 Binary files a/Content/Blueprint/Core/BP_NaviSplineCreator.uasset and b/Content/Blueprint/Core/BP_NaviSplineCreator.uasset differ diff --git a/Content/Blueprint/DATA/Enums/ESaveDataType.uasset b/Content/Blueprint/DATA/Enums/ESaveDataType.uasset deleted file mode 100644 index 7c4fe936..00000000 Binary files a/Content/Blueprint/DATA/Enums/ESaveDataType.uasset and /dev/null differ diff --git a/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset b/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset index 39ae995d..e8a4937d 100644 Binary files a/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset and b/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset differ diff --git a/Content/IanDevFolder/SK_Ik_RobotArm_CtrlRig.uasset b/Content/IanDevFolder/SK_Ik_RobotArm_CtrlRig.uasset index 28321ed3..6160f557 100644 Binary files a/Content/IanDevFolder/SK_Ik_RobotArm_CtrlRig.uasset and b/Content/IanDevFolder/SK_Ik_RobotArm_CtrlRig.uasset differ diff --git a/Content/Vehicles/OffroadCar/Offroad_CtrlRig.uasset b/Content/Vehicles/OffroadCar/Offroad_CtrlRig.uasset index e717222c..548134f2 100644 Binary files a/Content/Vehicles/OffroadCar/Offroad_CtrlRig.uasset and b/Content/Vehicles/OffroadCar/Offroad_CtrlRig.uasset differ diff --git a/Content/Vehicles/SportsCar/SportsCar_CtrlRig.uasset b/Content/Vehicles/SportsCar/SportsCar_CtrlRig.uasset index 360470cd..5afce918 100644 Binary files a/Content/Vehicles/SportsCar/SportsCar_CtrlRig.uasset and b/Content/Vehicles/SportsCar/SportsCar_CtrlRig.uasset differ diff --git a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListItem.uasset b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListItem.uasset index 5933cb6c..80ab0621 100644 Binary files a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListItem.uasset and b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListItem.uasset differ diff --git a/Content/luckyBot/Luckywidget/WB_GameWidget.uasset b/Content/luckyBot/Luckywidget/WB_GameWidget.uasset index 9b1d4d8f..d9672c3d 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_AllObjects.uasset b/Content/luckyBot/Luckywidget/menu/WB_AllObjects.uasset index 796bfa88..231756e9 100644 Binary files a/Content/luckyBot/Luckywidget/menu/WB_AllObjects.uasset and b/Content/luckyBot/Luckywidget/menu/WB_AllObjects.uasset differ diff --git a/Content/luckyBot/SkeletalMesh/LuckyNewMesh/luckyRobot_New_CtrlRig.uasset b/Content/luckyBot/SkeletalMesh/LuckyNewMesh/luckyRobot_New_CtrlRig.uasset index ad6e9aa4..7018c8d2 100644 Binary files a/Content/luckyBot/SkeletalMesh/LuckyNewMesh/luckyRobot_New_CtrlRig.uasset and b/Content/luckyBot/SkeletalMesh/LuckyNewMesh/luckyRobot_New_CtrlRig.uasset differ diff --git a/Content/luckyBot/SkeletalMesh/Unitree/go2/Go2_CtrlRig.uasset b/Content/luckyBot/SkeletalMesh/Unitree/go2/Go2_CtrlRig.uasset index 8a3f6820..60839472 100644 Binary files a/Content/luckyBot/SkeletalMesh/Unitree/go2/Go2_CtrlRig.uasset and b/Content/luckyBot/SkeletalMesh/Unitree/go2/Go2_CtrlRig.uasset differ diff --git a/Content/luckyBot/SkeletalMesh/Unitree/go2/Go2_CtrlRig1.uasset b/Content/luckyBot/SkeletalMesh/Unitree/go2/Go2_CtrlRig1.uasset index 9648d4d9..34ac276a 100644 Binary files a/Content/luckyBot/SkeletalMesh/Unitree/go2/Go2_CtrlRig1.uasset and b/Content/luckyBot/SkeletalMesh/Unitree/go2/Go2_CtrlRig1.uasset differ diff --git a/Content/luckyBot/SkeletalMesh/luckyBOt_CtrlRig.uasset b/Content/luckyBot/SkeletalMesh/luckyBOt_CtrlRig.uasset index 43435310..20446016 100644 Binary files a/Content/luckyBot/SkeletalMesh/luckyBOt_CtrlRig.uasset and b/Content/luckyBot/SkeletalMesh/luckyBOt_CtrlRig.uasset differ diff --git a/Content/luckyBot/SkeletalMesh/lucky_e_vehicle_arm_CtrlRig.uasset b/Content/luckyBot/SkeletalMesh/lucky_e_vehicle_arm_CtrlRig.uasset index ec7fb240..46dcac3d 100644 Binary files a/Content/luckyBot/SkeletalMesh/lucky_e_vehicle_arm_CtrlRig.uasset and b/Content/luckyBot/SkeletalMesh/lucky_e_vehicle_arm_CtrlRig.uasset differ diff --git a/Content/luckyBot/SkeletalMesh/testarm/Robot_Arm_Rigged_CtrlRig.uasset b/Content/luckyBot/SkeletalMesh/testarm/Robot_Arm_Rigged_CtrlRig.uasset index 805321cf..1b4f2a03 100644 Binary files a/Content/luckyBot/SkeletalMesh/testarm/Robot_Arm_Rigged_CtrlRig.uasset and b/Content/luckyBot/SkeletalMesh/testarm/Robot_Arm_Rigged_CtrlRig.uasset differ diff --git a/Content/luckyBot/StretchRobot/SkeletalMesh/stretch_robot_arm_CtrlRig.uasset b/Content/luckyBot/StretchRobot/SkeletalMesh/stretch_robot_arm_CtrlRig.uasset index 9c16e9d0..9465fc49 100644 Binary files a/Content/luckyBot/StretchRobot/SkeletalMesh/stretch_robot_arm_CtrlRig.uasset and b/Content/luckyBot/StretchRobot/SkeletalMesh/stretch_robot_arm_CtrlRig.uasset differ diff --git a/Content/luckyBot/Unitree_G1/SM_unitreeG1_CtrlRig.uasset b/Content/luckyBot/Unitree_G1/SM_unitreeG1_CtrlRig.uasset index 53a60c70..406f5974 100644 Binary files a/Content/luckyBot/Unitree_G1/SM_unitreeG1_CtrlRig.uasset and b/Content/luckyBot/Unitree_G1/SM_unitreeG1_CtrlRig.uasset differ diff --git a/Content/luckyBot/Unitree_G1/stretch_robot_V1_nohand_CtrlRig.uasset b/Content/luckyBot/Unitree_G1/stretch_robot_V1_nohand_CtrlRig.uasset index f798969d..11803bf1 100644 Binary files a/Content/luckyBot/Unitree_G1/stretch_robot_V1_nohand_CtrlRig.uasset and b/Content/luckyBot/Unitree_G1/stretch_robot_V1_nohand_CtrlRig.uasset differ diff --git a/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h b/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h index 76150b49..cc635968 100644 --- a/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h +++ b/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h @@ -43,6 +43,9 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) UGameUserWidget* GameUserWidget; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + TArray LuckyCodeList; + public: UFUNCTION(BlueprintCallable) void DoSendMessage(FString SendValue); diff --git a/Source/Luckyrobots/Public/SharedDef.h b/Source/Luckyrobots/Public/SharedDef.h index 6ab9acd4..511290be 100644 --- a/Source/Luckyrobots/Public/SharedDef.h +++ b/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; +};