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

worldsrv/welfmgr.go

@@ -1063,7 +1063,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
 			if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
 				p.WelfData.BlindBoxId = 0
 			}
-		} // == 1代表当日循环
+		}                               // == 1代表当日循环
 		if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
 
 			idx := bid
@@ -1762,23 +1762,25 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
 		}
 
 		if p.WelfData.PigBank.BankCoin >= BankMaxCoin {
-			pack.OpRetCode = welfare.OpResultCode_OPRC_Sucess
-			pack.TakeCoinNum = BankMaxCoin
-
-			p.AddCoin(BankMaxCoin, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
-
-			// 领取完之后 设置为0
-			p.WelfData.PigBank.BankCoin = 0
-			p.WelfData.PigBank.TakeTimes++
-			p.WelfData.PigBank.DayBuyTimes++
-
-			pack.TakeTimes = p.WelfData.PigBank.DayBuyTimes
-			pack.CostDiamond = int64(infoData.CostDiamond)
-			pack.DayBuyMaxCnt = DayBuyMaxCnt
-			pack.Price = int64(infoData.CoinPrice)
-			logger.Logger.Tracef("PigbankTakeCoin  snid: %v pack: %v", p.SnId, pack)
-			p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
+			p.WelfData.PigBank.BankCoin = BankMaxCoin
 		}
+		pack.OpRetCode = welfare.OpResultCode_OPRC_Sucess
+		pack.TakeCoinNum = p.WelfData.PigBank.BankCoin
+
+		p.AddCoin(p.WelfData.PigBank.BankCoin, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
+
+		// 领取完之后 设置为0
+		p.WelfData.PigBank.BankCoin = 0
+		p.WelfData.PigBank.TakeTimes++
+		p.WelfData.PigBank.DayBuyTimes++
+
+		pack.TakeTimes = p.WelfData.PigBank.DayBuyTimes
+		pack.CostDiamond = int64(infoData.CostDiamond)
+		pack.DayBuyMaxCnt = DayBuyMaxCnt
+		pack.Price = int64(infoData.CoinPrice)
+		logger.Logger.Tracef("PigbankTakeCoin  snid: %v pack: %v", p.SnId, pack)
+		p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
+
 	}
 }