This commit is contained in:
tomas 2025-03-03 11:19:39 +08:00
parent 42e5e3b7d8
commit 6e59204e95
2 changed files with 15 additions and 12 deletions

View File

@ -63,7 +63,10 @@ type CustomPay struct {
Pay int64 Pay int64
} }
func (s *SugarRushSceneData) EnterResponseFixCoin(Response *cli.SlotsEnterResponse) { func (s *SugarRushSceneData) EnterResponseFixCoin(Response *cli.SlotsEnterResponse, reload bool) {
if reload {
return
}
Response.Coin /= sugarrush.NowByte Response.Coin /= sugarrush.NowByte
Response.NodeTree.BetCoin.Coin /= sugarrush.NowByte Response.NodeTree.BetCoin.Coin /= sugarrush.NowByte
for k := range Response.NodeTree.Nodes { for k := range Response.NodeTree.Nodes {
@ -77,8 +80,8 @@ func (s *SugarRushSceneData) EnterResponseFixCoin(Response *cli.SlotsEnterRespon
if feature.Type == "sugarrush.CustomEliminate" { if feature.Type == "sugarrush.CustomEliminate" {
var customEliminate CustomEliminate var customEliminate CustomEliminate
json.Unmarshal([]byte(feature.Custom), &customEliminate) json.Unmarshal([]byte(feature.Custom), &customEliminate)
for k, wincoin := range customEliminate.WinCoins { for k1 := range customEliminate.WinCoins {
customEliminate.WinCoins[k] /= wincoin customEliminate.WinCoins[k1] /= sugarrush.NowByte
} }
ce, _ := json.Marshal(customEliminate) ce, _ := json.Marshal(customEliminate)
Response.NodeTree.Features[k].Custom = string(ce) Response.NodeTree.Features[k].Custom = string(ce)
@ -107,8 +110,8 @@ func (s *SugarRushSceneData) PlayResponseFixCoin(Response *cli.SlotsPlayResponse
if feature.Type == "sugarrush.CustomEliminate" { if feature.Type == "sugarrush.CustomEliminate" {
var customEliminate CustomEliminate var customEliminate CustomEliminate
json.Unmarshal([]byte(feature.Custom), &customEliminate) json.Unmarshal([]byte(feature.Custom), &customEliminate)
for k1, wincoin := range customEliminate.WinCoins { for k1 := range customEliminate.WinCoins {
customEliminate.WinCoins[k1] /= wincoin customEliminate.WinCoins[k1] /= sugarrush.NowByte
} }
ce, _ := json.Marshal(customEliminate) ce, _ := json.Marshal(customEliminate)
Response.NodeTree.Features[k].Custom = string(ce) Response.NodeTree.Features[k].Custom = string(ce)

View File

@ -98,7 +98,7 @@ func (this *ScenePolicySugarRush) OnPlayerEnter(s *base.Scene, p *base.Player) {
sceneEx.players[p.SnId] = playerEx sceneEx.players[p.SnId] = playerEx
p.SetExtraData(playerEx) p.SetExtraData(playerEx)
SugarRushSendRoomInfo(s, sceneEx, playerEx) SugarRushSendRoomInfo(s, sceneEx, playerEx, false)
s.FirePlayerEvent(p, base.PlayerEventEnter, nil) s.FirePlayerEvent(p, base.PlayerEventEnter, nil)
} }
@ -150,7 +150,7 @@ func (this *ScenePolicySugarRush) OnPlayerRehold(s *base.Scene, p *base.Player)
logger.Logger.Trace("(this *ScenePolicySugarRush) OnPlayerRehold, sceneId=", s.GetSceneId(), " player=", p.SnId) logger.Logger.Trace("(this *ScenePolicySugarRush) OnPlayerRehold, sceneId=", s.GetSceneId(), " player=", p.SnId)
if sceneEx, ok := s.GetExtraData().(*SugarRushSceneData); ok { if sceneEx, ok := s.GetExtraData().(*SugarRushSceneData); ok {
if playerEx, ok := p.GetExtraData().(*SugarRushPlayerData); ok { if playerEx, ok := p.GetExtraData().(*SugarRushPlayerData); ok {
SugarRushSendRoomInfo(s, sceneEx, playerEx) SugarRushSendRoomInfo(s, sceneEx, playerEx, true)
} }
} }
} }
@ -168,18 +168,18 @@ func (this *ScenePolicySugarRush) OnPlayerReturn(s *base.Scene, p *base.Player)
// p.SyncFlag() // p.SyncFlag()
//} //}
//发送房间信息给自己 //发送房间信息给自己
SugarRushSendRoomInfo(s, sceneEx, playerEx) SugarRushSendRoomInfo(s, sceneEx, playerEx, true)
s.FirePlayerEvent(p, base.PlayerEventReturn, nil) s.FirePlayerEvent(p, base.PlayerEventReturn, nil)
} }
} }
} }
func SugarRushSendRoomInfo(s *base.Scene, sceneEx *SugarRushSceneData, playerEx *SugarRushPlayerData) { func SugarRushSendRoomInfo(s *base.Scene, sceneEx *SugarRushSceneData, playerEx *SugarRushPlayerData, reload bool) {
pack := SugarRushCreateRoomInfoPacket(s, sceneEx, playerEx) pack := SugarRushCreateRoomInfoPacket(s, sceneEx, playerEx, reload)
logger.Logger.Trace("RoomInfo: ", pack) logger.Logger.Trace("RoomInfo: ", pack)
playerEx.SendToClient(int(protocol.SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHROOMINFO), pack) playerEx.SendToClient(int(protocol.SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHROOMINFO), pack)
} }
func SugarRushCreateRoomInfoPacket(s *base.Scene, sceneEx *SugarRushSceneData, playerEx *SugarRushPlayerData) interface{} { func SugarRushCreateRoomInfoPacket(s *base.Scene, sceneEx *SugarRushSceneData, playerEx *SugarRushPlayerData, reload bool) interface{} {
//房间信息 //房间信息
pack := &protocol.SCSugarRushRoomInfo{ pack := &protocol.SCSugarRushRoomInfo{
RoomId: s.SceneId, RoomId: s.SceneId,
@ -217,7 +217,7 @@ func SugarRushCreateRoomInfoPacket(s *base.Scene, sceneEx *SugarRushSceneData, p
logger.Logger.Error("slots enter err:", err) logger.Logger.Error("slots enter err:", err)
} }
sceneEx.EnterResponseFixCoin(Response) sceneEx.EnterResponseFixCoin(Response, reload)
Response.BetSizes = []int64{100, 1000, 2000, 5000, 7500, 20000} Response.BetSizes = []int64{100, 1000, 2000, 5000, 7500, 20000}
Response.BetChangeList = []float64{} Response.BetChangeList = []float64{}