Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts: # protos/MessageTypeProto.protomaster_huanxiang
commit
77c4183e8d
|
|
@ -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;//奖励
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1402,6 +1402,11 @@ enum MessageType{
|
||||||
EquipIntensifyResponse = 3050111;
|
EquipIntensifyResponse = 3050111;
|
||||||
// 建筑解锁推送
|
// 建筑解锁推送
|
||||||
ArchitectureUnlockIndication = 3050112;
|
ArchitectureUnlockIndication = 3050112;
|
||||||
|
|
||||||
|
|
||||||
|
//森罗幻境自动挂机奖励展示
|
||||||
|
TowerGetRewardInfoShowRequest = 3050050;
|
||||||
|
TowerGetRewardInfoShowResponse = 3050051;
|
||||||
|
|
||||||
|
|
||||||
//800000起为global 协议
|
//800000起为global 协议
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue