tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:a28d9163d8ba80d115c28a8dab042087c95945b5
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:8f55c7cb3d70883905753aefd8bc98d62ca896db
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "a28d9163d8ba80d115c28a8dab042087c95945b5" and "8f55c7cb3d70883905753aefd8bc98d62ca896db" have entirely different histories.
a28d9163d8 ... 8f55c7cb3d

9 changed files with 139 additions and 168 deletions
Show Stats Expand all files Collapse all files

BIN
data/DB_GameItem.dat
View File

Binary file not shown.

297
data/DB_GameItem.json
View File

@ -170,7 +170,7 @@
"Classify": [
1,
0,
0
1
],
"Type": 3,
"Effect0": [
@ -202,7 +202,7 @@
"Classify": [
1,
0,
0
1
],
"Type": 3,
"Effect0": [
@ -1264,35 +1264,6 @@
"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": "圣耀裁决",
@ -1475,9 +1446,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1506,9 +1477,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1537,9 +1508,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1568,9 +1539,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1599,9 +1570,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1630,9 +1601,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1661,9 +1632,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1692,9 +1663,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1723,9 +1694,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1754,9 +1725,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1785,9 +1756,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1816,9 +1787,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1847,9 +1818,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1878,9 +1849,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1909,9 +1880,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1940,9 +1911,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -1971,9 +1942,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2002,9 +1973,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2033,9 +2004,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2064,9 +2035,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2095,9 +2066,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2126,9 +2097,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2157,9 +2128,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2188,9 +2159,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2219,9 +2190,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2250,9 +2221,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2281,9 +2252,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2312,9 +2283,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2343,9 +2314,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2374,9 +2345,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2405,9 +2376,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2436,9 +2407,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2467,9 +2438,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2498,9 +2469,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2529,9 +2500,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2560,9 +2531,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2591,9 +2562,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2622,9 +2593,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2653,9 +2624,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2684,9 +2655,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2715,9 +2686,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2746,9 +2717,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2777,9 +2748,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [
@ -2808,9 +2779,9 @@
1
],
"Classify": [
0,
0,
1
1,
1,
0
],
"Type": 16,
"Effect0": [

BIN
data/DB_GiftCard.dat
View File

Binary file not shown.

BIN
data/DB_PropExchange.dat
View File

Binary file not shown.

BIN
data/DB_Task.dat
View File

Binary file not shown.

4
protocol/player/player.pb.go
View File

@ -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卡掉落 ... 跟后台确认
Tp int32 `protobuf:"varint,2,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1：兑换 2：v卡掉落 3:邀请活动开关 4:钻石抽奖
}
func (x *ChannelSwitch) Reset() {

4
protocol/player/player.proto
View File

@ -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卡掉落 ... 跟后台确认
int32 Tp = 2; // 开关类型 1：兑换 2：v卡掉落 3:邀请活动开关 4:钻石抽奖
}
// PACKET_SCExchangeChannel

2
public

@ -1 +1 @@
Subproject commit 20147d9ef04cb8f6f1df630ced583280c0361312
Subproject commit b99c38049f5744e9eda2860329a72fef4324520e

BIN
xlsx/DB_GameItem.xlsx
View File

Binary file not shown.