diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index d5e4962..a63140c 100644 Binary files a/data/DB_GameItem.dat and b/data/DB_GameItem.dat differ diff --git a/data/DB_GameItem.json b/data/DB_GameItem.json index 9649070..07a91f6 100644 --- a/data/DB_GameItem.json +++ b/data/DB_GameItem.json @@ -170,7 +170,7 @@ "Classify": [ 1, 0, - 1 + 0 ], "Type": 3, "Effect0": [ @@ -202,7 +202,7 @@ "Classify": [ 1, 0, - 1 + 0 ], "Type": 3, "Effect0": [ @@ -1264,6 +1264,35 @@ "Location": "0", "Describe": "通行证中任务获得积分,可作为排行使用" }, + { + "Id": 100012, + "Name": "钻石积分", + "ShowLocation": [ + 0, + 0 + ], + "Classify": [ + 0, + 0, + 0 + ], + "Type": 11, + "Effect0": [ + 0, + 0, + 0, + 0 + ], + "Effect": [ + 0, + 0, + 0, + 0 + ], + "CompositionMax": 1, + "Location": "0", + "Describe": "钻石抽奖中获得的积分" + }, { "Id": 100135, "Name": "圣耀裁决", diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 9f02d2b..38a4306 100644 Binary files a/data/DB_PropExchange.dat and b/data/DB_PropExchange.dat differ diff --git a/data/DB_Task.dat b/data/DB_Task.dat index dee7607..1be1093 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/protocol/player/player.pb.go b/protocol/player/player.pb.go index d9b8509..a5e9bd6 100644 --- a/protocol/player/player.pb.go +++ b/protocol/player/player.pb.go @@ -9453,7 +9453,7 @@ type CSExchangeChannel struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 0所有 1:兑换 2:v卡掉落 + Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 0所有 1:兑换 2:v卡掉落 ... 跟后台确认 } func (x *CSExchangeChannel) Reset() { @@ -9501,7 +9501,7 @@ type ChannelSwitch struct { unknownFields protoimpl.UnknownFields OnChannelName []string `protobuf:"bytes,1,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道 - Tp int32 `protobuf:"varint,2,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1:兑换 2:v卡掉落 3:邀请活动开关 4:钻石抽奖 + Tp int32 `protobuf:"varint,2,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1:兑换 2:v卡掉落 ... 跟后台确认 } func (x *ChannelSwitch) Reset() { diff --git a/protocol/player/player.proto b/protocol/player/player.proto index d282b63..1d713b0 100644 --- a/protocol/player/player.proto +++ b/protocol/player/player.proto @@ -1197,12 +1197,12 @@ message SCPigBankCoin { // PACKET_CSExchangeChannel message CSExchangeChannel{ - int32 Tp = 1; // 开关类型 0所有 1:兑换 2:v卡掉落 + int32 Tp = 1; // 开关类型 0所有 1:兑换 2:v卡掉落 ... 跟后台确认 } message ChannelSwitch { repeated string OnChannelName = 1; // 开启渠道 - int32 Tp = 2; // 开关类型 1:兑换 2:v卡掉落 3:邀请活动开关 4:钻石抽奖 + int32 Tp = 2; // 开关类型 1:兑换 2:v卡掉落 ... 跟后台确认 } // PACKET_SCExchangeChannel diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index efc1048..3c40b61 100644 Binary files a/xlsx/DB_GameItem.xlsx and b/xlsx/DB_GameItem.xlsx differ