250501 커밋

This commit is contained in:
2025-05-01 07:23:28 +09:00
parent 98bb2e3c5c
commit 23176551b7
353 changed files with 9972 additions and 6652 deletions

View File

@@ -1,37 +0,0 @@
using Google.Protobuf;
using Google.Protobuf.WellKnownTypes;
using ServerCore;
using ServerBase;
using ServerCommon;
using ServerCommon.BusinessLogDomain;
using MetaAssets;
namespace GameServer;
public class ArcadeRunningInstanceInitHandler : GameModeInitHandlerBase
{
public ArcadeRunningInstanceInitHandler(InstanceRoom instanceRoom) : base(instanceRoom, EPlaceType.ArcadeRunning)
{
}
public override Result gamedModeInstanceInitValidate()
{
var result = new Result();
//kihoon todo : running 추가
return result;
}
public override Result gamedModeInstanceInit()
{
var result = new Result();
//kihoon todo : running 추가
return result;
}
}

View File

@@ -1,36 +0,0 @@
using Google.Protobuf;
using Google.Protobuf.WellKnownTypes;
using ServerCore;
using ServerBase;
using ServerCommon;
using ServerCommon.BusinessLogDomain;
using MetaAssets;
namespace GameServer;
public class ArcadeRunningInstanceJoinHandler : GameModeJoinHandlerBase
{
public ArcadeRunningInstanceJoinHandler(InstanceRoom instanceRoom) : base(instanceRoom, EPlaceType.ArcadeRunning)
{
}
public override Result gamedModeInstanceJoinValidate(EPlaceType placeType)
{
var result = new Result();
return result;
}
public override Result gamedModeInstanceJoin(Player player)
{
var result = new Result();
string err_msg = string.Empty;
return result;
}
}

View File

@@ -0,0 +1,40 @@
using GameServer.Contents.GameMode.Manage.PlayManage;
using ServerCommon;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class GameModeRun : GameModeBase, IGameModeGenre
{
public GameModeRun(EntityType type, InstanceRoom instanceRoom) : base(type, instanceRoom)
{
}
public override Task<Result> onInit()
{
return base.onInit();
}
public override Task taskUpdate()
{
Log.getLogger().debug("run race taskUpdate called");
Log.getLogger().debug("run race taskUpdate done");
return Task.CompletedTask;
}
public override string toBasicString()
{
var basic_string = base.toBasicString() + $"GameModeRun....";
return basic_string;
}
public override Task initAfterTimerCreate()
{
m_current_game_mode_state = new RaceStateReady(this);
return Task.CompletedTask;
}
}

View File

@@ -0,0 +1,6 @@
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public interface IRunningMode
{
Task<Result> initRunningMode();
}

View File

@@ -0,0 +1,18 @@
using GameServer.Contents.GameMode.Manage.PlayManage;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class GameModeRunAdventure<T> : GameModeRun where T : IRunningMode
{
T m_run_mode_data;
public GameModeRunAdventure(T runModeData, InstanceRoom instanceRoom) : base(EntityType.GameModeRunAdventure, instanceRoom)
{
m_run_mode_data = runModeData;
}
public override string toBasicString()
{
var basic_string = base.toBasicString() + $"GameModeRunAdventure....";
return basic_string;
}
}

View File

@@ -0,0 +1,12 @@
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class GameModeRunAdventureData : IRunningMode
{
public async Task<Result> initRunningMode()
{
var result = new Result();
await Task.CompletedTask;
return result;
}
}

View File

@@ -0,0 +1,20 @@
using GameServer.Contents.GameMode.Manage.LeaveManage;
using GameServer.Contents.GameMode.Manage.PlayManage;
using ServerCommon;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RunAdventureDestroyHandler : GameModeDestroyHandlerBase
{
public RunAdventureDestroyHandler(string roomId) : base(roomId, GameModeType.RUN_ADV)
{
}
public override async Task<Result> postDestroy(IGameMode gameMode)
{
var result = new Result();
await Task.CompletedTask;
return result;
}
}

View File

@@ -0,0 +1,18 @@
using GameServer.Contents.GameMode.Manage;
using ServerCommon;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RunAdventureInitHandler : GameModeInitHandlerBase
{
public RunAdventureInitHandler(InstanceRoom instanceRoom) : base(instanceRoom, GameModeType.RUN_ADV)
{
}
public override Result gamedModeInstanceInitValidate()
{
var result = new Result();
return result;
}
}

View File

@@ -0,0 +1,30 @@
using GameServer.Contents.GameMode.Manage;
using ServerCommon;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RunAdventureJoinHandler : GameModeJoinHandlerBase
{
public RunAdventureJoinHandler(InstanceRoom instanceRoom) : base(instanceRoom, GameModeType.RUN_ADV)
{
}
public override Result gamedModeInstanceJoinValidate()
{
var result = new Result();
return result;
}
public override Result gamedModeInstanceJoin(Player player)
{
Log.getLogger().debug("run race gamedModeInstanceJoin called");
var result = new Result();
string err_msg = string.Empty;
Log.getLogger().debug("run race gamedModeInstanceJoin done");
return result;
}
}

View File

@@ -1,19 +1,11 @@
using Google.Protobuf;
using Google.Protobuf.WellKnownTypes;
using ServerCore;
using ServerBase;
using GameServer.Contents.GameMode.Manage;
using ServerCommon;
using ServerCommon.BusinessLogDomain;
using MetaAssets;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
namespace GameServer;
public class ArcadeRunningInstanceJoinSuccessHandler : GameModeJoinSuccessHandlerBase
public class RunAdventureJoinSuccessHandler : GameModeJoinSuccessHandlerBase
{
public ArcadeRunningInstanceJoinSuccessHandler(Player player, InstanceRoom instanceRoom) : base(player, EPlaceType.ArcadeRunning)
public RunAdventureJoinSuccessHandler(Player player, InstanceRoom instanceRoom) : base(player, GameModeType.RUN_ADV, instanceRoom)
{
}

View File

@@ -0,0 +1,38 @@
using GameServer.Contents.GameMode.Manage.LeaveManage;
using GameServer.Contents.GameMode.Manage.PlayManage;
using ServerCommon;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RunAdventureLeaveHandler : GameModeLeaveHandlerBase
{
public RunAdventureLeaveHandler(Player player, string roomId) : base(player, roomId, GameModeType.RUN_ADV)
{
}
public override async Task<Result> postLeave(IGameMode gameMode)
{
var result = new Result();
await Task.CompletedTask;
return new Result();
}
public override async Task<Result> notifyAfterLeave(IGameMode gameMode)
{
var result = new Result();
await Task.CompletedTask;
return result;
}
public override async Task<Result> logAfterLeave(IGameMode gameMode)
{
var result = new Result();
await Task.CompletedTask;
return result;
}
}

View File

@@ -0,0 +1,43 @@
using System.Collections.Concurrent;
using GameServer.Contents.GameMode.Action;
using GameServer.Contents.GameMode.InteractionObject;
using GameServer.Contents.GameMode.Manage.PlayManage;
using MetaAssets;
using ServerBase;
using ServerCommon;
namespace GameServer;
public class RaceGameObjectSavePointInteractAction : GameGameObjectAction
{
protected ConcurrentDictionary<string /*anchor_guid*/, GameObject> m_game_objects = new(); //kihoon todo : 이거 위로 올릴지 말지, 하니면 GameModeBase에서 들고 있을지... 고민해볼것..
public RaceGameObjectSavePointInteractAction (EntityBase owner)
: base(owner, EGameObjectType.Save_Point)
{
}
public override async Task<Result> onInit()
{
await Task.CompletedTask;
var result = new Result();
return result;
}
public override void onClear()
{
return;
}
public override async Task<Result> interact(string anchorGuid, DateTime interactionTime)
{
//여기에 interact 로직 추가해야 된다...
await Task.CompletedTask;
var result = new Result();
return result;
}
public override string toBasicString()
{
return $"class name : {nameof(RaceGameObjectSavePointInteractAction)}...." + base.toBasicString();
}
}

View File

@@ -0,0 +1,63 @@
using GameServer.Contents.GameMode.Manage.PlayManage;
using GameServer.Contents.GameMode.Mode_Running.Manage;
using GameServer.Contents.GameMode.Mode_Running.ModeRace.Helper;
using ServerBase;
using ServerCommon;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.ModeRace.Actions;
public class RaceStateCheckAction : EntityActionBase
{
public RaceStateCheckAction(EntityBase owner)
: base(owner)
{
}
public override void onClear()
{
return;
}
public override async Task<Result> onInit()
{
await Task.CompletedTask;
var result = new Result();
return result;
}
public async Task<Result> stateUpdate()
{
var run_race = getOwner() as GameModeBase;
NullReferenceCheckHelper.throwIfNull(run_race, () => $"GameModeRunRace is null !!");
var game_mode = getOwner() as IGameMode;
NullReferenceCheckHelper.throwIfNull(game_mode, () => $"game_mode is null !!");
var current_state = run_race.getGameModeState();
//kihoon todo : 해당 sate에 따른 업데이트 내용 처리 할게 있으면 여기서 처리 Update를 어떻게 써야 되나....
current_state.update();
var next_state_type = current_state.checkState();
var current_state_type = current_state.getStateType();
//다르면 상태 변경
if (!current_state_type.Equals(next_state_type))
{
var next_state = RunRaceHelper.createRaceGameState(game_mode, next_state_type);
current_state.exit();
run_race.setGameModeState(next_state);
current_state = run_race.getGameModeState();
current_state.enter();
}
var result = new Result();
await Task.CompletedTask;
return result;
}
}

View File

@@ -0,0 +1,27 @@
using GameServer.Contents.GameMode.Manage.PlayManage;
using GameServer.Contents.GameMode.Manage.StateManage;
using GameServer.Contents.GameMode.Mode_Running.Manage;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.ModeRace.Helper;
public class RunRaceHelper
{
public static IGameModeState createRaceGameState(IGameMode gameMode, GameModeState state)
{
switch (state)
{
case GameModeState.Start:
return new RaceStateStart(gameMode);
case GameModeState.Ready:
return new RaceStateReady(gameMode);
case GameModeState.End:
return new RaceStateReady(gameMode);
case GameModeState.Destroyed:
return new RaceStateReady(gameMode);
default:
Log.getLogger().error($"createRaceGameState not defined GameModeState : {state}");
return new RaceStateEnd(gameMode);
}
}
}

View File

@@ -0,0 +1,88 @@
using GameServer.Contents.GameMode.Helper;
using GameServer.Contents.GameMode.Mode_Running.Manage;
using GameServer.Contents.GameMode.Mode_Running.ModeRace.Actions;
using ServerBase;
using ServerCommon;
using ServerCore;
namespace GameServer;
public class GameModeRunRace<T> : GameModeRun where T : IRunningMode
{
T m_run_mode_data;
public GameModeRunRace(T runModeData, InstanceRoom instanceRoom) : base(EntityType.GameModeRunRace, instanceRoom)
{
Log.getLogger().debug("run race constructor called");
m_run_mode_data = runModeData;
Log.getLogger().debug("run race constructor done");
}
public override Task<Result> onInit()
{
Log.getLogger().debug("run race onInit called");
//제너릭 init
m_run_mode_data.initRunningMode();
//레이스 모드에 필요한 액션 추가
addRaceEntityAction();
//게임 모드에 필요한 상수값 입력
setDefaultMetaConstants();
//다 마무리 되면 부모 init 호출
var result = base.onInit();
Log.getLogger().debug("run race onInit done");
return result;
}
public override Task initAfterTimerCreate()
{
m_current_game_mode_state = new RaceStateReady(this);
return Task.CompletedTask;
}
private void addRaceEntityAction()
{
Log.getLogger().debug("run race addEntityAction called");
addEntityAction(new RaceStateCheckAction(this));
addEntityAction(new RaceGameObjectSavePointInteractAction(this));
Log.getLogger().debug("run race addEntityAction done");
}
private void setDefaultMetaConstants()
{
m_ticker_interval_msecs = GameModeConstants.GAME_MODE_RUN_RACE_CHECK_INTERVAL_MSECS;
}
public override async Task taskUpdate()
{
var state_check_action = getEntityAction<RaceStateCheckAction>();
NullReferenceCheckHelper.throwIfNull(state_check_action, () => $"location attribute is null !!");
var result = await state_check_action.stateUpdate();
if (result.isFail()) return;
}
public override string toBasicString()
{
var basic_string = base.toBasicString() + $"GameModeRunRace....roomId : {getRoomId()}";
return basic_string;
}
}

View File

@@ -0,0 +1,21 @@
using GameServer.Contents.GameMode.Manage.PlayManage;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class GameModeRunRaceData : IRunningMode
{
public async Task<Result> initRunningMode()
{
Log.getLogger().debug("run race data initRunningMode called");
var result = new Result();
await Task.CompletedTask;
Log.getLogger().debug("run race data initRunningMode done");
return result;
}
}

View File

@@ -0,0 +1,24 @@
using GameServer.Contents.GameMode.Manage.LeaveManage;
using GameServer.Contents.GameMode.Manage.PlayManage;
using GameServer.Contents.GameMode.Mode_Running.Manage;
using ServerCommon;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.ModeRace.Manage;
public class RunRaceDestroyHandler : GameModeDestroyHandlerBase
{
public RunRaceDestroyHandler(string roomId) : base(roomId, GameModeType.RUN_RACE)
{
}
public override async Task<Result> postDestroy(IGameMode gameMode)
{
var result = new Result();
await Task.CompletedTask;
return result;
}
}

View File

@@ -0,0 +1,21 @@
using GameServer.Contents.GameMode.Manage;
using ServerCommon;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RunRaceInitHandler : GameModeInitHandlerBase
{
public RunRaceInitHandler(InstanceRoom instanceRoom) : base(instanceRoom, GameModeType.RUN_RACE)
{
}
public override Result gamedModeInstanceInitValidate()
{
var result = new Result();
//kihoon todo : running 추가
return result;
}
}

View File

@@ -0,0 +1,31 @@
using GameServer.Contents.GameMode.Manage;
using ServerCommon;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RunRaceJoinHandler : GameModeJoinHandlerBase
{
public RunRaceJoinHandler(InstanceRoom instanceRoom) : base(instanceRoom, GameModeType.RUN_RACE)
{
}
public override Result gamedModeInstanceJoinValidate()
{
var result = new Result();
return result;
}
public override Result gamedModeInstanceJoin(Player player)
{
Log.getLogger().debug("run race gamedModeInstanceJoin called");
var result = new Result();
string err_msg = string.Empty;
Log.getLogger().debug("run race gamedModeInstanceJoin done");
return result;
}
}

View File

@@ -0,0 +1,65 @@
using GameServer.Contents.GameMode.Helper;
using GameServer.Contents.GameMode.Manage;
using GameServer.Contents.GameMode.Manage.PlayManage;
using GameServer.Contents.GameMode.Manage.StateManage;
using ServerBase;
using ServerCommon;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RunRaceJoinSuccessHandler : GameModeJoinSuccessHandlerBase
{
public RunRaceJoinSuccessHandler(Player player, InstanceRoom instanceRoom) : base(player, GameModeType.RUN_RACE, instanceRoom)
{
}
public override Result joinSuccessValidate()
{
var result = new Result();
return result;
}
public override Task<Result> joinSuccessConfirmation()
{
var result = new Result();
return Task.FromResult(result);
}
public override async Task<Result> joinSuccessNotify()
{
var result = new Result();
var room_id = m_instance_room.getMap().m_room_id;
var err_msg = string.Empty;
if (false == GameModeManager.It.tryGetGameMode(room_id, out var gameMode))
{
err_msg = $"not exist GameMode after join success!!!! roomId : {room_id}";
result.setFail(ServerErrorCode.GameModeClassIsNull, err_msg);
Log.getLogger().error(err_msg);
return result;
}
var game_mode_base = gameMode as GameModeBase;
NullReferenceCheckHelper.throwIfNull(game_mode_base, () => $"game_mode_base is null !!!");
var state = game_mode_base.getGameModeState();
var state_base = state as GameModeStateBase;
NullReferenceCheckHelper.throwIfNull(state_base, () => $"state_base is null !!!");
GameNotifyHelper.send_GS2C_NTF_GAME_STATE_UPDATE(m_player, m_instance_room, state.getStateType(), state_base.getNextStateChangeTime());
await Task.CompletedTask;
return result;
}
public override void joinSuccessWriteLog()
{
}
}

View File

@@ -0,0 +1,37 @@
using GameServer.Contents.GameMode.Manage.LeaveManage;
using GameServer.Contents.GameMode.Manage.PlayManage;
using ServerCommon;
namespace GameServer.Contents.GameMode.Mode_Running.ModeRace.Manage;
public class RunRaceLeaveHandler : GameModeLeaveHandlerBase
{
public RunRaceLeaveHandler(Player player, string roomId) : base(player, roomId, GameModeType.RUN_RACE)
{
}
public override async Task<Result> postLeave(IGameMode gameMode)
{
var result = new Result();
await Task.CompletedTask;
return result;
}
public override async Task<Result> notifyAfterLeave(IGameMode gameMode)
{
var result = new Result();
await Task.CompletedTask;
return result;
}
public override async Task<Result> logAfterLeave(IGameMode gameMode)
{
var result = new Result();
await Task.CompletedTask;
return result;
}
}

View File

@@ -0,0 +1,34 @@
using GameServer.Contents.GameMode.Manage.PlayManage;
using GameServer.Contents.GameMode.Manage.StateManage;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RaceStateDestroyed: GameModeStateBase
{
public RaceStateDestroyed(IGameMode gameMode) : base(gameMode, GameModeState.Destroyed)
{
}
public override void enter()
{
}
public override void update()
{
}
public override void exit()
{
}
public override GameModeState checkState()
{
return getStateType();
}
}

View File

@@ -0,0 +1,33 @@
using GameServer.Contents.GameMode.Manage.PlayManage;
using GameServer.Contents.GameMode.Manage.StateManage;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RaceStateEnd : GameModeStateBase
{
public RaceStateEnd(IGameMode gameMode) : base(gameMode, GameModeState.End)
{
}
public override void enter()
{
}
public override void update()
{
}
public override void exit()
{
}
public override GameModeState checkState()
{
return getStateType();
}
}

View File

@@ -0,0 +1,38 @@
using GameServer.Contents.GameMode.Manage.PlayManage;
using GameServer.Contents.GameMode.Manage.StateManage;
using ServerCore;
namespace GameServer;
public class RaceStateReady : GameModeStateBase
{
public RaceStateReady(IGameMode gameMode) : base(gameMode, GameModeState.Ready)
{
}
public override void enter()
{
}
public override void update()
{
}
public override void exit()
{
//Ready 상태에서 나갈때는 딱히 할게 없다.
}
public override GameModeState checkState()
{
var now = DateTimeHelper.Current;
if (m_next_state_change_time <= now)
{
return GameModeState.Start;
}
return getStateType();
}
}

View File

@@ -0,0 +1,45 @@
using GameServer.Contents.GameMode.Helper;
using GameServer.Contents.GameMode.Manage.PlayManage;
using GameServer.Contents.GameMode.Manage.StateManage;
using ServerCore;
namespace GameServer.Contents.GameMode.Mode_Running.Manage;
public class RaceStateStart : GameModeStateBase
{
public RaceStateStart(IGameMode gameMode) : base(gameMode, GameModeState.Start)
{
}
public override void enter()
{
getStateType();
var instance_room = m_game_mode_base.getInstanceRoom();
var next_update_time = DateTimeHelper.Current.AddMinutes(10); //kihoon todo : 이거 meta로 빼야된다.
GameNotifyHelper.broadcast_GS2C_NTF_GAME_STATE_UPDATE(instance_room, getStateType(), next_update_time);
}
public override void update()
{
}
public override void exit()
{
}
public override GameModeState checkState()
{
return getStateType();
}
}