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

Merge branch 'dev_pigbank2' into develop

This commit is contained in:
DESKTOP-45ANQ2C\unis 2024-12-27 15:35:31 +08:00
parent 32eb22f956 c12514e07d
commit f657773a5e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
worldsrv/welfmgr.go
View File

@ -1118,7 +1118,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
if cyc == 1 || blindBox.Cycle == model.WelfareOpen { if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
p.WelfData.BlindBoxId = 0 p.WelfData.BlindBoxId = 0
} }
} // == 1代表当日循环 } // == 1代表当日循环
if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
idx := bid idx := bid
@ -1871,6 +1871,10 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
p.AddCoin(p.WelfData.PigBank.BankCoin, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币") p.AddCoin(p.WelfData.PigBank.BankCoin, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
if p.WelfData.PigBank.TakeRecord != nil {
p.WelfData.PigBank.TakeRecord[infoData.Id] = p.WelfData.PigBank.BankCoin
}
if infoData.GoldExc != nil { if infoData.GoldExc != nil {
// 发放奖励道具 // 发放奖励道具
var items []*model.Item var items []*model.Item
@ -1898,11 +1902,8 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
p.WelfData.PigBank.TakeTimes++ p.WelfData.PigBank.TakeTimes++
p.WelfData.PigBank.DayBuyTimes++ p.WelfData.PigBank.DayBuyTimes++
if p.WelfData.PigBank.TakeRecord != nil {
p.WelfData.PigBank.TakeRecord[infoData.Id] = p.WelfData.PigBank.BankCoin
}
pack.TakeTimes = p.WelfData.PigBank.DayBuyTimes pack.TakeTimes = p.WelfData.PigBank.DayBuyTimes
logger.Logger.Tracef("PigbankTakeCoin snid: %v pack: %v", p.SnId, pack) logger.Logger.Tracef("PigbankTakeCoin snid: %v pack: %v", p.SnId, pack)
p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack) p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_CoinPigBank, 1)) mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_CoinPigBank, 1))