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

data/DB_PigBank_Diamond.dat

@@ -1,4 +1,4 @@
 
 


 (Ђ­в8–
@Ўи;PdX–
`c
-< ((€­β2ΕΈ
2συ
8¬@Άθ;Jσυ
JΖΈ
PdX¬`Η

-?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;JΖΈJσυ
PdXξ`σ
+< ((€­β2ΕΈ
2συ
8¬@Άθ;JΖΈ
Jσυ
PdX¬`Η

+?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;Jσυ
JΖΈPdXξ`σ

data/DB_PropExchange.dat

@@ -1,8 +1,8 @@
 
-6

с├
т├
у├
ж├
в├
"║█ю└=
+6

у├
ж├
в├
с├
т├
"║█ю└=
 .
Û†
؆
Ù†
Ú†
"¡<>À„=
-W
ж├
ь├
с├
т├
ы├
з├
ш├
у├
в├
"	║█─╜Б
-]
в├
ы├
ш├
с├
у├
ь├
з├
э├
т├
ж├
"╒█Т
+W
т├
у├
ш├
с├
ж├
в├
ь├
ы├
з├
"	║█─╜Б
+]
в├
з├
э├
т├
у├
ж├
ш├
с├
ь├
ы├
"╒█Т
 à†"¸
0
 à†
 "¢<>0

data/DB_Task.json

@@ -1523,10 +1523,10 @@
 			"Id": 13022,
 			"Order": 22,
 			"Name": "年兽活动",
-			"Des": "成功击杀2只年兽",
+			"Des": "成功击杀3只年兽",
 			"ActivityType": 9,
 			"TaskType": 33,
-			"TargetTimes": 2,
+			"TargetTimes": 3,
 			"FinishTimes": 1,
 			"Award": {
 				"50015": 5
@@ -1536,10 +1536,10 @@
 			"Id": 13023,
 			"Order": 23,
 			"Name": "年兽活动",
-			"Des": "成功击杀3只年兽",
+			"Des": "成功击杀6只年兽",
 			"ActivityType": 9,
 			"TaskType": 33,
-			"TargetTimes": 3,
+			"TargetTimes": 6,
 			"FinishTimes": 1,
 			"Award": {
 				"50015": 10
@@ -1549,10 +1549,10 @@
 			"Id": 13024,
 			"Order": 24,
 			"Name": "年兽活动",
-			"Des": "成功击杀5只年兽",
+			"Des": "成功击杀9只年兽",
 			"ActivityType": 9,
 			"TaskType": 33,
-			"TargetTimes": 5,
+			"TargetTimes": 9,
 			"FinishTimes": 1,
 			"Award": {
 				"50015": 15
@@ -1562,10 +1562,10 @@
 			"Id": 13025,
 			"Order": 25,
 			"Name": "年兽活动",
-			"Des": "成功击杀8只年兽",
+			"Des": "成功击杀12只年兽",
 			"ActivityType": 9,
 			"TaskType": 33,
-			"TargetTimes": 8,
+			"TargetTimes": 12,
 			"FinishTimes": 1,
 			"Award": {
 				"50015": 20
@@ -1575,10 +1575,10 @@
 			"Id": 13026,
 			"Order": 26,
 			"Name": "年兽活动",
-			"Des": "成功击杀10只年兽",
+			"Des": "成功击杀20只年兽",
 			"ActivityType": 9,
 			"TaskType": 33,
-			"TargetTimes": 10,
+			"TargetTimes": 20,
 			"FinishTimes": 1,
 			"Award": {
 				"50015": 45

worldsrv/action_nian.go

@@ -331,7 +331,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
 		for i := 0; i < count; i++ {
 			//随机伤害值
 			randomValue := int64(rand.Intn(intSlice[1]-intSlice[0]+1) + intSlice[0])
-			logger.Logger.Tracef("随机到的伤害值是：%d", randomValue)
+			logger.Logger.Tracef("snid :%v 随机到的伤害值是：%d", p.SnId, randomValue)
 			//计算BUFF
 			if p.WelfData.NianData.BuffCount > 0 {
 				randomValue = randomValue + randomValue/2
@@ -409,7 +409,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
 					Change:   extraItems,
 					GainWay:  common.GainWayNianGain_Attack_BigOther,
 					Operator: "system",
-					Remark:   "年兽活动-打爆竹额外活动奖励",
+					Remark:   "年兽活动-大爆竹额外活动奖励",
 				})
 				extraDrop := &activity.RankAwardData{}
 				extraDrop.ItemId = int32(extraItemId)
@@ -492,7 +492,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
 				var bossDieOther []*model.Item
 				for _, info := range pool.List[0].BossDieOtherReward {
 					if p.WelfData.NianData.OtherAwardNum[info.Id] >= info.DropUp {
-						logger.Logger.Trace("BOSS死亡 额外掉落达到上限 id = ", info.Id, "数量：", p.WelfData.NianData.OtherAwardNum[info.Id])
+						logger.Logger.Trace("snid:", p.SnId, "BOSS死亡 额外掉落达到上限 id = ", info.Id, "数量：", p.WelfData.NianData.OtherAwardNum[info.Id])
 						continue
 					}
 					//随机
@@ -565,6 +565,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
 			luckTime = 0
 		}
 		damage := p.WelfData.NianData.AttackSumHp
+		logger.Logger.Tracef("sndi :%v,当前最大幸运值：%v，“总榜伤害值:%v", p.SnId, p.WelfData.NianData.AttackMaxHp, p.WelfData.NianData.AttackSumHp)
 		if damage < RankNeed {
 			damage = 0
 		}
@@ -582,6 +583,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
 				log.LuckTime = luckTime
 			}
 			mq.Write(log)
+			logger.Logger.Tracef("更新排行榜数据 snid :%v,log:%v", p.SnId, log)
 		}
 	}
 	return nil