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

update

This commit is contained in:
sk 2024-12-02 17:55:49 +08:00
parent fc494cf7cf
commit aff05fcddc
17 changed files with 517 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/DB_GameFree.dat
View File

Binary file not shown.

201
data/DB_GameFree.json
View File

File diff suppressed because it is too large Load Diff

BIN
data/DB_GameItem.dat
View File

Binary file not shown.

595
data/DB_GameItem.json
View File

@ -6688,8 +6688,8 @@
}
},
{
"Id": 171001,
"Name": "电饭煲碎片",
"Id": 271001,
"Name": "1元话费直兑券碎片",
"ShowLocation": [
1,
1,
@ -6723,12 +6723,12 @@
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"71001": 10
"300008": 10
}
},
{
"Id": 171002,
"Name": "热水壶碎片",
"Id": 271002,
"Name": "2元话费直兑券碎片",
"ShowLocation": [
1,
1,
@ -6761,204 +6761,399 @@
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"300009": 10
}
},
{
"Id": 271003,
"Name": "5元话费直兑券碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"300010": 10
}
},
{
"Id": 271004,
"Name": "10元话费直兑券碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"300011": 10
}
},
{
"Id": 271005,
"Name": "iphone碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"77030": 10
}
},
{
"Id": 271006,
"Name": "大米碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"79001": 10
}
},
{
"Id": 271007,
"Name": "红米碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"76006": 10
}
},
{
"Id": 271008,
"Name": "鸡蛋碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"79005": 10
}
},
{
"Id": 271009,
"Name": "可乐碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"73004": 10
}
},
{
"Id": 271010,
"Name": "食用油碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"79002": 10
}
},
{
"Id": 271011,
"Name": "智能手环碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"76004": 10
}
},
{
"Id": 271012,
"Name": "电热水壶碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"71002": 10
}
},
{
"Id": 171003,
"Name": "迷你小风扇碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"71003": 10
}
},
{
"Id": 172001,
"Name": "厨房炊具套装碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"72001": 10
}
},
{
"Id": 172002,
"Name": "睡衣碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"72002": 10
}
},
{
"Id": 172003,
"Name": "洗衣液碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"72003": 10
}
},
{
"Id": 172004,
"Name": "水杯碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"72004": 10
}
}
]
}

BIN
data/DB_GameRule.dat
View File

Binary file not shown.

20
data/DB_GameRule.json
View File

@ -71,7 +71,7 @@
"Name": "十三张(四人场)",
"GameId": 211,
"Params": [
0,
4,
0,
30,
50,
@ -84,7 +84,7 @@
"Name": "十三张(八人场)",
"GameId": 212,
"Params": [
1,
8,
0,
30,
50,
@ -97,7 +97,7 @@
"Name": "十三张(自由场经典场)",
"GameId": 213,
"Params": [
1,
8,
0,
30,
50,
@ -110,7 +110,7 @@
"Name": "十三张(自由场癞子场)",
"GameId": 214,
"Params": [
1,
8,
0,
30,
50,
@ -250,6 +250,18 @@
"GameId": 312,
"GameDif": "312"
},
{
"Id": 31300,
"Name": "CashMania",
"GameId": 313,
"GameDif": "313"
},
{
"Id": 31400,
"Name": "GatesOfOlympus",
"GameId": 314,
"GameDif": "314"
},
{
"Id": 60800,
"Name": "娃娃机",

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.

22
protocol/doc.md
View File

@ -159,31 +159,39 @@
### samloc.proto
- 5550~5569
### thirteen.protp
### thirteen.proto
- 5570~5580
### smallrocket.protp
### smallrocket.proto
- 5581~5599
### fortunedragon.prot
### fortunedragon.proto
- 5600~5609
### fortunerabbit.prot
### fortunerabbit.proto
- 5610~5619
### fortuneox.prot
### fortuneox.proto
- 5620~5629
### fortunetiger.prot
### fortunetiger.proto
- 5630~5639
### fortunemouse.prot
### fortunemouse.proto
- 5640~5649
### cashmania.proto
- 5650~5659
### gatesofolympus.proto
- 5660~5669
### game.proto(玩家离开)
- 8000~8099

38
protocol/server/pbdata.pb.go
View File

@ -4238,10 +4238,10 @@ type DB_GameFree struct {
FreeMode int32 `protobuf:"varint,6,opt,name=FreeMode,proto3" json:"FreeMode,omitempty"`
GameRule int32 `protobuf:"varint,7,opt,name=GameRule,proto3" json:"GameRule,omitempty"`
GameType int32 `protobuf:"varint,8,opt,name=GameType,proto3" json:"GameType,omitempty"`
SceneType int32 `protobuf:"varint,9,opt,name=SceneType,proto3" json:"SceneType,omitempty"`
RankType int32 `protobuf:"varint,10,opt,name=RankType,proto3" json:"RankType,omitempty"`
SceneAdd int32 `protobuf:"varint,11,opt,name=SceneAdd,proto3" json:"SceneAdd,omitempty"`
Desc string `protobuf:"bytes,12,opt,name=Desc,proto3" json:"Desc,omitempty"`
Desc string `protobuf:"bytes,9,opt,name=Desc,proto3" json:"Desc,omitempty"`
SceneType int32 `protobuf:"varint,10,opt,name=SceneType,proto3" json:"SceneType,omitempty"`
RankType int32 `protobuf:"varint,11,opt,name=RankType,proto3" json:"RankType,omitempty"`
SceneAdd int32 `protobuf:"varint,12,opt,name=SceneAdd,proto3" json:"SceneAdd,omitempty"`
ShowType int32 `protobuf:"varint,13,opt,name=ShowType,proto3" json:"ShowType,omitempty"`
SubShowType int32 `protobuf:"varint,14,opt,name=SubShowType,proto3" json:"SubShowType,omitempty"`
Flag int32 `protobuf:"varint,15,opt,name=Flag,proto3" json:"Flag,omitempty"`
@ -4393,6 +4393,13 @@ func (x *DB_GameFree) GetGameType() int32 {
return 0
}
func (x *DB_GameFree) GetDesc() string {
if x != nil {
return x.Desc
}
return ""
}
func (x *DB_GameFree) GetSceneType() int32 {
if x != nil {
return x.SceneType
@ -4414,13 +4421,6 @@ func (x *DB_GameFree) GetSceneAdd() int32 {
return 0
}
func (x *DB_GameFree) GetDesc() string {
if x != nil {
return x.Desc
}
return ""
}
func (x *DB_GameFree) GetShowType() int32 {
if x != nil {
return x.ShowType
@ -11426,14 +11426,14 @@ var file_protocol_server_pbdata_proto_rawDesc = []byte{
0x65, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x75,
0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x75,
0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08,
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c,
0x0a, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28,
0x05, 0x52, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08,
0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x63, 0x65, 0x6e,
0x65, 0x41, 0x64, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x63, 0x65, 0x6e,
0x65, 0x41, 0x64, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x65, 0x73, 0x63, 0x18, 0x0c, 0x20, 0x01,
0x28, 0x09, 0x52, 0x04, 0x44, 0x65, 0x73, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x77,
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12,
0x0a, 0x04, 0x44, 0x65, 0x73, 0x63, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x44, 0x65,
0x73, 0x63, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18,
0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x54, 0x79, 0x70, 0x65,
0x12, 0x1a, 0x0a, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01,
0x28, 0x05, 0x52, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08,
0x53, 0x63, 0x65, 0x6e, 0x65, 0x41, 0x64, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
0x53, 0x63, 0x65, 0x6e, 0x65, 0x41, 0x64, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x77,
0x54, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x77,
0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x53, 0x68, 0x6f, 0x77, 0x54,
0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x53, 0x75, 0x62, 0x53, 0x68,

8
protocol/server/pbdata.proto
View File

@ -709,13 +709,13 @@ message DB_GameFree {
int32 GameType = 8;
int32 SceneType = 9;
string Desc = 9;
int32 RankType = 10;
int32 SceneType = 10;
int32 SceneAdd = 11;
int32 RankType = 11;
string Desc = 12;
int32 SceneAdd = 12;
int32 ShowType = 13;

2
protocol/thirteen/thirteen.pb.go
View File

@ -386,7 +386,7 @@ type CSThirteenPlayerOp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
OpCode int32 `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"` // 1:确定牌 2站起状态 3test 4重新选牌 5加入游戏
OpCode int32 `protobuf:"varint,1,opt,name=OpCode,proto3" json:"OpCode,omitempty"` // 1:确定牌 2站起状态 3test 4重新选牌 5加入游戏 6预选
// 确定牌时，两种参数规则,都可以
// 第一种：玩家从推荐牌型中选择一个，把Poker.IndexType发过来（减少数据传输）
// 第二种：按头墩中墩尾墩顺序把牌发过来

2
protocol/thirteen/thirteen.proto
View File

@ -73,7 +73,7 @@ message SCThirteenPlayerCards {
//玩家操作
//PACKET_CSThirteenPlayerOp
message CSThirteenPlayerOp {
int32 OpCode = 1; // 1:确定牌 2站起状态 3test 4重新选牌 5加入游戏
int32 OpCode = 1; // 1:确定牌 2站起状态 3test 4重新选牌 5加入游戏 6预选
// 确定牌时，两种参数规则,都可以
// 第一种：玩家从推荐牌型中选择一个，把Poker.IndexType发过来（减少数据传输）

BIN
xlsx/DB_GameFree.xlsx
View File

Binary file not shown.

BIN
xlsx/DB_GameItem.xlsx
View File

Binary file not shown.

BIN
xlsx/DB_GameRule.xlsx
View File

Binary file not shown.