1 龙虎新增大厅的通知

2 龙虎修改大厅桌子的信息
3 龙虎增加开始游戏后不能退出

game-server/game/dragonTiger/app/core/game/game.go

@@ -70,7 +70,7 @@ type Room struct {
 	PersonalRate          int64                     // 个人倍率
 	RoomRate              int64                     // 房间倍率
 	RoomLimit             decimal.Decimal           //int64// 房间进入条件
-	playerMap             map[int32]*Player         //
+	PlayerMap             map[int32]*Player         //
 	MaxPlayerNum          int32                     //
 	State                 int32                     //房间状态 0空闲,1准备开始，2花色下注，3花色结算，4二轮下注，5二轮结算
 	PokerIndex            int32                     //
@@ -143,13 +143,13 @@ func (rr *Room) OnPlayerReady(userId int64, p interface{}) {
 
 // GetRoomPlayer 获取玩家-chairId==椅子号
 func (rr *Room) GetRoomPlayer(chairId int32) *Player {
-	return rr.playerMap[chairId]
+	return rr.PlayerMap[chairId]
 }
 
 // GetRoomPlayerCount 房间人数
 func (rr *Room) GetRoomPlayerCount() int32 {
 	// count := int32(0)
-	// for _, v := range rr.playerMap {
+	// for _, v := range rr.PlayerMap {
 	// 	//玩家掉线也好还是主动退出房间也好,并不会在房间中消除该玩家对象,一律视为掉线状态
 	// 	//掉线状态表示不在房间
 	// 	if v.OnlineState != 0 {
@@ -157,12 +157,12 @@ func (rr *Room) GetRoomPlayerCount() int32 {
 	// 	}
 	// }
 	// return count
-	return int32(len(rr.playerMap))
+	return int32(len(rr.PlayerMap))
 }
 
 func (rr *Room) GetRoomRealPlayerCount() int32 {
 	count := int32(0)
-	for _, v := range rr.playerMap {
+	for _, v := range rr.PlayerMap {
 		if !v.IsRobot {
 			count++
 		}
@@ -172,7 +172,7 @@ func (rr *Room) GetRoomRealPlayerCount() int32 {
 
 // GetRoomPlayerByUid 通过uid取player_obj
 func (rr *Room) GetRoomPlayerByUid(uid int64) *Player {
-	for _, p := range rr.playerMap {
+	for _, p := range rr.PlayerMap {
 		if p.Uid == uid {
 			return p
 		}

game-server/game/dragonTiger/app/core/game/game_bet.go

@@ -19,7 +19,7 @@ func (rr *Room) OnUserBet(uid int64, msg interface{}) { // 用户下注
 	NotifyBet := &protocol.NotifyBet{}
 
 	ChairId := int32(-1)
-	for _, player := range rr.playerMap {
+	for _, player := range rr.PlayerMap {
 		if player.Uid == uid {
 			ChairId = player.ChairId
 			break
@@ -37,7 +37,7 @@ func (rr *Room) OnUserBet(uid int64, msg interface{}) { // 用户下注
 	}
 
 	// 下注区域判断
-	player := rr.playerMap[ChairId]
+	player := rr.PlayerMap[ChairId]
 	for _, TempBetInfo := range message.BetInfo {
 		if TempBetInfo.BetArea < protocol.AREA_1 || TempBetInfo.BetArea > protocol.AREA_3 {
 			log.Debug("玩家", ChairId, "下注区域错误 当前下注区域", TempBetInfo.BetArea)
@@ -52,7 +52,7 @@ func (rr *Room) OnUserBet(uid int64, msg interface{}) { // 用户下注
 	// 个人限红
 	UserPersonLimit := int64(0)
 	UserCurrentBet := int64(0)
-	for _, tempBetWin := range rr.playerMap[ChairId].BetWin {
+	for _, tempBetWin := range rr.PlayerMap[ChairId].BetWin {
 		UserPersonLimit += tempBetWin.BetAmount
 	}
 	for _, info := range message.BetInfo {
@@ -67,10 +67,10 @@ func (rr *Room) OnUserBet(uid int64, msg interface{}) { // 用户下注
 		return
 	}
 
-	if !player.IsRobot && UserCurrentBet > rr.playerMap[ChairId].Gold.IntPart() {
-		log.Debug("玩家", ChairId, "个人下注总值", UserCurrentBet, " 拥有的钱: ", rr.playerMap[ChairId].Gold.IntPart())
+	if !player.IsRobot && UserCurrentBet > rr.PlayerMap[ChairId].Gold.IntPart() {
+		log.Debug("玩家", ChairId, "个人下注总值", UserCurrentBet, " 拥有的钱: ", rr.PlayerMap[ChairId].Gold.IntPart())
 		BetRes.Code = protocol.ErrorCodeBetError
-		BetRes.CodeMsg = "玩家最多再下注 " + strconv.Itoa(int(rr.playerMap[ChairId].Gold.IntPart()))
+		BetRes.CodeMsg = "玩家最多再下注 " + strconv.Itoa(int(rr.PlayerMap[ChairId].Gold.IntPart()))
 		rr.Send(player, route.BetRes, BetRes)
 		return
 	}
@@ -133,11 +133,11 @@ func (rr *Room) OnUserBet(uid int64, msg interface{}) { // 用户下注
 	}
 
 	// 下过注
-	rr.playerMap[ChairId].CurrentRoundBet = true
+	rr.PlayerMap[ChairId].CurrentRoundBet = true
 
 	BetRes.ChairID = ChairId
-	BetRes.TableTotalWin = rr.playerMap[ChairId].TableWin
-	BetRes.UserScore = rr.playerMap[ChairId].Gold.IntPart()
+	BetRes.TableTotalWin = rr.PlayerMap[ChairId].TableWin
+	BetRes.UserScore = rr.PlayerMap[ChairId].Gold.IntPart()
 	BetRes.BetInfo = message.BetInfo
 
 	NotifyBet.ChairID = BetRes.ChairID
@@ -147,7 +147,7 @@ func (rr *Room) OnUserBet(uid int64, msg interface{}) { // 用户下注
 		NotifyBet.BetInfo[key].AreaTotalAmount = rr.AreaAmount[info.BetArea-1].AreaTotalAmount
 	}
 
-	for _, TempPlayer := range rr.playerMap {
+	for _, TempPlayer := range rr.PlayerMap {
 		if TempPlayer.ChairId == ChairId {
 			rr.Send(TempPlayer, route.BetRes, BetRes)
 		} else {

game-server/game/dragonTiger/app/core/game/game_comm.go

@@ -31,7 +31,7 @@ func (rr *Room) ColorGroup(arr []int) map[int][]int {
 func (rr *Room) GetInRoomRobotCount() int32 {
 	unm := int32(0)
 
-	for _, player := range rr.playerMap {
+	for _, player := range rr.PlayerMap {
 		if player.IsRobot == true {
 			unm++
 		}

game-server/game/dragonTiger/app/core/game/game_copy.go

@@ -88,22 +88,22 @@ func (rr *Room) Copy(SrcRoom *Room, Uid int64) {
 	rr.RobotMgr.OnInit("", rr)
 
 	// 复制桌子上的人过来
-	for i, i2 := range SrcRoom.playerMap {
+	for i, i2 := range SrcRoom.PlayerMap {
 		if i2.IsRobot {
-			rr.playerMap[i] = i2
+			rr.PlayerMap[i] = i2
 			rr.RobotMgr.CopyRobotsEnterGameRoom(i2)
 		}
 
 		if Uid == i2.Uid {
-			rr.playerMap[i] = i2
+			rr.PlayerMap[i] = i2
 		}
 	}
 
 	// 删除挪过来的人
-	for i, i2 := range SrcRoom.playerMap {
+	for i, i2 := range SrcRoom.PlayerMap {
 		if Uid == i2.Uid {
-			SrcRoom.playerMap[i] = nil
-			delete(SrcRoom.playerMap, i)
+			SrcRoom.PlayerMap[i] = nil
+			delete(SrcRoom.PlayerMap, i)
 			break
 		}
 	}

game-server/game/dragonTiger/app/core/game/game_disconnect.go

@@ -15,7 +15,7 @@ func (rr *Room) OnDisconnect(userId int64) {
 
 	log.Debug(" 桌子号", rr.RId, "玩家", userId, "离线")
 
-	for _, player := range rr.playerMap {
+	for _, player := range rr.PlayerMap {
 		if player != nil {
 			if player.Uid == userId {
 				player.OnlineState = USER_OFF_LINE

game-server/game/dragonTiger/app/core/game/game_get_room_info.go

@@ -37,7 +37,7 @@ func (rr *Room) OnGetRoomInfo(uid int64, ctx *node.Context) interface{} {
 		})
 	}
 
-	for _, player := range rr.playerMap {
+	for _, player := range rr.PlayerMap {
 		if player.Uid == uid {
 			pPlayer = player
 		}

game-server/game/dragonTiger/app/core/game/game_join_room.go

@@ -90,9 +90,9 @@ func (rr *Room) JoinRoom(pPlayer *Player) int32 {
 	SitDownRes.PlayerInfo = TableSeat
 	NotifySitDown.PlayerInfo = TableSeat
 
-	rr.playerMap[pPlayer.ChairId] = pPlayer
+	rr.PlayerMap[pPlayer.ChairId] = pPlayer
 
-	for temChairID, temPlayer := range rr.playerMap {
+	for temChairID, temPlayer := range rr.PlayerMap {
 		if temChairID != pPlayer.ChairId {
 			rr.Send(temPlayer, route.NotifySitDown, NotifySitDown)
 		}

game-server/game/dragonTiger/app/core/game/game_logic.go

@@ -15,7 +15,7 @@ func (rr *Room) UpdateCtx(uid int64, ctx *node.Context) {
 	defer rr.roomRWLock.Unlock()
 	//log.Debug("UpdateCtx 2")
 
-	for _, p := range rr.playerMap {
+	for _, p := range rr.PlayerMap {
 		if p.Uid == uid {
 			log.Debug("桌子ID", rr.RId, "User ", uid, " 用户名字 ", p.Nickname, "原来的 ", p.Ctx, "新的 Ctx", ctx)
 			p.OnlineState = USER_ON_LINE
@@ -25,6 +25,19 @@ func (rr *Room) UpdateCtx(uid int64, ctx *node.Context) {
 	}
 }
 
+func (rr *Room) UpdateUserOut(uid int64) { // 更新用户退出状态
+	rr.roomRWLock.Lock()
+	defer rr.roomRWLock.Unlock()
+
+	for Index, p := range rr.PlayerMap {
+		if p.Uid == uid {
+			rr.PlayerMap[Index].UserNeedOut = true
+			break
+		}
+	}
+
+}
+
 func (rr *Room) run() {
 
 	milliseconds := time.Now().UnixMilli()
@@ -43,13 +56,13 @@ func (rr *Room) run() {
 
 				//为点控玩家创建的房间 玩家走了 就销毁
 				//定时器只有在创建房间的时候和销毁房间的时候 开启或者停止
-				for _, p := range rr.playerMap {
+				for _, p := range rr.PlayerMap {
 					if rr.CreatorId != 0 && p.Uid == rr.CreatorId && p.OnlineState != USER_ON_LINE {
 						rr.GronTimer.Stop()
 						rr.RobotMgr.GronTimer.Stop()
 						log.Debug(" 桌子号", rr.RId, "点控玩家离开,解散房间")
 
-						for _, p := range rr.playerMap {
+						for _, p := range rr.PlayerMap {
 							rr.QuitRoomFunc(p.Uid)
 						}
 						rr.DestroyRoomFunc(rr.RId)
@@ -79,7 +92,7 @@ func (rr *Room) run() {
 
 				// 踢出连续五局没下注的用户
 				rr.roomRWLock.Lock()
-				for _, player := range rr.playerMap {
+				for _, player := range rr.PlayerMap {
 					if !player.IsRobot && player.NoBetCount > 0 {
 						log.Debug("用户 ", player.Nickname, " 已经连续 ", player.NoBetCount, " 局没下注 ", rr.RId)
 					}
@@ -91,6 +104,13 @@ func (rr *Room) run() {
 						rr.roomRWLock.Lock()
 					}
 
+					if player.UserNeedOut {
+						log.Debug(" 桌子号", rr.RId, " 用户 ", player.Nickname, " 需要退出 ")
+						rr.roomRWLock.Unlock()
+						rr.OnGetOutRoom(player.Uid, 0)
+						rr.roomRWLock.Lock()
+					}
+
 					if player.IsCheat && rr.CreatorId != player.Uid {
 						log.Debug("用户 ", player.Nickname, " 被点控 换房间 ", rr.RId)
 						rr.Send(player, route.NotifyReEnter, protocol.LeaveTableRes{})
@@ -163,7 +183,7 @@ func (rr *Room) SendAllMessage(msgId int32, message interface{}) {
 		rr.NotifyFunc(route.NotifyDTStateTime, message)
 	}
 
-	for _, pPlayer := range rr.playerMap {
+	for _, pPlayer := range rr.PlayerMap {
 		if pPlayer != nil {
 			rr.Send(pPlayer, msgId, message)
 		}

game-server/game/dragonTiger/app/core/game/game_new.go

@@ -19,7 +19,7 @@ func New(Uid, rid int64, RoomID, GameID, AgentID int32, destory comm.DestoryCB,
 		GameID:                GameID,
 		ReasonString:          strconv.Itoa(int(GameID)) + "|" + strconv.Itoa(int(RoomID)),
 		AgentID:               AgentID,
-		playerMap:             make(map[int32]*Player),
+		PlayerMap:             make(map[int32]*Player),
 		RobotMgr:              NewRobotManager(),
 		Round:                 0,
 		WinPlayer:             INVALID_VALUE,

game-server/game/dragonTiger/app/core/game/game_out_room.go

@@ -9,14 +9,14 @@ import (
 func (rr *Room) UpdateSeat() {
 	l := rr.GetRoomPlayerCount()
 	for i := int32(0); i < l; i++ {
-		p := rr.playerMap[i]
+		p := rr.PlayerMap[i]
 		if p == nil {
 			ChairId := rr.MakeChairId()
-			rr.playerMap[ChairId].ChairId = ChairId
+			rr.PlayerMap[ChairId].ChairId = ChairId
 		}
 	}
 
-	for _, pPlayer := range rr.playerMap {
+	for _, pPlayer := range rr.PlayerMap {
 		if pPlayer == nil {
 			continue
 		}
@@ -38,14 +38,14 @@ func (rr *Room) OnGetOutRoom(uid int64, Code int32) bool {
 	ret := false
 
 	var tempPlayerMap = map[int32]*Player{}
-	for seatId, pPlayer := range rr.playerMap {
+	for seatId, pPlayer := range rr.PlayerMap {
 		if pPlayer == nil {
 			continue
 		}
 		tempPlayerMap[seatId] = pPlayer
 	}
 
-	for _, pPlayer := range rr.playerMap {
+	for _, pPlayer := range rr.PlayerMap {
 		if pPlayer == nil {
 			continue
 		}
@@ -57,11 +57,24 @@ func (rr *Room) OnGetOutRoom(uid int64, Code int32) bool {
 				pPlayer.OnlineState = USER_LEAVE
 				pPlayer.Ctx = nil
 
-				//为了下面的rr.playerMap = tempPlayerMap这个表达式
+				//为了下面的rr.PlayerMap = tempPlayerMap这个表达式
 				tempPlayerMap[pPlayer.ChairId].OnlineState = USER_LEAVE
 				tempPlayerMap[pPlayer.ChairId].Ctx = nil
 				log.Debug("OnGetOutRoom 3 ", uid)
 				rr.QuitRoomFunc(pPlayer.Uid)
+
+				// 通知大厅有人离开
+				NotifySitDown := &protocol.NotifyDTSitDown{
+					Uid:          pPlayer.Uid,
+					RoomID:       rr.RoomID,
+					TableID:      rr.RId,
+					ChairID:      pPlayer.ChairId,
+					Avatar:       pPlayer.Avatar,
+					State:        rr.CurrentGameState,
+					CurrentCount: rr.GetRoomPlayerCount() - 1,
+				}
+				rr.NotifyFunc(route.NotifyDTStandUp, NotifySitDown)
+
 				log.Debug("OnGetOutRoom 4 ", uid)
 				delete(tempPlayerMap, pPlayer.ChairId)
 				log.Debug("OnGetOutRoom 5 ", uid)
@@ -77,9 +90,9 @@ func (rr *Room) OnGetOutRoom(uid int64, Code int32) bool {
 	}
 	log.Debug("OnGetOutRoom 6 ", uid)
 
-	rr.playerMap = tempPlayerMap
+	rr.PlayerMap = tempPlayerMap
 
-	//for i, v := range rr.playerMap {
+	//for i, v := range rr.PlayerMap {
 	//	log.Debug(" 桌子号", rr.RId, "退出房间后,房间中的玩家", i, "的信息", v.Uid, ":", v)
 	//}
 
@@ -97,12 +110,12 @@ func (rr *Room) OnGetOutRoom(uid int64, Code int32) bool {
 			rr.RobotMgr.GronTimer.Stop()
 
 			for i := int32(0); i < playerCount; i++ {
-				p := rr.playerMap[i]
+				p := rr.PlayerMap[i]
 				if p == nil {
 					continue
 				}
-				rr.playerMap[i] = nil
-				delete(rr.playerMap, i)
+				rr.PlayerMap[i] = nil
+				delete(rr.PlayerMap, i)
 				//这里面来全是机器人的，所有不需要调用 rr.QuitRoomFunc
 			}
 

game-server/game/dragonTiger/app/core/game/game_over.go

@@ -1,6 +1,7 @@
 package game
 
 import (
+	"base/encoding/json"
 	"base/log"
 	"fmt"
 	"github.com/shopspring/decimal"
@@ -49,7 +50,7 @@ func (rr *Room) OnBuildOtherResultPoker() { //计算扑克
 	rr.UserCtlGear = 0
 	PlayerCount := rr.GetRoomPlayerCount()
 	for i := int32(0); i < PlayerCount; i++ {
-		p := rr.playerMap[i]
+		p := rr.PlayerMap[i]
 		if p == nil || p.IsRobot {
 			continue
 		}
@@ -86,7 +87,7 @@ func (rr *Room) OnBuildOtherResultPoker() { //计算扑克
 		{BetArea: protocol.AREA_3},
 	} // AreaTotalAmount 记录开这个区域总赢的钱
 
-	for _, player := range rr.playerMap {
+	for _, player := range rr.PlayerMap {
 		if !player.IsRobot {
 			for _, BetWinArea := range player.BetWin {
 				for index, TempUserWinArea := range UserWinArea {
@@ -206,7 +207,7 @@ func (rr *Room) OnEventGameConclude() { // 结束-结算
 	var sArea string
 	var sPlayers string
 
-	for _, player := range rr.playerMap {
+	for _, player := range rr.PlayerMap {
 		if !player.IsRobot {
 			if len(sPlayers) == 0 {
 				sPlayers = sPlayers + player.UserNo
@@ -216,7 +217,7 @@ func (rr *Room) OnEventGameConclude() { // 结束-结算
 		}
 	}
 
-	for _, player := range rr.playerMap {
+	for _, player := range rr.PlayerMap {
 		player.PlayCount++
 		if !player.CurrentRoundBet {
 			player.NoBetCount++
@@ -231,14 +232,19 @@ func (rr *Room) OnEventGameConclude() { // 结束-结算
 		TempUserBackWinScore := int64(0)
 		player.WinBetScore = 0
 		sArea = ""
+		var RecordInfo []protocol.RecordInfo
 		for _, BetWinArea := range player.BetWin {
 			if !player.IsRobot {
 				if BetWinArea.BetAmount > 0 {
-					if len(sArea) == 0 {
-						sArea = "{" + strconv.Itoa(int(BetWinArea.BetArea)) + ":" + strconv.Itoa(int(BetWinArea.BetAmount))
-					} else {
-						sArea = sArea + "," + strconv.Itoa(int(BetWinArea.BetArea)) + ":" + strconv.Itoa(int(BetWinArea.BetAmount))
+					recordInfo := protocol.RecordInfo{}
+					recordInfo.Area = BetWinArea.BetArea
+					recordInfo.BetAmount = BetWinArea.BetAmount
+					recordInfo.AreaPro = rr.BloodCtrl.AreaConfig[BetWinArea.BetArea-1].AreaPro
+					recordInfo.IsWin = false
+					if BetWinArea.BetArea == rr.WinDTArea {
+						recordInfo.IsWin = true
 					}
+					RecordInfo = append(RecordInfo, recordInfo)
 				}
 			}
 
@@ -254,9 +260,11 @@ func (rr *Room) OnEventGameConclude() { // 结束-结算
 			}
 		}
 
-		if len(sArea) != 0 {
-			sArea = sArea + "}"
+		options, err := json.Marshal(RecordInfo)
+		if err != nil {
+			log.Debug("RecordInfo 序列化失败")
 		}
+		sArea = string(options)
 
 		//记录输赢并写分
 		UserRealBet := int64(0) // 计算打码量

game-server/game/dragonTiger/app/core/game/game_player.go

@@ -40,4 +40,6 @@ type Player struct {
 	WinScore        int64                  // 结算时的总输赢
 	WinBetScore     int64                  // 赢的区域的总下注
 	BetWin          []protocol.BetAreaInfo //分区下注
+
+	UserNeedOut bool //退出状态
 }

game-server/game/dragonTiger/app/core/game/game_repeat_room.go

@@ -30,15 +30,15 @@ func (rr *Room) RepeatRoom() {
 }
 
 func (rr *Room) RepeatRoomUser() { //复位玩家的数据
-	for index, _ := range rr.playerMap {
+	for index, _ := range rr.PlayerMap {
 		if rr.State == EN_TABLE_STATE_READY_TO_START {
-			rr.playerMap[index].CurrentRoundBet = false
+			rr.PlayerMap[index].CurrentRoundBet = false
 		}
-		rr.playerMap[index].BetScore = 0
-		rr.playerMap[index].WinScore = 0
-		rr.playerMap[index].BetWin = rr.playerMap[index].BetWin[:0]
+		rr.PlayerMap[index].BetScore = 0
+		rr.PlayerMap[index].WinScore = 0
+		rr.PlayerMap[index].BetWin = rr.PlayerMap[index].BetWin[:0]
 		for i := 1; i < 11; i++ {
-			rr.playerMap[index].BetWin = append(rr.playerMap[index].BetWin, protocol.BetAreaInfo{
+			rr.PlayerMap[index].BetWin = append(rr.PlayerMap[index].BetWin, protocol.BetAreaInfo{
 				BetArea:         int32(i),
 				BetAmount:       0,
 				AreaTotalAmount: 0,

game-server/game/dragonTiger/app/core/game/game_robot.go

@@ -37,7 +37,7 @@ type RobotManager struct {
 	NextEnterTimer  int64                       //下个机器人进入时间
 	FlushCountTimer int64                       //下次刷新机器人数量的时间
 	MaxCount        int                         //机器人数量
-	playerMaps      map[int32]*Player           //当前有的机器人
+	PlayerMaps      map[int32]*Player           //当前有的机器人
 	playerBetCtrl   map[int32]*RobotBetCtrlInfo //当前有的机器人
 	playerStat      map[int32]int32             //机器人的状态
 	RobotTimer      map[int32]int64             //机器人的操作时间
@@ -46,7 +46,7 @@ type RobotManager struct {
 func NewRobotManager() *RobotManager {
 	rm := &RobotManager{
 		Lock:          sync.RWMutex{},
-		playerMaps:    make(map[int32]*Player),
+		PlayerMaps:    make(map[int32]*Player),
 		playerStat:    make(map[int32]int32),
 		playerBetCtrl: make(map[int32]*RobotBetCtrlInfo),
 		RobotTimer:    make(map[int32]int64),
@@ -119,10 +119,22 @@ func (r *RobotManager) RobotsEnterGameRoom() {
 		return
 	}
 
+	// 通知大厅有机器人坐下
+	NotifySitDown := &protocol.NotifyDTSitDown{
+		Uid:          pPlayer.Uid,
+		RoomID:       r.GameRoom.RoomID,
+		TableID:      r.GameRoom.RId,
+		ChairID:      pPlayer.ChairId,
+		Avatar:       pPlayer.Avatar,
+		State:        r.GameRoom.CurrentGameState,
+		CurrentCount: r.GameRoom.GetRoomPlayerCount(),
+	}
+	r.GameRoom.NotifyFunc(route.NotifyDTSitDown, NotifySitDown)
+
 	r.Lock.Lock()
 	defer r.Lock.Unlock()
 
-	r.playerMaps[pPlayer.ChairId] = pPlayer
+	r.PlayerMaps[pPlayer.ChairId] = pPlayer
 	r.playerStat[pPlayer.ChairId] = 1
 	r.playerBetCtrl[pPlayer.ChairId] = &RobotBetCtrlInfo{}
 	//随机一个下次判断行为时间
@@ -136,7 +148,7 @@ func (r *RobotManager) CopyRobotsEnterGameRoom(pPlayer *Player) { // 复制的
 	r.Lock.Lock()
 	defer r.Lock.Unlock()
 
-	r.playerMaps[pPlayer.ChairId] = pPlayer
+	r.PlayerMaps[pPlayer.ChairId] = pPlayer
 	r.playerStat[pPlayer.ChairId] = 1
 	r.playerBetCtrl[pPlayer.ChairId] = &RobotBetCtrlInfo{}
 	//随机一个下次判断行为时间
@@ -150,12 +162,12 @@ func (r *RobotManager) AddLeaveRobot(chairId int32) { // 机器人离开
 	r.Lock.Lock()
 	defer r.Lock.Unlock()
 
-	robot := r.playerMaps[chairId]
+	robot := r.PlayerMaps[chairId]
 	if robot == nil {
 		return
 	}
 
-	delete(r.playerMaps, chairId)
+	delete(r.PlayerMaps, chairId)
 	delete(r.RobotTimer, chairId)
 	delete(r.playerStat, chairId)
 	delete(r.playerBetCtrl, chairId)
@@ -331,6 +343,18 @@ func (r *RobotManager) OnRobotMessage(msgId int32, player *Player, msg interface
 			}
 
 			if r.GameRoom.GetInRoomRobotCount() > int32(LeastMin) && rand.Intn(10000) < LeavePro {
+				// 通知大厅有人离开
+				NotifySitDown := &protocol.NotifyDTSitDown{
+					Uid:          player.Uid,
+					RoomID:       r.GameRoom.RoomID,
+					TableID:      r.GameRoom.RId,
+					ChairID:      player.ChairId,
+					Avatar:       player.Avatar,
+					State:        r.GameRoom.CurrentGameState,
+					CurrentCount: r.GameRoom.GetRoomPlayerCount() - 1,
+				}
+				r.GameRoom.NotifyFunc(route.NotifyDTStandUp, NotifySitDown)
+
 				r.GameRoom.OnGetOutRoom(player.Uid, 0)
 				log.Debug(r.GameRoom.RId, " 机器人 ", player.Uid, " 需要离开  当前机器人个数", r.GameRoom.GetInRoomRobotCount())
 			}

game-server/game/dragonTiger/app/core/game/game_robot_timer.go

@@ -42,12 +42,12 @@ func (r *RobotManager) run() {
 	}
 
 	r.Lock.Lock()
-	for Index, player := range r.playerMaps {
+	for Index, player := range r.PlayerMaps {
 		if _, exists := r.RobotTimer[Index]; !exists {
-			log.Debug("机器人 ", player.Uid, " RobotTimer状态不存在 ", r.playerMaps, r.playerStat, r.RobotTimer)
+			log.Debug("机器人 ", player.Uid, " RobotTimer状态不存在 ", r.PlayerMaps, r.playerStat, r.RobotTimer)
 		} else {
 			if _, exists2 := r.playerStat[Index]; !exists2 {
-				log.Debug("机器人 ", player.Uid, " 状态不存在 ", r.playerMaps, r.playerStat, r.RobotTimer)
+				log.Debug("机器人 ", player.Uid, " 状态不存在 ", r.PlayerMaps, r.playerStat, r.RobotTimer)
 			} else {
 				if r.playerStat[Index] != 0 && milliseconds >= r.RobotTimer[Index] {
 					// 可以下注并且到了下注时间

game-server/game/dragonTiger/app/core/game/game_update_gold.go

@@ -13,7 +13,7 @@ func (rr *Room) OnUpdateGold(userId int64) { // 更新用户的钱
 	defer rr.roomRWLock.Unlock()
 	//log.Debug("OnUpdateGold 2")
 
-	for i, player := range rr.playerMap {
+	for i, player := range rr.PlayerMap {
 		if player.Uid == userId {
 
 			client2, err := assetservice.NewClient(player.Ctx.Proxy.NewServiceClient)
@@ -30,9 +30,9 @@ func (rr *Room) OnUpdateGold(userId int64) { // 更新用户的钱
 				return
 			}
 
-			rr.playerMap[i].Gold = decimal.NewFromFloat(float64(reply3.Gold))
+			rr.PlayerMap[i].Gold = decimal.NewFromFloat(float64(reply3.Gold))
 
-			log.Debug("更新玩家 ", player.Uid, " 名字：", player.Nickname, " 金币：", rr.playerMap[i].Gold)
+			log.Debug("更新玩家 ", player.Uid, " 名字：", player.Nickname, " 金币：", rr.PlayerMap[i].Gold)
 			break
 		}
 	}

game-server/game/dragonTiger/app/core/protocol/protocol_msg.go

@@ -82,14 +82,27 @@ type NotifyGameConclude struct { // 通知游戏结束结算
 	TigerPoker  int32         `json:"tigerPoker"`         //虎区域扑克
 }
 
+type EnterHallTableUserInfo struct {
+	ChairID int32  `json:"chairId"` //座位号
+	Avatar  string `json:"avatar"`  //头像
+}
+type EnterHallAreaConfig struct {
+	AreaID    int32   `json:"AreaID"`    //区域ID
+	AreaName  string  `json:"AreaName"`  //区域名字
+	AreaPro   float64 `json:"AreaPro"`   //区域赔率
+	AreaLimit int64   `json:"AreaLimit"` //区域限制
+}
+
 type EnterHallRes struct { // 登陆大厅返回所有记录
-	Code          int32   `json:"code"`             //错误码
-	CodeMsg       string  `json:"codeMsg"`          //错误内容
-	MinBet        int64   `json:"minBet"`           //最小下注
-	PlayerCount   int32   `json:"playerCount"`      //游戏人数
-	GameState     int32   `json:"gameState"`        //游戏阶段
-	NextTimestamp int64   `json:"nextTimestamp"`    //下阶段开始时间戳
-	DTArea        []int32 `json:"record,omitempty"` //1 龙 2 虎 3 和
+	Code          int32                    `json:"code"`               //错误码
+	CodeMsg       string                   `json:"codeMsg"`            //错误内容
+	MinBet        int64                    `json:"minBet"`             //最小下注
+	PlayerCount   int32                    `json:"playerCount"`        //游戏人数
+	GameState     int32                    `json:"gameState"`          //游戏阶段
+	NextTimestamp int64                    `json:"nextTimestamp"`      //下阶段开始时间戳
+	DTArea        []int32                  `json:"record,omitempty"`   //1 龙 2 虎 3 和
+	AreaPro       []EnterHallAreaConfig    `json:"areaPro,omitempty"`  //区域的赔率
+	UserList      []EnterHallTableUserInfo `json:"userList,omitempty"` //玩家列表 16个
 }
 
 type NotifySingleGameRecord struct { // 通知最新一条记录
@@ -152,3 +165,20 @@ type Options struct {
 	DefaultBet         int64     `json:"defaultBet"`         // 默认下注
 	RoundTime          int64     `json:"roundTime"`          // 每轮回合的轮次时间
 }
+
+type RecordInfo struct { // 通知最新一条记录
+	Area      int32   `json:"area"`
+	BetAmount int64   `json:"betAmount"`
+	AreaPro   float64 `json:"areaPro"`
+	IsWin     bool    `json:"isWin"`
+}
+
+type NotifyDTSitDown struct { //通知大厅玩家坐下
+	Uid          int64  `json:"uid"`          // userId
+	RoomID       int32  `json:"roomID"`       // 房间ID 0初级场 1中级场 2高级场
+	TableID      int64  `json:"tableID"`      // 桌子ID 快速加入时桌子ID用0 不然用TableInfo里的TableID
+	ChairID      int32  `json:"chairId"`      // 座位号
+	Avatar       string `json:"avatar"`       // 玩家头像
+	State        int32  `json:"state"`        // 房间状态
+	CurrentCount int32  `json:"currentCount"` //当前总人数
+}

game-server/game/dragonTiger/app/core/protocol/protocol_struct.go

@@ -7,6 +7,7 @@ const (
 	ErrorCodeNoBetState       = 20001004 //非下注阶段
 	ErrorCodeBetError         = 20001005 //下注失败
 	ErrorLongTimeKickUser     = 20001006 //长时间未下注踢人 连续5局未下注
+	ErrorNeedLeaveKickUser    = 20001007 //标记了离开 结束正常离开
 )
 
 type RoomPlayer struct { //房间的用户信息

game-server/game/dragonTiger/app/core/room/base.go

@@ -29,6 +29,7 @@ type HomeBase interface {
 	GetRoomCreator() int64                                  // 获取房主
 	IsCanDissolution() bool                                 // 是否能解散房间
 	UpdateCtx(uid int64, ctx *node.Context)                 // 无奈加的,更新node.Context
+	UpdateUserOut(uid int64)                                // 更新用户退出状态
 	OnUserBet(uid int64, msg interface{})                   // 用户下注
 	OnResumeGameData(uid int64)                             //
 	OnDestroy(uid int64)                                    // 销毁房间

game-server/game/dragonTiger/app/core/room/roommgr.go

@@ -111,6 +111,21 @@ func (h *Home) EnterHall(uid int64, ctx *node.Context) { //进入大厅
 	for _, record := range GameRoom.Record {
 		EnterHallRes.DTArea = append(EnterHallRes.DTArea, record.DTArea)
 	}
+	for _, player := range GameRoom.PlayerMap {
+		EnterHallRes.UserList = append(EnterHallRes.UserList, protocol.EnterHallTableUserInfo{
+			ChairID: player.ChairId,
+			Avatar:  player.Avatar,
+		})
+
+		if len(EnterHallRes.UserList) >= 16 {
+			break
+		}
+	}
+
+	for _, i2 := range GameRoom.BloodCtrl.AreaConfig {
+		EnterHallRes.AreaPro = append(EnterHallRes.AreaPro, i2)
+	}
+
 	ctx.Request.Message.Route = route.EnterHallRes
 	if err := ctx.Response(EnterHallRes); err != nil {
 		log.Debugf("EnterGame ==> response message failed: %v", err)

game-server/game/dragonTiger/app/gamemanage/gamemanage.go

@@ -8,7 +8,9 @@ import (
 	"xgame/game/dragonTiger/app/core/game"
 	"xgame/game/dragonTiger/app/core/protocol"
 	"xgame/game/dragonTiger/app/core/room"
+	"xgame/game/dragonTiger/app/route"
 	"xgame/game/service/rpc_client"
+	"xgame/internal/code"
 	accountservice "xgame/internal/service/account"
 	accountpb "xgame/internal/service/account/pb"
 	assetservice "xgame/internal/service/asset"
@@ -169,6 +171,18 @@ func EnterGame(ctx *node.Context) {
 		room.Gh.RhbEx[Ctx.Request.UID] = roomObj.GetRId()
 		roomObj.OnGetRoomInfo(Ctx.Request.UID, Ctx)
 
+		roomObj.OnGetRoomInfo(Ctx.Request.UID, Ctx)
+		NotifySitDown := &protocol.NotifyDTSitDown{
+			Uid:          _player.Uid,
+			RoomID:       req.RoomID,
+			TableID:      roomObj.GetRId(),
+			ChairID:      _player.ChairId,
+			Avatar:       _player.Avatar,
+			State:        roomObj.GetState(),
+			CurrentCount: roomObj.GetRoomPlayerCount(),
+		}
+		room.Gh.Send(route.NotifyDTSitDown, NotifySitDown)
+
 		//message := roomObj.OnGetRoomInfo(Ctx.Request.UID)
 		//Ctx.Request.Message.Route = route.Enter
 		//if err := Ctx.Response(message); err != nil {
@@ -275,6 +289,33 @@ func LogoutTable(ctx *node.Context) { // 退出游戏
 			return
 		}
 
+		RoomID := room.Gh.GetRoomIdByUid(Ctx.Request.UID)
+		RoomInfo := room.Gh.GetGameRoomByRoomId(RoomID)
+
+		var TempPlayer *game.Player
+		TempPlayer = RoomInfo.GetRoomPlayerByUid(Ctx.Request.UID)
+		if TempPlayer != nil {
+			log.Debug("LogoutTable 没有获取到用户 ", Ctx.Request.UID)
+		}
+
+		if RoomInfo != nil {
+			if TempPlayer.ChairId != -1 && TempPlayer.CurrentRoundBet {
+				log.Debug("LogoutTable  开始游戏后不能退出游戏 ", " Request", ctx.Request)
+				LeaveTableRes := &protocol.LeaveTableRes{
+					Code:    code.ErrorWaitGameEndOut.Code(),
+					CodeMsg: "开始游戏后不能退出游戏",
+				}
+
+				Ctx.Request.Message.Route = route.LogoutTableRes
+				if err := Ctx.Response(LeaveTableRes); err != nil {
+					log.Debugf("开始游戏后不能退出游戏 出错了: %v", err)
+				}
+
+				RoomInfo.UpdateUserOut(Ctx.Request.UID)
+				return
+			}
+		}
+
 		log.Debug("UpdateCtx LogoutTable ", Ctx.Request.UID, " UserId", ctx.Request.UserId, " UID", ctx.Request.UID, " Request", ctx.Request)
 		r.UpdateCtx(Ctx.Request.UID, Ctx)
 

game-server/game/dragonTiger/app/route/route.go

@@ -28,6 +28,8 @@ const (
 	EnterHallRes int32 = 2000150 // 登陆回复
 
 	// 服务端通知
+	NotifyDTSitDown        int32 = 2000130 // 通知大厅玩家坐下
+	NotifyDTStandUp        int32 = 2000131 // 通知大厅玩家离开
 	NotifySingleGameRecord int32 = 2000160 // 通知最新一条记录
 	NotifyDTStateTime      int32 = 2000161 // 大厅通知阶段倒计时
 )