拉霸奖池金额数据类型错误

tienlen记牌器问题
2024-05-17 15:46:01 +08:00 · 2024-05-13 16:29:20 +08:00
11 changed files with 34 additions and 35 deletions
--- a/gamesrv/avengers/scenedata_avengers.go
+++ b/gamesrv/avengers/scenedata_avengers.go
@ -64,7 +64,7 @@ func (this *AvengersSceneData) init() bool {
 	this.jackpot = &base.SlotJackpotPool{}
 	if this.jackpot.Small <= 0 {
 		this.jackpot.Small = 0
-		this.jackpot.VirtualJK = int64(params[rule.AVENGERS_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore())
+		this.jackpot.VirtualJK = int64(params[rule.AVENGERS_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore())
 	}
 	str := base.SlotsPoolMgr.GetPool(this.GetGameFreeId(), this.Platform)
 	if str != "" {
@ -288,13 +288,13 @@ func (this *AvengersSceneData) AIBurstJackPot() {
 	if time.Now().Sub(this.GetLastBurstJackPot()) > 0 {
 		this.SetLastBurstJackPot()
 		jackpotParams := this.DbGameFree.GetJackpot()
-		var jackpotInit = int64(jackpotParams[rule.AVENGERS_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore()) //奖池初始值
+		var jackpotInit = int64(jackpotParams[rule.AVENGERS_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore()) //奖池初始值

 		//AI机器人爆奖
 		val := this.jackpot.VirtualJK
 		this.jackpot.VirtualJK = jackpotInit
-		bet := this.DbGameFree.GetBaseScore() * int32(rule.LINENUM)
-		this.RecordBurstLog(this.RandNickName(), val, int64(bet))
+		bet := int64(this.DbGameFree.GetBaseScore()) * int64(rule.LINENUM)
+		this.RecordBurstLog(this.RandNickName(), val, bet)
 	}
 }
 func (this *AvengersSceneData) KickPlayerByTime() {
--- a/gamesrv/avengers/scenepolicy_avengers.go
+++ b/gamesrv/avengers/scenepolicy_avengers.go
@ -449,7 +449,7 @@ func (this *SceneStateAvengersStart) OnPlayerOp(s *base.Scene, p *base.Player, o

 		// 奖池参数
 		jackpotParams := sceneEx.DbGameFree.GetJackpot()
-		var jackpotInit = int64(jackpotParams[rule.AVENGERS_JACKPOT_InitJackpot] * sceneEx.DbGameFree.GetBaseScore()) //奖池初始值
+		var jackpotInit = int64(jackpotParams[rule.AVENGERS_JACKPOT_InitJackpot]) * int64(sceneEx.DbGameFree.GetBaseScore()) //奖池初始值

 		var jackpotFundAdd, prizeFundAdd int64 //奖池/水池增量
 		if playerEx.freeTimes <= 0 {           //正常模式才能记录用户的押注变化，免费模式不能改变押注
@ -806,7 +806,7 @@ func (this *SceneStateAvengersStart) BenchTest(s *base.Scene, p *base.Player) {
 	file.WriteString("玩家id,当前水位,之前余额,之后余额,投入,产出,税收,小游戏,爆奖,中线倍数,中线数,剩余免费次数\r\n")

 	oldCoin := p.Coin
-	p.Coin = int64(5000 * s.DbGameFree.GetBaseScore())
+	p.Coin = 5000 * int64(s.DbGameFree.GetBaseScore())
 	if playerEx, ok := p.ExtraData.(*AvengersPlayerData); ok {
 		for i := 0; i < BENCH_CNT; i++ {
 			startCoin := p.Coin
--- a/gamesrv/caishen/scenedata_caishen.go
+++ b/gamesrv/caishen/scenedata_caishen.go
@ -66,7 +66,7 @@ func (this *CaiShenSceneData) init() bool {
 	this.jackpot = &base.SlotJackpotPool{}
 	if this.jackpot.Small <= 0 {
 		this.jackpot.Small = 0
-		this.jackpot.VirtualJK = int64(params[rule.CAISHEN_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore())
+		this.jackpot.VirtualJK = int64(params[rule.CAISHEN_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore())
 	}
 	str := base.XSlotsPoolMgr.GetPool(this.GetGameFreeId(), this.Platform)
 	if str != "" {
@ -288,12 +288,12 @@ func (this *CaiShenSceneData) AIBurstJackPot() {
 	if time.Now().Sub(this.GetLastBurstJackPot()) > 0 {
 		this.SetLastBurstJackPot()
 		jackpotParams := this.DbGameFree.GetJackpot()
-		var jackpotInit = int64(jackpotParams[rule.CAISHEN_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore()) //奖池初始值
+		var jackpotInit = int64(jackpotParams[rule.CAISHEN_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore()) //奖池初始值

 		//AI机器人爆奖
 		val := this.jackpot.VirtualJK
 		this.jackpot.VirtualJK = jackpotInit
-		bet := this.DbGameFree.GetBaseScore() * int32(rule.LINENUM)
+		bet := int64(this.DbGameFree.GetBaseScore()) * int64(rule.LINENUM)
 		this.RecordBurstLog(this.RandNickName(), val, int64(bet))
 	}
 }
--- a/gamesrv/caishen/scenepolicy_caishen.go
+++ b/gamesrv/caishen/scenepolicy_caishen.go
@ -446,7 +446,7 @@ func (this *SceneStateCaiShenStart) OnPlayerOp(s *base.Scene, p *base.Player, op

 		// 奖池参数
 		var jackpotParam = sceneEx.DbGameFree.GetJackpot()
-		var jackpotInit = int64(jackpotParam[rule.CAISHEN_JACKPOT_InitJackpot] * sceneEx.DbGameFree.GetBaseScore()) //奖池初始值
+		var jackpotInit = int64(jackpotParam[rule.CAISHEN_JACKPOT_InitJackpot]) * int64(sceneEx.DbGameFree.GetBaseScore()) //奖池初始值

 		var jackpotFundAdd, prizeFundAdd int64
 		if playerEx.freeTimes <= 0 { //正常模式才能记录用户的押注变化，免费模式不能改变押注
@ -918,7 +918,7 @@ func (this *SceneStateCaiShenStart) MultiplayerBenchTest(s *base.Scene) {

 	playersFile := make(map[int32]*os.File)
 	oldCoins := make(map[int32]int64)
-	hasCoin := int64(1000 * s.DbGameFree.GetBaseScore())
+	hasCoin := 1000 * int64(s.DbGameFree.GetBaseScore())
 	robots := make(map[int32]bool)
 	testPlayers := make(map[int32]*base.Player)
 	for _, p := range s.Players {
@ -955,12 +955,12 @@ func (this *SceneStateCaiShenStart) MultiplayerBenchTest(s *base.Scene) {
 		}
 	}()

-	totalBet := s.DbGameFree.GetBaseScore() * int32(len(rule.AllBetLines))
+	totalBet := int64(s.DbGameFree.GetBaseScore()) * int64(len(rule.AllBetLines))
 	for i := 0; i < BENCH_CNT; i++ {
 		for snid, p := range testPlayers {
 			if playerEx, ok := p.ExtraData.(*CaiShenPlayerData); ok {
 				StartCoin := p.Coin
-				if StartCoin < int64(totalBet) {
+				if StartCoin < totalBet {
 					continue
 				}
 				freeTimes := playerEx.freeTimes
--- a/gamesrv/easterisland/scenedata_easterisland.go
+++ b/gamesrv/easterisland/scenedata_easterisland.go
@ -60,7 +60,7 @@ func (this *EasterIslandSceneData) init() bool {
 	this.jackpot = &base.SlotJackpotPool{}
 	if this.jackpot.Small <= 0 {
 		this.jackpot.Small = 0
-		this.jackpot.VirtualJK = int64(params[rule.EL_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore())
+		this.jackpot.VirtualJK = int64(params[rule.EL_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore())
 	}
 	str := base.SlotsPoolMgr.GetPool(this.GetGameFreeId(), this.Platform)
 	if str != "" {
@ -290,13 +290,13 @@ func (this *EasterIslandSceneData) AIBurstJackPot() {
 	if time.Now().Sub(this.GetLastBurstJackPot()) > 0 {
 		this.SetLastBurstJackPot()
 		jackpotParams := this.DbGameFree.GetJackpot()
-		var jackpotInit = int64(jackpotParams[rule.EL_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore()) //奖池初始值
+		var jackpotInit = int64(jackpotParams[rule.EL_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore()) //奖池初始值

 		//AI机器人爆奖
 		val := this.jackpot.VirtualJK
 		this.jackpot.VirtualJK = jackpotInit
-		bet := this.DbGameFree.GetBaseScore() * int32(rule.LINENUM)
-		this.RecordBurstLog(this.RandNickName(), val, int64(bet))
+		bet := int64(this.DbGameFree.GetBaseScore()) * int64(rule.LINENUM)
+		this.RecordBurstLog(this.RandNickName(), val, bet)
 	}
 }
 func (this *EasterIslandSceneData) KickPlayerByTime() {
--- a/gamesrv/easterisland/scenepolicy_easterisland.go
+++ b/gamesrv/easterisland/scenepolicy_easterisland.go
@ -430,9 +430,9 @@ func (this *SceneStateEasterIslandStart) OnPlayerOp(s *base.Scene, p *base.Playe
 		} else {
 			gamePoolCoin = base.CoinPoolMgr.GetCoin(sceneEx.GetGameFreeId(), sceneEx.Platform, sceneEx.GroupId) // 当前水池金额
 		}
-		prizeFund := gamePoolCoin - sceneEx.jackpot.VirtualJK                                                   // 除去奖池的水池剩余金额
-		jackpotParams := sceneEx.DbGameFree.GetJackpot()                                                        // 奖池参数
-		var jackpotInit = int64(jackpotParams[rule.EL_JACKPOT_InitJackpot] * sceneEx.DbGameFree.GetBaseScore()) //奖池初始值
+		prizeFund := gamePoolCoin - sceneEx.jackpot.VirtualJK                                                          // 除去奖池的水池剩余金额
+		jackpotParams := sceneEx.DbGameFree.GetJackpot()                                                               // 奖池参数
+		var jackpotInit = int64(jackpotParams[rule.EL_JACKPOT_InitJackpot]) * int64(sceneEx.DbGameFree.GetBaseScore()) //奖池初始值

 		var jackpotFundAdd, prizeFundAdd int64
 		if playerEx.freeTimes <= 0 { //正常模式才能记录用户的押注变化，免费模式不能改变押注
--- a/gamesrv/iceage/scenedata_iceage.go
+++ b/gamesrv/iceage/scenedata_iceage.go
@ -67,7 +67,7 @@ func (this *IceAgeSceneData) init() bool {
 	this.jackpot = &base.SlotJackpotPool{}
 	if this.jackpot.Small <= 0 {
 		this.jackpot.Small = 0
-		this.jackpot.VirtualJK = int64(params[rule.ICEAGE_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore())
+		this.jackpot.VirtualJK = int64(params[rule.ICEAGE_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore())
 	}

 	str := base.SlotsPoolMgr.GetPool(this.GetGameFreeId(), this.GetPlatform())
@ -179,7 +179,7 @@ func (this *IceAgeSceneData) CalcSpinsPrize(cards []int, betLines []int64, distr
 				if spinRes.TotalPrizeJackpot == 0 { // 第一个爆奖 获取当前奖池所有
 					prizeJackpot = this.jackpot.VirtualJK
 				} else { // 之后的爆奖 奖励为奖池初值
-					prizeJackpot = int64(this.GetDBGameFree().GetJackpot()[rule.ICEAGE_JACKPOT_InitJackpot] * this.GetDBGameFree().GetBaseScore())
+					prizeJackpot = int64(this.GetDBGameFree().GetJackpot()[rule.ICEAGE_JACKPOT_InitJackpot]) * int64(this.GetDBGameFree().GetBaseScore())
 				}
 				prizeJackpot = calcTaxScore(prizeJackpot, &spinRes.TotalTaxScore)
 				spinRes.TotalPrizeJackpot += prizeJackpot
@ -332,13 +332,13 @@ func (this *IceAgeSceneData) AIBurstJackPot() {
 	if time.Now().Sub(this.GetLastBurstJackPot()) > 0 {
 		this.SetLastBurstJackPot()
 		jackpotParams := this.DbGameFree.GetJackpot()
-		var jackpotInit = int64(jackpotParams[rule.ICEAGE_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore()) //奖池初始值
+		var jackpotInit = int64(jackpotParams[rule.ICEAGE_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore()) //奖池初始值

 		//AI机器人爆奖
 		val := this.jackpot.VirtualJK
 		this.jackpot.VirtualJK = jackpotInit
-		bet := this.DbGameFree.GetBaseScore() * int32(rule.LINENUM)
-		this.RecordBurstLog(this.RandNickName(), val, int64(bet))
+		bet := int64(this.DbGameFree.GetBaseScore()) * int64(rule.LINENUM)
+		this.RecordBurstLog(this.RandNickName(), val, bet)
 	}
 }
 func (this *IceAgeSceneData) KickPlayerByTime() {
--- a/gamesrv/iceage/scenepolicy_iceage.go
+++ b/gamesrv/iceage/scenepolicy_iceage.go
@ -418,7 +418,7 @@ func (this *SceneStateIceAgeStart) OnPlayerOp(s *base.Scene, p *base.Player, opc
 		prizeFund := gamePoolCoin - sceneEx.jackpot.VirtualJK // 除去奖池的水池剩余金额

 		var jackpotParam = sceneEx.GetDBGameFree().GetJackpot() // 奖池参数
-		var jackpotInit = int64(jackpotParam[rule.ICEAGE_JACKPOT_InitJackpot] * sceneEx.GetDBGameFree().GetBaseScore())
+		var jackpotInit = int64(jackpotParam[rule.ICEAGE_JACKPOT_InitJackpot]) * int64(sceneEx.GetDBGameFree().GetBaseScore())
 		var jackpotFundAdd, prizeFundAdd int64 //奖池/水池增量
 		if playerEx.freeTimes <= 0 {           //正常模式才能记录用户的押注变化，免费模式不能改变押注
 			playerEx.betLines = lineParams // 选线记录
@ -816,7 +816,7 @@ func (this *SceneStateIceAgeStart) BenchTest(s *base.Scene, p *base.Player) {

 	oldCoin := p.GetCoin()
 	//p.coin = int64(5000 * s.GetDBGameFree().GetBaseScore())
-	p.SetCoin(int64(5000 * s.GetDBGameFree().GetBaseScore()))
+	p.SetCoin(5000 * int64(s.GetDBGameFree().GetBaseScore()))
 	if playerEx, ok := p.GetExtraData().(*IceAgePlayerData); ok {
 		for i := 0; i < BENCH_CNT; i++ {
 			startCoin := p.GetCoin()
--- a/gamesrv/tamquoc/scenedata_tamquoc.go
+++ b/gamesrv/tamquoc/scenedata_tamquoc.go
@ -59,7 +59,7 @@ func (this *TamQuocSceneData) init() bool {
 	this.jackpot = &base.SlotJackpotPool{}
 	if this.jackpot.Small <= 0 {
 		this.jackpot.Small = 0
-		this.jackpot.VirtualJK = int64(params[rule.TAMQUOC_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore())
+		this.jackpot.VirtualJK = int64(params[rule.TAMQUOC_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore())
 	}
 	str := base.SlotsPoolMgr.GetPool(this.GetGameFreeId(), this.Platform)
 	if str != "" {
@ -114,7 +114,7 @@ func (this *TamQuocSceneData) CalcLinePrize(cards []int, betLines []int64, betVa
 			if spinRes.TotalPrizeJackpot == 0 { // 第一个爆奖 获取当前奖池所有
 				prizeJackpot = this.jackpot.VirtualJK
 			} else { // 之后的爆奖 奖励为奖池初值
-				prizeJackpot = int64(this.DbGameFree.GetJackpot()[rule.TAMQUOC_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore())
+				prizeJackpot = int64(this.DbGameFree.GetJackpot()[rule.TAMQUOC_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore())
 			}
 			prizeJackpot = calcTaxScore(prizeJackpot, &spinRes.TotalTaxScore)
 			spinRes.TotalPrizeJackpot += prizeJackpot
@ -273,12 +273,12 @@ func (this *TamQuocSceneData) AIBurstJackPot() {
 	if time.Now().Sub(this.GetLastBurstJackPot()) > 0 {
 		this.SetLastBurstJackPot()
 		jackpotParams := this.DbGameFree.GetJackpot()
-		var jackpotInit = int64(jackpotParams[rule.TAMQUOC_JACKPOT_InitJackpot] * this.DbGameFree.GetBaseScore()) //奖池初始值
+		var jackpotInit = int64(jackpotParams[rule.TAMQUOC_JACKPOT_InitJackpot]) * int64(this.DbGameFree.GetBaseScore()) //奖池初始值

 		//AI机器人爆奖
 		val := this.jackpot.VirtualJK
 		this.jackpot.VirtualJK = jackpotInit
-		bet := this.DbGameFree.GetBaseScore() * int32(rule.LINENUM)
+		bet := int64(this.DbGameFree.GetBaseScore()) * int64(rule.LINENUM)
 		this.RecordBurstLog(this.RandNickName(), val, int64(bet))
 	}
 }
--- a/gamesrv/tamquoc/scenepolicy_tamquoc.go
+++ b/gamesrv/tamquoc/scenepolicy_tamquoc.go
@ -411,7 +411,7 @@ func (this *SceneStateTamQuocStart) OnPlayerOp(s *base.Scene, p *base.Player, op

 		// 奖池参数
 		var jackpotParam = sceneEx.DbGameFree.GetJackpot()
-		var jackpotInit = int64(jackpotParam[rule.TAMQUOC_JACKPOT_InitJackpot] * sceneEx.DbGameFree.GetBaseScore()) //奖池初始值
+		var jackpotInit = int64(jackpotParam[rule.TAMQUOC_JACKPOT_InitJackpot]) * int64(sceneEx.DbGameFree.GetBaseScore()) //奖池初始值

 		var jackpotFundAdd, prizeFundAdd int64
 		if playerEx.freeTimes <= 0 { //正常模式才能记录用户的押注变化，免费模式不能改变押注
--- a/gamesrv/tienlen/scenepolicy_tienlen.go
+++ b/gamesrv/tienlen/scenepolicy_tienlen.go
@ -461,7 +461,8 @@ func TienLenCreateRoomInfoPacket(s *base.Scene, p *base.Player, sceneEx *TienLen
 				}
 			}
 		}
-
+		pack.IsOutRecord = playerEx.CanUseRecordItem()
+		pack.ItemRecExpireTime = playerEx.ItemRecExpireTime
 	}
 	pack.Players = append(pack.Players, pd)

@ -516,8 +517,6 @@ func TienLenCreateRoomInfoPacket(s *base.Scene, p *base.Player, sceneEx *TienLen
 			}
 		}
 	}
-	pack.IsOutRecord = playerEx.CanUseRecordItem()
-	pack.ItemRecExpireTime = playerEx.ItemRecExpireTime

 	proto.SetDefaults(pack)
 	return pack
Author	SHA1	Message	Date
sk	ed1aa36815	拉霸奖池金额数据类型错误	2024-05-17 15:46:01 +08:00
sk	bc81c3c204	tienlen记牌器问题	2024-05-13 16:29:20 +08:00