Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts: # protos/MessageTypeProto.protomaster_huanxiang
commit
1405ed0a78
|
|
@ -348,7 +348,7 @@ option optimize_for = SPEED;
|
|||
optional int32 missionId =1;
|
||||
optional int32 progress =2; //进度
|
||||
optional int32 state = 3; //0:未完成 1:完成未领取 2:已达成(已领取)
|
||||
optional int32 type =4 ;// 任务类型 1:vip任务
|
||||
optional int32 type =4 ;// 任务类型 1:vip任务 2:每日任务
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -136,9 +136,11 @@ enum MessageType{
|
|||
GET_VIP_MISSION_REQUEST = 16632; //获取vip任务详情
|
||||
GET_VIP_MISSION_REPONSE = 16633;
|
||||
|
||||
GET_CHAT_MESSAGE_REQUEST = 16634; // 获取聊天信息
|
||||
GET_CHAT_MESSAGE_REPONSE = 16635;
|
||||
GET_DAILY_MISSION_REQUEST = 16634; //获取每日任务
|
||||
GET_DAILY_MISSION_RESPONSE = 16635; //
|
||||
|
||||
GET_CHAT_MESSAGE_REQUEST = 16636; // 获取聊天信息
|
||||
GET_CHAT_MESSAGE_REPONSE = 16637;
|
||||
// H 10700
|
||||
HERO_RAND_REQQUEST = 10701;
|
||||
HERO_RAND_RESPONSE = 10702;
|
||||
|
|
@ -183,7 +185,7 @@ enum MessageType{
|
|||
MAP_FAST_FIGHT_REQUEST = 11218; // 快速战斗结算
|
||||
MAP_FAST_FIGHT_RESPONSE = 11219;
|
||||
|
||||
MISSION_UPDATE_INDICATION = 111220; //任务更细
|
||||
MISSION_UPDATE_INDICATION = 11220; //任务更细
|
||||
// N 11300
|
||||
// O 11400
|
||||
// P 11500
|
||||
|
|
|
|||
|
|
@ -234,6 +234,10 @@ import "CommonProto.proto";
|
|||
optional Drop drop = 1 ;// 首冲奖励
|
||||
}
|
||||
|
||||
message GetDailyMissionResponse{
|
||||
repeated UserMissionInfo UserMissionInfo =1;//每日任务详情
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue