diff --git a/FunGame.Server/Controllers/DataRequestController.cs b/FunGame.Server/Controllers/DataRequestController.cs index 375a050..c6805d2 100644 --- a/FunGame.Server/Controllers/DataRequestController.cs +++ b/FunGame.Server/Controllers/DataRequestController.cs @@ -130,14 +130,6 @@ namespace Milimoe.FunGame.Server.Controller await UpdateRoomMaster(data, result); break; - case DataRequestType.UserCenter_GetUserProfile: - GetUserProfile(result); - break; - - case DataRequestType.UserCenter_GetUserStatistics: - GetUserStatistics(data, result); - break; - case DataRequestType.UserCenter_UpdateUser: UpdateUser(data, result); break; @@ -166,8 +158,8 @@ namespace Milimoe.FunGame.Server.Controller MarketBuy(data, result); break; - case DataRequestType.Inventory_GetInventory: - GetInventory(data, result); + case DataRequestType.Inventory_UpdateInventory: + UpdateInventory(data, result); break; case DataRequestType.Inventory_Use: @@ -1014,25 +1006,6 @@ namespace Milimoe.FunGame.Server.Controller #region UserCenter - /// - /// 获取用户资料信息 - /// - /// - private void GetUserProfile(Dictionary resultData) - { - // TODO - } - - /// - /// 获取用户统计数据 - /// - /// - /// - private void GetUserStatistics(Dictionary requestData, Dictionary resultData) - { - // TODO - } - /// /// 更新用户(全部数据) /// @@ -1155,11 +1128,11 @@ namespace Milimoe.FunGame.Server.Controller } /// - /// 获取库存信息 + /// 更新库存 /// /// /// - private void GetInventory(Dictionary requestData, Dictionary resultData) + private void UpdateInventory(Dictionary requestData, Dictionary resultData) { // TODO } diff --git a/FunGame.Server/Models/ServerModel.cs b/FunGame.Server/Models/ServerModel.cs index 789a840..87f09b9 100644 --- a/FunGame.Server/Models/ServerModel.cs +++ b/FunGame.Server/Models/ServerModel.cs @@ -479,6 +479,10 @@ namespace Milimoe.FunGame.Server.Model { // 创建User对象 User = Factory.GetUser(_dsUser); + if (SQLHelper?.GetUserById(User.Id, true, true) is User real) + { + User = real; + } User.OnlineState = OnlineState.Online; // 检查有没有重复登录的情况 await ForceLogOutDuplicateLogonUser(); diff --git a/FunGame.Server/Services/DataRequestService.cs b/FunGame.Server/Services/DataRequestService.cs index 94cd6bf..0cb900b 100644 --- a/FunGame.Server/Services/DataRequestService.cs +++ b/FunGame.Server/Services/DataRequestService.cs @@ -6,6 +6,7 @@ using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.SQLScript.Common; using Milimoe.FunGame.Core.Library.SQLScript.Entity; using Milimoe.FunGame.Server.Others; +using ProjectRedbud.FunGame.SQLQueryExtension; namespace Milimoe.FunGame.Server.Services { @@ -128,7 +129,7 @@ namespace Milimoe.FunGame.Server.Services ServerHelper.WriteLine("[Reg] Username: " + username + " Email: " + email); FunGameSystem.UpdateUserKey(username); password = password.Encrypt(FunGameSystem.GetUserKey(username)); - sqlHelper.Execute(UserQuery.Insert_Register(sqlHelper, username, password, email, clientIP)); + sqlHelper.RegisterUser(username, password, email, clientIP); if (sqlHelper.Result == SQLResult.Success) { success = true;