Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
This commit is contained in:
commit
d155818a4e
|
@ -110,7 +110,6 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
|
|||
if msg.Result == 1 {
|
||||
// 获得娃娃卡
|
||||
|
||||
playerEx.CatchCardClawdoll()
|
||||
playerEx.IsWin = true
|
||||
logger.Logger.Tracef("下抓成功!!!!!!!!!!!!snid = %v", msg.Snid)
|
||||
} else {
|
||||
|
@ -118,6 +117,8 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
|
|||
playerEx.IsWin = false
|
||||
}
|
||||
|
||||
playerEx.CatchCardClawdoll()
|
||||
|
||||
logger.Logger.Tracef("ClawDoll StatePlayGame OnPlayerOp Grab response, SnId= %v", msg.Snid)
|
||||
|
||||
s.ChangeSceneState(rule.ClawDollSceneStateBilled)
|
||||
|
|
|
@ -132,7 +132,7 @@ func (this *SceneEx) OnPlayerEnter(p *base.Player, reason int) {
|
|||
if this.GetPlayerNum() >= 1 {
|
||||
logger.Logger.Trace("Clawdoll (*SceneEx) OnPlayerEnter, GetPlayerNum = ", this.GetPlayerNum())
|
||||
// 发送http Get请求 恢复直播间流
|
||||
//operateTask(this, 2, rule.Zego_ResumeRTCStream, p.Platform)
|
||||
operateTask(this, 2, rule.Zego_ResumeRTCStream, p.Platform)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -150,7 +150,7 @@ func (this *SceneEx) OnPlayerLeave(p *base.Player, reason int) {
|
|||
if len(this.players) <= 0 {
|
||||
logger.Logger.Trace("Clawdoll (*SceneEx) OnPlayerLeave, cur player num = ", len(this.players))
|
||||
// 发送http Get请求 关闭直播间流
|
||||
//operateTask(this, 2, rule.Zego_ForbidRTCStream, p.Platform)
|
||||
operateTask(this, 2, rule.Zego_ForbidRTCStream, p.Platform)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue