add rabbitlog
This commit is contained in:
parent
662c0beaa7
commit
07e252aa1d
|
|
@ -459,7 +459,7 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
|
|||
}
|
||||
|
||||
// 记录本次操作
|
||||
FortunedragonAndSaveLog(sceneEx, playerEx, data)
|
||||
FortuneDragonAndSaveLog(sceneEx, playerEx, data)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -494,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)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,11 @@ type FortuneRabbitPlayerData struct {
|
|||
BetLineIndex int64 `json:"bii"` //选中的线数下标
|
||||
BetMode int64 `json:"bm,optional"` //0.常规 1.必中
|
||||
|
||||
taxCoin int64
|
||||
winCoin int64
|
||||
currentLogId string
|
||||
totalBet int64
|
||||
|
||||
isFree bool //只用于判断是否可以离开
|
||||
}
|
||||
|
||||
|
|
@ -23,7 +28,9 @@ 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上进行数据处理
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -401,11 +402,45 @@ 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
|
||||
|
|
@ -415,6 +450,9 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
|
|||
} 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),
|
||||
|
|
@ -422,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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -456,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{})
|
||||
|
|
|
|||
Loading…
Reference in New Issue