Game/Fishing2Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对对对

Browse Source
This commit is contained in:
bob
2025-07-26 17:58:25 +08:00
parent 4d8748e866
commit 6311c7cb12
57 changed files with 458 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Hotfix/EntityHelper.cs
View File

@@ -1,11 +1,11 @@
using System.Authentication;
using NB.Authentication;
using Fantasy;
using Fantasy.Async;
using Fantasy.Entitas;
using Fantasy.Network;
// ReSharper disable ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
namespace System;
namespace NB;
public static class EntityHelper
{

2
Hotfix/EntityTimeOutComponentSystem.cs
View File

@@ -3,7 +3,7 @@ using Fantasy.Async;
using Fantasy.Entitas.Interface;
using Fantasy.Helper;
namespace System.Authentication;
namespace NB.Authentication;
public sealed class EntityTimeOutComponentDestroySystem : DestroySystem<EntityTimeOutComponent>
{

3
Hotfix/OnCreateSceneEvent.cs
View File

@@ -1,3 +1,4 @@
using Fantasy;
using Fantasy.Async;
using Fantasy.Entitas;
using Fantasy.Event;
@@ -5,7 +6,7 @@ using Fantasy.Helper;
using Fantasy.Serialize;
using ProtoBuf;
namespace Fantasy;
namespace NB;
public sealed class SubSceneTestComponent : Entity
{

9
Hotfix/OnSceneCreate_Init.cs
View File

@@ -1,11 +1,10 @@
using System.Authentication;
using Fantasy;
using Fantasy;
using Fantasy.Async;
using Fantasy.Authentication;
using Fantasy.Event;
using Fantasy.Gate;
using NB.Authentication;
using NB.Gate;
namespace System;
namespace NB;
public class OnSceneCreate_Init : AsyncEventSystem<OnCreateScene>
{

31
Hotfix/Outer/Authentication/Handler/C2A_LoginRequestHandler.cs
View File

@@ -1,21 +1,46 @@
using Fantasy;
using Fantasy.Async;
using Fantasy.Authentication.Jwt;
using Fantasy.Network;
using Fantasy.Network.Interface;
using Fantasy.Platform.Net;
using NB.Authentication.Jwt;
namespace Fantasy.Authentication.Handler;
namespace NB.Authentication.Handler;
public class C2A_LoginRequestHandler : MessageRPC<C2A_LoginRequest, A2C_LoginResponse>
{
protected override async FTask Run(Session session, C2A_LoginRequest request, A2C_LoginResponse response,
Action reply)
{
if (!session.CheckInterval(2000))
{
// 返回这个3代表操作过于频繁。
response.ErrorCode = ErrorCode.ErrFrequent;
return;
}
session.SetTimeout(3000);
var scene = session.Scene;
var result = await AuthenticationHelper.Login(scene, request.Username, request.Password);
if (result.ErrorCode == 0)
if (result.ErrorCode != ErrorCode.Successful && result.AccountId == -1)
{
//开始注册账号
var regErrorCode =
await AuthenticationHelper.Register(session.Scene, request.Username, request.Password, "用户注册");
if (regErrorCode != ErrorCode.Successful)
{
result.ErrorCode = regErrorCode;
}
else
{
Log.Debug($"Register 当前的服务器是:{scene.SceneConfigId}");
//注册完毕，执行登录
result = await AuthenticationHelper.Login(scene, request.Username, request.Password);
}
}
if (result.ErrorCode == ErrorCode.Successful)
{
// 通过配置表或其他方式拿到Gate服务器组的信息
var gates = SceneConfigData.Instance.GetSceneBySceneType(SceneType.Gate);

25
Hotfix/Outer/Authentication/Handler/C2A_RegisterRequestHandler.cs
View File

@@ -1,25 +0,0 @@
using Fantasy;
using Fantasy.Async;
using Fantasy.Network;
using Fantasy.Network.Interface;
namespace Fantasy.Authentication.Handler;
public sealed class C2A_RegisterRequestHandler : MessageRPC<C2A_RegisterRequest, A2C_RegisterResponse>
{
protected override async FTask Run(Session session, C2A_RegisterRequest request, A2C_RegisterResponse response,
Action reply)
{
if (!session.CheckInterval(2000))
{
// 返回这个3代表操作过于频繁。
response.ErrorCode = 3;
return;
}
session.SetTimeout(3000);
response.ErrorCode =
await AuthenticationHelper.Register(session.Scene, request.Username, request.Password, "用户注册");
Log.Debug($"Register 当前的服务器是:{session.Scene.SceneConfigId}");
}
}

2
Hotfix/Outer/Authentication/System/AccountSystem.cs
View File

@@ -1,7 +1,7 @@
using Fantasy;
using Fantasy.Entitas.Interface;
namespace Fantasy.Authentication;
namespace NB.Authentication;
public class AccountDestroySystem : DestroySystem<Account>
{

84
Hotfix/Outer/Authentication/System/AuthenticationComponentSystem.cs
View File

@@ -9,7 +9,7 @@ using Fantasy.Platform.Net;
#pragma warning disable CS8602 // Dereference of a possibly null reference.
#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
namespace Fantasy.Authentication;
namespace NB.Authentication;
public sealed class AuthenticationComponentDestroySystem : DestroySystem<AuthenticationComponent>
{
@@ -19,7 +19,7 @@ public sealed class AuthenticationComponentDestroySystem : DestroySystem<Authent
{
account.Dispose();
}
self.Accounts.Clear();
}
}
@@ -39,31 +39,31 @@ internal static class AuthenticationComponentSystem
self.AuthenticationCount = authentications.Count;
Log.Info($"鉴权服务器启动成功！Position:{self.Position} AuthenticationCount:{self.AuthenticationCount}");
}
internal static async FTask<(uint ErrorCode, long AccountId)> Login(this AuthenticationComponent self, string userName, string password)
internal static async FTask<(uint ErrorCode, long AccountId)> Login(this AuthenticationComponent self,
string userName, string password)
{
// 1、检查传递的参数是否完整
if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(password))
{
// 这个1代表的是参数不完整。
return (1, 0);
return (ErrorCode.ErrArgs, 0);
}
// 检查账号是否应该在当前鉴权服务器中处理
// 检查账号是否应该在当前鉴权服务器中处理
var position = HashCodeHelper.MurmurHash3(userName) % self.AuthenticationCount;
if (self.Position != position)
{
// 这个3代表的是当前账号不应该在这个鉴权服务器处理。
return (3, 0);
// return (3, 0);
return (ErrorCode.ErrServer, 0);
}
var scene = self.Scene;
var worldDateBase = scene.World.DataBase;//DateBase
var worldDateBase = scene.World.DataBase; //DateBase
var usernameHashCode = userName.GetHashCode();
using (var @lock = await scene.CoroutineLockComponent.Wait((int)LockType.AuthenticationLoginLock, usernameHashCode))
using (var @lock =
await scene.CoroutineLockComponent.Wait((int)LockType.AuthenticationLoginLock, usernameHashCode))
{
// 如果用户频繁发生登录的请求，导致服务器会频繁请求数据库或缓存。
// 针对这个问题咱们可以利用缓存来解决这个问题。
@@ -71,13 +71,13 @@ internal static class AuthenticationComponentSystem
// 2、key:userName + password, Value = ?
// 3、为了防止缓存暴涨、肯定需要一个定期清理的过程，Value肯定是要一个实体了。
// 4、因为这个实体下面咱们可以挂载一个组件，这个组件的作用就是定时清理这个缓存。5
// 问题
// 1、如果用户的密码改了怎么办?
// 因为缓存中有定时清除的，所以遇到改密码的情况下，最多等待这个缓存清除了，然后就可以登录了。
// 2、如果我不这样做，还有什么其他办法？
// 通过防火墙的策略来限制用户请求，比如100ms请求一次。
// 作业:
// 在这个AccountCacheInfo下创建一个组件，这个组件的功能就是定时清理这个缓存。
@@ -87,23 +87,29 @@ internal static class AuthenticationComponentSystem
if (self.LoginAccounts.TryGetValue(loginAccountsKey, out var accountCacheInfo))
{
account = accountCacheInfo.GetComponent<Account>();
if (account == null)
{
return (2, 0);
return (ErrorCode.ErrAccountOrPass, 0);
}
return (0, account.Id);
return (ErrorCode.Successful, account.Id);
}
uint result = 0;
accountCacheInfo = Entity.Create<AccountCacheInfo>(scene, true, true);
account = await worldDateBase.First<Account>(d => d.Username == userName && d.Password == password);
account = await worldDateBase.First<Account>(d => d.Username == userName);
if (account == null)
{
// 这个2代表的是该用户没有注册或者用户或密码错误
result = 2;
// 没有注册
return (ErrorCode.ErrAccountOrPass, -1); //返回-1，用于判断是否需要自动注册
}
if (account.Password != password)
{
//密码错误
result = ErrorCode.ErrAccountOrPass;
}
else
{
@@ -123,7 +129,7 @@ internal static class AuthenticationComponentSystem
return (result, 0);
}
return (0, account.Id);
return (ErrorCode.Successful, account.Id);
}
}
@@ -134,46 +140,48 @@ internal static class AuthenticationComponentSystem
/// <param name="username"></param>
/// <param name="password"></param>
/// <param name="source"></param>
internal static async FTask<uint> Register(this AuthenticationComponent self, string username, string password, string source)
internal static async FTask<uint> Register(this AuthenticationComponent self, string username, string password,
string source)
{
// 1、检查传递的参数是否完整
if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))
{
// 这个1代表的是参数不完整。
return 1;
return ErrorCode.ErrArgs;
}
// 检查账号是否应该在当前鉴权服务器中处理
var position = HashCodeHelper.MurmurHash3(username) % self.AuthenticationCount;
if (self.Position != position)
{
// 这个3代表的是当前账号不应该在这个鉴权服务器处理。
return 3;
// 这个代表的是当前账号不应该在这个鉴权服务器处理。
return ErrorCode.ErrServer;
}
var usernameHashCode = username.GetHashCode();
var scene = self.Scene;
// 利用协程锁来解决异步的原子问题
using (var @lock = await scene.CoroutineLockComponent.Wait((int)LockType.AuthenticationRegisterLock, usernameHashCode))
using (var @lock =
await scene.CoroutineLockComponent.Wait((int)LockType.AuthenticationRegisterLock, usernameHashCode))
{
// 利用缓存来减少频繁请求数据库或缓存的压力。
if (self.Accounts.TryGetValue(username, out var account))
{
// 这个2代表的是该用户已经存在。
return 2;
return ErrorCode.ErrAccountHave;
}
// 2、数据库查询该账号是否存在
var worldDateBase = scene.World.DataBase;
var isExist = await worldDateBase.Exist<Account>(d => d.Username == username);
if (isExist)
{
// 这个2代表的是该用户已经存在。
return 2;
return ErrorCode.ErrAccountHave;
}
//3、执行到这里的话，表示数据库或缓存没有该账号的注册信息，需要咱们创建一个。
@@ -190,7 +198,7 @@ internal static class AuthenticationComponentSystem
account.AddComponent<AccountTimeOut>().TimeOut(4000);
// 这个0代表的是操作成功
Log.Info($"Register source:{source} username:{username} accountId:{accountId}");
return 0;
return ErrorCode.Successful;
}
}
@@ -213,7 +221,7 @@ internal static class AuthenticationComponentSystem
{
return;
}
Log.Debug($"Remove cache username:{username} Count:{self.Accounts.Count}");
if (isDispose)
@@ -225,9 +233,9 @@ internal static class AuthenticationComponentSystem
internal static async FTask<uint> Remove(this AuthenticationComponent self, long accountId, string source)
{
var scene = self.Scene;
// 其实呢，这里没必要加协程锁，这里加是为了给大家加深下这个协程锁的印象。
using (var @lock = await scene.CoroutineLockComponent.Wait((int)LockType.AuthenticationRemoveLock, accountId))
{
var worldDateBase = scene.World.DataBase;

2
Hotfix/Outer/Authentication/System/AuthenticationHelper.cs
View File

@@ -1,7 +1,7 @@
using Fantasy;
using Fantasy.Async;
namespace Fantasy.Authentication;
namespace NB.Authentication;
public static class AuthenticationHelper
{

2
Hotfix/Outer/Authentication/System/Jwt/AuthenticationJwtComponentSystem.cs
View File

@@ -4,7 +4,7 @@ using Fantasy;
using Fantasy.Entitas.Interface;
using Microsoft.IdentityModel.Tokens;
namespace Fantasy.Authentication.Jwt;
namespace NB.Authentication.Jwt;
public sealed class AuthenticationJwtComponentAwakeSystem : AwakeSystem<AuthenticationJwtComponent>
{

2
Hotfix/Outer/Authentication/System/Jwt/AuthenticationJwtHelper.cs
View File

@@ -1,6 +1,6 @@
using Fantasy;
namespace Fantasy.Authentication.Jwt;
namespace NB.Authentication.Jwt;
public static class AuthenticationJwtHelper
{

2
Hotfix/Outer/Authentication/System/TimeOut/AccountCacheInfoTimeOutSystem.cs
View File

@@ -2,7 +2,7 @@ using Fantasy;
using Fantasy.Entitas.Interface;
// ReSharper disable ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
namespace Fantasy.Authentication;
namespace NB.Authentication;
public sealed class AccountCacheInfoTimeOutDestroySystem : DestroySystem<AccountCacheInfoTimeOut>
{

2
Hotfix/Outer/Authentication/System/TimeOut/AccountTimeOutSystem.cs
View File

@@ -1,7 +1,7 @@
using Fantasy;
using Fantasy.Entitas.Interface;
namespace Fantasy.Authentication;
namespace NB.Authentication;
public sealed class AccountTimeOutDestroySystem : DestroySystem<AccountTimeOut>
{

6
Hotfix/Outer/Game/Handler/ItemFactory.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace NB.Game;
public class ItemFactory
{
}

6
Hotfix/Outer/Game/System/ItemManagerComponentSystem.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace NB.Game.System;
public class ItemManagerComponentSystem
{
}

3
Hotfix/Outer/Gate/Handler/Outer/C2G_GetAccountInfoRequestHandler.cs
View File

@@ -1,10 +1,9 @@
using Fantasy;
using Fantasy.Async;
using Fantasy.Gate;
using Fantasy.Network;
using Fantasy.Network.Interface;
namespace System.Gate;
namespace NB.Gate;
public sealed class C2G_GetAccountInfoRequestHandler : MessageRPC<C2G_GetAccountInfoRequest, G2C_GetAccountInfoResponse>
{

5
Hotfix/Outer/Gate/Handler/Outer/C2G_LoginRequestHandler.cs
View File

@@ -1,13 +1,12 @@
using System.Gate.System;
using NB.Gate.System;
using Fantasy;
using Fantasy.Async;
using Fantasy.Gate;
using Fantasy.Network;
using Fantasy.Network.Interface;
#pragma warning disable CS8604 // Possible null reference argument.
namespace System.Gate.Handler;
namespace NB.Gate.Handler;
public sealed class C2G_LoginRequestHandler : MessageRPC<C2G_LoginRequest, G2C_LoginResponse>
{

3
Hotfix/Outer/Gate/System/GameAccount/GameAccountFactory.cs
View File

@@ -1,10 +1,9 @@
using Fantasy;
using Fantasy.Async;
using Fantasy.Entitas;
using Fantasy.Gate;
using Fantasy.Helper;
namespace System.Gate;
namespace NB.Gate;
public static class GameAccountFactory
{

3
Hotfix/Outer/Gate/System/GameAccount/GameAccountFlagComponentSystem.cs
View File

@@ -1,7 +1,6 @@
using Fantasy.Entitas.Interface;
using Fantasy.Gate;
namespace System.Gate;
namespace NB.Gate;
public sealed class GameAccountFlagComponentDestroySystem : DestroySystem<GameAccountFlagComponent>
{

5
Hotfix/Outer/Gate/System/GameAccount/GameAccountHelper.cs
View File

@@ -1,10 +1,9 @@
using System.Gate.System;
using NB.Gate.System;
using Fantasy;
using Fantasy.Async;
using Fantasy.Gate;
using Fantasy.Network;
namespace System.Gate;
namespace NB.Gate;
public static class GameAccountHelper
{

3
Hotfix/Outer/Gate/System/GameAccount/GameAccountSystem.cs
View File

@@ -1,7 +1,6 @@
using Fantasy.Entitas.Interface;
using Fantasy.Gate;
namespace System.Gate;
namespace NB.Gate;
public sealed class GameAccountDestroySystem : DestroySystem<GameAccount>
{

3
Hotfix/Outer/Gate/System/GameAccountManageComponentSystem.cs
View File

@@ -1,7 +1,6 @@
using Fantasy.Entitas.Interface;
using Fantasy.Gate;
namespace System.Gate.System;
namespace NB.Gate.System;
public sealed class GameAccountManageComponentDestroySystem : DestroySystem<GameAccountManageComponent>
{

3
Hotfix/Outer/Gate/System/JWT/GateJWTComponentSystem.cs
View File

@@ -1,11 +1,10 @@
using System.IdentityModel.Tokens.Jwt;
using System.Security.Cryptography;
using Fantasy.Entitas.Interface;
using Fantasy.Gate;
using Microsoft.IdentityModel.Tokens;
#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
namespace System.Gate;
namespace NB.Gate;
public sealed class GateJWTComponentAwakeSystem : AwakeSystem<GateJWTComponent>
{

3
Hotfix/Outer/Gate/System/JWT/GateJWTHelper.cs
View File

@@ -1,8 +1,7 @@
using System.IdentityModel.Tokens.Jwt;
using Fantasy;
using Fantasy.Gate;
namespace System.Gate;
namespace NB.Gate;
public static class GateJWTHelper
{