++

Assets/Lua/Pb/login.txt

@@ -1,5 +1,5 @@
 
-ÂÝ
+ŰÝ
 login.protoserverproto
 user.proto"0
 
@@ -422,10 +422,11 @@ config_ids (2.serverproto.KeyValueTypeR	configIds"q
 CSCardCollectInfoReq"i
 SCCardCollectInfoAck
 error
 
(Rerror;
-card_collect (2.serverproto.CardCollectRcardCollect"G
+card_collect (2.serverproto.CardCollectRcardCollect"`
 CSCardCollectRewardReq
 card_id
 
(RcardId
-level 
(Rlevel"™

+level 
(Rlevel
+get_all 
(RgetAll"™

 SCCardCollectRewardAck
 error
 
(Rerror
 card_id 
(RcardId

ProtocolGen/proto/login.proto

@@ -640,6 +640,7 @@ message SCCardCollectInfoAck {
 message CSCardCollectRewardReq {  //project game    //RouteRule game
     int32       card_id             = 1;
     int32       level               = 2;
+    bool        get_all                 = 3; //是否领取全部奖励
 }
 message SCCardCollectRewardAck {
     int32    error                         = 1;