update

data/DB_GameItem.json

@@ -393,7 +393,7 @@
 				1,
 				0
 			],
-			"Type": 4,
+			"Type": 13,
 			"Effect0": [
 				1,
 				0,

data/DB_PropExchange.dat

@@ -1,5 +1,5 @@
 
-6

с├
т├
у├
ж├
в├
"║█ю└=
+6

ж├
в├
с├
т├
у├
"║█ю└=
 .
؆
Ù†
Ú†
Û†
"¡<>À„=
-W
с├
т├
ж├
з├
ш├
у├
в├
ь├
ы├
"	║█─╜Б
-]
ж├
ь├
з├
э├
с├
т├
ы├
ш├
у├
в├
"╒█Т
+W
с├
т├
з├
у├
ж├
в├
ь├
ы├
ш├
"	║█─╜Б
+]
у├
ы├
с├
т├
ь├
з├
ш├
э├
ж├
в├
"╒█Т

protocol/bag/bag.pb.go

@@ -223,6 +223,7 @@ type CSBagInfo struct {
 	unknownFields protoimpl.UnknownFields
 
 	NowLocation int32 `protobuf:"varint,1,opt,name=NowLocation,proto3" json:"NowLocation,omitempty"` //0.通用 1.大厅 2.Tienlen 3.捕鱼
+	Tp          int32 `protobuf:"varint,2,opt,name=Tp,proto3" json:"Tp,omitempty"`                   // 道具类型
 }
 
 func (x *CSBagInfo) Reset() {
@@ -264,6 +265,13 @@ func (x *CSBagInfo) GetNowLocation() int32 {
 	return 0
 }
 
+func (x *CSBagInfo) GetTp() int32 {
+	if x != nil {
+		return x.Tp
+	}
+	return 0
+}
+
 //PACKET_ALL_BAG_INFO
 type SCBagInfo struct {
 	state         protoimpl.MessageState
@@ -563,10 +571,11 @@ var file_bag_proto_rawDesc = []byte{
 	0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x12, 0x1e,
 	0x0a, 0x0a, 0x4f, 0x62, 0x74, 0x61, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x0a, 0x4f, 0x62, 0x74, 0x61, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x2d,
+	0x28, 0x03, 0x52, 0x0a, 0x4f, 0x62, 0x74, 0x61, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x3d,
 	0x0a, 0x09, 0x43, 0x53, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x4e,
 	0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0b, 0x4e, 0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x7b, 0x0a,
+	0x52, 0x0b, 0x4e, 0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a,
+	0x02, 0x54, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x22, 0x7b, 0x0a,
 	0x09, 0x53, 0x43, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x0a, 0x07, 0x52, 0x65,
 	0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x62, 0x61,
 	0x67, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x07,

protocol/bag/bag.proto

@@ -43,6 +43,7 @@ message ItemInfo{
 //PACKET_ALL_BAG_INFO
 message CSBagInfo {
   int32 NowLocation = 1;//0.通用 1.大厅 2.Tienlen 3.捕鱼
+  int32 Tp = 2;// 道具类型
 }
 //PACKET_ALL_BAG_INFO
 message SCBagInfo {

protocol/welfare/welfare.pb.go

@@ -116,6 +116,7 @@ const (
 	// 2900~2999
 	SPacketID_PACKET_CSWelfRelief SPacketID = 2900 //救济金信息
 	SPacketID_PACKET_SCWelfRelief SPacketID = 2901 //救济金信息
+	// 邀请活动
 	SPacketID_PACKET_CSInviteInfo SPacketID = 2902 //邀请信息
 	SPacketID_PACKET_SCInviteInfo SPacketID = 2903 //邀请信息
 	SPacketID_PACKET_CSBindInvite SPacketID = 2904 //绑定邀请人

protocol/welfare/welfare.proto

@@ -36,13 +36,18 @@ enum SPacketID {
   PACKET_SC_WELF_CONTINPAYINFO = 2597;//连续充值信息
   PACKET_CS_WELF_CONTINPAY = 2598;//领取(购买)连续充值 后期走充值回调
   PACKET_SC_WELF_CONTINPAY = 2599;//领取连续充值
+
   // 2900~2999
   PACKET_CSWelfRelief = 2900;//救济金信息
   PACKET_SCWelfRelief = 2901;//救济金信息
+  // 邀请活动
   PACKET_CSInviteInfo = 2902;//邀请信息
   PACKET_SCInviteInfo = 2903;//邀请信息
   PACKET_CSBindInvite = 2904;//绑定邀请人
   PACKET_SCBindInvite = 2905;//绑定邀请人
+  // 集卡活动
+
+
 }
 
 //救济金领取