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

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

This commit is contained in:
sk 2024-06-27 17:32:15 +08:00
parent 0c0f270762 606aff2240
commit 7786aeac9c
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gamesrv/base/player.go
View File

@ -1325,8 +1325,13 @@ func (this *Player) UpdatePigBankCoin(gainTexCoin int64) {
}
return 0
}
BankCoinMax := fGetPropValue("BankMaxCoin")
BankCoinMax := int64(0)
for _, data := range srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr() {
if this.WelfData.PigBank.DayBuyTimes+1 >= data.BuyCountMin && this.WelfData.PigBank.DayBuyTimes+1 <= data.BuyCountMax {
BankCoinMax = int64(data.MaxGold)
break
}
}
pack := &player.SCPigBankCoin{}

10
worldsrv/welfmgr.go
View File

@ -460,6 +460,9 @@ func (this *WelfareMgr) GetTurnplteVideo(p *Player) {
// 可以领取
p.WelfData.Sign7.VideoTicket = ts
index := p.WelfData.Sign7.SignIndex % int32(len(turn.RateList))
if index == 0 {
index = 7
}
var drawdates []*webapi_proto.WelfareDate
for _, v := range sign7.List {
if v.Day == index { // 找到对应天数
@ -641,6 +644,13 @@ func (this *WelfareMgr) WelfaredInfo(p *Player) {
info := this.GetConfig(p.Platform)
turnplate := info.WelfareTurnplateDateList
sign7 := info.Welfare7SignDateList
//第8天 清除数据
if p.WelfData.Sign7.SignIndex%int32(len(turnplate.RateList)) == 0 && (time.Now().Unix()-p.WelfData.Sign7.SignTickets)/86400 >= 1 {
p.WelfData.Sign7.Addup2Data = make(map[int32]map[int32]int64)
p.WelfData.Sign7.AddupIndex = []int32{}
}
if turnplate != nil && sign7 != nil {
pack.Switch = turnplate.Switch
if turnplate.Switch != model.WelfareClose {