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

@@ -199,13 +199,13 @@ public partial class InstanceRoom
}
//GameMode
(var gamemode_init_result, var gamemode_init_handler) = GameModeHelper.getGameModeInitHandler(this, _placeType);
(var gamemode_init_result, var gamemode_init_handler) = GameModeHelper.getGameModeInitHandler(this, 1, _roomId);
if (gamemode_init_result.isSuccess())
{
var gamemode_validation_result = gamemode_init_handler.gamedModeInstanceInitValidate();
if (gamemode_validation_result.isFail()) return false;
var init_result = gamemode_init_handler.gamedModeInstanceInit();
var init_result = await gamemode_init_handler.gamedModeInstanceInit();
if (init_result.isFail())
{
Log.getLogger().error($"battleInstanceInit error roomId : {_roomId}");
@@ -266,12 +266,12 @@ public partial class InstanceRoom
//GameMode
(var get_mode_result, var gamemode_join_handler) = GameModeHelper.getGameModeJoinHandler(this, _placeType);
(var get_mode_result, var gamemode_join_handler) = GameModeHelper.getGameModeJoinHandler(this, 1, _roomId);
if (get_mode_result.isFail()) return true; //fail 이면 gamemode 인스턴스가 아니므로 그냥 정상 리턴 처리
if (get_mode_result.isSuccess())
{
get_mode_result = gamemode_join_handler.gamedModeInstanceJoinValidate(_placeType);
get_mode_result = gamemode_join_handler.gamedModeInstanceJoinValidate();
if (get_mode_result.isSuccess())
{
//successs 면 gamemod join 설정
@@ -412,11 +412,9 @@ public partial class InstanceRoom
//GameMode
(var handler_result, var gamemode_join_success_handler) = GameModeHelper.getGameModeJoinSuccessHandler(player, this, _placeType);
(var handler_result, var gamemode_join_success_handler) = GameModeHelper.getGameModeJoinSuccessHandler(player, this, 1, _roomId);
if (handler_result.isFail() || gamemode_join_success_handler == null) return;
await gamemode_join_success_handler.joinSuccess();
}
async Task SendConcertStartPacket()