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

Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop

This commit is contained in:
by 2024-07-11 10:20:25 +08:00
parent 240711a0bd a28d9163d8
commit e326ccdf81
9 changed files with 168 additions and 139 deletions
Show Stats Download Patch File Download Diff File 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,
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": [

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

2
public

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

BIN
xlsx/DB_GameItem.xlsx
View File

Binary file not shown.