diff --git a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go index c2041a1..dd8da12 100644 --- a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go +++ b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go @@ -409,6 +409,12 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play if err == nil { s.SetGameNowTime(time.Now()) data = assemble.DataToCli(Response).(assemble.GameEnd) + + data.BetSizeIndex = playerEx.BetSizeIndex + data.BetLevelIndex = playerEx.BetLevelIndex + data.LinesIndex = playerEx.BetLineIndex + //data.BaseBetIndex = 1 + data.Results[0].BetMode = playerEx.BetMode if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { //logger.Logger.Trace("=====================AddCoin=====TotalBet===", -data.TotalBet) diff --git a/gamesrv/fortunemouse/scenepolicy_fortunemouse.go b/gamesrv/fortunemouse/scenepolicy_fortunemouse.go index 65356b3..861f9fd 100644 --- a/gamesrv/fortunemouse/scenepolicy_fortunemouse.go +++ b/gamesrv/fortunemouse/scenepolicy_fortunemouse.go @@ -407,6 +407,12 @@ func (this *SceneStateStartFortuneMouse) OnPlayerOp(s *base.Scene, p *base.Playe if err == nil { s.SetGameNowTime(time.Now()) data = assemble.DataToCli(Response).(assemble.GameEnd) + + data.BetSizeIndex = playerEx.BetSizeIndex + data.BetLevelIndex = playerEx.BetLevelIndex + data.LinesIndex = playerEx.BetLineIndex + //data.BaseBetIndex = 1 + var respinStatus int if data.Results[0].ArrSpins[0].Special != nil { sp, _ := json.Marshal(data.Results[0].ArrSpins[0].Special) diff --git a/gamesrv/fortuneox/scenepolicy_fortuneox.go b/gamesrv/fortuneox/scenepolicy_fortuneox.go index d6a4b33..184290b 100644 --- a/gamesrv/fortuneox/scenepolicy_fortuneox.go +++ b/gamesrv/fortuneox/scenepolicy_fortuneox.go @@ -407,6 +407,12 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player, if err == nil { s.SetGameNowTime(time.Now()) data = assemble.DataToCli(Response).(assemble.GameEnd) + + data.BetSizeIndex = playerEx.BetSizeIndex + data.BetLevelIndex = playerEx.BetLevelIndex + data.LinesIndex = playerEx.BetLineIndex + //data.BaseBetIndex = 1 + var respinStatus int if data.Results[0].ArrSpins[0].Special != nil { sp, _ := json.Marshal(data.Results[0].ArrSpins[0].Special) diff --git a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go index a292add..91991fd 100644 --- a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go +++ b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go @@ -407,6 +407,12 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play if err == nil { s.SetGameNowTime(time.Now()) data = assemble.DataToCli(Response).(assemble.GameEnd) + + data.BetSizeIndex = playerEx.BetSizeIndex + data.BetLevelIndex = playerEx.BetLevelIndex + data.LinesIndex = playerEx.BetLineIndex + //data.BaseBetIndex = 1 + if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { //第一次触发或者正常模式 //logger.Logger.Trace("=============addcoin1111 ", -data.TotalBet) diff --git a/gamesrv/fortunetiger/scenepolicy_fortunetiger.go b/gamesrv/fortunetiger/scenepolicy_fortunetiger.go index 9557faf..5202fcc 100644 --- a/gamesrv/fortunetiger/scenepolicy_fortunetiger.go +++ b/gamesrv/fortunetiger/scenepolicy_fortunetiger.go @@ -407,6 +407,12 @@ func (this *SceneStateStartFortuneTiger) OnPlayerOp(s *base.Scene, p *base.Playe if err == nil { s.SetGameNowTime(time.Now()) data = assemble.DataToCli(Response).(assemble.GameEnd) + + data.BetSizeIndex = playerEx.BetSizeIndex + data.BetLevelIndex = playerEx.BetLevelIndex + data.LinesIndex = playerEx.BetLineIndex + //data.BaseBetIndex = 1 + var respinStatus int if data.Results[0].ArrSpins[0].Special != nil { sp, _ := json.Marshal(data.Results[0].ArrSpins[0].Special) diff --git a/gamesrv/slotspkg/assemble/struct_.go b/gamesrv/slotspkg/assemble/struct_.go index eab6537..71b7f19 100644 --- a/gamesrv/slotspkg/assemble/struct_.go +++ b/gamesrv/slotspkg/assemble/struct_.go @@ -34,6 +34,7 @@ type GameEnd struct { BetSizeIndex int64 `json:"bet_size_index"` //选中的单注下标 BetLevelIndex int64 `json:"bet_level_index"` //选中的等级下标 LinesIndex int64 `json:"lines_index"` //选中的线数下标 + BaseBetIndex int64 `json:"base_bet_index"` //选中的下注基数下标 TotalBet float64 `json:"total_bet"` //下注 BetBeforeCoin float64 `json:"bet_before_coin"` //下注前 BetAfterCoin float64 `json:"bet_after_coin"` //下注后 diff --git a/gamesrv/slotspkg/external/excel/Base/Slots/FortuneMouse/Bet.xlsx b/gamesrv/slotspkg/external/excel/Base/Slots/FortuneMouse/Bet.xlsx index 4d00e3f..4502c03 100644 Binary files a/gamesrv/slotspkg/external/excel/Base/Slots/FortuneMouse/Bet.xlsx and b/gamesrv/slotspkg/external/excel/Base/Slots/FortuneMouse/Bet.xlsx differ diff --git a/gamesrv/slotspkg/internal/exported/excel2go/base/fortune_mouse.go b/gamesrv/slotspkg/internal/exported/excel2go/base/fortune_mouse.go index e03d898..db3b7e3 100644 --- a/gamesrv/slotspkg/internal/exported/excel2go/base/fortune_mouse.go +++ b/gamesrv/slotspkg/internal/exported/excel2go/base/fortune_mouse.go @@ -10,79 +10,79 @@ func init() { FortuneMouseBetBetChangeList = map[int64]*structs.FortuneMouseBetBetChangeList{ 0: { Index: 0, - BetChangeList: 0.15, + BetChangeList: 150000, BetSizeIndex: 0, BetLevelIndex: 0, }, 1: { Index: 1, - BetChangeList: 0.3, + BetChangeList: 300000, BetSizeIndex: 0, BetLevelIndex: 1, }, 2: { Index: 2, - BetChangeList: 0.45, + BetChangeList: 450000, BetSizeIndex: 0, BetLevelIndex: 2, }, 3: { Index: 3, - BetChangeList: 0.5, + BetChangeList: 500000, BetSizeIndex: 1, BetLevelIndex: 0, }, 4: { Index: 4, - BetChangeList: 0.75, + BetChangeList: 750000, BetSizeIndex: 0, BetLevelIndex: 4, }, 5: { Index: 5, - BetChangeList: 1.5, + BetChangeList: 1500000, BetSizeIndex: 0, BetLevelIndex: 9, }, 6: { Index: 6, - BetChangeList: 2.5, + BetChangeList: 2500000, BetSizeIndex: 1, BetLevelIndex: 4, }, 7: { Index: 7, - BetChangeList: 4.5, + BetChangeList: 4500000, BetSizeIndex: 3, BetLevelIndex: 0, }, 8: { Index: 8, - BetChangeList: 5, + BetChangeList: 5000000, BetSizeIndex: 1, BetLevelIndex: 9, }, 9: { Index: 9, - BetChangeList: 7.5, + BetChangeList: 7500000, BetSizeIndex: 2, BetLevelIndex: 4, }, 10: { Index: 10, - BetChangeList: 15, + BetChangeList: 15000000, BetSizeIndex: 2, BetLevelIndex: 9, }, 11: { Index: 11, - BetChangeList: 22.5, + BetChangeList: 22500000, BetSizeIndex: 3, BetLevelIndex: 4, }, 12: { Index: 12, - BetChangeList: 45, + BetChangeList: 45000000, BetSizeIndex: 3, BetLevelIndex: 9, }, @@ -142,19 +142,19 @@ func init() { FortuneMouseBetBetSize = map[int64]*structs.FortuneMouseBetBetSize{ 0: { Index: 0, - BetSize: 300, + BetSize: 300000000, }, 1: { Index: 1, - BetSize: 1000, + BetSize: 1000000000, }, 2: { Index: 2, - BetSize: 3000, + BetSize: 3000000000, }, 3: { Index: 3, - BetSize: 9000, + BetSize: 9000000000, }, }