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

@@ -1227,14 +1227,20 @@ message ClientToGameReq
{
google.protobuf.Timestamp packetCreateTime = 1;
}
//<2F><>Ʋ <20><><EFBFBD><EFBFBD> <20><>Ŷ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
// ============================================================================================
//=============================================================================================
// GameMode <20><><EFBFBD><EFBFBD>
message C2GS_REQ_GAME_OBJECT_INTERACTION
{
string anchorGuid = 1;
google.protobuf.Timestamp packetCreateTime = 2;
}
// GameMode <20><><EFBFBD><EFBFBD>
//=============================================================================================
//=============================================================================================
// REQ <20><>Ŷ <20><><EFBFBD><EFBFBD>
@@ -1487,6 +1493,11 @@ message ClientToGameReq
C2GS_REQ_BATTLE_PLAYER_RESPAWN reqBattlePlayerRespawn = 100003;
C2GS_REQ_BATTLE_OBJECT_INTERACTION reqBattleObjectInteraction = 100004;
C2GS_REQ_PREPARATION_FOR_LEAVING_BATTLE_INSTANCE reqPreparationForLeavingInstance = 100005;
//=============================================================================================
// GameMode <20><><EFBFBD><EFBFBD> <20><>Ŷ <20><><EFBFBD><EFBFBD> - <20>ϴ<EFBFBD> <20><><EFBFBD><20><><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>߿<EFBFBD> <20><><EFBFBD><EFBFBD> <20>ø<EFBFBD><C3B8><EFBFBD><EFBFBD><EFBFBD> <20>Ѵ<EFBFBD>.
C2GS_REQ_GAME_OBJECT_INTERACTION reqGameObjectInteraction = 100010;
}
}
@@ -2724,9 +2735,20 @@ message ClientToGameRes
google.protobuf.Timestamp packetProcessStartTime = 1;
google.protobuf.Timestamp beforSendAckTime = 2;
}
//<2F><>Ʋ <20><><EFBFBD><EFBFBD> <20><>Ŷ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
// ============================================================================================
// ============================================================================================
//<2F><><EFBFBD>Ӹ<EFBFBD><D3B8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>Ŷ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
message GS2C_ACK_GAME_OBJECT_INTERACTION
{
string anchorGuid = 1;
}
//<2F><><EFBFBD>Ӹ<EFBFBD><D3B8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>Ŷ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
// ============================================================================================
//=============================================================================================
// ACK <20><>Ŷ <20><><EFBFBD><EFBFBD>
@@ -2981,7 +3003,10 @@ message ClientToGameRes
GS2C_ACK_BATTLE_PLAYER_RESPAWN ackBattlePlayerRespawn = 100003;
GS2C_ACK_BATTLE_OBJECT_INTERACTION ackBattleObjectInteraction = 100004;
GS2C_ACK_PREPARATION_FOR_LEAVING_BATTLE_INSTANCE ackPreparationForLeavingInstance = 100005;
//=============================================================================================
// GameMode <20><><EFBFBD><EFBFBD> <20><>Ŷ <20><><EFBFBD><EFBFBD> - <20>ϴ<EFBFBD> <20><><EFBFBD><20><><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>߿<EFBFBD> <20><><EFBFBD><EFBFBD> <20>ø<EFBFBD><C3B8><EFBFBD><EFBFBD><EFBFBD> <20>Ѵ<EFBFBD>.
GS2C_ACK_GAME_OBJECT_INTERACTION ackGameObjectInteraction = 100010;
}
}
@@ -3807,6 +3832,15 @@ message ClientToGameMessage
}
//=================================================================================================
// GameMode <20><><EFBFBD><EFBFBD> Notify
//=================================================================================================
message GS2C_NTF_GAME_STATE_UPDATE_NOTI
{
GameModeState currentState = 1;
google.protobuf.Timestamp nextUpdatableTime = 2; //<2F>ð<EFBFBD><C3B0><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>·<EFBFBD> <20><>ȯ<EFBFBD>Ǵ<EFBFBD> <20>ð<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>°<EFBFBD> <20>ٲ𽺵<D9B2> <20>ִ<EFBFBD>.<2E>ʿ<EFBFBD><CABF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> ó<><C3B3>
}
message GS2C_NTF_POD_COMBAT_STATE
{
repeated BattlePodCombatState podCombatState = 1;
@@ -3882,6 +3916,7 @@ message ClientToGameMessage
message GS2C_NTF_BEACON_SHOP_REFRESH
{
string beaconGuid = 1;
BoolType hasBeaconShopItem = 2;
}
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
@@ -4082,6 +4117,9 @@ message ClientToGameMessage
GS2C_NTF_BATTLE_EVENT ntfBattleEvent = 100008;
GS2C_NTF_PREPARATION_FOR_LEAVING_BATTLE_INSTANCE ntfPreparationForLeavingBattleInstance = 100009;
GS2C_NTF_P2P_HOST_UPDATE ntfP2PHostUpdate = 100010;
//GameMode
GS2C_NTF_GAME_STATE_UPDATE_NOTI ntfGameStateUpdate = 110000;
}
}

View File

@@ -1191,6 +1191,8 @@ enum ServerErrorCode
BeaconShopFailedToFindOrUpdate = 57028; // BeaconShop db에서 찾지 못하거나 update에 실패했습니다.
BeaconShopDbException = 57029; // BeaconShop db에서 Exception이 발생했습니다.
BeaconShopOverSellingPrice = 57030; // BeaconShop에 판매가격이 최대값보다 높습니다.
BeaconShopOverRentalSafeTime = 57031; // BeaconShop이 있는 마이홈 랜탈 기간이 곧 만료됩니다.
BeaconShopDeactiveItemForSell = 57032; // BeaconShop에 판매 아이템의 판매가 비활성화 되었습니다.
//=============================================================================================
// UGQ 관련 오류. Web Api 오류
@@ -1326,7 +1328,10 @@ enum ServerErrorCode
GameModeJoinHandlerNotExist = 11000100; // 게임모드 조인 핸들러가 없습니다.
GameModeInitHandlerNotExist = 11000101; // 게임모드 Init 핸들러가 없습니다.
GameModeJoinSuccessHandlerNotExist = 11000102; // 게임모드 조인 성공 핸들러가 없습니다.
GameModeCreateFail = 11000103; // 게임모드 생성 실패
GameModeClassIsNull = 11000104; // 게임모드가 null
GameModeAlreadyExist = 11000105; // 게임모드가 존재
GameModeInvalidAnchorGuid = 11000106; // 유효하지 않은 AnchorGuid 입니다.

View File

@@ -120,7 +120,19 @@ enum EntityType
EntityType_BattleInstance = 901; //<2F>ϴ<EFBFBD> <20><><EFBFBD><20><><EFBFBD><EFBFBD>
EntityType_BattleEvent = 902; //<2F>ϴ<EFBFBD> <20><><EFBFBD><20><><EFBFBD><EFBFBD>
EntityType_SystemBattleEvent = 903; //<2F>ϴ<EFBFBD> <20><><EFBFBD><20><><EFBFBD><EFBFBD>
EntityType_GameRoom = 904;
EntityType_GameModeTPSFreeForAll = 90401;
EntityType_GameModeTPSTeamDeathMatch = 90402;
EntityType_GameModeRunAdventure = 90411;
EntityType_GameModeRunRace = 90412;
EntityType_GameObject = 905;
EntityType_GameObjectWeapon = 90501;
EntityType_GameObjectBuff = 90502;
EntityType_GameObjectPodStorage = 90503;
EntityType_GameObjectCombatPod = 90504;
EntityType_GameObjectPickupPod = 90505;
EntityType_GameObjectSavePoint = 90506;
// <20>۷ι<DBB7> <20><>Ƽ
EntityType_Party = 10;
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>Ƽ <20><>ƼƼ
@@ -160,9 +172,9 @@ enum EntityType
EntityType_CaliumEventTicker = 1417;
EntityType_BattleEventCheckTicker = 1418;
EntityType_BattleInstanceStateCheckTicker = 1419;
EntityType_LandAuctionReservationConfigureTicker = 1420;
EntityType_LandAuctionCheckTicker = 1421;
EntityType_LandAuctionReservationConfigureTicker = 1420;
EntityType_LandAuctionCheckTicker = 1421;
EntityType_GameModeLifeCycleTicker = 1422;
// <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
EntityType_BlockUser = 15;
@@ -1954,10 +1966,26 @@ message BattleEventInfo
int32 roundCount = 7;
}
//message BattleResult
//{
// string userGuid = 1;
// int32 killCount = 2;
// int32 deathCount = 3;
// repeated ItemAmount rewardedItem = 4;
//}
//=================================================================================================
// <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> - khlee
//=================================================================================================
enum GameModeState
{
GameModeState_None = 0;
//common
GameModeState_Destroyed = 1;
//TPS FFA
GameModeState_Rounding = 11;
GameModeState_RoundWait = 12;
GameModeState_RoundEndAll = 13;
GameModeState_Ready = 21;
GameModeState_Start = 22;
GameModeState_End = 23;
}

View File

@@ -589,6 +589,7 @@ message ServerMessage
{
string targetUserGuid = 1;
string targetBeaconGuid = 2;
BoolType hasBeaconShopItem = 3;
}
google.protobuf.Timestamp messageTime = 1;