From 464f112038ffe7887332d4a49cd21f06d4c5bfd9 Mon Sep 17 00:00:00 2001
From: kxdd <39694055+shaojiayao@users.noreply.github.com>
Date: Tue, 7 May 2024 17:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E9=92=B1=E7=BD=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/welfmgr.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/worldsrv/welfmgr.go b/worldsrv/welfmgr.go
index 14889d1..ccfad96 100644
--- a/worldsrv/welfmgr.go
+++ b/worldsrv/welfmgr.go
@@ -1545,12 +1545,13 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
 		return 0
 	}
 
+	BankMaxCoin := int64(fGetPropValue("BankMaxCoin"))
 	if p.WelfData != nil && p.WelfData.PigBank != nil {
 
 		pack.CostDiamond = fGetCostDiamond(p.WelfData.PigBank.TakeTimes + 1)
-		pack.BankMaxCoin = int64(fGetPropValue("BankMaxCoin"))
+		pack.BankMaxCoin = BankMaxCoin
 
-		if p.WelfData.PigBank.BankCoin < int64(fGetPropValue("BankMaxCoin")) {
+		if p.WelfData.PigBank.BankCoin < BankMaxCoin {
 			pack.OpRetCode = welfare.OpResultCode_OPRC_PigbankNotFull
 			logger.Logger.Trace("存钱罐没有满")
 			p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
@@ -1569,11 +1570,11 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
 			return
 		}
 
-		if p.WelfData.PigBank.BankCoin == int64(fGetPropValue("BankMaxCoin")) {
+		if p.WelfData.PigBank.BankCoin >= BankMaxCoin {
 			pack.OpRetCode = welfare.OpResultCode_OPRC_Sucess
-			pack.TakeCoinNum = p.WelfData.PigBank.BankCoin
+			pack.TakeCoinNum = BankMaxCoin
 
-			p.AddCoin(p.WelfData.PigBank.BankCoin, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
+			p.AddCoin(BankMaxCoin, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
 
 			// 领取完之后 设置为0
 			p.WelfData.PigBank.BankCoin = 0