|
@@ -13,6 +13,7 @@ import (
|
|
|
"github.com/sirupsen/logrus"
|
|
|
"gogs.daxia.dev/huanan/pkg.daxia.dev/db"
|
|
|
"gogs.daxia.dev/huanan/pkg.daxia.dev/rdb"
|
|
|
+ "gogs.daxia.dev/huanan/pkg.daxia.dev/time_utils"
|
|
|
"gorm.io/gorm"
|
|
|
"nn.daxia.dev/gameproto"
|
|
|
"nn.daxia.dev/model"
|
|
@@ -313,7 +314,7 @@ func (p *Game) WaitOpen(room Room) error {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- timeNow := time.Now()
|
|
|
+ timeNow := time_utils.TimeNowInCN()
|
|
|
msg := &gameproto.OpenFinish{
|
|
|
RoomID: uint32(room.ID),
|
|
|
PayoutInfoList: []*gameproto.PayoutInfo{},
|
|
@@ -518,6 +519,8 @@ func (p *Game) WaitOpen(room Room) error {
|
|
|
}
|
|
|
|
|
|
for _, userModel := range userModelList {
|
|
|
+ timeNow := timeNow
|
|
|
+
|
|
|
userID := int32(userModel.ID)
|
|
|
userItem := p.PlayerMap[userID]
|
|
|
|
|
@@ -527,6 +530,7 @@ func (p *Game) WaitOpen(room Room) error {
|
|
|
userItem.Name = userModel.Nickname
|
|
|
userItem.IsMaster = false
|
|
|
userItem.Status = PlayerStatusWaitReady
|
|
|
+ userItem.LastPayoutTime = &timeNow
|
|
|
|
|
|
p.EventInfo(userID, "开牌", "更新用户状态为等待开牌")
|
|
|
|