diff --git a/hwanyoung2/Content/Hwanyoung/BP_ShopNPC.uasset b/hwanyoung2/Content/Hwanyoung/BP_ShopNPC.uasset index 3a999b59..3f9a054d 100644 --- a/hwanyoung2/Content/Hwanyoung/BP_ShopNPC.uasset +++ b/hwanyoung2/Content/Hwanyoung/BP_ShopNPC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a639ad2cf0336103582b83ed15debf86b4e96cb0a209727019be58948569556c -size 58999 +oid sha256:c6deb8add56c075f8526f301c55a0248115566bbbfb012ccc5b43d4ae9a0ffd3 +size 80349 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset index 3836905a..afa2a5e3 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f04a8d1189b817569dec4dd147ec6b2493ea5a8d9446cff2d3d4ab9ac5b9a40a -size 708343 +oid sha256:b9db7e8a78cfc5455ab4d0a796dc64144cac970e809984dc5090f273c28b6364 +size 724041 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_DamageAmount.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_DamageAmount.uasset new file mode 100644 index 00000000..7ff82d5d --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_DamageAmount.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4750c174c050368946f3e638a84e5e87a6ad98a998f07c3066b8a5572546c511 +size 88252 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap index f717d1f2..b77ee4ae 100644 --- a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap +++ b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8adfca0a3dda5c912a27a7bb3c817d9c7d5a2f5e3a5aef0769c70e564df9b621 +oid sha256:38c3c5938b4833ac6c5c4b28a9cc73f185a87c02a6a34de8dd94a0158076810f size 21818877 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_DamageAmount.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_DamageAmount.uasset new file mode 100644 index 00000000..1e14d640 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_DamageAmount.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d06d8ab58513fcba96ff631432d9314d0b3266dd8a80092d91163d4d83fb15e6 +size 61312 diff --git a/hwanyoung2/Intermediate/Build/SourceFileCache.bin b/hwanyoung2/Intermediate/Build/SourceFileCache.bin index f6f0412c..8880f96d 100644 Binary files a/hwanyoung2/Intermediate/Build/SourceFileCache.bin and b/hwanyoung2/Intermediate/Build/SourceFileCache.bin differ diff --git a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin index 4f7c257d..54f19c75 100644 Binary files a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin and b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin differ diff --git a/hwanyoung2/Source/hwanyoung2/HYShopAOE.cpp b/hwanyoung2/Source/hwanyoung2/HYShopAOE.cpp index 82fc5624..109296f5 100644 --- a/hwanyoung2/Source/hwanyoung2/HYShopAOE.cpp +++ b/hwanyoung2/Source/hwanyoung2/HYShopAOE.cpp @@ -82,7 +82,7 @@ TMap AHYShopAOE::GetTradableItemSets(int CurrentHonbaekAmou for (FInventoryItem TempItem : TempItems) { int MaxAmount = CurrentHonbaekAmount / TempItem.ItemValue; - int Amount = FMath::Clamp(FMath::RandRange(0, MaxAmount), 1, 10); + int Amount = FMath::Clamp(FMath::RandRange(0, MaxAmount), 1, TempItem.ItemTradeLimitNumber); Item.Add({ TempItem, Amount }); } diff --git a/hwanyoung2/Source/hwanyoung2/InventoryItem.h b/hwanyoung2/Source/hwanyoung2/InventoryItem.h index 261fbb1b..58911e6d 100644 --- a/hwanyoung2/Source/hwanyoung2/InventoryItem.h +++ b/hwanyoung2/Source/hwanyoung2/InventoryItem.h @@ -71,6 +71,10 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) TArray CraftCombinations; + // The limit on the number of trade possible. + UPROPERTY(EditAnywhere, BlueprintReadWrite) + int32 ItemTradeLimitNumber; + bool operator==(const FInventoryItem& OtherItem) const { return ItemID == OtherItem.ItemID; }