diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll index 588a88d..873dce1 100644 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll index d0a1476..ee7e617 100644 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll differ diff --git a/ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset b/ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset index 1933fba..02be966 100644 Binary files a/ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset and b/ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset differ diff --git a/ProjectFish/Content/DataAssets/FishReward/Shapes/FishingReward2_Shape.uasset b/ProjectFish/Content/DataAssets/FishReward/Shapes/FishingReward2_Shape.uasset new file mode 100644 index 0000000..fae8539 Binary files /dev/null and b/ProjectFish/Content/DataAssets/FishReward/Shapes/FishingReward2_Shape.uasset differ diff --git a/ProjectFish/Content/Gameplay/Ship/BP_ShipController.uasset b/ProjectFish/Content/Gameplay/Ship/BP_ShipController.uasset index a8a4ec0..e72cad1 100644 Binary files a/ProjectFish/Content/Gameplay/Ship/BP_ShipController.uasset and b/ProjectFish/Content/Gameplay/Ship/BP_ShipController.uasset differ diff --git a/ProjectFish/Content/Maps/TestUI.umap b/ProjectFish/Content/Maps/TestUI.umap new file mode 100644 index 0000000..b07ded3 Binary files /dev/null and b/ProjectFish/Content/Maps/TestUI.umap differ diff --git a/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/BP_RewardItem_DragOption.uasset b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/BP_RewardItem_DragOption.uasset new file mode 100644 index 0000000..d9e22d6 Binary files /dev/null and b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/BP_RewardItem_DragOption.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_Grid_RewardsItem.uasset b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_Grid_RewardsItem.uasset new file mode 100644 index 0000000..3dad965 Binary files /dev/null and b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_Grid_RewardsItem.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_RewardsGrid_Item.uasset b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_RewardsGrid_Item.uasset new file mode 100644 index 0000000..54e8543 Binary files /dev/null and b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_RewardsGrid_Item.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_ShapeMask.uasset b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_ShapeMask.uasset new file mode 100644 index 0000000..eafb956 Binary files /dev/null and b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_ShapeMask.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_ShipContainer_Grid.uasset b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_ShipContainer_Grid.uasset new file mode 100644 index 0000000..b2a7816 Binary files /dev/null and b/ProjectFish/Content/UI/Fishing/Widgets/ManagerRewards/UMG_ShipContainer_Grid.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_Item.uasset b/ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_Item.uasset similarity index 85% rename from ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_Item.uasset rename to ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_Item.uasset index 443ffcd..40e57cf 100644 Binary files a/ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_Item.uasset and b/ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_Item.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_ListWidget.uasset b/ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_ListWidget.uasset similarity index 63% rename from ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_ListWidget.uasset rename to ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_ListWidget.uasset index 62a2bc7..bbe2a8e 100644 Binary files a/ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_ListWidget.uasset and b/ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_ListWidget.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_SelectWidget.uasset b/ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_SelectWidget.uasset similarity index 78% rename from ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_SelectWidget.uasset rename to ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_SelectWidget.uasset index 249c598..96e05aa 100644 Binary files a/ProjectFish/Content/UI/Fishing/Widgets/UMG_FishingReward_SelectWidget.uasset and b/ProjectFish/Content/UI/Fishing/Widgets/Select/UMG_FishingReward_SelectWidget.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Windows/UMG_FishingRewardSelect_Window.uasset b/ProjectFish/Content/UI/Fishing/Windows/UMG_FishingRewardSelect_Window.uasset new file mode 100644 index 0000000..437423a Binary files /dev/null and b/ProjectFish/Content/UI/Fishing/Windows/UMG_FishingRewardSelect_Window.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Windows/UMG_FishingReward_Window.uasset b/ProjectFish/Content/UI/Fishing/Windows/UMG_FishingReward_Window.uasset deleted file mode 100644 index d041aa6..0000000 Binary files a/ProjectFish/Content/UI/Fishing/Windows/UMG_FishingReward_Window.uasset and /dev/null differ diff --git a/ProjectFish/Content/UI/Fishing/Windows/UMG_ManagerFishingREward_Window.uasset b/ProjectFish/Content/UI/Fishing/Windows/UMG_ManagerFishingREward_Window.uasset new file mode 100644 index 0000000..daec255 Binary files /dev/null and b/ProjectFish/Content/UI/Fishing/Windows/UMG_ManagerFishingREward_Window.uasset differ diff --git a/ProjectFish/Source/ProjectFishEditor/Public/AssetActions/ShapeAssetTypeAction.h b/ProjectFish/Source/ProjectFishEditor/Public/AssetActions/ShapeAssetTypeAction.h index abecd97..328816e 100644 --- a/ProjectFish/Source/ProjectFishEditor/Public/AssetActions/ShapeAssetTypeAction.h +++ b/ProjectFish/Source/ProjectFishEditor/Public/AssetActions/ShapeAssetTypeAction.h @@ -15,7 +15,7 @@ public: { MyAssetCategory = InAssetCategory; } - virtual FText GetName() const override {return FText::FromString("Bag Shape");} + virtual FText GetName() const override {return FText::FromString("Shape Asset");} virtual FColor GetTypeColor() const override { return FColor(129, 196, 115); } virtual UClass* GetSupportedClass() const override; virtual void OpenAssetEditor(const TArray& InObjects, TSharedPtr EditWithinLevelEditor = TSharedPtr()) override;