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

Compare commits

base: tl_server_2:d6989f42ea8f1eed2a54703ccf8abd1e76cb96c9
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:72b287ebfa6a2a3e847f090507d845c6e9a44d23
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. "d6989f42ea8f1eed2a54703ccf8abd1e76cb96c9" and "72b287ebfa6a2a3e847f090507d845c6e9a44d23" have entirely different histories.
d6989f42ea ... 72b287ebfa

15 changed files with 2378 additions and 2595 deletions
Show Stats Expand all files Collapse all files

BIN
data/DB_GameFree.dat
View File

Binary file not shown.

3283
data/DB_GameFree.json
View File

File diff suppressed because it is too large Load Diff

BIN
data/DB_PropExchange.dat
View File

Binary file not shown.

BIN
data/DB_Task.dat
View File

Binary file not shown.

3
dbproxy/svc/m_monitor.go
View File

@ -13,7 +13,6 @@ import (
"mongo.games.com/game/dbproxy/mongo"
"mongo.games.com/game/mgrsrv/api"
"mongo.games.com/game/model"
"mongo.games.com/game/webapi"
"mongo.games.com/goserver/core/basic"
"mongo.games.com/goserver/core/logger"
"mongo.games.com/goserver/core/netlib"
@ -120,8 +119,6 @@ func init() {
gob.Register(map[string]*model.APITransactStats{})
gob.Register(api.ApiStats{}) // 这里依赖了mgrsrv的结构体，会导致mgrsrv初始化，最好是把结构体放到一个公共包里，不要两个不相关的程序有直接依赖
gob.Register(map[string]api.ApiStats{})
gob.Register(webapi.ApiStats{})
gob.Register(map[string]webapi.ApiStats{})
gob.Register(mgo.Stats{})
gob.Register(profile.TimeElement{})
gob.Register(map[string]profile.TimeElement{})

91
gamerule/thirteen/logic_test.go
View File

@ -165,29 +165,6 @@ func TestLogic_CompareHead(t *testing.T) {
l.LaiZi = []int{52, 53}
data := [][]int{
// 比花色的
{1, 27, 49, 50, 43, 42, 1},
{47, 20, 23, 29, 36, 42, -1},
{0, 2, 18, 31, 21, 29, -1},
{45, 7, 18, 13, 15, 29, 1},
{14, 4, 46, 9, 1, 11, -1},
{7, 3, 24, 43, 50, 44, 1},
{5, 4, 31, 15, 33, 14, 1},
{21, 21, 32, 31, 38, 28, 1},
{47, 38, 49, 30, 34, 23, 1},
{14, 10, 16, 29, 30, 35, 1},
//
{0, 52, 8, 7, 8, 9, 1},
{0, 52, 52, 7, 8, 9, 1},
{0, 52, 52, 7, 51, 53, 1},
{0, 52, 51, 7, 51, 53, -1},
{8, 52, 51, 7, 51, 53, 1},
{7, 52, 51, 7, 51, 53, 0},
{7, 9, 22, 22, 7, 53, -1},
{7, 48, 22, 22, 7, 53, 1},
{7, 48, 22, 22, 6, 53, 1},
{7, 48, 22, 22, 20, 53, -1},
// 不比花色
//{1, 27, 49, 50, 43, 42, 1},
//{47, 20, 23, 29, 36, 42, -1},
//{0, 2, 18, 31, 21, 29, -1},
@ -205,10 +182,33 @@ func TestLogic_CompareHead(t *testing.T) {
//{0, 52, 51, 7, 51, 53, -1},
//{8, 52, 51, 7, 51, 53, 1},
//{7, 52, 51, 7, 51, 53, 0},
//{7, 9, 22, 22, 7, 53, 1},
//{7, 9, 22, 22, 7, 53, -1},
//{7, 48, 22, 22, 7, 53, 1},
//{7, 48, 22, 22, 6, 53, 1},
//{7, 48, 22, 22, 20, 53, 1},
//{7, 48, 22, 22, 20, 53, -1},
// 不比花色
{1, 27, 49, 50, 43, 42, 1},
{47, 20, 23, 29, 36, 42, -1},
{0, 2, 18, 31, 21, 29, -1},
{45, 7, 18, 13, 15, 29, 1},
{14, 4, 46, 9, 1, 11, -1},
{7, 3, 24, 43, 50, 44, 1},
{5, 4, 31, 15, 33, 14, 1},
{21, 21, 32, 31, 38, 28, 1},
{47, 38, 49, 30, 34, 23, 1},
{14, 10, 16, 29, 30, 35, 1},
//
{0, 52, 8, 7, 8, 9, 1},
{0, 52, 52, 7, 8, 9, 1},
{0, 52, 52, 7, 51, 53, 1},
{0, 52, 51, 7, 51, 53, -1},
{8, 52, 51, 7, 51, 53, 1},
{7, 52, 51, 7, 51, 53, 0},
{7, 9, 22, 22, 7, 53, 1},
{7, 48, 22, 22, 7, 53, 1},
{7, 48, 22, 22, 6, 53, 1},
{7, 48, 22, 22, 20, 53, 1},
}
for _, v := range data {
@ -233,33 +233,6 @@ func TestLogic_CompareFive(t *testing.T) {
l := new(Logic)
l.LaiZi = []int{52, 53}
data := [][]int{
// 不比花色
//{5, 23, 10, 6, 1, 45, 41, 20, 1, 13, 1},
//{29, 31, 26, 1, 39, 31, 44, 17, 9, 34, -1},
//{24, 26, 9, 10, 0, 16, 30, 7, 37, 3, -1},
//{31, 30, 11, 33, 7, 18, 1, 36, 9, 3, 1},
//// 牌型不同
//{2, 15, 28, 0, 6, 12, 0, 1, 2, 3, -1},
//// 点数不同
//{2, 15, 28, 0, 6, 2, 15, 28, 0, 6, 0},
//{2, 15, 28, 0, 6, 2, 15, 28, 0, 7, -1},
//{0, 13, 4, 17, 6, 0, 13, 4, 17, 5, 1},
//{0, 13, 5, 18, 6, 0, 13, 4, 17, 6, 1},
//{1, 14, 4, 17, 6, 0, 13, 4, 17, 5, 1},
//// 花色不同
//{2, 15, 28, 0, 6, 2, 15, 28, 0, 19, 0},
//{41, 15, 28, 0, 6, 2, 15, 28, 0, 6, 0},
//{2, 15, 28, 0, 6, 2, 15, 28, 13, 6, 0},
//{3, 4, 5, 6, 52, 3, 52, 5, 6, 53, 1},
//{3, 17, 5, 6, 52, 3, 52, 5, 6, 53, -1},
//{3, 4, 5, 6, 7, 16, 52, 18, 19, 53, 1},
//{3, 52, 5, 6, 20, 3, 17, 18, 19, 53, 0},
//{3, 52, 5, 6, 46, 3, 17, 18, 19, 53, 0},
//// 癞子数不同
//{52, 52, 7, 20, 12, 52, 7, 20, 33, 25, -1},
//{52, 33, 7, 20, 12, 52, 7, 20, 33, 25, 0},
// 比花色
{5, 23, 10, 6, 1, 45, 41, 20, 1, 13, 1},
{29, 31, 26, 1, 39, 31, 44, 17, 9, 34, -1},
{24, 26, 9, 10, 0, 16, 30, 7, 37, 3, -1},
@ -273,17 +246,17 @@ func TestLogic_CompareFive(t *testing.T) {
{0, 13, 5, 18, 6, 0, 13, 4, 17, 6, 1},
{1, 14, 4, 17, 6, 0, 13, 4, 17, 5, 1},
// 花色不同
{2, 15, 28, 0, 6, 2, 15, 28, 0, 19, -1},
{41, 15, 28, 0, 6, 2, 15, 28, 0, 6, 1},
{2, 15, 28, 0, 6, 2, 15, 28, 13, 6, -1},
{2, 15, 28, 0, 6, 2, 15, 28, 0, 19, 0},
{41, 15, 28, 0, 6, 2, 15, 28, 0, 6, 0},
{2, 15, 28, 0, 6, 2, 15, 28, 13, 6, 0},
{3, 4, 5, 6, 52, 3, 52, 5, 6, 53, 1},
{3, 17, 5, 6, 52, 3, 52, 5, 6, 53, -1},
{3, 4, 5, 6, 7, 16, 52, 18, 19, 53, -1},
{3, 52, 5, 6, 20, 3, 17, 18, 19, 53, -1},
{3, 52, 5, 6, 46, 3, 17, 18, 19, 53, -1},
{3, 4, 5, 6, 7, 16, 52, 18, 19, 53, 1},
{3, 52, 5, 6, 20, 3, 17, 18, 19, 53, 0},
{3, 52, 5, 6, 46, 3, 17, 18, 19, 53, 0},
// 癞子数不同
{52, 52, 7, 20, 12, 52, 7, 20, 33, 25, -1},
{52, 33, 7, 20, 12, 52, 7, 20, 33, 25, -1},
{52, 33, 7, 20, 12, 52, 7, 20, 33, 25, 0},
}
for _, v := range data {

6
gamesrv/fortunedragon/scenepolicy_fortunedragon.go
View File

@ -409,12 +409,6 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd)
data.BetSizeIndex = playerEx.BetSizeIndex
data.BetLevelIndex = playerEx.BetLevelIndex
data.LinesIndex = playerEx.BetLineIndex
//data.BaseBetIndex = 1
data.Results[0].BetMode = playerEx.BetMode
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
//logger.Logger.Trace("=====================AddCoin=====TotalBet===", -data.TotalBet)

6
gamesrv/fortunemouse/scenepolicy_fortunemouse.go
View File

@ -407,12 +407,6 @@ func (this *SceneStateStartFortuneMouse) OnPlayerOp(s *base.Scene, p *base.Playe
if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd)
data.BetSizeIndex = playerEx.BetSizeIndex
data.BetLevelIndex = playerEx.BetLevelIndex
data.LinesIndex = playerEx.BetLineIndex
//data.BaseBetIndex = 1
var respinStatus int
if data.Results[0].ArrSpins[0].Special != nil {
sp, _ := json.Marshal(data.Results[0].ArrSpins[0].Special)

6
gamesrv/fortuneox/scenepolicy_fortuneox.go
View File

@ -407,12 +407,6 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player,
if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd)
data.BetSizeIndex = playerEx.BetSizeIndex
data.BetLevelIndex = playerEx.BetLevelIndex
data.LinesIndex = playerEx.BetLineIndex
//data.BaseBetIndex = 1
var respinStatus int
if data.Results[0].ArrSpins[0].Special != nil {
sp, _ := json.Marshal(data.Results[0].ArrSpins[0].Special)

6
gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
View File

@ -407,12 +407,6 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd)
data.BetSizeIndex = playerEx.BetSizeIndex
data.BetLevelIndex = playerEx.BetLevelIndex
data.LinesIndex = playerEx.BetLineIndex
//data.BaseBetIndex = 1
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
//第一次触发或者正常模式
//logger.Logger.Trace("=============addcoin1111 ", -data.TotalBet)

8
gamesrv/thirteen/scenepolicy.go
View File

@ -867,6 +867,10 @@ func (this *StateOp) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, param
copy(playerEx.cardsO.Mid[:], common.Int64Toint(params[3:8]))
copy(playerEx.cardsO.End[:], common.Int64Toint(params[8:]))
playerEx.cardsO.PokerType = 0
tp := sceneEx.logic.GetSpecialType(playerEx.cards)
if tp > 0 {
playerEx.cardsO.PokerType = tp
}
sceneEx.SendSelectCards(playerEx, 0, int64(opcode))
} else {
sceneEx.SendSelectCards(playerEx, int(params[0]), int64(opcode))
@ -913,6 +917,10 @@ func (this *StateOp) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, param
copy(playerEx.preCardsO.Mid[:], common.Int64Toint(params[3:8]))
copy(playerEx.preCardsO.End[:], common.Int64Toint(params[8:]))
playerEx.preCardsO.PokerType = 0
tp := sceneEx.logic.GetSpecialType(playerEx.cards)
if tp > 0 {
playerEx.preCardsO.PokerType = tp
}
}
playerEx.SendToClient(int(thirteen.TWMmoPacketID_PACKET_SCThirteenPlayerOp), pack)

4
machine/machinedoll/command.go
View File

@ -394,14 +394,14 @@ var data = []byte{
0x01, //11 强抓力电压占用位
0x80, //12 中抓力电压
0x01, //13 中抓力电压占用位
0x64, //14 弱抓力电压
0x78, //14 弱抓力电压
0x00, //15 弱抓力电压占用位
0xE0, //16 中奖电压
0x01, //17 中奖电压占用位
0xC8, //18 强抓力时间
0x00, //19 强抓力时间占用位
0x0A, //20 放抓时间
0x14, //20 放抓时间
0x32, //21 前后速度
0x32, //22 左右速度
0x50, //23 上下速度

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

File diff suppressed because it is too large Load Diff

2
protocol/server/pbdata.proto
View File

@ -839,8 +839,6 @@ message DB_GameFree {
int32 IsCustom = 73;
string GameName = 74;
}
message DB_GameFreeArray {

BIN
xlsx/DB_GameFree.xlsx
View File

Binary file not shown.