diff --git a/Server/Manager/ItemManager.cs b/Server/Manager/ItemManager.cs index 4d11e73..bd29eff 100644 --- a/Server/Manager/ItemManager.cs +++ b/Server/Manager/ItemManager.cs @@ -36,9 +36,8 @@ namespace Server.Manager DeckUnitInfo deckUnitInfo = new DeckUnitInfo(); deckUnitInfo.user_id = user.id; deckUnitInfo.unit_data_id = rewardData.return_item; - deckUnitInfo.count = rewardData.return_count; if (!box.Add(deckUnitInfo)) - throw new RuntimeException("add new unit [box.Add(deckUnitInfo)]", Error.RuntimeException); + user.free_cash += 2500; break; case eRewardItemType.equipment: Random rand = new Random(); @@ -89,10 +88,9 @@ namespace Server.Manager { DeckUnitInfo deckUnitInfo = new DeckUnitInfo(); deckUnitInfo.user_id = user.id; - deckUnitInfo.count = 1; deckUnitInfo.unit_data_id = unitDataId; if (!box.Add(deckUnitInfo)) - throw new RuntimeException("add new unit", Error.RuntimeException); + user.free_cash += 2500; } public void randomItem(int group, int count) @@ -124,9 +122,8 @@ namespace Server.Manager DeckUnitInfo deckUnitInfo = new DeckUnitInfo(); deckUnitInfo.user_id = user.id; deckUnitInfo.unit_data_id = randomRewardDatas[n].reward; - deckUnitInfo.count = (randomRewardDatas[n].return_count * count); if (!box.Add(deckUnitInfo)) - throw new RuntimeException("add new unit", Error.RuntimeException); + user.free_cash += 2500; break; case eRewardItemType.equipment: Random rand = new Random(); @@ -224,9 +221,8 @@ namespace Server.Manager DeckUnitInfo deckUnitInfo = new DeckUnitInfo(); deckUnitInfo.user_id = user.id; deckUnitInfo.unit_data_id = randomRewardDatas[selectItem].reward; - deckUnitInfo.count = (randomRewardDatas[selectItem].return_count); if (!box.Add(deckUnitInfo)) - throw new RuntimeException("add new unit", Error.RuntimeException); + user.free_cash += 2500; break; case eRewardItemType.equipment: int reward_count = randomRewardDatas[selectItem].return_count; diff --git a/Server/SQL/DeckUnitInfo.cs b/Server/SQL/DeckUnitInfo.cs index a986e14..5dea2a3 100644 --- a/Server/SQL/DeckUnitInfo.cs +++ b/Server/SQL/DeckUnitInfo.cs @@ -17,10 +17,7 @@ namespace Server.SQL public long equip3_id { get; set; } public long equip4_id { get; set; } public long equip5_id { get; set; } - [JsonIgnore] - public int level { get; set; } public long exp { get; set; } - public long count { get; set; } } public class DeckUnitInfoSQL : SQL