From 565429f47a86368d7b06fb3fdd4d4c69f4edcd39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Mon, 11 Mar 2024 21:04:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=A0=80?= =?UTF-8?q?=EB=A6=AC=20=ED=98=95=EC=8B=9D=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F?= =?UTF-8?q?=20=EC=9C=A0=EB=8B=9B=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Manager/ItemManager.cs | 89 ++++++++++++++--------------------- 1 file changed, 35 insertions(+), 54 deletions(-) diff --git a/Server/Manager/ItemManager.cs b/Server/Manager/ItemManager.cs index 631bbd5..4d11e73 100644 --- a/Server/Manager/ItemManager.cs +++ b/Server/Manager/ItemManager.cs @@ -37,7 +37,8 @@ namespace Server.Manager deckUnitInfo.user_id = user.id; deckUnitInfo.unit_data_id = rewardData.return_item; deckUnitInfo.count = rewardData.return_count; - box.Add(deckUnitInfo); + if (!box.Add(deckUnitInfo)) + throw new RuntimeException("add new unit [box.Add(deckUnitInfo)]", Error.RuntimeException); break; case eRewardItemType.equipment: Random rand = new Random(); @@ -48,7 +49,8 @@ namespace Server.Manager equipment.equip_unit = 0; equipment.rand_stats = rand.Next(5); equipment.equipment_data_id = rewardData.return_item; - box.Add(equipment); + if(!box.Add(equipment)) + throw new RuntimeException("Unknown Error [box.Add(equipment)]", Error.RuntimeException); } break; case eRewardItemType.consumable: @@ -61,7 +63,8 @@ namespace Server.Manager consumableItem.user_id = user.id; consumableItem.consumable_item_data_id = rewardData.return_item; consumableItem.count = rewardData.return_count; - box.Add(consumableItem); + if(!box.Add(consumableItem)) + throw new RuntimeException("Unknown Error [box.Add(consumableItem)]", Error.RuntimeException); break; case eItemType.random: randomItem(consumableItemData.reward, rewardData.return_count); @@ -74,7 +77,8 @@ namespace Server.Manager etcItem.user_id = user.id; etcItem.etc_item_data_id = rewardData.return_item; etcItem.count = rewardData.return_count; - box.Add(etcItem); + if (!box.Add(etcItem)) + throw new RuntimeException("Unknown Error [box.Add(etcItem)]", Error.RuntimeException); break; default: throw new RuntimeException("Not case", Error.nodata); @@ -87,7 +91,8 @@ namespace Server.Manager deckUnitInfo.user_id = user.id; deckUnitInfo.count = 1; deckUnitInfo.unit_data_id = unitDataId; - box.Add(deckUnitInfo); + if (!box.Add(deckUnitInfo)) + throw new RuntimeException("add new unit", Error.RuntimeException); } public void randomItem(int group, int count) @@ -120,7 +125,8 @@ namespace Server.Manager deckUnitInfo.user_id = user.id; deckUnitInfo.unit_data_id = randomRewardDatas[n].reward; deckUnitInfo.count = (randomRewardDatas[n].return_count * count); - box.Add(deckUnitInfo); + if (!box.Add(deckUnitInfo)) + throw new RuntimeException("add new unit", Error.RuntimeException); break; case eRewardItemType.equipment: Random rand = new Random(); @@ -132,7 +138,8 @@ namespace Server.Manager equipment.equip_unit = 0; equipment.rand_stats = rand.Next(5); equipment.equipment_data_id = randomRewardDatas[n].reward; - box.Add(equipment); + if (!box.Add(equipment)) + throw new RuntimeException("Unknown Error [box.Add(equipment)]", Error.RuntimeException); } break; case eRewardItemType.consumable: @@ -141,14 +148,16 @@ namespace Server.Manager consumableItem.user_id = user.id; consumableItem.consumable_item_data_id = randomRewardDatas[n].reward; consumableItem.count = (randomRewardDatas[n].return_count * count); - box.Add(consumableItem); + if (!box.Add(consumableItem)) + throw new RuntimeException("Unknown Error [box.Add(consumableItem)]", Error.RuntimeException); break; case eRewardItemType.etc: EtcItem etcItem = new EtcItem(); etcItem.user_id = user.id; etcItem.etc_item_data_id = randomRewardDatas[n].reward; etcItem.count = (randomRewardDatas[n].return_count * count); - box.Add(etcItem); + if (!box.Add(etcItem)) + throw new RuntimeException("Unknown Error [box.Add(etcItem)]", Error.RuntimeException); break; default: throw new RuntimeException("Not case", Error.nodata); @@ -216,7 +225,8 @@ namespace Server.Manager deckUnitInfo.user_id = user.id; deckUnitInfo.unit_data_id = randomRewardDatas[selectItem].reward; deckUnitInfo.count = (randomRewardDatas[selectItem].return_count); - box.Add(deckUnitInfo); + if (!box.Add(deckUnitInfo)) + throw new RuntimeException("add new unit", Error.RuntimeException); break; case eRewardItemType.equipment: int reward_count = randomRewardDatas[selectItem].return_count; @@ -227,7 +237,8 @@ namespace Server.Manager equipment.equip_unit = 0; equipment.rand_stats = rand.Next(5); equipment.equipment_data_id = randomRewardDatas[selectItem].reward; - box.Add(equipment); + if (!box.Add(equipment)) + throw new RuntimeException("Unknown Error [box.Add(equipment)]", Error.RuntimeException); } break; case eRewardItemType.consumable: @@ -236,14 +247,16 @@ namespace Server.Manager consumableItem.user_id = user.id; consumableItem.consumable_item_data_id = randomRewardDatas[selectItem].reward; consumableItem.count = randomRewardDatas[selectItem].return_count; - box.Add(consumableItem); + if (!box.Add(consumableItem)) + throw new RuntimeException("Unknown Error [box.Add(consumableItem)]", Error.RuntimeException); break; case eRewardItemType.etc: EtcItem etcItem = new EtcItem(); etcItem.user_id = user.id; etcItem.etc_item_data_id = randomRewardDatas[selectItem].reward; etcItem.count = randomRewardDatas[selectItem].return_count; - box.Add(etcItem); + if (!box.Add(etcItem)) + throw new RuntimeException("Unknown Error [box.Add(etcItem)]", Error.RuntimeException); break; default: throw new RuntimeException("Not case", Error.nodata); @@ -297,33 +310,9 @@ namespace Server.Manager Statics.userSQL.Update(user); Statics.userSQL.SaveChanges(); if (addDeckUnitInfo.Count != 0) - { - List newItem = new List(); - foreach (var item in _deckUnitInfo) - { - if(item.id == 0) - { - newItem.Add(item); - } - } - if (newItem.Count != 0) - Statics.deckUnitInfoSQL.Insert(newItem); - Statics.deckUnitInfoSQL.SaveChanges(); - } + Statics.deckUnitInfoSQL.Insert(addDeckUnitInfo); if (addEquipment.Count != 0) - { - List newItem = new List(); - foreach (var item in _equipment) - { - if (item.id == 0) - { - newItem.Add(item); - } - } - if (newItem.Count != 0) - Statics.equipmentrSQL.Insert(newItem); - Statics.equipmentrSQL.SaveChanges(); - } + Statics.equipmentrSQL.Insert(addEquipment); if (addConsumableItem.Count != 0) { List newItem = new List(); @@ -336,7 +325,6 @@ namespace Server.Manager } if (newItem.Count != 0) Statics.consumableItemSQL.Insert(newItem); - Statics.consumableItemSQL.SaveChanges(); } if (addEtcItem.Count != 0) { @@ -350,8 +338,11 @@ namespace Server.Manager } if (newItem.Count != 0) Statics.etcItemSQL.Insert(newItem); - Statics.etcItemSQL.SaveChanges(); } + Statics.deckUnitInfoSQL.SaveChanges(); + Statics.equipmentrSQL.SaveChanges(); + Statics.consumableItemSQL.SaveChanges(); + Statics.etcItemSQL.SaveChanges(); } public bool Add(DeckUnitInfo item) @@ -361,22 +352,12 @@ namespace Server.Manager if (index == -1) { _deckUnitInfo.Add(item); - } - else - { - _deckUnitInfo[index].count += item.count; - item.id = _deckUnitInfo[index].id; - } - if (addIndex == -1) - { addDeckUnitInfo.Add(item); + return true; } else - { - addDeckUnitInfo[addIndex].count += item.count; - } - - return true; + return false; + } public bool Add(List items)