fix coin test001
This commit is contained in:
parent
c702e1c786
commit
42e5e3b7d8
|
@ -96,19 +96,19 @@ func (s *SugarRushSceneData) PlayResponseFixCoin(Response *cli.SlotsPlayResponse
|
||||||
Response.ActualBet /= sugarrush.NowByte
|
Response.ActualBet /= sugarrush.NowByte
|
||||||
Response.ActualWin /= sugarrush.NowByte
|
Response.ActualWin /= sugarrush.NowByte
|
||||||
Response.NodeTree.BetCoin.Coin /= sugarrush.NowByte
|
Response.NodeTree.BetCoin.Coin /= sugarrush.NowByte
|
||||||
for _, node := range Response.NodeTree.Nodes {
|
for k := range Response.NodeTree.Nodes {
|
||||||
node.Win /= sugarrush.NowByte
|
Response.NodeTree.Nodes[k].Win /= sugarrush.NowByte
|
||||||
node.TotalWin /= sugarrush.NowByte
|
Response.NodeTree.Nodes[k].TotalWin /= sugarrush.NowByte
|
||||||
node.ChildrenTotalWin /= sugarrush.NowByte
|
Response.NodeTree.Nodes[k].ChildrenTotalWin /= sugarrush.NowByte
|
||||||
node.Bet /= sugarrush.NowByte
|
Response.NodeTree.Nodes[k].Bet /= sugarrush.NowByte
|
||||||
}
|
}
|
||||||
for k, feature := range Response.NodeTree.Features {
|
for k, feature := range Response.NodeTree.Features {
|
||||||
Response.NodeTree.Features[k].Win /= sugarrush.NowByte
|
Response.NodeTree.Features[k].Win /= sugarrush.NowByte
|
||||||
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, wincoin := range customEliminate.WinCoins {
|
||||||
customEliminate.WinCoins[k] /= wincoin
|
customEliminate.WinCoins[k1] /= wincoin
|
||||||
}
|
}
|
||||||
ce, _ := json.Marshal(customEliminate)
|
ce, _ := json.Marshal(customEliminate)
|
||||||
Response.NodeTree.Features[k].Custom = string(ce)
|
Response.NodeTree.Features[k].Custom = string(ce)
|
||||||
|
|
|
@ -217,14 +217,13 @@ 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)
|
||||||
|
|
||||||
Response.BetSizes = []int64{100, 1000, 2000, 5000, 7500, 20000}
|
Response.BetSizes = []int64{100, 1000, 2000, 5000, 7500, 20000}
|
||||||
Response.BetChangeList = []float64{}
|
Response.BetChangeList = []float64{}
|
||||||
sceneEx.BetLevel = Response.BetLevels
|
sceneEx.BetLevel = Response.BetLevels
|
||||||
pi, _ := json.Marshal(Response)
|
pi, _ := json.Marshal(Response)
|
||||||
pack.PlayerInfo = string(pi)
|
pack.PlayerInfo = string(pi)
|
||||||
|
|
||||||
sceneEx.EnterResponseFixCoin(Response)
|
|
||||||
|
|
||||||
proto.SetDefaults(pack)
|
proto.SetDefaults(pack)
|
||||||
return pack
|
return pack
|
||||||
}
|
}
|
||||||
|
@ -379,8 +378,8 @@ func (this *SceneStateStartSugarRush) OnPlayerOp(s *base.Scene, p *base.Player,
|
||||||
}
|
}
|
||||||
cval := params[0]
|
cval := params[0]
|
||||||
playerEx.BetMode = params[1]
|
playerEx.BetMode = params[1]
|
||||||
//playerEx.SlotsSession.SetCoin(playerEx.Coin * sugarrush.NowByte)
|
//playerEx.SlotsSession.SetCoin(playerEx.Coin)
|
||||||
//logger.Logger.Trace("=============init dif coin", playerEx.Coin-playerEx.SlotsSession.Coin()/sugarrush.NowByte)
|
//logger.Logger.Trace("=============init dif coin", playerEx.Coin-playerEx.SlotsSession.Coin())
|
||||||
|
|
||||||
index := slots.SlotsMgrSington.PPGetBetIndex(playerEx.SlotsSession, "SugarRush", float64(cval*20))
|
index := slots.SlotsMgrSington.PPGetBetIndex(playerEx.SlotsSession, "SugarRush", float64(cval*20))
|
||||||
if index == nil {
|
if index == nil {
|
||||||
|
@ -424,7 +423,7 @@ func (this *SceneStateStartSugarRush) OnPlayerOp(s *base.Scene, p *base.Player,
|
||||||
playerEx.SendToClient(int(protocol.SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHBILLED), pack)
|
playerEx.SendToClient(int(protocol.SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHBILLED), pack)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
var ActualWin = Response.ActualWin / sugarrush.NowByte
|
var ActualWin = Response.ActualWin
|
||||||
s.SetGameNowTime(time.Now())
|
s.SetGameNowTime(time.Now())
|
||||||
midNodes := Response.NodeTree.Nodes[1]
|
midNodes := Response.NodeTree.Nodes[1]
|
||||||
lastNodes := Response.NodeTree.Nodes[2]
|
lastNodes := Response.NodeTree.Nodes[2]
|
||||||
|
@ -438,7 +437,7 @@ func (this *SceneStateStartSugarRush) OnPlayerOp(s *base.Scene, p *base.Player,
|
||||||
needWinBilled = false
|
needWinBilled = false
|
||||||
if lastNodes.ProgressValue == 0 {
|
if lastNodes.ProgressValue == 0 {
|
||||||
//第一次触发
|
//第一次触发
|
||||||
playerEx.totalBet = Response.ActualBet / sugarrush.NowByte
|
playerEx.totalBet = Response.ActualBet
|
||||||
playerEx.AddCoin(-playerEx.totalBet, common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
|
playerEx.AddCoin(-playerEx.totalBet, common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
|
||||||
totalIn = playerEx.totalBet
|
totalIn = playerEx.totalBet
|
||||||
}
|
}
|
||||||
|
@ -447,7 +446,7 @@ func (this *SceneStateStartSugarRush) OnPlayerOp(s *base.Scene, p *base.Player,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//正常模式
|
//正常模式
|
||||||
playerEx.totalBet = Response.ActualBet / sugarrush.NowByte
|
playerEx.totalBet = Response.ActualBet
|
||||||
totalIn = playerEx.totalBet
|
totalIn = playerEx.totalBet
|
||||||
playerEx.AddCoin(-playerEx.totalBet, common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
|
playerEx.AddCoin(-playerEx.totalBet, common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
|
||||||
}
|
}
|
||||||
|
@ -564,7 +563,7 @@ func SugarRushAndSaveLog(sceneEx *SugarRushSceneData, playerEx *SugarRushPlayerD
|
||||||
playerBet := &server.PlayerData{
|
playerBet := &server.PlayerData{
|
||||||
SnId: proto.Int32(playerEx.SnId),
|
SnId: proto.Int32(playerEx.SnId),
|
||||||
Bet: proto.Int64(playerEx.CurrentBet),
|
Bet: proto.Int64(playerEx.CurrentBet),
|
||||||
Gain: proto.Int64(Response.ActualWin/sugarrush.NowByte + playerEx.taxCoin),
|
Gain: proto.Int64(Response.ActualWin + playerEx.taxCoin),
|
||||||
Tax: proto.Int64(playerEx.taxCoin),
|
Tax: proto.Int64(playerEx.taxCoin),
|
||||||
Coin: proto.Int64(playerEx.GetCoin()),
|
Coin: proto.Int64(playerEx.GetCoin()),
|
||||||
GameCoinTs: proto.Int64(playerEx.GameCoinTs),
|
GameCoinTs: proto.Int64(playerEx.GameCoinTs),
|
||||||
|
|
Loading…
Reference in New Issue