|
@@ -141,15 +141,6 @@ func (p *Game) WaitChooseMul(room Room) error {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
- roomUserIDList, err := p.getRoomUserIDList(room.ID)
|
|
|
- if err != nil {
|
|
|
- logrus.Error(err)
|
|
|
-
|
|
|
- //FOCUS:UnLock
|
|
|
- p.locker.Unlock()
|
|
|
- return err
|
|
|
- }
|
|
|
-
|
|
|
//master提前发送
|
|
|
for _, userID := range userIDList {
|
|
|
userItem, exists := p.PlayerMap[userID]
|
|
@@ -192,7 +183,7 @@ func (p *Game) WaitChooseMul(room Room) error {
|
|
|
p.locker.Lock()
|
|
|
defer p.locker.Unlock()
|
|
|
|
|
|
- roomUserIDList, err = p.getRoomUserIDList(room.ID)
|
|
|
+ roomUserIDList, err := p.getRoomUserIDList(room.ID)
|
|
|
if err != nil {
|
|
|
logrus.Error(err)
|
|
|
return err
|
|
@@ -450,6 +441,19 @@ func (p *Game) WaitOpen(room Room) error {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
+ if len(roomUserIDList) != len(userModelList) {
|
|
|
+ logrus.Panicf("len(roomUserIDList) != len(userModelList), %d != %d, %v, %v",
|
|
|
+ len(roomUserIDList), len(userModelList), roomUserIDList, userModelList)
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, userID := range roomUserIDList {
|
|
|
+ userItem := p.PlayerMap[userID]
|
|
|
+ userItem.IsMaster = false
|
|
|
+ userItem.Status = PlayerStatusWaitReady
|
|
|
+
|
|
|
+ p.PlayerMap[userID] = userItem
|
|
|
+ }
|
|
|
+
|
|
|
for _, userModel := range userModelList {
|
|
|
userID := int32(userModel.ID)
|
|
|
userItem := p.PlayerMap[userID]
|