Merge branch 'master_soldier' into master_assist

# Conflicts:
#	protos/CommonProto.proto
#	protos/MessageTypeProto.proto
master_assist
grimm 2024-04-12 16:42:08 +08:00
commit 724639744f
4 changed files with 69 additions and 1 deletions

View File

@ -1394,3 +1394,13 @@ option optimize_for = SPEED;
optional int32 state = 2;
optional string heroId = 3;
}
//
message Soldier{
optional int32 id = 1;
optional int32 type = 2;
optional int32 position = 3;
optional int32 level = 4;
optional int32 quality = 5;
repeated Attribute attributes = 6;
}

View File

@ -457,3 +457,47 @@ import "CommonProto.proto";
message TowerCleanFloorResponse{
optional Drop drop = 1;//
}
//
message GetSoldiersInfoRequest{
}
message GetSoldiersInfoResponse{
optional int32 level = 1;//
repeated Soldier soldiers = 2;// position-1
optional int32 upLvEndTime = 3;//0
}
//
message RecruitSoldierRequest{
}
message RecruitSoldierResponse{
optional Soldier soldier = 1;
optional Drop drop = 2;
}
//
message ReplaceSoldierRequest{
optional int32 operate = 1;//12
optional int32 autoLayOff = 2;//10
}
message ReplaceSoldierResponse{
repeated Soldier soldiers = 1;// position-1
optional Drop drop = 2;//
}
//
message UpSoldierLevelRequest{
optional int32 operate = 1;//1:2
}
message UpSoldierLevelResponse{
optional int32 upLvEndTime = 1;//
}
//
message SoldierFightCheckRequest{
}
message SoldierFightCheckResponse{
optional int32 result = 1;// 10
optional Drop drop = 2;//
}

View File

@ -1691,6 +1691,18 @@ enum MessageType{
NewArenaResetRequest = 6000044;
NewArenaResetResponse = 6000045;
//
GetSoldiersInfoRequest = 6000046;
GetSoldiersInfoResponse = 6000047;
ReplaceSoldierRequest = 6000048;
ReplaceSoldierResponse = 6000049;
RecruitSoldierRequest = 6000050;
RecruitSoldierResponse = 6000051;
UpSoldierLevelRequest = 6000052;
UpSoldierLevelResponse = 6000053;
SoldierFightCheckRequest = 6000054;
SoldierFightCheckResponse = 6000055;
//
AssistInfoRequest = 7000001;
AssistInfoResponse = 7000002;

View File

@ -666,6 +666,8 @@ message GetMainLevelInfoResponse{
optional int32 duration = 3;//
repeated AdventureBossInfo adventureBossInfo = 4;
optional string reward = 5;
optional int32 soldierLayerId = 6;//id
optional int32 soldierStartTime = 7;//
}
//