add rabbitlog

gamesrv/fortunedragon/playerdata_fortunedragon.go

@@ -20,6 +20,8 @@ type FortuneDragonPlayerData struct {
 	winCoin      int64
 	currentLogId string
 	totalBet     int64
+
+	isFree bool //只用于判断是否可以离开
 }
 
 func (p *FortuneDragonPlayerData) init() {

gamesrv/fortunedragon/scenedata_fortunedragon.go

@@ -1,10 +1,14 @@
 package fortunedragon
 
-import "mongo.games.com/game/gamesrv/base"
+import (
+	"mongo.games.com/game/gamesrv/base"
+	"mongo.games.com/game/gamesrv/slotspkg/assemble"
+)
 
 type FortuneDragonSceneData struct {
 	*base.Scene                                    //场景
 	players     map[int32]*FortuneDragonPlayerData //玩家信息
+	BetConfig   *assemble.BetConfig
 }
 
 func NewFortuneDragonSceneData(s *base.Scene) *FortuneDragonSceneData {

gamesrv/fortunedragon/scenepolicy_fortunedragon.go

@@ -217,6 +217,9 @@ func FortuneDragonCreateRoomInfoPacket(s *base.Scene, sceneEx *FortuneDragonScen
 		data := assemble.DataToCli(Response).(assemble.TableInfo)
 		pi, _ := json.Marshal(data)
 		pack.PlayerInfo = string(pi)
+		if sceneEx.BetConfig == nil {
+			sceneEx.BetConfig = &data.BetConfig
+		}
 	} else {
 		logger.Logger.Error("slots enter err:", err)
 	}
@@ -327,11 +330,11 @@ func (this *SceneStateStartFortuneDragon) CanChangeTo(s base.SceneState) bool {
 
 // 当前状态能否换桌
 func (this *SceneStateStartFortuneDragon) CanChangeCoinScene(s *base.Scene, p *base.Player) bool {
-	//if playerEx, ok := p.GetExtraData().(*FortuneDragonPlayerData); ok {
+	if playerEx, ok := p.GetExtraData().(*FortuneDragonPlayerData); ok {
-	//	if playerEx.IsOnLine() {
+		if playerEx.isFree {
-	//		return false
+			return false
-	//	}
+		}
-	//}
+	}
 	return true
 }
 
@@ -375,12 +378,22 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
 				playerEx.BetSizeIndex = params[0]
 				playerEx.BetLevelIndex = params[1]
 				playerEx.BetLineIndex = params[2]
+				needCoin := sceneEx.BetConfig.BetSize[params[0]] * float64(sceneEx.BetConfig.BetLevel[params[1]]) *
+					float64(sceneEx.BetConfig.BetLines[params[2]])
+				if needCoin/10000 > float64(playerEx.Coin) {
+					pack := &protocol.SCFortuneDragonBilled{
+						OpRetCode: proto.Int32(1),
+					}
+					proto.SetDefaults(pack)
+					logger.Logger.Trace("SCFortuneDragonBilled:", pack.String())
+					playerEx.SendToClient(int(protocol.FortuneDragonPID_PACKET_FORTUNEDRAGON_SCFORTUNEDRAGONBILLED), pack)
+					return true
+				}
+
 				playerEx.BetMode = params[3]
 
-				logger.Logger.Trace("playerEx.Coin", playerEx.Coin)
 				playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunedragon.NowByte)
 
-				logger.Logger.Trace("coin.... ", playerEx.SlotsSession.Coin())
 				//get data
 				Response, err := slots.SlotsMgrSington.Play(playerEx.SlotsSession, &base.SpinReq{
 					GameId:        int64(sceneEx.GameId),
@@ -395,7 +408,6 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
 				if err == nil {
 					data = assemble.DataToCli(Response).(assemble.GameEnd)
 					if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
-						logger.Logger.Error("bet....", -data.TotalBet)
 						//第一次触发或者正常模式
 						playerEx.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
 						playerEx.totalBet = int64(data.TotalBet)
@@ -417,7 +429,6 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
 					gameEndStr = string(pi)
 
 					if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
-						logger.Logger.Error("win....", data.RoundReward)
 						playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName())
 						//免费游戏结束或者正常模式
 						sceneEx.StaticsLaba(&base.StaticLabaParam{
@@ -427,6 +438,11 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
 							IsAddTimes: true,
 						})
 					}
+					if data.Results[0].FreeNum > 0 {
+						playerEx.isFree = true
+					} else {
+						playerEx.isFree = false
+					}
 				} else {
 					logger.Logger.Error("slots Play err:", err)
 				}
@@ -443,7 +459,7 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
 				}
 
 				// 记录本次操作
-				FortunedragonAndSaveLog(sceneEx, playerEx, data)
+				FortuneDragonAndSaveLog(sceneEx, playerEx, data)
 			}
 		}
 	}
@@ -478,7 +494,7 @@ func (this *ScenePolicyFortuneDragon) GetSceneState(s *base.Scene, stateid int)
 	}
 	return nil
 }
-func FortunedragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneDragonPlayerData, data assemble.GameEnd) {
+func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneDragonPlayerData, data assemble.GameEnd) {
 	if !playerEx.IsRob {
 		data.SnId = playerEx.SnId
 		info, err := model.MarshalGameNoteByROLL(data)

gamesrv/fortunerabbit/playerdata_fortunerabbit.go

@@ -15,13 +15,22 @@ type FortuneRabbitPlayerData struct {
 	BetLevelIndex int64 `json:"bli"`         //选中的等级下标
 	BetLineIndex  int64 `json:"bii"`         //选中的线数下标
 	BetMode       int64 `json:"bm,optional"` //0.常规 1.必中
+
+	taxCoin      int64
+	winCoin      int64
+	currentLogId string
+	totalBet     int64
+
+	isFree bool //只用于判断是否可以离开
 }
 
 func (p *FortuneRabbitPlayerData) init() {
 	p.SlotsSession = base.NewSession(uint64(p.SnId), p.Coin*fortunerabbit.NowByte)
 }
 func (p *FortuneRabbitPlayerData) Clear() {
-
+	p.taxCoin = 0
+	p.winCoin = 0
+	p.currentLogId = ""
 }
 
 // 需要带到world上进行数据处理

gamesrv/fortunerabbit/scenedata_fortunerabbit.go

@@ -1,10 +1,14 @@
 package fortunerabbit
 
-import "mongo.games.com/game/gamesrv/base"
+import (
+	"mongo.games.com/game/gamesrv/base"
+	"mongo.games.com/game/gamesrv/slotspkg/assemble"
+)
 
 type FortuneRabbitSceneData struct {
 	*base.Scene                                    //场景
 	players     map[int32]*FortuneRabbitPlayerData //玩家信息
+	BetConfig   *assemble.BetConfig
 }
 
 func NewFortuneRabbitSceneData(s *base.Scene) *FortuneRabbitSceneData {

gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go

@@ -10,6 +10,7 @@ import (
 	"mongo.games.com/game/model"
 	"mongo.games.com/game/proto"
 	protocol "mongo.games.com/game/protocol/fortunerabbit"
+	"mongo.games.com/game/protocol/server"
 	"mongo.games.com/goserver/core"
 	"mongo.games.com/goserver/core/logger"
 	"time"
@@ -109,11 +110,6 @@ func (this *ScenePolicyFortuneRabbit) OnPlayerLeave(s *base.Scene, p *base.Playe
 		return
 	}
 	logger.Logger.Trace("(this *ScenePolicyFortuneRabbit) OnPlayerLeave, sceneId=", s.GetSceneId(), " player=", p.SnId)
-	if sceneEx, ok := s.ExtraData.(*FortuneRabbitSceneData); ok {
-		s.FirePlayerEvent(p, base.PlayerEventLeave, nil)
-		sceneEx.OnPlayerLeave(p, reason)
-	}
-
 	if playerEx, ok := p.ExtraData.(*FortuneRabbitPlayerData); ok {
 		m := playerEx.PushPlayer()
 		if m != nil && len(m) > 0 {
@@ -130,6 +126,10 @@ func (this *ScenePolicyFortuneRabbit) OnPlayerLeave(s *base.Scene, p *base.Playe
 			}
 		}
 	}
+	if sceneEx, ok := s.ExtraData.(*FortuneRabbitSceneData); ok {
+		s.FirePlayerEvent(p, base.PlayerEventLeave, nil)
+		sceneEx.OnPlayerLeave(p, reason)
+	}
 }
 
 // 玩家掉线
@@ -216,6 +216,9 @@ func FortuneRabbitCreateRoomInfoPacket(s *base.Scene, sceneEx *FortuneRabbitScen
 		data := assemble.DataToCli(Response).(assemble.TableInfo)
 		pi, _ := json.Marshal(data)
 		pack.PlayerInfo = string(pi)
+		if sceneEx.BetConfig == nil {
+			sceneEx.BetConfig = &data.BetConfig
+		}
 	} else {
 		logger.Logger.Error("slots enter err:", err)
 	}
@@ -326,11 +329,11 @@ func (this *SceneStateStartFortuneRabbit) CanChangeTo(s base.SceneState) bool {
 
 // 当前状态能否换桌
 func (this *SceneStateStartFortuneRabbit) CanChangeCoinScene(s *base.Scene, p *base.Player) bool {
-	//if playerEx, ok := p.GetExtraData().(*FortuneRabbitPlayerData); ok {
+	if playerEx, ok := p.GetExtraData().(*FortuneRabbitPlayerData); ok {
-	//	if playerEx.IsOnLine() {
+		if playerEx.isFree {
-	//		return false
+			return false
-	//	}
+		}
-	//}
+	}
 	return true
 }
 
@@ -375,6 +378,17 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
 				playerEx.BetLevelIndex = params[1]
 				playerEx.BetLineIndex = params[2]
 				//playerEx.BetMode = params[3]
+				needCoin := sceneEx.BetConfig.BetSize[params[0]] * float64(sceneEx.BetConfig.BetLevel[params[1]]) *
+					float64(sceneEx.BetConfig.BetLines[params[2]])
+				if needCoin/10000 > float64(playerEx.Coin) {
+					pack := &protocol.SCFortuneRabbitBilled{
+						OpRetCode: proto.Int32(1),
+					}
+					proto.SetDefaults(pack)
+					logger.Logger.Trace("SCFortuneRabbitBilled:", pack.String())
+					playerEx.SendToClient(int(protocol.FortuneRabbitPID_PACKET_FORTUNERABBIT_SCFORTUNERABBITBILLED), pack)
+					return true
+				}
 
 				playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunerabbit.NowByte)
 
@@ -388,14 +402,57 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
 					Ts:            time.Now().Unix(),
 				})
 				var gameEndStr string
+				var data assemble.GameEnd
 				if err == nil {
-					data := assemble.DataToCli(Response).(assemble.GameEnd)
+					data = assemble.DataToCli(Response).(assemble.GameEnd)
+					if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
+						//第一次触发或者正常模式
+						playerEx.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
+						playerEx.totalBet = int64(data.TotalBet)
+					}
+					var taxCoin float64
+					if data.RoundReward > 0 {
+						//税收比例
+						taxRate := sceneEx.GetDBGameFree().GetTaxRate()
+						if taxRate < 0 || taxRate > 10000 {
+							taxRate = 500
+						}
+						taxCoin = data.RoundReward * float64(taxRate) / 10000
+						data.RoundReward = data.RoundReward - taxCoin
+						playerEx.AddServiceFee(int64(taxCoin))
+						playerEx.taxCoin = int64(taxCoin)
+						playerEx.winCoin = int64(data.RoundReward)
+					}
 					pi, _ := json.Marshal(data)
 					gameEndStr = string(pi)
-					playerEx.Coin = int64(data.FinalCoin)
+
+					if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
+						playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName())
+						//免费游戏结束或者正常模式
+						sceneEx.StaticsLaba(&base.StaticLabaParam{
+							SnId:       playerEx.SnId,
+							Gain:       int64(data.RoundReward - data.TotalBet),
+							GainTax:    int64(taxCoin),
+							IsAddTimes: true,
+						})
+					}
+					if data.Results[0].FreeNum > 0 {
+						playerEx.isFree = true
+					} else {
+						playerEx.isFree = false
+					}
+
+					if data.Results[0].FreeNum > 0 {
+						playerEx.isFree = true
+					} else {
+						playerEx.isFree = false
+					}
 				} else {
 					logger.Logger.Error("slots Play err:", err)
 				}
+				if playerEx.Coin != int64(data.FinalCoin) {
+					logger.Logger.Error("==========playerEx.Coin != Response.Coin==============", playerEx.Coin, data.FinalCoin)
+				}
 				pack := &protocol.SCFortuneRabbitBilled{
 					OpRetCode:  proto.Int32(0),
 					GameEndStr: proto.String(gameEndStr),
@@ -403,6 +460,9 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
 				proto.SetDefaults(pack)
 				logger.Logger.Trace("SCFortuneRabbitBilled", pack.String())
 				playerEx.SendToClient(int(protocol.FortuneRabbitPID_PACKET_FORTUNERABBIT_SCFORTUNERABBITBILLED), pack)
+
+				// 记录本次操作
+				FortuneRabbitAndSaveLog(sceneEx, playerEx, data)
 			}
 		}
 	}
@@ -437,7 +497,66 @@ func (this *ScenePolicyFortuneRabbit) GetSceneState(s *base.Scene, stateid int)
 	}
 	return nil
 }
+func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneRabbitPlayerData, data assemble.GameEnd) {
+	if !playerEx.IsRob {
+		data.SnId = playerEx.SnId
+		info, err := model.MarshalGameNoteByROLL(data)
+		if err == nil {
+			logid, _ := model.AutoIncGameLogId()
+			playerEx.currentLogId = logid
+			sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
+			totalin := playerEx.totalBet
+			totalout := int64(data.RoundReward) + playerEx.taxCoin + totalin
+			validFlow := totalin + totalout
+			validBet := common.AbsI64(totalin - totalout)
+			logParam := &base.SaveGamePlayerListLogParam{
+				Platform:          playerEx.Platform,
+				Channel:           playerEx.Channel,
+				Promoter:          playerEx.BeUnderAgentCode,
+				PackageTag:        playerEx.PackageID,
+				InviterId:         playerEx.InviterId,
+				LogId:             logid,
+				TotalIn:           totalin,
+				TotalOut:          totalout,
+				TaxCoin:           playerEx.taxCoin,
+				BetAmount:         playerEx.totalBet,
+				WinAmountNoAnyTax: int64(data.RoundReward) + playerEx.taxCoin,
+				ValidBet:          validBet,
+				ValidFlow:         validFlow,
+				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),
+			}
+			sceneEx.SaveGamePlayerListLog(playerEx.SnId, logParam)
+		}
+	}
 
+	//统计输下注金币数
+	if !sceneEx.Testing && !playerEx.IsRob {
+		playerBet := &server.PlayerData{
+			SnId:       proto.Int32(playerEx.SnId),
+			Bet:        proto.Int64(playerEx.CurrentBet),
+			Gain:       proto.Int64(int64(data.RoundReward) + playerEx.taxCoin),
+			Tax:        proto.Int64(playerEx.taxCoin),
+			Coin:       proto.Int64(playerEx.GetCoin()),
+			GameCoinTs: proto.Int64(playerEx.GameCoinTs),
+		}
+		gwPlayerBet := &server.GWPlayerData{
+			SceneId:    sceneEx.SceneId,
+			GameFreeId: proto.Int32(sceneEx.GetDBGameFree().GetId()),
+		}
+		gwPlayerBet.Datas = append(gwPlayerBet.Datas, playerBet)
+		sceneEx.SyncPlayerDatas(&base.PlayerDataParam{
+			HasRobotGaming: false,
+			Data:           gwPlayerBet,
+		})
+	}
+
+	playerEx.taxCoin = 0
+	playerEx.winCoin = 0
+
+	if sceneEx.CheckNeedDestroy() && data.Results[0].FreeNum <= 0 {
+		sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true)
+	}
+}
 func init() {
 	//主状态
 	ScenePolicyFortuneRabbitSington.RegisteSceneState(&SceneStateStartFortuneRabbit{})