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

worldsrv/welfmgr.go

@@ -2281,7 +2281,7 @@ func (this *WelfareMgr) SendRedPacketInfo(p *Player) *welfare.SCRedPacketInfo {
 			continue
 		}
 		startTs, endTs := common.IntToTime(int(v.GetStartHMS())).Unix(), common.IntToTime(int(v.GetEndHMS())).Unix()
-		if now < startTs || now >= endTs {
+		if now >= endTs {
 			continue
 		}
 		info := &welfare.RedPacketInfo{
@@ -2296,7 +2296,7 @@ func (this *WelfareMgr) SendRedPacketInfo(p *Player) *welfare.SCRedPacketInfo {
 			}
 		}
 		_, info.RemainCount = RedPacketMgrInst.GetRemainTimesByConfig(p, v)
-		if info.RemainCount > 0 {
+		if info.RemainCount > 0 || info.RemainCount == -1 {
 			pack.Info = append(pack.Info, info)
 		}
 	}