年兽任务

data/DB_NewYearActivity.dat

@@ -8,18 +8,19 @@ SignReward50014,10;100001,100000"签到奖励
 BOSS血量
 9
 BossReward100001,100000;100002,10"BOSS击杀奖励
-0
LuckyRankNeed110000"幸运榜上榜条件
-0RankNeed80000000"总伤害榜上榜条件
-@	LittleHurtGold80000,120000"小爆竹造成的伤害范围
+/
LuckyRankNeed10000"幸运榜上榜条件
+/RankNeed7000000"总伤害榜上榜条件
+>	LittleHurtGold
+8000,12000"小爆竹造成的伤害范围
 >
 BigHurtGold
400000,600000"大爆竹造成的伤害范围
 4
 BigHurtExc30001"大爆竹额外掉落道具ID
->BigHurtExcNumber10,30"!大爆竹额外掉落数量范围
+=BigHurtExcNumber3,15"!大爆竹额外掉落数量范围
 5
LittleGuaranteed30"小爆竹保底掉落次数
 ALittleGuaranteedReward100002,5"小爆竹保底掉落物品
 2
BigGuaranteed10"大爆竹保底掉落次数
-?BigGuaranteedReward	30001,100"大爆竹保底掉落物品
+>BigGuaranteedReward30001,80"大爆竹保底掉落物品
 .
 GiftShopID991001,991002,991003"礼包ID
 @
GiftShopLimit3,0,0"&礼包每日限购次数,0为不限购

data/DB_NewYearActivity.json

@@ -39,19 +39,19 @@
 		{
 			"Id": 7,
 			"PorpName": "LuckyRankNeed",
-			"PropValue": "110000",
+			"PropValue": "10000",
 			"PropDec": "幸运榜上榜条件"
 		},
 		{
 			"Id": 8,
 			"PorpName": "RankNeed",
-			"PropValue": "80000000",
+			"PropValue": "7000000",
 			"PropDec": "总伤害榜上榜条件"
 		},
 		{
 			"Id": 9,
 			"PorpName": "LittleHurtGold",
-			"PropValue": "80000,120000",
+			"PropValue": "8000,12000",
 			"PropDec": "小爆竹造成的伤害范围"
 		},
 		{
@@ -69,7 +69,7 @@
 		{
 			"Id": 12,
 			"PorpName": "BigHurtExcNumber",
-			"PropValue": "10,30",
+			"PropValue": "3,15",
 			"PropDec": "大爆竹额外掉落数量范围"
 		},
 		{
@@ -93,7 +93,7 @@
 		{
 			"Id": 16,
 			"PorpName": "BigGuaranteedReward",
-			"PropValue": "30001,100",
+			"PropValue": "30001,80",
 			"PropDec": "大爆竹保底掉落物品"
 		},
 		{

dbproxy/svc/l_ranknian.go

@@ -80,7 +80,7 @@ func (svc *RankNianSvc) LuckFind(args *model.FindNianListArgs, ret *model.FindNi
 		return RankNianColError
 	}
 
-	err := fc.Find(bson.M{}).Sort("-luck").Limit(40).All(&ret.List)
+	err := fc.Find(bson.M{"luck": bson.M{"$gt": 0}}).Sort("-luck").Limit(40).All(&ret.List)
 	if err != nil && !errors.Is(err, mgo.ErrNotFound) {
 		logger.Logger.Error("QueryMatchSeason is err: ", err)
 		return err
@@ -95,7 +95,7 @@ func (svc *RankNianSvc) DamageFind(args *model.FindNianListArgs, ret *model.Find
 		return RankNianColError
 	}
 
-	err := fc.Find(bson.M{}).Sort("-damage").Limit(40).All(&ret.List)
+	err := fc.Find(bson.M{"damage": bson.M{"$gt": 0}}).Sort("-damage").Limit(40).All(&ret.List)
 	if err != nil && !errors.Is(err, mgo.ErrNotFound) {
 		logger.Logger.Error("QueryMatchSeason is err: ", err)
 		return err

worldsrv/rankmatch.go

@@ -1034,6 +1034,7 @@ func (r *RankMatchMgr) NianRankAward() {
 						log.RankData = append(log.RankData, rankData)
 						rankId += 1
 					}
+					mq.Write(log)
 					//清除幸运榜数值
 					err := model.ClearNianRank(&model.FindNianListArgs{
 						Platform: platform,
@@ -1041,7 +1042,6 @@ func (r *RankMatchMgr) NianRankAward() {
 					if err != nil {
 						logger.Logger.Errorf("清除幸运榜数值失败 err:%v", err)
 					}
-					mq.Write(log)
 
 				})).StartByExecutor("NianLuck_Award")
 			} else if info.TypeId == 2 {
@@ -1117,6 +1117,7 @@ func (r *RankMatchMgr) NianRankAward() {
 						log.RankData = append(log.RankData, rankData)
 						rankId += 1
 					}
+					mq.Write(log)
 					//删除数据库数据
 					err := model.DelNianRank(&model.FindNianListArgs{
 						Platform: platform,
@@ -1124,7 +1125,6 @@ func (r *RankMatchMgr) NianRankAward() {
 					if err != nil {
 						logger.Logger.Errorf("删除年兽排行榜数据库数据 err:%v", err)
 					}
-					mq.Write(log)
 				})).StartByExecutor("NianDamage_Award")
 			}
 		}

worldsrv/welfmgr.go

@@ -2232,13 +2232,18 @@ func (this *WelfareMgr) ClearActivityNianData(p *Player) {
 	if p != nil && p.WelfData != nil && p.WelfData.NianData != nil {
 		p.WelfData.NianData = nil
 		//清除任务数据
+		if p.WelfData.Task != nil {
 			for id, _ := range p.WelfData.Task {
 				data := srvdata.PBDB_TaskMgr.GetData(id)
+				if data == nil {
+					continue
+				}
 				if data.ActivityType == common.TaskActivityTypeNianEveryDay || data.ActivityType == common.TaskActivityTypeNian {
 					delete(p.WelfData.Task, id)
 				}
 			}
 		}
+	}
 }
 
 // UpdateRedPacket 更新红包配置
@@ -2351,7 +2356,7 @@ func (this *WelfareMgr) GetRedPacket(p *Player, id int64) *welfare.SCRedPacketDr
 				p.WelfData.RedPacket[v.GetId()].JN++
 			}
 		}
-		Send(welfare.OpResultCode_OPRC_Sucess)
+		//Send(welfare.OpResultCode_OPRC_Sucess)
 		return pack
 	}