Merge branch 'master_test_gn' into master_test_gn_lifeGrid

master_huanxiang
yuanshuai 2021-12-23 09:54:10 +08:00
commit 5ee84a21db
4 changed files with 9 additions and 0 deletions

View File

@ -230,6 +230,7 @@ import "CommonProto.proto";
message HeroReturnRequest{ message HeroReturnRequest{
optional string heroId = 1; optional string heroId = 1;
optional int32 type = 2; // 0:神将回归元 1:神将回退
} }
message HeroReturnResponse{ message HeroReturnResponse{

View File

@ -358,6 +358,7 @@ import "CommonProto.proto";
} }
message JourneyGetInfoResponse{ message JourneyGetInfoResponse{
repeated JourneyInfo infos = 1;//逍遥游数据 repeated JourneyInfo infos = 1;//逍遥游数据
optional int32 finishNum = 2;//逍遥游累计通关次数
} }
message JourneyGetOneInfoRequest{ message JourneyGetOneInfoRequest{
optional int32 mapId = 1; optional int32 mapId = 1;

View File

@ -85,6 +85,7 @@ enum MessageType{
WELFARE_RED_PACKET_SEND_REQUEST = 10057;//福利红包发送 WELFARE_RED_PACKET_SEND_REQUEST = 10057;//福利红包发送
WELFARE_RED_PACKET_SEND_RESPONSE = 10058; WELFARE_RED_PACKET_SEND_RESPONSE = 10058;
WELFARE_RED_PACKET_REQUEST = 10059; WELFARE_RED_PACKET_REQUEST = 10059;
SPECIAL_ACTIVITY_UPDATE_INDICATION = 10060 ;// 特殊活动更新推送
// B 10100 // B 10100
BUY_STORE_ITEM_REQUEST = 10100; // 购买商店物品 BUY_STORE_ITEM_REQUEST = 10100; // 购买商店物品

View File

@ -489,6 +489,12 @@ import "CommonProto.proto";
repeated int32 closeActivityId = 2; repeated int32 closeActivityId = 2;
} }
//特殊活动开启关闭
message SpecailActivityUpateIndication{
repeated int32 closeActivityId = 1;
}
message GetForceRankInfoRequest{ message GetForceRankInfoRequest{
optional int32 page = 1; //页数 optional int32 page = 1; //页数
optional int32 activiteId = 2; //活动ID optional int32 activiteId = 2; //活动ID