StarRailPS/DanhengServer-OpenSource
1
0
Fork 0
mirror of https://github.com/EggLinks/DanhengServer-OpenSource.git synced 2026-01-02 20:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Uid exceed error when number too large

Browse Source 
Fuck ushort
This commit is contained in:
WatchAndyTW
2024-05-30 23:36:11 +08:00
parent dc2b6ceb4b
commit 877af770bc
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/Database/Account/AccountData.cs
View File

@@ -31,9 +31,9 @@ namespace EggLink.DanhengServer.Database.Account
return result;
}
public static AccountData? GetAccountByUid(long uid)
public static AccountData? GetAccountByUid(int uid)
{
AccountData? result = DatabaseHelper.Instance?.GetInstance<AccountData>((int)uid);
AccountData? result = DatabaseHelper.Instance?.GetInstance<AccountData>(uid);
return result;
}

2
GameServer/Command/CommandSender.cs
View File

@@ -37,7 +37,7 @@ namespace EggLink.DanhengServer.Command
public void SendMsg(string msg)
{
Player.SendPacket(new PacketRevcMsgScNotify(toUid:Player.Uid, fromUid: (uint)ConfigManager.Config.ServerOption.ServerProfile.Uid, msg));
Player.SendPacket(new PacketRevcMsgScNotify(toUid: (uint)Player.Uid, fromUid: (uint)ConfigManager.Config.ServerOption.ServerProfile.Uid, msg));
}
public bool HasPermission(string permission)

2
GameServer/Game/Friend/FriendManager.cs
View File

@@ -89,7 +89,7 @@ namespace EggLink.DanhengServer.Game.Friend
var targetData = PlayerData.GetPlayerByUid(targetUid)!;
var targetPlayer = Listener.GetActiveConnection(targetUid);
targetPlayer?.SendPacket(new PacketSyncHandleFriendScNotify(Player.Uid, true, Player.Data));
targetPlayer?.SendPacket(new PacketSyncHandleFriendScNotify((uint)Player.Uid, true, Player.Data));
targetPlayer?.Player!.FriendManager!.FriendData.SendApplyList.Remove(Player.Uid);
targetPlayer?.Player!.FriendManager!.FriendData.FriendList.Add(Player.Uid);

4
GameServer/Game/Player/PlayerInstance.cs
View File

@@ -65,7 +65,7 @@ namespace EggLink.DanhengServer.Game.Player
public TutorialData? TutorialData { get; private set; }
public TutorialGuideData? TutorialGuideData { get; private set; }
public SceneInstance? SceneInstance { get; private set; }
public ushort Uid { get; set; }
public int Uid { get; set; }
public Connection? Connection { get; set; }
public bool Initialized { get; set; } = false;
public bool IsNewPlayer { get; set; } = false;
@@ -110,7 +110,7 @@ namespace EggLink.DanhengServer.Game.Player
private void InitialPlayerManager()
{
Uid = (ushort)Data.Uid;
Uid = Data.Uid;
ActivityManager = new(this);
AvatarManager = new(this);
LineupManager = new(this);

2
GameServer/Server/Packet/Send/Player/PacketPlayerGetTokenScRsp.cs
View File

@@ -9,7 +9,7 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Player
var rsp = new PlayerGetTokenScRsp()
{
BlackInfo = new(),
Uid = connection.Player?.Uid ?? 0,
Uid = (uint)(connection.Player?.Uid ?? 0),
};
SetData(rsp);

2
WebServer/Handler/ComboTokenGranterHandler.cs
View File

@@ -17,7 +17,7 @@ namespace EggLink.DanhengServer.WebServer.Handler
res.message = "Invalid login data";
return new JsonResult(res);
}
AccountData? account = AccountData.GetAccountByUid(long.Parse(tokenData.uid!));
AccountData? account = AccountData.GetAccountByUid(int.Parse(tokenData.uid!));
if (account == null)
{
res.retcode = -201;

2
WebServer/Handler/TokenLoginHandler.cs
View File

@@ -9,7 +9,7 @@ namespace EggLink.DanhengServer.WebServer.Handler
{
public JsonResult Handle(string uid, string token)
{
AccountData? account = AccountData.GetAccountByUid(long.Parse(uid));
AccountData? account = AccountData.GetAccountByUid(int.Parse(uid));
var res = new LoginResJson();
if (account == null || !account?.DispatchToken?.Equals(token) == true)
{