diff --git a/gamesrv/slotspkg/slots/plugin/gatesofolympus/eliminate.go b/gamesrv/slotspkg/slots/plugin/gatesofolympus/eliminate.go index 3440693..4f19caa 100644 --- a/gamesrv/slotspkg/slots/plugin/gatesofolympus/eliminate.go +++ b/gamesrv/slotspkg/slots/plugin/gatesofolympus/eliminate.go @@ -59,7 +59,27 @@ func (p *PluginEliminate) OnEnterNode(m intf.Master) { m.RootCustom(&CustomMulti{}).(*CustomMulti).Multi = 0 } } - +func (p *PluginEliminate) BeforeDisplay(m intf.Master) { + //cursorFormation := m.CursorFormation() + //formattedSymbols := cursorFormation.GetMatrixFormattedSymbols() + //f := getCustomFortune(m) + //if f.FreeNumMax == 15 && f.FreeSpinNum == 1 { + // formattedSymbols[0][0] = 1 + // formattedSymbols[0][1] = 1 + // formattedSymbols[0][2] = 1 + // formattedSymbols[0][3] = 1 + // + // formattedSymbols[1][0] = 7 + // formattedSymbols[1][1] = 7 + // formattedSymbols[1][2] = 7 + // formattedSymbols[1][3] = 7 + // formattedSymbols[2][0] = 7 + // formattedSymbols[2][1] = 7 + // formattedSymbols[2][2] = 7 + // formattedSymbols[2][3] = 7 + //} + //cursorFormation.SetFormattedSymbols(formattedSymbols) +} func (p *PluginEliminate) BeforeSpin(m intf.Master) { m.AddCursorFeature(&CustomPay{}).SetLifetime(1) } @@ -68,13 +88,6 @@ func (p *PluginEliminate) AfterSpin(m intf.Master) { cursorFormation := m.CursorFormation() formattedSymbols := cursorFormation.GetReelFormattedDisplaySymbols() - //f := getCustomFortune(m) - //if f.FreeSpinNum == 13 { - // formattedSymbols[0][0] = 1 - // formattedSymbols[0][1] = 1 - // formattedSymbols[0][2] = 1 - //} - appendFormattedSymbols := deepcopy.Copy(formattedSymbols).([][]int64) randPositions := cursorFormation.GetRandPositions() diff --git a/gamesrv/slotspkg/slots/plugin/gatesofolympus/free_spin.go b/gamesrv/slotspkg/slots/plugin/gatesofolympus/free_spin.go index b2ae211..07d04d6 100644 --- a/gamesrv/slotspkg/slots/plugin/gatesofolympus/free_spin.go +++ b/gamesrv/slotspkg/slots/plugin/gatesofolympus/free_spin.go @@ -60,19 +60,23 @@ func (p *PluginFreeSpin) AfterFreeSpin(m intf.Master) { customFortune.FreeStatus = 2 customFortune.FreeNumTrigger = addTimes customFortune.FreeNumMax += addTimes - customFortune.FreeSpinNum += addTimes + customFortune.FreeSpinNum += addTimes - 1 customFortune.ScatterWin = win m.AddProgress(addTimes) m.AddCursorFeature(&generic.CustomExtraFreeSpin{ExtraTimes: addTimes}).SetLifetime(1) + m.CursorFeature(customFortune).SetLifetime(customFortune.FreeSpinNum + 1) } else { + //logger.Logger.Trace("1111 FreeStatus", customFortune.FreeStatus) + //logger.Logger.Trace("1111 FreeSpinNum", customFortune.FreeSpinNum) customFortune.FreeStatus = 0 + customFortune.ScatterWin = 0 customFortune.FreeNumTrigger = 0 if customFortune.FreeSpinNum > 0 { - if customFortune.FreeSpinNum == 1 { - customFortune.FreeStatus = 3 - } customFortune.FreeSpinNum-- } + if customFortune.FreeSpinNum == 0 { + customFortune.FreeStatus = 3 + } } if win > 0 { m.AddCursorFeature(&generic.CustomScatterWin{}).SetWin(win) diff --git a/gamesrv/slotspkg/slots/plugin/gatesofolympus/tospecial.go b/gamesrv/slotspkg/slots/plugin/gatesofolympus/tospecial.go index 4e6b074..233e6ce 100644 --- a/gamesrv/slotspkg/slots/plugin/gatesofolympus/tospecial.go +++ b/gamesrv/slotspkg/slots/plugin/gatesofolympus/tospecial.go @@ -15,6 +15,7 @@ type Special struct { FreeSpinNum int64 `json:"fsn,omitempty"` //剩余freespin FreeNumMax int64 `json:"fnm,omitempty"` //总次数 FreeNumTrigger int64 `json:"fnt,omitempty"` //新增freespin + ScatterWin int64 `json:"sw"` Pay float64 `json:"Pay,omitempty"` Multi int64 `json:"Multi,omitempty"` MultiStr string `json:"multi_str,omitempty"` @@ -65,6 +66,7 @@ func (p *PluginSpecial) AfterSpin(m intf.Master) { sp.FreeSpinNum = customFortune.FreeSpinNum sp.FreeNumMax = customFortune.FreeNumMax sp.FreeNumTrigger = customFortune.FreeNumTrigger + sp.ScatterWin = customFortune.ScatterWin customMulti := m.RootCustom(&CustomMulti{}).(*CustomMulti) customPay := m.CursorCustom(&CustomPay{}).(*CustomPay)