From 1eae79e61795eeff428f63a885b9a4cf32f8b4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=9C?= Date: Thu, 4 Apr 2024 18:24:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=B8=EC=85=98=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Service/BuyShopItem.cs | 13 ++++++++++++- Server/Service/DeckChange.cs | 2 +- Server/Service/Downlode.cs | 5 +++++ Server/Service/EquipChange.cs | 2 +- Server/Service/Login.cs | 6 ++++++ Server/Service/NicknameChange.cs | 11 +++++++++-- Server/Service/UpdateStory.cs | 2 +- Server/System/Abstract.cs | 2 ++ 8 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Server/Service/BuyShopItem.cs b/Server/Service/BuyShopItem.cs index 4e89fd5..65776ec 100644 --- a/Server/Service/BuyShopItem.cs +++ b/Server/Service/BuyShopItem.cs @@ -5,6 +5,7 @@ using Server.Manager; using NLog; using System.Diagnostics; using Server.SQL.Excel; +using System; namespace Server.Service { @@ -15,6 +16,16 @@ namespace Server.Service private void SaveSQL(ItemManager item) { + Statics.userSQL.Update(req.user); + + Dictionary saveUser = new Dictionary(); + saveUser.Add("nickname", req.user.nickname); + saveUser.Add("gold", req.user.gold); + saveUser.Add("free_cash", req.user.free_cash); + saveUser.Add("pay_cash", req.user.pay_cash); + Statics.redis.SetHash(saveUser, "UserInfo", req.uuid); + + Statics.userSQL.SaveChanges(); Statics.resetShopItemSQL.SaveChanges(); Statics.shopItemSQL.SaveChanges(); @@ -23,7 +34,7 @@ namespace Server.Service public override string Process() { - User user = Statics.userSQL.SelectUuid(req.uuid); + User user = req.user; eBuyType buy_type; int buy; int reward; diff --git a/Server/Service/DeckChange.cs b/Server/Service/DeckChange.cs index dd45c2d..90ed327 100644 --- a/Server/Service/DeckChange.cs +++ b/Server/Service/DeckChange.cs @@ -15,7 +15,7 @@ namespace Server.Service public override string Process() { - User user = Statics.userSQL.SelectUuid(req.uuid); + User user = req.user; List deckInfo = Statics.deckInfoSQL.SelectUid(user.id); List deckUnitInfo = Statics.deckUnitInfoSQL.SelectUid(user.id); //실제 존재하는 유닛인지 확인 diff --git a/Server/Service/Downlode.cs b/Server/Service/Downlode.cs index 89fcf51..e93a33f 100644 --- a/Server/Service/Downlode.cs +++ b/Server/Service/Downlode.cs @@ -40,6 +40,11 @@ namespace Server.Service { return true; } + + public override bool GetRedis() + { + return true; + } } public class DownlodeResp : Resp diff --git a/Server/Service/EquipChange.cs b/Server/Service/EquipChange.cs index da51333..53f3e18 100644 --- a/Server/Service/EquipChange.cs +++ b/Server/Service/EquipChange.cs @@ -17,7 +17,7 @@ namespace Server.Service public override string Process() { - User user = Statics.userSQL.SelectUuid(req.uuid); + User user = req.user; Equipment equipment = Statics.equipmentrSQL.SelectItem(user.id, req.equipment_id); DeckUnitInfo deckUnitInfo = Statics.deckUnitInfoSQL.SelectItem(user.id, req.unit_id); Equipment equipitem = null; diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index 75f2494..9358a4a 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -102,6 +102,8 @@ namespace Server.Service Statics.redis.SetList(loginUUID, "LoginUsers"); Dictionary userInfo = new Dictionary(); userInfo.Add("id", user.id); + userInfo.Add("uuid", user.uuid); + userInfo.Add("mail", user.mail); userInfo.Add("nickname ", user.nickname); userInfo.Add("gold ", user.gold); userInfo.Add("free_cash", user.free_cash); @@ -309,6 +311,10 @@ namespace Server.Service return false; return true; } + public override bool GetRedis() + { + return true; + } } public class LoginResp : Resp diff --git a/Server/Service/NicknameChange.cs b/Server/Service/NicknameChange.cs index b7b0338..e4542fb 100644 --- a/Server/Service/NicknameChange.cs +++ b/Server/Service/NicknameChange.cs @@ -10,12 +10,19 @@ namespace Server.Service private NicknameChangeReq req; private void SaveSQL() { - Statics.userSQL.SaveChanges(); + Statics.userSQL.Update(req.user); + + Dictionary saveUser = new Dictionary(); + saveUser.Add("nickname", req.user.nickname); + saveUser.Add("gold", req.user.gold); + saveUser.Add("free_cash", req.user.free_cash); + saveUser.Add("pay_cash", req.user.pay_cash); + Statics.redis.SetHash(saveUser, "UserInfo", req.uuid); } public override string Process() { - User user = Statics.userSQL.SelectUuid(req.uuid); + User user = req.user; string newNickname = req.newNickname; string regular = @"^[가-힣a-zA-Z0-9\s]*$"; string defaultNick = Statics.dynamicDataSQL.SelectName("defaultNick").value; diff --git a/Server/Service/UpdateStory.cs b/Server/Service/UpdateStory.cs index 2d79d3e..daa3c4a 100644 --- a/Server/Service/UpdateStory.cs +++ b/Server/Service/UpdateStory.cs @@ -15,7 +15,7 @@ namespace Server.Service public override string Process() { - User user = Statics.userSQL.SelectUuid(req.uuid); + User user = req.user; List storyProgress = Statics.storyProgressSQL.SelectUid(user.id); StoryProgress story = storyProgress.Find(n => n.story_data_id == req.story_id); int chapter = 1; diff --git a/Server/System/Abstract.cs b/Server/System/Abstract.cs index f643f09..2ff8dc2 100644 --- a/Server/System/Abstract.cs +++ b/Server/System/Abstract.cs @@ -41,6 +41,8 @@ namespace Server.System { Dictionary hash = Statics.redis.GetAllHash("UserInfo", uuid); user.id = (int)hash["id"]; + user.uuid = (string)hash["uuid"]; + user.mail = (string)hash["mail"]; user.nickname = (string)hash["nickname"]; user.gold = (int)hash["gold"]; user.free_cash = (int)hash["free_cash"];