Merge remote-tracking branch 'origin/develop' into dev_slots

gamesrv/clawdoll/action_clawdoll.go

@@ -77,7 +77,7 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
 			if msg.Result == 1 {
 				logger.Logger.Tracef("上分成功！！！！！！！！！！！！snid = ", msg.Snid)
 				//发送向前移动指令
-				sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonFront)
+				//sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonFront)
 
 				s.ChangeSceneState(rule.ClawDollSceneStateStart)
 				sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateStart))

machine/action/action_server.go

@@ -119,6 +119,7 @@ func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data inte
 		Process(conn, f1, f2)
 	case 5:
 		//投币
+		fmt.Println("===========玩家投币===========")
 		machinedoll.Coin(conn)
 		go DollMachineGrabResult(session, conn, msg.Snid, msg.GetId())
 	}
@@ -141,18 +142,20 @@ func SMDollMachineGrabHandler(session *netlib.Session, packetId int, data interf
 	switch msg.GetTypeId() {
 	case 1:
 		//弱抓
-		f1 := []func(){
-			func() { machinedoll.WeakGrab(conn) },
-		}
-		f2 := []func(){}
-		Process(conn, f1, f2)
+		/*		f1 := []func(){
+					func() { machinedoll.WeakGrab(conn) },
+				}
+				f2 := []func(){}
+				Process(conn, f1, f2)*/
+		machinedoll.WeakGrab(conn)
 	case 2:
 		//强力抓
-		f1 := []func(){
-			func() { machinedoll.Grab(conn) },
-		}
-		f2 := []func(){}
-		Process(conn, f1, f2)
+		/*		f1 := []func(){
+					func() { machinedoll.Grab(conn) },
+				}
+				f2 := []func(){}
+				Process(conn, f1, f2)*/
+		machinedoll.Grab(conn)
 	}
 	return nil
 }

worldsrv/action_friend.go

@@ -354,7 +354,7 @@ func (this *CSInviteFriendHandler) Process(s *netlib.Session, packetid int, data
 			return nil
 		}
 		//私有房间
-		if p.scene.sceneMode != common.SceneModePrivate {
+		if !p.scene.IsPrivateScene() && !p.scene.IsCustom() {
 			logger.Logger.Warn("CSInviteFriendHandler scene is common.SceneMode_Private")
 			opRetCode = friend.OpResultCode_OPRC_InviteFriend_RoomLimit
 			send(p)
@@ -461,7 +461,7 @@ func (this *CSInviteFriendOpHandler) Process(s *netlib.Session, packetid int, da
 				return nil
 			}
 			//私有房间
-			if scene.sceneMode != common.SceneModePrivate {
+			if !scene.IsPrivateScene() && !scene.IsCustom() {
 				logger.Logger.Warn("CSInviteFriendHandler scene is common.SceneMode_Private")
 				opRetCode = friend.OpResultCode_OPRC_InviteFriend_RoomLimit //只能进入私有房间
 				send(p)

worldsrv/action_game.go

@@ -1249,7 +1249,7 @@ func CSCreatePrivateRoomHandler(s *netlib.Session, packetId int, data interface{
 		costType = int64(msg.GetCostType())
 	}
 	if costType < 1 || costType > 2 {
-		costType = 1 // 默认房主支付
+		costType = 1 // 默认AA
 	}
 	// 语音
 	if cfg.GetVoice() != 3 {
@@ -1335,7 +1335,7 @@ func CSCreatePrivateRoomHandler(s *netlib.Session, packetId int, data interface{
 		return nil
 	}
 
-	if cfg.GetCostType() == 1 {
+	if cfg.GetCostType() == 2 {
 		sp.CostPayment(scene, p)
 	}
 

worldsrv/scenepolicydata.go

@@ -66,7 +66,7 @@ func (spd *ScenePolicyData) OnSceneState(s *Scene, state int) {
 	case common.SceneStateStart:
 		s.NotifyPrivateRoom(common.ListModify)
 		if s.IsCustom() {
-			if s.GetCostType() == 2 {
+			if s.GetCostType() == 1 {
 				for _, v := range s.players {
 					spd.CostPayment(s, v)
 				}
@@ -96,7 +96,7 @@ func (spd *ScenePolicyData) CanEnter(s *Scene, p *Player) int {
 func (spd *ScenePolicyData) costEnough(costType, playerNum int, roomConfig *webapi.RoomConfig, snid int32, f func(items []*model.Item)) bool {
 	isEnough := true
 	var items []*model.Item
-	if costType == 1 {
+	if costType == 2 {
 		// 房主
 		for _, v := range roomConfig.GetCost() {
 			if item := BagMgrSingleton.GetItem(snid, v.GetItemId()); item == nil || item.ItemNum < v.GetItemNum() {
@@ -119,7 +119,7 @@ func (spd *ScenePolicyData) costEnough(costType, playerNum int, roomConfig *weba
 			} else {
 				items = append(items, &model.Item{
 					ItemId:  v.GetItemId(),
-					ItemNum: v.GetItemNum(),
+					ItemNum: n,
 				})
 			}
 		}