Compare commits
1 Commits
fb76f49ec0
...
fix/cross-
| Author | SHA1 | Date | |
|---|---|---|---|
| a5eedb2fb2 |
@@ -4,39 +4,10 @@ namespace MMOserver.Api;
|
||||
// API 응답(BossRaidAccessResponse)을 직접 노출하지 않고 이걸로 매핑해서 반환
|
||||
public sealed class BossRaidResult
|
||||
{
|
||||
public int RoomId
|
||||
{
|
||||
get;
|
||||
init;
|
||||
}
|
||||
|
||||
public string SessionName
|
||||
{
|
||||
get;
|
||||
init;
|
||||
} = string.Empty;
|
||||
|
||||
public int BossId
|
||||
{
|
||||
get;
|
||||
init;
|
||||
}
|
||||
|
||||
public List<string> Players
|
||||
{
|
||||
get;
|
||||
init;
|
||||
} = new();
|
||||
|
||||
public string Status
|
||||
{
|
||||
get;
|
||||
init;
|
||||
} = string.Empty;
|
||||
|
||||
public Dictionary<string, string> Tokens
|
||||
{
|
||||
get;
|
||||
init;
|
||||
} = new();
|
||||
public int RoomId { get; init; }
|
||||
public string SessionName { get; init; } = string.Empty;
|
||||
public int BossId { get; init; }
|
||||
public List<string> Players { get; init; } = new();
|
||||
public string Status { get; init; } = string.Empty;
|
||||
public Dictionary<string, string> Tokens { get; init; } = new();
|
||||
}
|
||||
|
||||
@@ -73,13 +73,13 @@ public class RestApi : Singleton<RestApi>
|
||||
// 성공 시 BossRaidResult 반환, 실패/거절 시 null 반환
|
||||
public async Task<BossRaidResult?> BossRaidAccesssAsync(List<string> userNames, int bossId)
|
||||
{
|
||||
string url = AppConfig.RestApi.BaseUrl + AppConfig.RestApi.BossRaidAccess;
|
||||
string url = AppConfig.RestApi.BaseUrl + "/api/internal/bossraid/entry";
|
||||
|
||||
for (int attempt = 1; attempt <= MAX_RETRY; attempt++)
|
||||
{
|
||||
try
|
||||
{
|
||||
HttpResponseMessage response = await httpClient.PostAsJsonAsync(url, new { usernames = userNames, bossId = bossId });
|
||||
HttpResponseMessage response = await httpClient.PostAsJsonAsync(url, new { usernames = userNames, bossId });
|
||||
|
||||
// 401: API 키 인증 실패
|
||||
if (response.StatusCode == HttpStatusCode.Unauthorized)
|
||||
@@ -88,13 +88,20 @@ public class RestApi : Singleton<RestApi>
|
||||
return null;
|
||||
}
|
||||
|
||||
// 400: 입장 조건 미충족 (레벨 부족, 이미 진행중 등)
|
||||
// 400: 입장 조건 미충족 (레벨 부족 등)
|
||||
if (response.StatusCode == HttpStatusCode.BadRequest)
|
||||
{
|
||||
Log.Warning("[RestApi] 보스 레이드 입장 거절 (400) BossId={BossId}", bossId);
|
||||
return null;
|
||||
}
|
||||
|
||||
// 409: 이미 진행 중이거나 슬롯 충돌
|
||||
if (response.StatusCode == HttpStatusCode.Conflict)
|
||||
{
|
||||
Log.Warning("[RestApi] 보스 레이드 충돌 (409) BossId={BossId} - 이미 진행 중이거나 슬롯 없음", bossId);
|
||||
return null;
|
||||
}
|
||||
|
||||
response.EnsureSuccessStatusCode();
|
||||
|
||||
BossRaidAccessResponse? raw = await response.Content.ReadFromJsonAsync<BossRaidAccessResponse>();
|
||||
@@ -111,7 +118,7 @@ public class RestApi : Singleton<RestApi>
|
||||
BossId = raw.BossId,
|
||||
Players = raw.Players,
|
||||
Status = raw.Status ?? string.Empty,
|
||||
Tokens = raw.Tokens
|
||||
Tokens = raw.Tokens ?? new()
|
||||
};
|
||||
}
|
||||
catch (Exception ex) when (attempt < MAX_RETRY)
|
||||
@@ -166,10 +173,10 @@ public class RestApi : Singleton<RestApi>
|
||||
}
|
||||
|
||||
[JsonPropertyName("tokens")]
|
||||
public Dictionary<string, string> Tokens
|
||||
public Dictionary<string, string>? Tokens
|
||||
{
|
||||
get;
|
||||
set;
|
||||
} = new();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,15 +30,9 @@ public sealed class ServerConfig
|
||||
get;
|
||||
}
|
||||
|
||||
public int ChannelCount
|
||||
{
|
||||
get;
|
||||
}
|
||||
|
||||
public ServerConfig(IConfigurationSection section)
|
||||
{
|
||||
Port = int.Parse(section["Port"] ?? throw new InvalidOperationException("Server:Port is required in config.json"));
|
||||
ChannelCount = int.Parse(section["ChannelCount"] ?? "1");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,11 +48,6 @@ public sealed class RestApiConfig
|
||||
get;
|
||||
}
|
||||
|
||||
public string BossRaidAccess
|
||||
{
|
||||
get;
|
||||
}
|
||||
|
||||
public string ApiKey
|
||||
{
|
||||
get;
|
||||
@@ -68,7 +57,6 @@ public sealed class RestApiConfig
|
||||
{
|
||||
BaseUrl = section["BaseUrl"] ?? throw new InvalidOperationException("RestApi:BaseUrl is required in config.json");
|
||||
VerifyToken = section["VerifyToken"] ?? throw new InvalidOperationException("RestApi:BaseUrl is required in config.json");
|
||||
BossRaidAccess = section["BossRaidAccess"] ?? throw new InvalidOperationException("RestApi:BaseUrl is required in config.json");
|
||||
ApiKey = section["ApiKey"] ?? throw new InvalidOperationException("RestApi:ApiKey is required in config.json");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using LiteNetLib;
|
||||
using MMOserver.Config;
|
||||
using MMOserver.Utils;
|
||||
|
||||
namespace MMOserver.Game.Channel;
|
||||
@@ -9,12 +8,16 @@ public class ChannelManager : Singleton<ChannelManager>
|
||||
// 채널 관리
|
||||
private Dictionary<int, Channel> channels = new Dictionary<int, Channel>();
|
||||
|
||||
// 보스 레이드 채널
|
||||
private readonly int bossChannelStart = 10000;
|
||||
private readonly int bossChannelSize = 10;
|
||||
|
||||
// 채널별 유저 관리 (유저 key, 채널 val)
|
||||
private Dictionary<int, int> connectUsers = new Dictionary<int, int>();
|
||||
|
||||
public ChannelManager()
|
||||
{
|
||||
Initializer(AppConfig.Server.ChannelCount);
|
||||
Initializer();
|
||||
}
|
||||
|
||||
public void Initializer(int channelSize = 1)
|
||||
@@ -23,6 +26,13 @@ public class ChannelManager : Singleton<ChannelManager>
|
||||
{
|
||||
channels.Add(i, new Channel(i));
|
||||
}
|
||||
|
||||
// 보스 채널 생성
|
||||
for (int i = 1; i <= bossChannelSize; i++)
|
||||
{
|
||||
int bossChannel = i + bossChannelStart;
|
||||
channels.Add(bossChannel, new Channel(bossChannel));
|
||||
}
|
||||
}
|
||||
|
||||
public Channel GetChannel(int channelId)
|
||||
|
||||
@@ -103,7 +103,7 @@ public class GameServer : ServerBase
|
||||
{
|
||||
AccTokenPacket accTokenPacket = Serializer.Deserialize<AccTokenPacket>(new ReadOnlyMemory<byte>(payload));
|
||||
string token = accTokenPacket.Token;
|
||||
string? username = "";
|
||||
string username = "";
|
||||
tokenHash.TryGetValue(token, out int hashKey);
|
||||
if (hashKey <= 1000)
|
||||
{
|
||||
@@ -122,7 +122,7 @@ public class GameServer : ServerBase
|
||||
{
|
||||
// 신규 연결: 웹서버에 JWT 검증 요청
|
||||
username = await RestApi.Instance.VerifyTokenAsync(token);
|
||||
if (username == null || username.Trim().Length <= 0)
|
||||
if (username == null)
|
||||
{
|
||||
Log.Warning("[Server] 토큰 검증 실패 - 연결 거부 PeerId={Id}", peer.Id);
|
||||
userUuidGenerator.Release(hashKey);
|
||||
@@ -406,7 +406,12 @@ public class GameServer : ServerBase
|
||||
Mp = player.Mp,
|
||||
MaxMp = player.MaxMp,
|
||||
Position = new Position { X = player.PosX, Y = player.PosY, Z = player.PosZ },
|
||||
RotY = player.RotY
|
||||
RotY = player.RotY,
|
||||
Experience = player.Experience,
|
||||
NextExp = player.NextExp,
|
||||
AttackPower = player.AttackPower,
|
||||
AttackRange = player.AttackRange,
|
||||
SprintMultiplier = player.SprintMultiplier
|
||||
};
|
||||
}
|
||||
|
||||
@@ -574,12 +579,17 @@ public class GameServer : ServerBase
|
||||
|
||||
if (memberPeer != null)
|
||||
{
|
||||
// 세션에서 username 조회
|
||||
string nickname = memberPeer.Tag is Session s && !string.IsNullOrEmpty(s.UserName)
|
||||
? s.UserName
|
||||
: memberId.ToString();
|
||||
|
||||
// 새 채널에 유저 추가
|
||||
Player newPlayer = new()
|
||||
{
|
||||
HashKey = memberId,
|
||||
PlayerId = memberId,
|
||||
Nickname = memberId.ToString()
|
||||
Nickname = nickname
|
||||
};
|
||||
cm.AddUser(packet.ChannelId, memberId, newPlayer, memberPeer);
|
||||
|
||||
@@ -1073,14 +1083,16 @@ public class GameServer : ServerBase
|
||||
List<string> userNames = new List<string>();
|
||||
foreach (int memberId in party.PartyMemberIds)
|
||||
{
|
||||
Player? memberPlayer = channel.GetPlayer(memberId);
|
||||
if (memberPlayer != null)
|
||||
Player? member = channel.GetPlayer(memberId);
|
||||
if (member == null)
|
||||
{
|
||||
userNames.Add(memberPlayer.Nickname);
|
||||
continue;
|
||||
}
|
||||
|
||||
userNames.Add(member.Nickname);
|
||||
}
|
||||
|
||||
BossRaidResult? result = await RestApi.Instance.BossRaidAccesssAsync(userNames, 1);
|
||||
BossRaidResult? result = await RestApi.Instance.BossRaidAccesssAsync(userNames, packet.RaidId);
|
||||
|
||||
// 입장 실패
|
||||
if (result == null || result.BossId <= 0)
|
||||
@@ -1147,17 +1159,13 @@ public class GameServer : ServerBase
|
||||
|
||||
SendTo(memberPeer, PacketSerializer.Serialize((ushort)PacketCode.CHANGE_MAP, response));
|
||||
|
||||
// 모두에게 레이드로 이동 (할당된 실제 레이드 맵 ID 전달)
|
||||
if (result.Tokens.ContainsKey(memberPlayer.Nickname.Trim()))
|
||||
{
|
||||
SendTo(peer,
|
||||
PacketSerializer.Serialize((ushort)PacketCode.INTO_BOSS_RAID,
|
||||
new IntoBossRaidPacket
|
||||
{
|
||||
RaidId = assignedRaidMapId, IsSuccess = true, Session = result.SessionName,
|
||||
Token = result.Tokens[memberPlayer.Nickname.Trim()]
|
||||
}));
|
||||
}
|
||||
// 각 파티원에게 레이드 입장 정보 전달 (본인의 토큰 포함)
|
||||
string? memberToken = null;
|
||||
result.Tokens?.TryGetValue(memberPlayer.Nickname, out memberToken);
|
||||
SendTo(memberPeer,
|
||||
PacketSerializer.Serialize((ushort)PacketCode.INTO_BOSS_RAID,
|
||||
new IntoBossRaidPacket
|
||||
{ RaidId = assignedRaidMapId, IsSuccess = true, Session = result.SessionName, Token = memberToken }));
|
||||
}
|
||||
|
||||
Log.Debug("[GameServer] INTO_BOSS_RAID HashKey={Key} PartyId={PartyId} AssignedRaidMapId={RaidId}", hashKey, party.PartyId,
|
||||
|
||||
@@ -75,6 +75,38 @@ public class Player
|
||||
set;
|
||||
}
|
||||
|
||||
// 경험치
|
||||
public int Experience
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public int NextExp
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
// 전투 스탯
|
||||
public float AttackPower
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public float AttackRange
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public float SprintMultiplier
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
// 현재 위치한 맵 ID
|
||||
public int CurrentMapId
|
||||
{
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
{
|
||||
"Server": {
|
||||
"Port": 9500,
|
||||
"ChannelCount": 5
|
||||
"Port": 9500
|
||||
},
|
||||
"RestApi": {
|
||||
"BaseUrl": "https://a301.api.tolelom.xyz",
|
||||
"VerifyToken": "/api/internal/auth/verify",
|
||||
"BossRaidAccess": "/api/internal/bossraid/entry",
|
||||
"ApiKey": "017f15b28143fc67d2e5bed283c37d2da858b9f294990a5334238e055e3f5425"
|
||||
},
|
||||
"Database": {
|
||||
|
||||
Reference in New Issue
Block a user