Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0
This commit is contained in:
commit
0e860b6ade
|
|
@ -121,13 +121,6 @@ public class BulkOrder : MonoBehaviour
|
||||||
GameDataManager.GameData.MoveHeart(bulkOrderData.rewardHeart);
|
GameDataManager.GameData.MoveHeart(bulkOrderData.rewardHeart);
|
||||||
});
|
});
|
||||||
|
|
||||||
// 販売数加算
|
|
||||||
foreach (var (num,productId,count) in bulkOrderData.OrderList)
|
|
||||||
{
|
|
||||||
var rarity = gameData.CompletedProductList.FirstOrDefault(data => data.Number == num)?.Rarity ?? ProductRarity.Normal;
|
|
||||||
gameData.AddSalesCount(productId, count, rarity);
|
|
||||||
}
|
|
||||||
|
|
||||||
// カウントリセット
|
// カウントリセット
|
||||||
gameData.OrderConditionCount = 0;
|
gameData.OrderConditionCount = 0;
|
||||||
gameData.DeliveredOrder.Add(bulkOrderData.id);
|
gameData.DeliveredOrder.Add(bulkOrderData.id);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue