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

Compare commits

base: tl_server_2:72b287ebfa6a2a3e847f090507d845c6e9a44d23
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:d6989f42ea8f1eed2a54703ccf8abd1e76cb96c9
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

19 Commits
72b287ebfa ... d6989f42ea

Author SHA1 Message Date
tomas d6989f42ea Merge branch 'dev_slots' into develop 2024-12-10 20:43:26 +08:00
tomas 684d05642e fix idx 2024-12-10 20:42:55 +08:00
sk 3104e68bb9 Merge branch 'release' into develop 2024-12-10 15:20:21 +08:00
sk e9e0aac833 update data 2024-12-10 15:19:44 +08:00
by 34062ef47e 娃娃机调整 2024-12-10 10:49:21 +08:00
sk 53ebe7bbdc 系统赠送记录破产补助 2024-12-10 10:49:10 +08:00
sk 7198f8c99f 十三张花色比牌添加单元测试 2024-12-10 10:46:19 +08:00
sk ee94c94fb7 十三张比牌包含花色 2024-12-10 10:45:53 +08:00
sk 3e853c2434 十三张手动摆牌不算特殊牌型 2024-12-09 16:14:31 +08:00
sk 343d2466ef 十三张调试发牌 2024-12-09 16:14:05 +08:00
DESKTOP-45ANQ2C\unis 3e97f97d38 十三水测试牌型比率 2024-12-09 16:13:40 +08:00
sk b56a874b36 修改十三张全垒打分数 2024-12-09 16:13:34 +08:00
sk ccd3481b06 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-09 13:12:35 +08:00
sk c8b7647695 Merge branch 'sk' into develop 2024-12-09 13:11:57 +08:00
sk b342e0ad61 十三张手动摆牌不算特殊牌型 2024-12-09 11:56:46 +08:00
by 4671d33f67 娃娃机调整 2024-12-09 10:30:37 +08:00
sk 886bf444c3 十三张花色比牌添加单元测试 2024-12-09 09:55:15 +08:00
sk 6adba98ddb 监控消息注册 2024-12-06 16:00:43 +08:00
sk 4675e0ff58 Merge branch 'dev_slots' into release 2024-12-05 13:46:07 +08:00
15 changed files with 1877 additions and 1660 deletions
Show Stats Expand all files Collapse all files

BIN
data/DB_GameFree.dat
View File

Binary file not shown.

1845
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,6 +13,7 @@ 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"
@ -119,6 +120,8 @@ 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,6 +233,33 @@ 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},
@ -246,17 +273,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, 0},
{41, 15, 28, 0, 6, 2, 15, 28, 0, 6, 0},
{2, 15, 28, 0, 6, 2, 15, 28, 13, 6, 0},
{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},
{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},
{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},
// 癞子数不同
{52, 52, 7, 20, 12, 52, 7, 20, 33, 25, -1},
{52, 33, 7, 20, 12, 52, 7, 20, 33, 25, 0},
{52, 33, 7, 20, 12, 52, 7, 20, 33, 25, -1},
}
for _, v := range data {

6
gamesrv/fortunedragon/scenepolicy_fortunedragon.go
View File

@ -409,6 +409,12 @@ 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,6 +407,12 @@ 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,6 +407,12 @@ 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,6 +407,12 @@ 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,10 +867,6 @@ 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))
@ -917,10 +913,6 @@ 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 中抓力电压占用位
0x78, //14 弱抓力电压
0x64, //14 弱抓力电压
0x00, //15 弱抓力电压占用位
0xE0, //16 中奖电压
0x01, //17 中奖电压占用位
0xC8, //18 强抓力时间
0x00, //19 强抓力时间占用位
0x14, //20 放抓时间
0x0A, //20 放抓时间
0x32, //21 前后速度
0x32, //22 左右速度
0x50, //23 上下速度

1560
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,6 +839,8 @@ message DB_GameFree {
int32 IsCustom = 73;
string GameName = 74;
}
message DB_GameFreeArray {

BIN
xlsx/DB_GameFree.xlsx
View File

Binary file not shown.