Compare commits

..

No commits in common. "3b364a545eea80ae3b3cc61f3f5b89116f54e8f6" and "c3ff0dc8effa3c6800610cacfdf322de94725171" have entirely different histories.

7 changed files with 2 additions and 26 deletions

View File

@ -393,7 +393,6 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
playerEx.BetMode = params[3] playerEx.BetMode = params[3]
//playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunedragon.NowByte) //playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunedragon.NowByte)
//logger.Logger.Trace("=====================init===== playerEx.Coin===", playerEx.Coin)
//get data //get data
Response, err := slots.SlotsMgrSington.Play(playerEx.SlotsSession, &base.SpinReq{ Response, err := slots.SlotsMgrSington.Play(playerEx.SlotsSession, &base.SpinReq{
@ -409,7 +408,6 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
if err == nil { 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 { 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.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
playerEx.totalBet = int64(data.TotalBet) playerEx.totalBet = int64(data.TotalBet)
@ -431,7 +429,6 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
gameEndStr = string(pi) gameEndStr = string(pi)
if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 { 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()) playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName())
//免费游戏结束或者正常模式 //免费游戏结束或者正常模式
sceneEx.StaticsLaba(&base.StaticLabaParam{ sceneEx.StaticsLaba(&base.StaticLabaParam{
@ -451,8 +448,6 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
} }
playerEx.SlotsSession.SetCoin(int64(data.FinalCoin) * fortunedragon.NowByte) 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{ pack := &protocol.SCFortuneDragonBilled{
OpRetCode: proto.Int32(0), OpRetCode: proto.Int32(0),

View File

@ -406,8 +406,7 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player,
var data assemble.GameEnd var data assemble.GameEnd
if err == nil { if err == nil {
data = assemble.DataToCli(Response).(assemble.GameEnd) data = assemble.DataToCli(Response).(assemble.GameEnd)
respinStatus := data.Results[0].ArrSpins[0].Special.(SpinLock).ReSpinStatus if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
if respinStatus == 0 || respinStatus == 1 {
//第一次触发或者正常模式 //第一次触发或者正常模式
//logger.Logger.Trace("=============addcoin1111 ", -data.TotalBet) //logger.Logger.Trace("=============addcoin1111 ", -data.TotalBet)
playerEx.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName()) playerEx.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
@ -429,6 +428,7 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player,
} }
pi, _ := json.Marshal(data) pi, _ := json.Marshal(data)
gameEndStr = string(pi) gameEndStr = string(pi)
respinStatus := data.Results[0].ArrSpins[0].Special.(SpinLock).ReSpinStatus
if respinStatus == 0 || respinStatus == 3 { if respinStatus == 0 || respinStatus == 3 {
//logger.Logger.Trace("===win==========addcoin222 ", data.RoundReward) //logger.Logger.Trace("===win==========addcoin222 ", data.RoundReward)
playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName()) playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName())

View File

@ -103,7 +103,6 @@ func response2NodeTree(NodeTree *shared.LiteNodeTree) *shared.Result {
res.TotalRewardBase = ass[0].LineReward ///line_win res.TotalRewardBase = ass[0].LineReward ///line_win
res.TotalReward = ass[0].Reward ///total_win res.TotalReward = ass[0].Reward ///total_win
res.FreeStatus = customFortune.FreeStatus
res.FreeNumTrigger = customFortune.FreeNumTrigger res.FreeNumTrigger = customFortune.FreeNumTrigger
res.FreeNumMax = customFortune.FreeNumMax res.FreeNumMax = customFortune.FreeNumMax
res.FreeNum = customFortune.FreeSpinNum res.FreeNum = customFortune.FreeSpinNum

View File

@ -7,7 +7,6 @@ import (
) )
type CustomFortune struct { type CustomFortune struct {
FreeStatus int `json:"fss"` //free状态
FreeSpinNum int64 `json:"fsn"` //剩余freespin FreeSpinNum int64 `json:"fsn"` //剩余freespin
FreeNumMax int64 `json:"fnm"` //总次数 FreeNumMax int64 `json:"fnm"` //总次数
FreeNumTrigger int64 `json:"fnt"` //新增freespin FreeNumTrigger int64 `json:"fnt"` //新增freespin

View File

@ -17,7 +17,6 @@ func (p *PluginSpecial) Theme() string {
// Special // Special
type Special struct { type Special struct {
FreeStatus int `json:"fss,omitempty"` //free状态
FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin
FreeNumMax int64 `json:"fnm,omitempty"` //总次数 FreeNumMax int64 `json:"fnm,omitempty"` //总次数
FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin
@ -40,12 +39,5 @@ func (p *PluginSpecial) AfterSpin(m intf.Master) {
sp.FreeSpinNum = Fortune.FreeSpinNum sp.FreeSpinNum = Fortune.FreeSpinNum
sp.FreeNumMax = Fortune.FreeNumMax sp.FreeNumMax = Fortune.FreeNumMax
sp.FreeNumTrigger = Fortune.FreeNumTrigger sp.FreeNumTrigger = Fortune.FreeNumTrigger
if Fortune.FreeNumTrigger > 0 {
sp.FreeStatus = 1
} else if Fortune.FreeSpinNum == 0 {
sp.FreeStatus = 3
} else {
sp.FreeStatus = 0
}
} }
} }

View File

@ -9,7 +9,6 @@ const (
) )
type CustomFortune struct { type CustomFortune struct {
FreeStatus int `json:"fss"`
FreeSpinNum int64 `json:"fsn"` //剩余freespin FreeSpinNum int64 `json:"fsn"` //剩余freespin
FreeNumMax int64 `json:"fnm"` //总次数 FreeNumMax int64 `json:"fnm"` //总次数
FreeNumTrigger int64 `json:"fnt"` //新增freespin FreeNumTrigger int64 `json:"fnt"` //新增freespin

View File

@ -17,7 +17,6 @@ func (p *PluginSpecial) Theme() string {
// Special // Special
type Special struct { type Special struct {
FreeStatus int `json:"fss,omitempty"` //free状态
FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin
FreeNumMax int64 `json:"fnm,omitempty"` //总次数 FreeNumMax int64 `json:"fnm,omitempty"` //总次数
FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin
@ -51,12 +50,5 @@ func (p *PluginSpecial) AfterSpin(m intf.Master) {
sp.FreeSpinNum = Fortune.FreeSpinNum sp.FreeSpinNum = Fortune.FreeSpinNum
sp.FreeNumMax = Fortune.FreeNumMax sp.FreeNumMax = Fortune.FreeNumMax
sp.FreeNumTrigger = Fortune.FreeNumTrigger sp.FreeNumTrigger = Fortune.FreeNumTrigger
if Fortune.FreeNumTrigger > 0 {
sp.FreeStatus = 1
} else if Fortune.FreeSpinNum == 0 {
sp.FreeStatus = 3
} else {
sp.FreeStatus = 0
}
} }
} }