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

worldsrv/welfmgr.go

@@ -1762,10 +1762,12 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
 		}
 
 		if p.WelfData.PigBank.BankCoin >= BankMaxCoin {
+			p.WelfData.PigBank.BankCoin = BankMaxCoin
+		}
 		pack.OpRetCode = welfare.OpResultCode_OPRC_Sucess
-			pack.TakeCoinNum = BankMaxCoin
+		pack.TakeCoinNum = p.WelfData.PigBank.BankCoin
 
-			p.AddCoin(BankMaxCoin, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
+		p.AddCoin(p.WelfData.PigBank.BankCoin, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
 
 		// 领取完之后 设置为0
 		p.WelfData.PigBank.BankCoin = 0
@@ -1778,7 +1780,7 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
 		pack.Price = int64(infoData.CoinPrice)
 		logger.Logger.Tracef("PigbankTakeCoin  snid: %v pack: %v", p.SnId, pack)
 		p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
-		}
+
 	}
 }