From 27ada01d0a10a68310f206062a40d597f675cdc7 Mon Sep 17 00:00:00 2001
From: piaohua <twopiao7@gmail.com>
Date: Fri, 17 Aug 2018 16:34:16 +0800
Subject: [PATCH] update

---
 ebg/desk_coin.go    | 27 ++++++++++++++++++++-------
 ebg/desk_msg.go     |  1 +
 ebg/desk_request.go |  4 ++--
 niu/desk_coin.go    |  6 ++++--
 niu/desk_msg.go     |  1 +
 niu/desk_niu.go     |  2 --
 robot/robots.go     |  2 +-
 robot/sender.go     |  2 +-
 8 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/ebg/desk_coin.go b/ebg/desk_coin.go
index 7799d74..9636558 100644
--- a/ebg/desk_coin.go
+++ b/ebg/desk_coin.go
@@ -137,23 +137,36 @@ func (t *Desk) coinCameinMsg(userid string) {
 }
 
 //召唤机器人
+func (t *Desk) loadRobot() {
+	t.robotTime++
+	if t.robotTime < 10 {
+		return
+	}
+	t.robotTime = 0
+	t.callRobot()
+}
+
 func (t *Desk) callRobot() {
+	if len(t.roles) >= 5 {
+		return
+	}
+	r, n := t.roleCountNum()
+	if r == 0 {
+		return
+	}
 	switch t.DeskData.Rtype {
 	case int32(pb.ROOM_TYPE0):
-		r, n := t.roleCountNum()
-		if r > 1 {
+		if r >= 3 || n >= 2 {
 			return
 		}
-		if n >= 4 {
-		}
 	case int32(pb.ROOM_TYPE1):
 		if !t.DeskData.Pub {
 			return
 		}
-	case int32(pb.ROOM_TYPE2):
-		if len(t.roles) > 5 {
+		if r >= 2 || n >= 2 {
 			return
 		}
+	case int32(pb.ROOM_TYPE2):
 	}
 	msg := new(pb.RobotMsg)
 	msg.Roomid = t.DeskData.Rid
@@ -162,7 +175,7 @@ func (t *Desk) callRobot() {
 	msg.Ltype = t.DeskData.Ltype
 	msg.Gtype = t.DeskData.Gtype
 	msg.EnvBet = int32(t.DeskData.Multiple)
-	msg.Num = 2
+	msg.Num = 1
 	t.dbmsPid.Tell(msg)
 }
 
diff --git a/ebg/desk_msg.go b/ebg/desk_msg.go
index 82e14d9..ecced45 100644
--- a/ebg/desk_msg.go
+++ b/ebg/desk_msg.go
@@ -82,6 +82,7 @@ func (a *Desk) ding(ctx actor.Context) {
 	case int32(pb.ROOM_TYPE2): //百人
 		a.freeTimeout()
 	}
+	a.loadRobot()
 }
 
 //关闭时钟
diff --git a/ebg/desk_request.go b/ebg/desk_request.go
index ca6e414..939a7fc 100644
--- a/ebg/desk_request.go
+++ b/ebg/desk_request.go
@@ -25,7 +25,7 @@ func (a *Desk) handlerRequest(msg interface{}, ctx actor.Context) {
 		msg1 := a.coinEnterMsg(userid)
 		ctx.Respond(msg1)
 		a.coinCameinMsg(userid)
-		//a.callRobot()
+		a.callRobot()
 	case *pb.CEBFreeEnterRoom:
 		arg := msg.(*pb.CEBFreeEnterRoom)
 		glog.Debugf("CEBFreeEnterRoom %#v", arg)
@@ -33,7 +33,7 @@ func (a *Desk) handlerRequest(msg interface{}, ctx actor.Context) {
 		msg1 := a.freeEnterMsg(userid)
 		ctx.Respond(msg1)
 		a.freeCameinMsg(userid)
-		//a.callRobot()
+		a.callRobot()
 	case *pb.CEBFreeDealer:
 		arg := msg.(*pb.CEBFreeDealer)
 		glog.Debugf("CEBFreeDealer %#v", arg)
diff --git a/niu/desk_coin.go b/niu/desk_coin.go
index bd2a0bd..de14d59 100644
--- a/niu/desk_coin.go
+++ b/niu/desk_coin.go
@@ -150,9 +150,12 @@ func (t *Desk) callRobot() {
 	if len(t.roles) >= 5 {
 		return
 	}
+	r, n := t.roleCountNum()
+	if r == 0 {
+		return
+	}
 	switch t.DeskData.Rtype {
 	case int32(pb.ROOM_TYPE0):
-		r, n := t.roleCountNum()
 		if r >= 3 || n >= 2 {
 			return
 		}
@@ -160,7 +163,6 @@ func (t *Desk) callRobot() {
 		if !t.DeskData.Pub {
 			return
 		}
-		r, n := t.roleCountNum()
 		if r >= 2 || n >= 2 {
 			return
 		}
diff --git a/niu/desk_msg.go b/niu/desk_msg.go
index 82e14d9..ecced45 100644
--- a/niu/desk_msg.go
+++ b/niu/desk_msg.go
@@ -82,6 +82,7 @@ func (a *Desk) ding(ctx actor.Context) {
 	case int32(pb.ROOM_TYPE2): //百人
 		a.freeTimeout()
 	}
+	a.loadRobot()
 }
 
 //关闭时钟
diff --git a/niu/desk_niu.go b/niu/desk_niu.go
index fcda397..ed73079 100644
--- a/niu/desk_niu.go
+++ b/niu/desk_niu.go
@@ -190,7 +190,6 @@ func (t *Desk) dismiss(force bool) {
 
 //' 超时处理
 func (t *Desk) coinTimeout() {
-	t.loadRobot()
 	t.checkPubOver2()
 	switch t.state {
 	case int32(pb.STATE_READY):
@@ -229,7 +228,6 @@ func (t *Desk) coinTimeout() {
 
 //' 超时处理
 func (t *Desk) privTimeout() {
-	t.loadRobot()
 	t.checkPubOver2()
 	t.voteTimeout()
 	switch t.state {
diff --git a/robot/robots.go b/robot/robots.go
index c8226db..75331c3 100644
--- a/robot/robots.go
+++ b/robot/robots.go
@@ -273,7 +273,7 @@ func (r *RobotServer) run2(msg *pb.RobotMsg) {
 	//重置
 	phone1 := cfg.Section("robot").Key("phone").Value()
 	//if r.phone > utils.StringAdd2(phone1, "750") {
-	if r.phone > utils.StringAdd2(phone1, "74") {
+	if r.phone > utils.StringAdd2(phone1, "73") {
 		r.phone = phone1
 	}
 }
diff --git a/robot/sender.go b/robot/sender.go
index 3c09116..f396a49 100644
--- a/robot/sender.go
+++ b/robot/sender.go
@@ -60,7 +60,7 @@ func (c *Robot) addCurrency() {
 
 //SendDefer 延迟发送
 func (c *Robot) SendDefer(msg interface{}) {
-	utils.Sleep(utils.RandIntN(6) + 5) //随机
+	utils.Sleep(utils.RandIntN(5) + 3) //随机
 	c.Sender(msg)
 }