diff --git a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go index 1877f77..d21a993 100644 --- a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go +++ b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go @@ -393,6 +393,7 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play playerEx.BetMode = params[3] //playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunedragon.NowByte) + //logger.Logger.Trace("=====================init===== playerEx.Coin===", playerEx.Coin) //get data Response, err := slots.SlotsMgrSington.Play(playerEx.SlotsSession, &base.SpinReq{ @@ -408,6 +409,7 @@ 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.Trace("=====================AddCoin=====TotalBet===", -data.TotalBet) //第一次触发或者正常模式 playerEx.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName()) playerEx.totalBet = int64(data.TotalBet) @@ -429,6 +431,7 @@ 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.Trace("=====================AddCoin=====RoundReward===", data.RoundReward) playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName()) //免费游戏结束或者正常模式 sceneEx.StaticsLaba(&base.StaticLabaParam{ @@ -448,6 +451,8 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play } playerEx.SlotsSession.SetCoin(int64(data.FinalCoin) * fortunedragon.NowByte) + //logger.Logger.Trace("=====================end===== playerEx.Coin===", playerEx.Coin) + //logger.Logger.Trace("=====================end===== data.FinalCoin===", data.FinalCoin) pack := &protocol.SCFortuneDragonBilled{ OpRetCode: proto.Int32(0), diff --git a/gamesrv/slotspkg/assemble/datatocli.go b/gamesrv/slotspkg/assemble/datatocli.go index fa3bc95..cd915f4 100644 --- a/gamesrv/slotspkg/assemble/datatocli.go +++ b/gamesrv/slotspkg/assemble/datatocli.go @@ -103,6 +103,7 @@ func response2NodeTree(NodeTree *shared.LiteNodeTree) *shared.Result { res.TotalRewardBase = ass[0].LineReward ///line_win res.TotalReward = ass[0].Reward ///total_win + res.FreeStatus = customFortune.FreeStatus res.FreeNumTrigger = customFortune.FreeNumTrigger res.FreeNumMax = customFortune.FreeNumMax res.FreeNum = customFortune.FreeSpinNum diff --git a/gamesrv/slotspkg/assemble/difgame.go b/gamesrv/slotspkg/assemble/difgame.go index fc874fc..721eec1 100644 --- a/gamesrv/slotspkg/assemble/difgame.go +++ b/gamesrv/slotspkg/assemble/difgame.go @@ -7,6 +7,7 @@ import ( ) type CustomFortune struct { + FreeStatus int `json:"fss"` //free状态 FreeSpinNum int64 `json:"fsn"` //剩余freespin FreeNumMax int64 `json:"fnm"` //总次数 FreeNumTrigger int64 `json:"fnt"` //新增freespin diff --git a/gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go b/gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go index 3b830c8..c2db338 100644 --- a/gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go +++ b/gamesrv/slotspkg/slots/plugin/fortunedragon/tospecial.go @@ -17,6 +17,7 @@ func (p *PluginSpecial) Theme() string { // Special type Special struct { + FreeStatus int `json:"fss,omitempty"` //free状态 FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin FreeNumMax int64 `json:"fnm,omitempty"` //总次数 FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin @@ -39,5 +40,12 @@ func (p *PluginSpecial) AfterSpin(m intf.Master) { sp.FreeSpinNum = Fortune.FreeSpinNum sp.FreeNumMax = Fortune.FreeNumMax sp.FreeNumTrigger = Fortune.FreeNumTrigger + if Fortune.FreeNumTrigger > 0 { + sp.FreeStatus = 1 + } else if Fortune.FreeSpinNum == 0 { + sp.FreeStatus = 3 + } else { + sp.FreeStatus = 0 + } } } diff --git a/gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go b/gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go index 4f162f7..01ab40e 100644 --- a/gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go +++ b/gamesrv/slotspkg/slots/plugin/fortunerabbit/common.go @@ -9,6 +9,7 @@ const ( ) type CustomFortune struct { + FreeStatus int `json:"fss"` FreeSpinNum int64 `json:"fsn"` //剩余freespin FreeNumMax int64 `json:"fnm"` //总次数 FreeNumTrigger int64 `json:"fnt"` //新增freespin diff --git a/gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go b/gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go index 20b810b..7c0b1cd 100644 --- a/gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go +++ b/gamesrv/slotspkg/slots/plugin/fortunerabbit/tospecial.go @@ -17,6 +17,7 @@ func (p *PluginSpecial) Theme() string { // Special type Special struct { + FreeStatus int `json:"fss,omitempty"` //free状态 FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin FreeNumMax int64 `json:"fnm,omitempty"` //总次数 FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin @@ -50,5 +51,12 @@ func (p *PluginSpecial) AfterSpin(m intf.Master) { sp.FreeSpinNum = Fortune.FreeSpinNum sp.FreeNumMax = Fortune.FreeNumMax sp.FreeNumTrigger = Fortune.FreeNumTrigger + if Fortune.FreeNumTrigger > 0 { + sp.FreeStatus = 1 + } else if Fortune.FreeSpinNum == 0 { + sp.FreeStatus = 3 + } else { + sp.FreeStatus = 0 + } } }