diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index 65207bc..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 0b5c87e..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": "圣耀裁决", @@ -1446,9 +1475,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1477,9 +1506,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1508,9 +1537,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1539,9 +1568,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1570,9 +1599,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1601,9 +1630,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1632,9 +1661,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1663,9 +1692,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1694,9 +1723,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1725,9 +1754,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1756,9 +1785,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1787,9 +1816,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1818,9 +1847,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1849,9 +1878,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1880,9 +1909,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1911,9 +1940,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1942,9 +1971,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -1973,9 +2002,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2004,9 +2033,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2035,9 +2064,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2066,9 +2095,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2097,9 +2126,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2128,9 +2157,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2159,9 +2188,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2190,9 +2219,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2221,9 +2250,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2252,9 +2281,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2283,9 +2312,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2314,9 +2343,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2345,9 +2374,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2376,9 +2405,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2407,9 +2436,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2438,9 +2467,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2469,9 +2498,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2500,9 +2529,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2531,9 +2560,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2562,9 +2591,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2593,9 +2622,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2624,9 +2653,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2655,9 +2684,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2686,9 +2715,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2717,9 +2746,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2748,9 +2777,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ @@ -2779,9 +2808,9 @@ 1 ], "Classify": [ - 1, - 1, - 0 + 0, + 0, + 1 ], "Type": 16, "Effect0": [ diff --git a/data/DB_GiftCard.dat b/data/DB_GiftCard.dat index 1560036..96640b0 100644 Binary files a/data/DB_GiftCard.dat and b/data/DB_GiftCard.dat differ diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 6cdad71..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 2747ac4..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/public b/public index b99c380..20147d9 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit b99c38049f5744e9eda2860329a72fef4324520e +Subproject commit 20147d9ef04cb8f6f1df630ced583280c0361312 diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index 0151116..3c40b61 100644 Binary files a/xlsx/DB_GameItem.xlsx and b/xlsx/DB_GameItem.xlsx differ