Merge branch 'master_soldier' into master_assist
# Conflicts: # protos/CommonProto.proto # protos/MessageTypeProto.protomaster_assist
commit
724639744f
|
@ -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;
|
||||
}
|
|
@ -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;//1:替换,2:遣散
|
||||
optional int32 autoLayOff = 2;//是否自动遣散,1:是,0:否
|
||||
}
|
||||
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;//战斗结果 1:成功,0:失败
|
||||
optional Drop drop = 2;//通关奖励
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;//小兵挂机开始时间
|
||||
}
|
||||
|
||||
//快速购买孙龙宝藏等级
|
||||
|
|
Loading…
Reference in New Issue