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

Compare commits

base: tl_server_2:2904be27f452ae2b8aeca477e4d592015241420f
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:48456483c7864e8466d4f68d3f2e654f2af0e623
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "2904be27f452ae2b8aeca477e4d592015241420f" and "48456483c7864e8466d4f68d3f2e654f2af0e623" have entirely different histories.
2904be27f4 ... 48456483c7

1 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

11
worldsrv/welfmgr.go
View File

@ -1545,13 +1545,12 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
return 0 return 0
} }
BankMaxCoin := int64(fGetPropValue("BankMaxCoin"))
if p.WelfData != nil && p.WelfData.PigBank != nil { if p.WelfData != nil && p.WelfData.PigBank != nil {
pack.CostDiamond = fGetCostDiamond(p.WelfData.PigBank.TakeTimes + 1) pack.CostDiamond = fGetCostDiamond(p.WelfData.PigBank.TakeTimes + 1)
pack.BankMaxCoin = BankMaxCoin pack.BankMaxCoin = int64(fGetPropValue("BankMaxCoin"))
if p.WelfData.PigBank.BankCoin < BankMaxCoin { if p.WelfData.PigBank.BankCoin < int64(fGetPropValue("BankMaxCoin")) {
pack.OpRetCode = welfare.OpResultCode_OPRC_PigbankNotFull pack.OpRetCode = welfare.OpResultCode_OPRC_PigbankNotFull
logger.Logger.Trace("存钱罐没有满") logger.Logger.Trace("存钱罐没有满")
p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack) p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
@ -1570,11 +1569,11 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
return return
} }
if p.WelfData.PigBank.BankCoin >= BankMaxCoin { if p.WelfData.PigBank.BankCoin == int64(fGetPropValue("BankMaxCoin")) {
pack.OpRetCode = welfare.OpResultCode_OPRC_Sucess 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 // 领取完之后 设置为0
p.WelfData.PigBank.BankCoin = 0 p.WelfData.PigBank.BankCoin = 0