Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
This commit is contained in:
commit
23b44237d8
|
|
@ -255,22 +255,17 @@ func (this *TienLenPlayerData) UpdatePigbankCoin(gainTexCoin int64) {
|
|||
|
||||
if gainTexCoin < 0 {
|
||||
LoseCoinRate := fGetPropValue("LoseCoinRate")
|
||||
|
||||
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
|
||||
}
|
||||
pack.AddBankCoin = int64(math.Abs(math.Ceil(float64(gainTexCoin) * float64(LoseCoinRate) / 100.0)))
|
||||
}
|
||||
|
||||
if gainTexCoin > 0 {
|
||||
WinCoinRate := fGetPropValue("WinCoinRate")
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -2582,7 +2582,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
|
|||
// 刷新存钱罐
|
||||
playerEx, _ := s.GetPlayer(o_player.UserId).GetExtraData().(*TienLenPlayerData)
|
||||
if playerEx != nil && (s.IsRankMatch() || s.IsCoinScene()) {
|
||||
playerEx.UpdatePigbankCoin(o_player.GainTaxCoin)
|
||||
playerEx.UpdatePigbankCoin(o_player.GainCoin)
|
||||
}
|
||||
|
||||
validFlow := totalin + totalout
|
||||
|
|
|
|||
Loading…
Reference in New Issue