project-redbud/FunGame-Server
6
1
Fork 0
mirror of https://github.com/project-redbud/FunGame-Server.git synced 2025-04-22 03:59:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

一些改动

Browse Source
This commit is contained in:
milimoe 2025-04-13 19:58:43 +08:00
parent 333bdc72aa
commit d91cef8c6d
Signed by: milimoe
GPG Key ID: 05D280912DA6C69E
3 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
FunGame.Server/Controllers/DataRequestController.cs
View File

@ -130,14 +130,6 @@ namespace Milimoe.FunGame.Server.Controller
await UpdateRoomMaster(data, result); await UpdateRoomMaster(data, result);
break; break;
case DataRequestType.UserCenter_GetUserProfile:
GetUserProfile(result);
break;
case DataRequestType.UserCenter_GetUserStatistics:
GetUserStatistics(data, result);
break;
case DataRequestType.UserCenter_UpdateUser: case DataRequestType.UserCenter_UpdateUser:
UpdateUser(data, result); UpdateUser(data, result);
break; break;
@ -166,8 +158,8 @@ namespace Milimoe.FunGame.Server.Controller
MarketBuy(data, result); MarketBuy(data, result);
break; break;
case DataRequestType.Inventory_GetInventory: case DataRequestType.Inventory_UpdateInventory:
GetInventory(data, result); UpdateInventory(data, result);
break; break;
case DataRequestType.Inventory_Use: case DataRequestType.Inventory_Use:
@ -1014,25 +1006,6 @@ namespace Milimoe.FunGame.Server.Controller
#region UserCenter #region UserCenter
/// <summary>
/// 获取用户资料信息
/// </summary>
/// <param name="resultData"></param>
private void GetUserProfile(Dictionary<string, object> resultData)
{
// TODO
}
/// <summary>
/// 获取用户统计数据
/// </summary>
/// <param name="requestData"></param>
/// <param name="resultData"></param>
private void GetUserStatistics(Dictionary<string, object> requestData, Dictionary<string, object> resultData)
{
// TODO
}
/// <summary> /// <summary>
/// 更新用户（全部数据） /// 更新用户（全部数据）
/// </summary> /// </summary>
@ -1155,11 +1128,11 @@ namespace Milimoe.FunGame.Server.Controller
} }
/// <summary> /// <summary>
/// 获取库存信息 /// 更新库存
/// </summary> /// </summary>
/// <param name="requestData"></param> /// <param name="requestData"></param>
/// <param name="resultData"></param> /// <param name="resultData"></param>
private void GetInventory(Dictionary<string, object> requestData, Dictionary<string, object> resultData) private void UpdateInventory(Dictionary<string, object> requestData, Dictionary<string, object> resultData)
{ {
// TODO // TODO
} }

4
FunGame.Server/Models/ServerModel.cs
View File

@ -479,6 +479,10 @@ namespace Milimoe.FunGame.Server.Model
{ {
// 创建User对象 // 创建User对象
User = Factory.GetUser(_dsUser); User = Factory.GetUser(_dsUser);
if (SQLHelper?.GetUserById(User.Id, true, true) is User real)
{
User = real;
}
User.OnlineState = OnlineState.Online; User.OnlineState = OnlineState.Online;
// 检查有没有重复登录的情况 // 检查有没有重复登录的情况
await ForceLogOutDuplicateLogonUser(); await ForceLogOutDuplicateLogonUser();

3
FunGame.Server/Services/DataRequestService.cs
View File

@ -6,6 +6,7 @@ using Milimoe.FunGame.Core.Library.Constant;
using Milimoe.FunGame.Core.Library.SQLScript.Common; using Milimoe.FunGame.Core.Library.SQLScript.Common;
using Milimoe.FunGame.Core.Library.SQLScript.Entity; using Milimoe.FunGame.Core.Library.SQLScript.Entity;
using Milimoe.FunGame.Server.Others; using Milimoe.FunGame.Server.Others;
using ProjectRedbud.FunGame.SQLQueryExtension;
namespace Milimoe.FunGame.Server.Services namespace Milimoe.FunGame.Server.Services
{ {
@ -128,7 +129,7 @@ namespace Milimoe.FunGame.Server.Services
ServerHelper.WriteLine("[Reg] Username: " + username + " Email: " + email); ServerHelper.WriteLine("[Reg] Username: " + username + " Email: " + email);
FunGameSystem.UpdateUserKey(username); FunGameSystem.UpdateUserKey(username);
password = password.Encrypt(FunGameSystem.GetUserKey(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) if (sqlHelper.Result == SQLResult.Success)
{ {
success = true; success = true;