tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

This commit is contained in:
sk 2024-05-06 11:32:29 +08:00
parent d6cb1f3266 83f571b543
commit 23b44237d8
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gamesrv/tienlen/playerdata_tienlen.go
View File

@ -255,22 +255,17 @@ func (this *TienLenPlayerData) UpdatePigbankCoin(gainTexCoin int64) {
if gainTexCoin < 0 { if gainTexCoin < 0 {
LoseCoinRate := fGetPropValue("LoseCoinRate") LoseCoinRate := fGetPropValue("LoseCoinRate")
pack.AddBankCoin = int64(math.Abs(math.Ceil(float64(gainTexCoin) * float64(LoseCoinRate) / 100.0)))
pack.AddBankCoin = int64(math.Ceil(float64(gainTexCoin) * float64(LoseCoinRate) / 100.0))
this.WelfData.PigBank.BankCoin += pack.AddBankCoin
if this.WelfData.PigBank.BankCoin < 0 {
this.WelfData.PigBank.BankCoin = 0
}
} }
if gainTexCoin > 0 { if gainTexCoin > 0 {
WinCoinRate := fGetPropValue("WinCoinRate") WinCoinRate := fGetPropValue("WinCoinRate")
pack.AddBankCoin = int64(math.Ceil(float64(gainTexCoin) * float64(WinCoinRate) / 100.0)) pack.AddBankCoin = int64(math.Ceil(float64(gainTexCoin) * float64(WinCoinRate) / 100.0))
this.WelfData.PigBank.BankCoin += pack.AddBankCoin }
if this.WelfData.PigBank.BankCoin > BankCoinMax {
this.WelfData.PigBank.BankCoin = BankCoinMax this.WelfData.PigBank.BankCoin += pack.AddBankCoin
} if this.WelfData.PigBank.BankCoin > BankCoinMax {
this.WelfData.PigBank.BankCoin = BankCoinMax
} }
pack.BankCoinMax = BankCoinMax pack.BankCoinMax = BankCoinMax

2
gamesrv/tienlen/scenepolicy_tienlen.go
View File

@ -2582,7 +2582,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
// 刷新存钱罐 // 刷新存钱罐
playerEx, _ := s.GetPlayer(o_player.UserId).GetExtraData().(*TienLenPlayerData) playerEx, _ := s.GetPlayer(o_player.UserId).GetExtraData().(*TienLenPlayerData)
if playerEx != nil && (s.IsRankMatch() || s.IsCoinScene()) { if playerEx != nil && (s.IsRankMatch() || s.IsCoinScene()) {
playerEx.UpdatePigbankCoin(o_player.GainTaxCoin) playerEx.UpdatePigbankCoin(o_player.GainCoin)
} }
validFlow := totalin + totalout validFlow := totalin + totalout