fycode_ZF_Client
/
game-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1 修改玩家中间退出 和 观战转坐下导致的游戏卡死及重启问题

dev
MoQingYu 5 months ago
parent
c1af578a93
commit
ed72021815
7 changed files with 43 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      game-server/game/21Game/app/core/game/game_ctrl_blood.go
  2. 1
      game-server/game/21Game/app/core/game/game_out_room.go
  3. 2
      game-server/game/21Game/app/core/game/game_watch.go
  4. 2
      game-server/game/DZ/app/core/game/game_watch.go
  5. 74
      game-server/game/DZ/config/blood.json
  6. 2
      game-server/game/SixAndarBahar/app/core/game/game_watch.go
  7. 2
      game-server/game/rummy/app/core/game/game_watch.go

2
game-server/game/21Game/app/core/game/game_ctrl_blood.go
View File

@ -9,7 +9,7 @@ import (
func (rr *Room) GetCtrlBlood() types.Poker { // 0 爆牌
//return 0 // 测试添加
//log.Debug(" 桌子号", rr.RId, "房间当前血池 ：", rr.BoolePool)
log.Debug(" 桌子号", rr.RId, "GetCtrlBlood 当前庄家 ：", rr.CurrBanker, " 当前操作人 ", rr.CurrOperationPlayer)
CurrentGears := 0
TempRoomGears, err := strconv.Atoi(rr.BoolePool.RoomGears)
if err == nil {

1
game-server/game/21Game/app/core/game/game_out_room.go
View File

@ -111,6 +111,7 @@ func (rr *Room) OnGetOutRoom(uid int64) bool {
// 如果游戏进行中 判断是不是只剩庄家了 如果是直接结算结束
if pPlayer.CanBet && rr.CurrentGameState > protocol.STATE_GET_BANKER && rr.CurrentGameState != protocol.STATE_RESULT {
rr.OnEventGameUserOutConclude(pPlayer.ChairId)
rr.PlayerMap[pPlayer.ChairId].GameState = 5 // 玩家逃跑了
AllUserEnd := true
for _, tempPlayer := range rr.PlayerMap {

2
game-server/game/21Game/app/core/game/game_watch.go
View File

@ -82,7 +82,7 @@ func (rr *Room) OnUserWatchToDown(uid int64, msg interface{}) { // 主动观战
}
rr.NotifyFunc(route.NotifyDTSitDown, NotifySitDown)
rr.PlayerMap[TempWatchPlayer.ChairId] = TempWatchPlayer
rr.PlayerMap[WatchUser.ChairId] = WatchUser
if TempIndex == len(rr.PlayerWatchMap)-1 {
rr.PlayerWatchMap = rr.PlayerWatchMap[:TempIndex]

2
game-server/game/DZ/app/core/game/game_watch.go
View File

@ -82,7 +82,7 @@ func (rr *Room) OnUserWatchToDown(uid int64, msg interface{}) { // 主动观战
}
rr.NotifyFunc(route.NotifyDTSitDown, NotifySitDown)
rr.PlayerMap[TempWatchPlayer.ChairId] = TempWatchPlayer
rr.PlayerMap[WatchUser.ChairId] = WatchUser
if TempIndex == len(rr.PlayerWatchMap)-1 {
rr.PlayerWatchMap = rr.PlayerWatchMap[:TempIndex]

74
game-server/game/DZ/config/blood.json
View File

@ -11,17 +11,17 @@
"GearIDComment": "GearID 【输 3000档】",
"GearID": 3000,
"WinProComment": "赢得概率 万分率",
"WinPro": 4000,
"WinPro": 9500,
"UserWinPokerProComment": "玩家获胜抽牌权重",
"UserWinPokerPro": [[1,3508],[2,4000],[3,1801],[4,350],[5,200],[6,100],[7,25],[8,10],[9,5],[10,1]],
"RobotWinPokerProComment": "机器人获胜抽牌权重",
"RobotWinPokerPro": [[1,2500],[2,3000],[3,2501],[4,801],[5,601],[6,501],[7,50],[8,30],[9,15],[10,1]],
"RobotWinDropProComment": "机器人赢的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinDropPro": [[1,500],[2,200],[3,50],[4,0],[5,0]],
"RobotWinDropPro": [[1,0],[2,0],[3,0],[4,0],[5,0]],
"RobotWinJiaProComment": "机器人赢的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinJiaPro": [[1,2500],[2,2500],[3,2500],[4,4800],[5,6700]],
"RobotLoseDropProComment": "机器人输的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseDropPro": [[1,3000],[2,3000],[3,3000],[4,8000],[5,9000]],
"RobotLoseDropPro": [[1,6855],[2,4352],[3,7855],[4,8358],[5,9823]],
"RobotLoseJiaProComment": "机器人输的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseJiaPro": [[1,0],[2,0],[3,0],[4,0],[5,0]]
},
@ -29,17 +29,17 @@
"GearIDComment": "GearID 【输 2000档】",
"GearID": 2000,
"WinProComment": "赢得概率 万分率",
"WinPro": 4000,
"WinPro": 8000,
"UserWinPokerProComment": "玩家获胜抽牌权重",
"UserWinPokerPro": [[1,3508],[2,4000],[3,1801],[4,350],[5,200],[6,100],[7,25],[8,10],[9,5],[10,1]],
"UserWinPokerPro": [[1,3000],[2,3500],[3,2000],[4,800],[5,400],[6,200],[7,50],[8,25],[9,10],[10,5]],
"RobotWinPokerProComment": "机器人获胜抽牌权重",
"RobotWinPokerPro": [[1,2500],[2,3000],[3,2501],[4,801],[5,601],[6,501],[7,50],[8,30],[9,15],[10,1]],
"RobotWinPokerPro": [[1,2800],[2,3200],[3,2500],[4,1000],[5,800],[6,500],[7,100],[8,50],[9,25],[10,10]],
"RobotWinDropProComment": "机器人赢的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinDropPro": [[1,500],[2,200],[3,50],[4,0],[5,0]],
"RobotWinDropPro": [[1,0],[2,0],[3,0],[4,0],[5,0]],
"RobotWinJiaProComment": "机器人赢的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinJiaPro": [[1,2500],[2,2500],[3,2500],[4,4800],[5,6700]],
"RobotWinJiaPro": [[1,2300],[2,2300],[3,2300],[4,4000],[5,5500]],
"RobotLoseDropProComment": "机器人输的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseDropPro": [[1,3000],[2,3000],[3,3000],[4,8000],[5,9000]],
"RobotLoseDropPro": [[1,2685],[2,2198],[3,6931],[4,7199],[5,9538]],
"RobotLoseJiaProComment": "机器人输的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseJiaPro": [[1,0],[2,0],[3,0],[4,0],[5,0]]
},
@ -47,37 +47,37 @@
"GearIDComment": "GearID 【输 1000档】",
"GearID": 1000,
"WinProComment": "赢得概率 万分率",
"WinPro": 4000,
"WinPro": 6000,
"UserWinPokerProComment": "玩家获胜抽牌权重",
"UserWinPokerPro": [[1,3508],[2,4000],[3,1801],[4,350],[5,200],[6,100],[7,25],[8,10],[9,5],[10,1]],
"UserWinPokerPro": [[1,2500],[2,3000],[3,2200],[4,1200],[5,800],[6,400],[7,100],[8,50],[9,25],[10,10]],
"RobotWinPokerProComment": "机器人获胜抽牌权重",
"RobotWinPokerPro": [[1,2500],[2,3000],[3,2501],[4,801],[5,601],[6,501],[7,50],[8,30],[9,15],[10,1]],
"RobotWinPokerPro": [[1,3000],[2,3500],[3,2000],[4,1200],[5,1000],[6,800],[7,200],[8,100],[9,50],[10,20]],
"RobotWinDropProComment": "机器人赢的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinDropPro": [[1,500],[2,200],[3,50],[4,0],[5,0]],
"RobotWinDropPro": [[1,0],[2,0],[3,0],[4,0],[5,0]],
"RobotWinJiaProComment": "机器人赢的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinJiaPro": [[1,2500],[2,2500],[3,2500],[4,4800],[5,6700]],
"RobotWinJiaPro": [[1,2000],[2,2000],[3,2000],[4,3500],[5,4500]],
"RobotLoseDropProComment": "机器人输的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseDropPro": [[1,3000],[2,3000],[3,3000],[4,8000],[5,9000]],
"RobotLoseDropPro":[[1,3000],[2,3000],[3,3000],[4,8000],[5,9000]],
"RobotLoseJiaProComment": "机器人输的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseJiaPro": [[1,0],[2,0],[3,0],[4,0],[5,0]]
"RobotLoseJiaPro": [[1,0],[2,0],[3,3588],[4,2515],[5,1681]]
},
{
"GearIDComment": "GearID 【赢 1000档】",
"GearID": -1000,
"WinProComment": "赢得概率 万分率",
"WinPro": 4000,
"WinPro": 6000,
"UserWinPokerProComment": "玩家获胜抽牌权重",
"UserWinPokerPro": [[1,3508],[2,4000],[3,1801],[4,350],[5,200],[6,100],[7,25],[8,10],[9,5],[10,1]],
"UserWinPokerPro": [[1,2000],[2,2500],[3,2500],[4,1500],[5,1000],[6,600],[7,200],[8,100],[9,50],[10,20]],
"RobotWinPokerProComment": "机器人获胜抽牌权重",
"RobotWinPokerPro": [[1,2500],[2,3000],[3,2501],[4,801],[5,601],[6,501],[7,50],[8,30],[9,15],[10,1]],
"RobotWinPokerPro": [[1,3200],[2,3000],[3,1800],[4,1000],[5,800],[6,600],[7,300],[8,200],[9,100],[10,50]],
"RobotWinDropProComment": "机器人赢的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinDropPro": [[1,500],[2,200],[3,50],[4,0],[5,0]],
"RobotWinDropPro": [[1,1000],[2,0],[3,0],[4,0],[5,0]],
"RobotWinJiaProComment": "机器人赢的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinJiaPro": [[1,2500],[2,2500],[3,2500],[4,4800],[5,6700]],
"RobotWinJiaPro": [[1,1500],[2,1500],[3,1500],[4,3000],[5,4000]],
"RobotLoseDropProComment": "机器人输的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseDropPro": [[1,3000],[2,3000],[3,3000],[4,8000],[5,9000]],
"RobotLoseDropPro": [[1,2685],[2,2198],[3,6931],[4,7199],[5,9538]],
"RobotLoseJiaProComment": "机器人输的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseJiaPro": [[1,0],[2,0],[3,0],[4,0],[5,0]]
"RobotLoseJiaPro": [[1,0],[2,0],[3,3611],[4,2518],[5,2696]]
},
{
"GearIDComment": "GearID 【赢 2000档】",
@ -85,35 +85,35 @@
"WinProComment": "赢得概率 万分率",
"WinPro": 4000,
"UserWinPokerProComment": "玩家获胜抽牌权重",
"UserWinPokerPro": [[1,3508],[2,4000],[3,1801],[4,350],[5,200],[6,100],[7,25],[8,10],[9,5],[10,1]],
"UserWinPokerPro": [[1,1500],[2,2000],[3,2700],[4,1800],[5,1200],[6,800],[7,300],[8,150],[9,75],[10,30]],
"RobotWinPokerProComment": "机器人获胜抽牌权重",
"RobotWinPokerPro": [[1,2500],[2,3000],[3,2501],[4,801],[5,601],[6,501],[7,50],[8,30],[9,15],[10,1]],
"RobotWinPokerPro": [[1,3500],[2,2500],[3,1600],[4,900],[5,600],[6,400],[7,200],[8,100],[9,50],[10,20]],
"RobotWinDropProComment": "机器人赢的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinDropPro": [[1,500],[2,200],[3,50],[4,0],[5,0]],
"RobotWinDropPro": [[1,2000],[2,0],[3,0],[4,0],[5,0]],
"RobotWinJiaProComment": "机器人赢的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinJiaPro": [[1,2500],[2,2500],[3,2500],[4,4800],[5,6700]],
"RobotWinJiaPro": [[1,1000],[2,1000],[3,1000],[4,2500],[5,3500]],
"RobotLoseDropProComment": "机器人输的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseDropPro": [[1,3000],[2,3000],[3,3000],[4,8000],[5,9000]],
"RobotLoseDropPro": [[1,2185],[2,1898],[3,4531],[4,5199],[5,9538]],
"RobotLoseJiaProComment": "机器人输的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseJiaPro": [[1,0],[2,0],[3,0],[4,0],[5,0]]
"RobotLoseJiaPro": [[1,0],[2,0],[3,3788],[4,3255],[5,2588]]
},
{
"GearIDComment": "GearID 【赢 3000档】",
"GearID": -3000,
"WinProComment": "赢得概率 万分率",
"WinPro": 4000,
"WinPro": 3500,
"UserWinPokerProComment": "玩家获胜抽牌权重",
"UserWinPokerPro": [[1,3508],[2,4000],[3,1801],[4,350],[5,200],[6,100],[7,25],[8,10],[9,5],[10,1]],
"UserWinPokerPro": [[1,500],[2,800],[3,3200],[4,2500],[5,2000],[6,1200],[7,500],[8,250],[9,100],[10,50]],
"RobotWinPokerProComment": "机器人获胜抽牌权重",
"RobotWinPokerPro": [[1,2500],[2,3000],[3,2501],[4,801],[5,601],[6,501],[7,50],[8,30],[9,15],[10,1]],
"RobotWinPokerPro": [[1,4000],[2,2000],[3,1400],[4,700],[5,400],[6,300],[7,100],[8,50],[9,25],[10,10]],
"RobotWinDropProComment": "机器人赢的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinDropPro": [[1,500],[2,200],[3,50],[4,0],[5,0]],
"RobotWinDropPro": [[1,3000],[2,0],[3,0],[4,0],[5,0]],
"RobotWinJiaProComment": "机器人赢的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotWinJiaPro": [[1,2500],[2,2500],[3,2500],[4,4800],[5,6700]],
"RobotWinJiaPro": [[1,500],[2,500],[3,500],[4,2000],[5,3000]],
"RobotLoseDropProComment": "机器人输的弃牌概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseDropPro": [[1,3000],[2,3000],[3,3000],[4,8000],[5,9000]],
"RobotLoseDropPro": [[1,1885],[2,1698],[3,3231],[4,3819],[5,9218]],
"RobotLoseJiaProComment": "机器人输的加注概率 1：小盲注 2：大盲注 3：翻牌圈 4 转牌圈 5河牌圈",
"RobotLoseJiaPro": [[1,0],[2,0],[3,0],[4,0],[5,0]]
"RobotLoseJiaPro": [[1,0],[2,0],[3,3788],[4,3415],[5,3111]]
}
],
"CommentAndroidOperateConfig": "机器人的配置",
@ -148,4 +148,4 @@
"TimeOutFinalResult" : 2000,
"CommentTimeKickTimes": "多少次不下注踢出房间",
"TimeKickTimes" :5
}
}

2
game-server/game/SixAndarBahar/app/core/game/game_watch.go
View File

@ -81,7 +81,7 @@ func (rr *Room) OnUserWatchToDown(uid int64, msg interface{}) { // 主动观战
}
rr.NotifyFunc(route.NotifyDTSitDown, NotifySitDown)
rr.PlayerMap[TempWatchPlayer.ChairId] = TempWatchPlayer
rr.PlayerMap[WatchUser.ChairId] = WatchUser
if TempIndex == len(rr.PlayerWatchMap)-1 {
rr.PlayerWatchMap = rr.PlayerWatchMap[:TempIndex]

2
game-server/game/rummy/app/core/game/game_watch.go
View File

@ -82,7 +82,7 @@ func (rr *Room) OnUserWatchToDown(uid int64, msg interface{}) { // 主动观战
}
rr.NotifyFunc(route.NotifyDTSitDown, NotifySitDown)
rr.PlayerMap[TempWatchPlayer.ChairId] = TempWatchPlayer
rr.PlayerMap[WatchUser.ChairId] = WatchUser
if TempIndex == len(rr.PlayerWatchMap)-1 {
rr.PlayerWatchMap = rr.PlayerWatchMap[:TempIndex]

Write Preview
Loading…
Cancel
Save