diff --git a/Server/SQL/ShopItem.cs b/Server/SQL/ShopItem.cs index 9617bb8..744e4b9 100644 --- a/Server/SQL/ShopItem.cs +++ b/Server/SQL/ShopItem.cs @@ -11,7 +11,7 @@ namespace Server.SQL public long user_id { get; set; } public long id { get; set; } public long shop_item_data_id { get; set; } - public DateTime end_date { get; set; } + public DateTime buy_date { get; set; } } public class ShopItemSQL : SQL @@ -25,7 +25,6 @@ namespace Server.SQL public override List SelectUid(long user_id) { - //현재 시간도 비교해서 이전날자가 들어가지 않게 하기 return table.Where(data => data.user_id == user_id).ToList(); } } diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index a6eb7ae..4557348 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -274,6 +274,7 @@ namespace Server.Service resp.consumable_item = itemManager.box.consumableItem; resp.etc_item = itemManager.box.etcItem; resp.reset_shop_item = resetShopItem; + resp.shop_item = shopItem; resp.status = 200; return resp.ToJson(); } @@ -307,5 +308,6 @@ namespace Server.Service public List consumable_item; public List etc_item; public List reset_shop_item; + public List shop_item; } }