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

バグ修正

This commit is contained in:
kimura 2022-11-21 10:58:11 +09:00
parent 92c9e80236
commit 93d069f07d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,19 +213,23 @@ public class BulkOrder : MonoBehaviour
*/ */
var cityGameData = GameDataManager.GetCurrentCityGameData(); var cityGameData = GameDataManager.GetCurrentCityGameData();
var nextOrderLevel = cityGameData.AchievedOrderLevel + 1; var nextOrderLevel = cityGameData.AchievedOrderLevel + 1;
var bulkOrderList = GetCityOrderList(GameDataManager.GameData.CurrentCityId);
if (bulkOrderList.FirstOrDefault(data => data.shopLevel >= nextOrderLevel) is {} sampleNextOrder)
{
nextOrderLevel = sampleNextOrder.shopLevel;
}
if (cityGameData.ViewedShopLevel < nextOrderLevel) if (cityGameData.ViewedShopLevel < nextOrderLevel)
{ {
return null; return null;
} }
var bulkOrderList = GetCityOrderList(GameDataManager.GameData.CurrentCityId); var nextOrderList = bulkOrderList.Where(data => data.shopLevel == nextOrderLevel).ToList();
if (!bulkOrderList.Exists(data => data.shopLevel == nextOrderLevel)) if (nextOrderList.Count == 0)
{ {
return null; return null;
} }
var nextOrderList = bulkOrderList.Where(data => data.shopLevel == nextOrderLevel).ToList();
var firstTime = !nextOrderList.Exists(data => data.id == cityGameData.OrderIdInProgress); var firstTime = !nextOrderList.Exists(data => data.id == cityGameData.OrderIdInProgress);
var achieved = cityGameData.DeliveredOrder.Contains(cityGameData.OrderIdInProgress); var achieved = cityGameData.DeliveredOrder.Contains(cityGameData.OrderIdInProgress);
var canceled = cityGameData.OrderIdInProgress == cityGameData.CancelOrderId; var canceled = cityGameData.OrderIdInProgress != 0 && cityGameData.OrderIdInProgress == cityGameData.CancelOrderId;
#if UNITY_EDITOR #if UNITY_EDITOR
Debug.Log("delivered:"+cityGameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s}, {data}")); Debug.Log("delivered:"+cityGameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s}, {data}"));
Debug.Log($@"CheckBulkOrder NextOrder Debug.Log($@"CheckBulkOrder NextOrder
@ -247,7 +251,7 @@ next: {nextOrderList.Aggregate(string.Empty, (s, data) => $"{s}, {data.shopLevel
// オーダーリストがすべて達成済みの場合エラー // オーダーリストがすべて達成済みの場合エラー
Debug.LogError( Debug.LogError(
$@"大量注文レベル{nextOrderLevel}に受けられるオーダーがありませんデータを確認してください $@"大量注文レベル{nextOrderLevel}に受けられるオーダーがありませんデータを確認してください
orderCount:{nextOrderList.Count} maxOrder:{nextOrderList[0].maxOrder} orderCount:{nextOrderList.Count} maxOrder:{nextOrderList[0]?.maxOrder}
orderList:{nextOrderList.Aggregate(string.Empty, (s, data) => $"{s}, {data.id}")} orderList:{nextOrderList.Aggregate(string.Empty, (s, data) => $"{s}, {data.id}")}
delivered:{cityGameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s}, {data}")} delivered:{cityGameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s}, {data}")}
"); ");

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomize.cs
View File

@ -86,7 +86,7 @@ myItems {string.Join(",", gameData.ShopCustomizeMyItems.Select(x => x.ToString()
{ {
if (item != selectedItem) if (item != selectedItem)
{ {
selectedItem.SetState(ShopCustomizeItemState.Purchased); selectedItem?.SetState(ShopCustomizeItemState.Purchased);
selectedItem = item; selectedItem = item;
} }
item.SetState(ShopCustomizeItemState.Selected); item.SetState(ShopCustomizeItemState.Selected);