Merge branch 'master_test_gn' into 开发/dev_dh

# Conflicts:
#	protos/MessageTypeProto.proto
master_huanxiang
duhui 2022-01-05 10:18:09 +08:00
commit 77c4183e8d
2 changed files with 12 additions and 0 deletions

View File

@ -441,3 +441,10 @@ import "CommonProto.proto";
message EndlessTakeTreasureResponse{ message EndlessTakeTreasureResponse{
optional Drop drop =1; optional Drop drop =1;
} }
//森罗幻境自动挂机奖励展示
message TowerGetRewardInfoShowRequest{
}
message TowerGetRewardInfoShowResponse{
optional Drop drop = 1;//奖励
}

View File

@ -1402,6 +1402,11 @@ enum MessageType{
EquipIntensifyResponse = 3050111; EquipIntensifyResponse = 3050111;
// 建筑解锁推送 // 建筑解锁推送
ArchitectureUnlockIndication = 3050112; ArchitectureUnlockIndication = 3050112;
//森罗幻境自动挂机奖励展示
TowerGetRewardInfoShowRequest = 3050050;
TowerGetRewardInfoShowResponse = 3050051;
//800000起为global 协议 //800000起为global 协议