diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index bade5c452..82cf4000e 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -2165,7 +2165,11 @@ type HeroBuyResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
+<<<<<<< HEAD
 	CurCard int32 `protobuf:"varint,1,opt,name=curCard,proto3" json:"curCard"` // 当前抽卡卷数量
+=======
+	IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"`
+>>>>>>> b17f485a6f359949831b9b81e05e038360cdff79
 }
 
 func (x *HeroBuyResp) Reset() {
@@ -2200,11 +2204,19 @@ func (*HeroBuyResp) Descriptor() ([]byte, []int) {
 	return file_hero_hero_msg_proto_rawDescGZIP(), []int{41}
 }
 
+<<<<<<< HEAD
 func (x *HeroBuyResp) GetCurCard() int32 {
 	if x != nil {
 		return x.CurCard
 	}
 	return 0
+=======
+func (x *HeroBuyResp) GetIsSucc() bool {
+	if x != nil {
+		return x.IsSucc
+	}
+	return false
+>>>>>>> b17f485a6f359949831b9b81e05e038360cdff79
 }
 
 var File_hero_hero_msg_proto protoreflect.FileDescriptor
@@ -2398,10 +2410,17 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
 	0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, 0x43,
 	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, 0x43,
+<<<<<<< HEAD
 	0x6f, 0x75, 0x6e, 0x74, 0x22, 0x27, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52,
 	0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x43, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a,
 	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+=======
+	0x6f, 0x75, 0x6e, 0x74, 0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+>>>>>>> b17f485a6f359949831b9b81e05e038360cdff79
 }
 
 var (