yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0

This commit is contained in:
koya_15 2022-05-27 19:08:45 +09:00
parent 0ea41c81b2 fcbe53f5d6
commit 1e9ca603f4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
View File

@ -91,13 +91,7 @@ public class BulkOrder : MonoBehaviour
}).AddTo(this);
// 納品チェック
var orderList = new List<int>
{
bulkOrderData.productId1,
bulkOrderData.productId2,
bulkOrderData.productId3,
};
var completed = gameData.CompletedProductList.Count == orderList.Count(x => x != 0);
var completed = gameData.CompletedProductList.Count == bulkOrderData.OrderList.Count(data => data.productId != 0);
var delivered = gameData.DeliveredOrder.Contains(bulkOrderData.id);
if (completed)
{
@ -127,6 +121,13 @@ public class BulkOrder : MonoBehaviour
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.DeliveredOrder.Add(bulkOrderData.id);

9
popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
View File

@ -377,6 +377,15 @@ public sealed class BulkOrderData
public int count3;
public int rewardCoin;
public int rewardHeart;
private List<(int id, int productId, int count)> orderList;
public List<(int id, int productId, int count)> OrderList =>
orderList ?? (orderList = new List<(int id, int productId, int count)>
{
(1, productId1, count1),
(2, productId2, count2),
(3, productId3, count3)
});
}
[Serializable]