解决冲突

common/constant.go

@@ -700,6 +700,9 @@ const (
 	TaskTypeRankMatchWinTimes = 30 // 排位胜利次数
 	TaskTypeBuyPermit         = 31 // 购买典藏通行证
 	TaskTypeBuyRedBag         = 32 // 参与红包雨活动
+	TaskTypeNianBossKill      = 33 // 击杀年兽
+	TaskTypeNianBossDamage    = 34 // 年兽造成伤害
+	TaskTypeNianSign          = 35 // 年兽签到
 )
 
 const (

data/DB_NewYearActivity.dat

@@ -24,4 +24,5 @@ ALittleGuaranteedReward100002,5"小爆竹保底掉落物品
 GiftShopID991001,991002,991003"礼包ID
 @
GiftShopLimit3,0,0"&礼包每日限购次数,0为不限购
 4BossExcLimit30"年兽死亡额外掉落要求
-"	BuffCount
1"Buff生效次数
+"	BuffCount
1"Buff生效次数
+oExchangeDiamond30,5,1000000"L单次兑换爆竹所需要消耗的钻石,获得数量，获得金币数量

data/DB_NewYearActivity.json

@@ -119,6 +119,12 @@
 			"PorpName": "BuffCount",
 			"PropValue": "1",
 			"PropDec": "Buff生效次数"
+		},
+		{
+			"Id": 21,
+			"PorpName": "ExchangeDiamond",
+			"PropValue": "30,5,1000000",
+			"PropDec": "单次兑换爆竹所需要消耗的钻石,获得数量，获得金币数量"
 		}
 	]
 }

data/DB_NewYearRankReward.dat

@@ -1,7 +1,7 @@
 
-


"¹ê
"¡<EFBFBD>"¢<>d
+


"¡<>"¢<>d"¹ê

-
"¢<>d"¸ê
"¡<>
+
"¡<EFBFBD>"¢<EFBFBD>d"¸ê

-
"¡<>"¢<>d"¸ê


+
"¸ê

"¡<EFBFBD>"¢<>d
 
"¡<>"¢<>d
 
"¡<>"¢<>c
 
"¡<>"¢<>b
@@ -17,33 +17,33 @@
 
"¡<>"¢<>Z
 
"¡<>"¢<>Y
 
"¡<>"¢<>X
-
"¡<EFBFBD>"¢<>W
+
"¢<EFBFBD>W"¡<>
 
"¡<>"¢<>V
 
"¡<>"¢<>U
-
"¢<EFBFBD>T"¡<>
+
"¡<EFBFBD>"¢<>T
 
"¡<>"¢<>S
 
"¡<>"¢<>R
 
"¡<>"¢<>Q
 
"¡<>"¢<>P
 
"¡<>"¢<>O
 
"¡<>"¢<>N
-
"¢<EFBFBD>M"¡<>
+
"¡<EFBFBD>"¢<>M
-
"¡<EFBFBD>"¢<>L
+
"¢<EFBFBD>L"¡<>
 
"¡<>"¢<>K
-
"¡<EFBFBD>"¢<>J
+
"¢<EFBFBD>J"¡<>
-
"¡<EFBFBD>"¢<>I
+
"¢<EFBFBD>I"¡<>
  
 "¡<>"¢<>H
-!
!"¢<EFBFBD>G"¡<>
+!
!"¡<EFBFBD>"¢<>G
 "
""¡<>"¢<>F
-#
#"¡<EFBFBD>"¢<>E
+#
#"¢<EFBFBD>E"¡<>
 $
$"¡<>"¢<>D
 %
%"¡<>"¢<>C
-&
&"¢<EFBFBD>B"¡<>
+&
&"¡<EFBFBD>"¢<>B
 '
'"¡<>"¢<>A
 (
("¡<>"¢<>@
-)
"¹ê
"¡<EFBFBD>"¢<>d
+)
"¡<>"¢<>d"¹ê

 *"¡<>"¢<>d"¸ê

-+"¸ê

"¡<EFBFBD>"¢<>d
++"¡<>"¢<>d"¸ê


 ,"¡<>"¢<>d
 -"¡<>"¢<>c
 ."¡<>"¢<>b
@@ -55,25 +55,25 @@
 3"¡<>"¢<>]
 4"¡<>"¢<>\
 5
"¡<>"¢<>[
-6"¢<EFBFBD>Z"¡<>
+6"¡<EFBFBD>"¢<>Z
 7"¡<>"¢<>Y
 8"¡<>"¢<>X
-9"¢<EFBFBD>W"¡<>
+9"¡<EFBFBD>"¢<>W
-:"¡<EFBFBD>"¢<>V
+:"¢<EFBFBD>V"¡<>
 ;"¡<>"¢<>U
 <"¡<>"¢<>T
 ="¡<>"¢<>S
 >"¡<>"¢<>R
-?"¢<EFBFBD>Q"¡<>
+?"¡<EFBFBD>"¢<>Q
 @"¡<>"¢<>P
-A"¡<EFBFBD>"¢<>O
+A"¢<EFBFBD>O"¡<>
 B"¡<>"¢<>N
-C"¢<EFBFBD>M"¡<>
+C"¡<EFBFBD>"¢<>M
 D"¡<>"¢<>L
-E"¢<EFBFBD>K"¡<>
+E"¡<EFBFBD>"¢<>K
 F"¡<>"¢<>J
 G"¡<>"¢<>I
-H "¢<EFBFBD>H"¡<>
+H "¡<EFBFBD>"¢<>H
 I!"¡<>"¢<>G
 J""¡<>"¢<>F
 K#"¡<>"¢<>E
@@ -81,4 +81,4 @@
 M%"¡<>"¢<>C
 N&"¡<>"¢<>B
 O'"¡<>"¢<>A
-P("¢<EFBFBD>@"¡<>
+P("¡<EFBFBD>"¢<>@

data/DB_PigBank_Diamond.dat

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


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

+< ((€­β2ΕΈ
2συ
8¬@Άθ;JΖΈ
Jσυ
PdX¬`Η

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

data/DB_Task.json

@@ -1239,9 +1239,9 @@
 			"Id": 13001,
 			"Order": 1,
 			"Name": "年兽活动",
-			"Des": "领取转盘签到奖励",
+			"Des": "领取年兽签到奖励",
 			"ActivityType": 8,
-			"TaskType": 17,
+			"TaskType": 35,
 			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
@@ -1265,24 +1265,7 @@
 			"Id": 13003,
 			"Order": 3,
 			"Name": "年兽活动",
-			"Des": "购买任意金币1次",
+			"Des": "购买1次任意存钱罐",
-			"ActivityType": 8,
-			"TaskType": 2,
-			"TargetTimes": 1,
-			"FinishTimes": 1,
-			"Award": {
-				"50014": 10
-			},
-			"Position": [
-				0,
-				1
-			]
-		},
-		{
-			"Id": 13004,
-			"Order": 4,
-			"Name": "年兽活动",
-			"Des": "购买任意存钱罐1次",
 			"ActivityType": 8,
 			"TaskType": 22,
 			"TargetTimes": 1,
@@ -1292,83 +1275,93 @@
 			}
 		},
 		{
-			"Id": 13005,
+			"Id": 13004,
-			"Order": 5,
+			"Order": 4,
 			"Name": "年兽活动",
-			"Des": "参与大众场对局获得胜利3次",
+			"Des": "游戏Tienlen比赛场5次",
 			"ActivityType": 8,
-			"TaskType": 23,
+			"TaskType": 25,
-			"TargetTimes": 3,
+			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
 				"50014": 10
 			},
 			"GameType": 1
 		},
+		{
+			"Id": 13005,
+			"Order": 5,
+			"Name": "年兽活动",
+			"Des": "游戏十三水10次",
+			"ActivityType": 8,
+			"TaskType": 5,
+			"TargetTimes": 10,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			},
+			"GameType": 2
+		},
 		{
 			"Id": 13006,
 			"Order": 6,
 			"Name": "年兽活动",
-			"Des": "参与排位赛获得胜利3次",
+			"Des": "今日累计赢取1M金币",
 			"ActivityType": 8,
-			"TaskType": 30,
+			"TaskType": 8,
-			"TargetTimes": 3,
+			"TargetTimes": 1000000,
 			"FinishTimes": 1,
 			"Award": {
 				"50014": 10
-			},
+			}
-			"GameType": 1
 		},
 		{
 			"Id": 13007,
 			"Order": 7,
 			"Name": "年兽活动",
-			"Des": "邀请好友进行私人桌对局1次",
+			"Des": "今日消耗100钻石",
 			"ActivityType": 8,
-			"TaskType": 24,
+			"TaskType": 27,
-			"TargetTimes": 1,
+			"TargetTimes": 100,
 			"FinishTimes": 1,
 			"Award": {
 				"50014": 10
-			},
+			}
-			"GameType": 1
 		},
 		{
 			"Id": 13008,
 			"Order": 8,
 			"Name": "年兽活动",
-			"Des": "成功参与比赛场3次",
+			"Des": "今日累计赢取5M金币",
 			"ActivityType": 8,
-			"TaskType": 25,
+			"TaskType": 8,
-			"TargetTimes": 3,
+			"TargetTimes": 5000000,
 			"FinishTimes": 1,
 			"Award": {
 				"50014": 10
-			},
+			}
-			"GameType": 1
 		},
 		{
 			"Id": 13009,
 			"Order": 9,
 			"Name": "年兽活动",
-			"Des": "比赛场获得前十名1次",
+			"Des": "今日累计赢取10M金币",
 			"ActivityType": 8,
-			"TaskType": 26,
+			"TaskType": 8,
-			"TargetTimes": 1,
+			"TargetTimes": 10000000,
 			"FinishTimes": 1,
 			"Award": {
 				"50014": 10
-			},
+			}
-			"GameType": 1
 		},
 		{
 			"Id": 13010,
 			"Order": 10,
 			"Name": "年兽活动",
-			"Des": "今日累计消耗100钻石",
+			"Des": "今日累计赢取20M金币",
 			"ActivityType": 8,
-			"TaskType": 27,
+			"TaskType": 8,
-			"TargetTimes": 100,
+			"TargetTimes": 20000000,
 			"FinishTimes": 1,
 			"Award": {
 				"50014": 10
@@ -1385,20 +1378,16 @@
 			"FinishTimes": 1,
 			"Award": {
 				"50014": 10
-			},
+			}
-			"Position": [
-				1,
-				1
-			]
 		},
 		{
 			"Id": 13012,
 			"Order": 12,
 			"Name": "年兽活动",
-			"Des": "累计领取转盘签到奖励7天",
+			"Des": "今日消耗500钻石",
-			"ActivityType": 9,
+			"ActivityType": 8,
-			"TaskType": 17,
+			"TaskType": 27,
-			"TargetTimes": 7,
+			"TargetTimes": 500,
 			"FinishTimes": 1,
 			"Award": {
 				"50014": 10
@@ -1408,6 +1397,19 @@
 			"Id": 13013,
 			"Order": 13,
 			"Name": "年兽活动",
+			"Des": "今日充值1.99$",
+			"ActivityType": 8,
+			"TaskType": 7,
+			"TargetTimes": 199,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 10
+			}
+		},
+		{
+			"Id": 13014,
+			"Order": 14,
+			"Name": "年兽活动",
 			"Des": "参与红包雨活动1次",
 			"ActivityType": 8,
 			"TaskType": 32,
@@ -1418,52 +1420,160 @@
 			}
 		},
 		{
-			"Id": 13014,
+			"Id": 13015,
-			"Order": 14,
+			"Order": 15,
 			"Name": "年兽活动",
-			"Des": "累计充值$9.99",
+			"Des": "成功对年兽造成伤害1000000点",
+			"ActivityType": 8,
+			"TaskType": 34,
+			"TargetTimes": 1000000,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 10
+			}
+		},
+		{
+			"Id": 13016,
+			"Order": 16,
+			"Name": "年兽活动",
+			"Des": "成功对年兽造成伤害10000000点",
+			"ActivityType": 8,
+			"TaskType": 34,
+			"TargetTimes": 10000000,
+			"FinishTimes": 1,
+			"Award": {
+				"50015": 10
+			}
+		},
+		{
+			"Id": 13017,
+			"Order": 17,
+			"Name": "年兽活动",
+			"Des": "累计充值9.99$",
 			"ActivityType": 9,
 			"TaskType": 7,
 			"TargetTimes": 999,
 			"FinishTimes": 1,
 			"Award": {
 				"50015": 10
-			},
+			}
-			"Position": [
-				1,
-				1
-			]
 		},
 		{
-			"Id": 13015,
+			"Id": 13018,
-			"Order": 15,
+			"Order": 18,
 			"Name": "年兽活动",
-			"Des": "累计充值$19.99",
+			"Des": "累计充值19.99$",
 			"ActivityType": 9,
 			"TaskType": 7,
 			"TargetTimes": 1999,
 			"FinishTimes": 1,
 			"Award": {
 				"50015": 10
-			},
+			}
-			"Position": [
-				1,
-				1
-			]
 		},
 		{
-			"Id": 13016,
+			"Id": 13019,
-			"Order": 16,
+			"Order": 19,
 			"Name": "年兽活动",
-			"Des": "累计赚取10B金币",
+			"Des": "累计充值59.99$",
 			"ActivityType": 9,
-			"TaskType": 11,
+			"TaskType": 7,
-			"TargetTimes": 10000000000,
+			"TargetTimes": 5999,
 			"FinishTimes": 1,
 			"Award": {
-				"50015": 10
+				"50014": 10
-			},
+			}
-			"GameType": 1
+		},
+		{
+			"Id": 13020,
+			"Order": 20,
+			"Name": "年兽活动",
+			"Des": "累计充值99.99$",
+			"ActivityType": 9,
+			"TaskType": 7,
+			"TargetTimes": 9999,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13021,
+			"Order": 21,
+			"Name": "年兽活动",
+			"Des": "成功击杀1只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 1,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13022,
+			"Order": 22,
+			"Name": "年兽活动",
+			"Des": "成功击杀2只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 2,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13023,
+			"Order": 23,
+			"Name": "年兽活动",
+			"Des": "成功击杀3只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 3,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13024,
+			"Order": 24,
+			"Name": "年兽活动",
+			"Des": "成功击杀5只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 5,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13025,
+			"Order": 25,
+			"Name": "年兽活动",
+			"Des": "成功击杀8只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 8,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
+		},
+		{
+			"Id": 13026,
+			"Order": 26,
+			"Name": "年兽活动",
+			"Des": "成功击杀10只年兽",
+			"ActivityType": 9,
+			"TaskType": 33,
+			"TargetTimes": 10,
+			"FinishTimes": 1,
+			"Award": {
+				"50014": 10
+			}
 		}
 	]
 }

worldsrv/action_nian.go

@@ -415,6 +415,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
 					}
 				}
 			}
+			TaskSubjectSingleton.Touch(common.TaskTypeNianBossKill, &TaskData{SnId: p.SnId, Num: 1}) // BOSS死亡
 		}
 
 		items = append(items, &model.Item{
@@ -444,6 +445,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
 		}
 		pack.BuffCount = p.WelfData.NianData.BuffCount
 		p.SendToClient(int(activity.NianPacketID_PACKET_SCNianAttackData), pack)
+		TaskSubjectSingleton.Touch(common.TaskTypeNianBossDamage, &TaskData{SnId: p.SnId, Num: AttackHp}) // 对年兽造成伤害
 	}
 	return nil
 }
@@ -539,6 +541,7 @@ func CSNianSignAward(s *netlib.Session, packetid int, data interface{}, sid int6
 			Remark:   "年兽活动-领取签到奖励获得",
 		})
 		p.SendToClient(int(activity.NianPacketID_PACKET_SCNianSignAward), pack)
+		TaskSubjectSingleton.Touch(common.TaskTypeNianSign, &TaskData{SnId: p.SnId, Num: 1})
 	}
 	return nil
 }

worldsrv/taskmgr.go

@@ -463,6 +463,9 @@ func init() {
 	TaskSubjectSingleton.Attach(common.TaskTypeRankMatchWinTimes, taskHandle)
 	TaskSubjectSingleton.Attach(common.TaskTypeBuyPermit, taskHandle)
 	TaskSubjectSingleton.Attach(common.TaskTypeBuyRedBag, taskHandle)
+	TaskSubjectSingleton.Attach(common.TaskTypeNianBossKill, taskHandle)
+	TaskSubjectSingleton.Attach(common.TaskTypeNianBossDamage, taskHandle)
+	TaskSubjectSingleton.Attach(common.TaskTypeNianSign, taskHandle)
 
 	internal.RegisterPlayerListenerFunc(&internal.PlayerListenerFunc[*Player, *Scene]{
 		OnPlayerDayChangedFunc: func(p *Player, isLogin, isContinue bool) {