Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
This commit is contained in:
commit
87a9a65643
|
@ -958,7 +958,7 @@ func (r *RankMatchMgr) NianRankAward() {
|
|||
end, _ := time.Parse(time.DateTime, endTime)
|
||||
endTimestamp := end.Unix()
|
||||
nowTime := time.Now().Unix()
|
||||
if nowTime < timestamp || nowTime > endTimestamp {
|
||||
if nowTime < timestamp || nowTime-86400 > endTimestamp {
|
||||
return
|
||||
}
|
||||
log := &model.NianPlayerRankLog{}
|
||||
|
@ -1053,7 +1053,8 @@ func (r *RankMatchMgr) NianRankAward() {
|
|||
|
||||
})).StartByExecutor("NianLuck_Award")
|
||||
} else if info.TypeId == 2 {
|
||||
if time.Now().Day()-1 != end.Day() {
|
||||
yesterday := time.Unix(time.Now().Unix()-86400, 0)
|
||||
if yesterday.Day() != end.Day() {
|
||||
return
|
||||
}
|
||||
rankAward := info.RankInfo
|
||||
|
|
|
@ -2291,7 +2291,7 @@ func init() {
|
|||
retFail("购买记录状态修改失败")
|
||||
return
|
||||
}
|
||||
if player != nil || (player != nil && player.IsOffline()) {
|
||||
if player != nil && !player.IsOffline() {
|
||||
player.DoShopInfo(info, false)
|
||||
// 邀请积分
|
||||
InviteTask(msg.Platform, player.PSnId, info.SnId, common.InviteScoreTypePay, int64(info.ConsumeNum))
|
||||
|
|
Loading…
Reference in New Issue