From a8913ff03657d8f5372c50d2766f8679f5067cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Sun, 10 Mar 2024 14:19:15 +0900 Subject: [PATCH] =?UTF-8?q?=EB=BD=91=EA=B8=B0=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Manager/ItemManager.cs | 71 +++++++++++++++++++++++------------ Server/SQL/SQL.cs | 2 - 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/Server/Manager/ItemManager.cs b/Server/Manager/ItemManager.cs index 1d555f4..631bbd5 100644 --- a/Server/Manager/ItemManager.cs +++ b/Server/Manager/ItemManager.cs @@ -6,8 +6,6 @@ namespace Server.Manager { public class ItemManager { - private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger(); - User user; public ItemBox box; @@ -205,23 +203,23 @@ namespace Server.Manager switch (randomRewardDatas[selectItem].reward_item_type) { case eRewardItemType.gold: - user.gold += (randomRewardDatas[selectItem].return_count * count); + user.gold += randomRewardDatas[selectItem].return_count; break; case eRewardItemType.freecash: - user.free_cash += (randomRewardDatas[selectItem].return_count * count); + user.free_cash += randomRewardDatas[selectItem].return_count; break; case eRewardItemType.paycash: - user.pay_cash += (randomRewardDatas[selectItem].return_count * count); + user.pay_cash += randomRewardDatas[selectItem].return_count; break; case eRewardItemType.character: DeckUnitInfo deckUnitInfo = new DeckUnitInfo(); deckUnitInfo.user_id = user.id; deckUnitInfo.unit_data_id = randomRewardDatas[selectItem].reward; - deckUnitInfo.count = (randomRewardDatas[selectItem].return_count * count); + deckUnitInfo.count = (randomRewardDatas[selectItem].return_count); box.Add(deckUnitInfo); break; case eRewardItemType.equipment: - int reward_count = (randomRewardDatas[selectItem].return_count * count); + int reward_count = randomRewardDatas[selectItem].return_count; for (int m = 0; m < reward_count; m++) { Equipment equipment = new Equipment(); @@ -237,14 +235,14 @@ namespace Server.Manager ConsumableItem consumableItem = new ConsumableItem(); consumableItem.user_id = user.id; consumableItem.consumable_item_data_id = randomRewardDatas[selectItem].reward; - consumableItem.count = (randomRewardDatas[selectItem].return_count * count); + consumableItem.count = randomRewardDatas[selectItem].return_count; box.Add(consumableItem); 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 * count); + etcItem.count = randomRewardDatas[selectItem].return_count; box.Add(etcItem); break; default: @@ -300,35 +298,58 @@ namespace Server.Manager Statics.userSQL.SaveChanges(); if (addDeckUnitInfo.Count != 0) { - Statics.deckUnitInfoSQL.Insert(addDeckUnitInfo); + 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(); } if (addEquipment.Count != 0) { - Statics.equipmentrSQL.Insert(addEquipment); + 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(); } if (addConsumableItem.Count != 0) { - for (int n = 0; n < addConsumableItem.Count; n++) + List newItem = new List(); + foreach (var item in _consumableItem) { - if (addConsumableItem[n].id == 0) - Statics.consumableItemSQL.Insert(addConsumableItem[n]); - else - Statics.consumableItemSQL.Update(_consumableItem[_consumableItem.FindIndex(item => item.id == addConsumableItem[n].id)]); - + if (item.id == 0) + { + newItem.Add(item); + } } + if (newItem.Count != 0) + Statics.consumableItemSQL.Insert(newItem); Statics.consumableItemSQL.SaveChanges(); } if (addEtcItem.Count != 0) { - for (int n = 0; n < addEtcItem.Count; n++) + List newItem = new List(); + foreach (var item in _etcItem) { - if (addEtcItem[n].id == 0) - Statics.etcItemSQL.Insert(addEtcItem[n]); - else - Statics.etcItemSQL.Update(_etcItem[_etcItem.FindIndex(item => item.id == addEtcItem[n].id)]); + if (item.id == 0) + { + newItem.Add(item); + } } + if (newItem.Count != 0) + Statics.etcItemSQL.Insert(newItem); Statics.etcItemSQL.SaveChanges(); } } @@ -352,7 +373,7 @@ namespace Server.Manager } else { - addDeckUnitInfo[index].count += item.count; + addDeckUnitInfo[addIndex].count += item.count; } return true; @@ -404,7 +425,7 @@ namespace Server.Manager } else { - addConsumableItem[index].count += item.count; + addConsumableItem[addIndex].count += item.count; } return true; } @@ -438,7 +459,7 @@ namespace Server.Manager } else { - addEtcItem[index].count += item.count; + addEtcItem[addIndex].count += item.count; } return true; } diff --git a/Server/SQL/SQL.cs b/Server/SQL/SQL.cs index d105c82..390dad8 100644 --- a/Server/SQL/SQL.cs +++ b/Server/SQL/SQL.cs @@ -21,13 +21,11 @@ namespace Server.SQL public void Insert(T newData) { table.Add(newData); - SaveChanges(); } public void Insert(List newData) { table.AddRange(newData); - SaveChanges(); } // Update 예시