Merge branch 'master' into master_test

2020-07-22 11:05:30 +08:00 · 2020-07-22 11:05:30 +08:00 · 46511596ff
parent 1ace57ac1b dc4f7d235d
commit 46511596ff
1 changed files with 2 additions and 0 deletions
--- a/protos/Family.proto
+++ b/protos/Family.proto
@ -435,6 +435,8 @@ import "CommonProto.proto";
 	
 	message GetDeathPathStatusResponse{
 		optional int32 status = 1;//0未开启；1开启；2 领奖阶段
+		optional int32 allowChallange = 2;//1允许挑战 0开启时加入本次不许挑战
+
 	}
 	message GetDeathPathInfoResponse{
 		optional int32 overTime = 1;//剩余时间