diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 3f0f16fa5..89059eff3 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -25242,7 +25242,7 @@ "text": "寻找所有宝箱2" }, "type": 205, - "valid": 1, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25264,7 +25264,7 @@ "text": "寻找所有宝箱3" }, "type": 205, - "valid": 2, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25286,7 +25286,7 @@ "text": "寻找所有宝箱4" }, "type": 205, - "valid": 3, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25308,7 +25308,7 @@ "text": "寻找所有宝箱5" }, "type": 205, - "valid": 4, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25330,7 +25330,7 @@ "text": "清理所有怪物1" }, "type": 70, - "valid": 5, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25354,7 +25354,7 @@ "text": "清理所有怪物2" }, "type": 70, - "valid": 6, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25378,7 +25378,7 @@ "text": "清理所有怪物3" }, "type": 70, - "valid": 7, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25402,7 +25402,7 @@ "text": "清理所有怪物4" }, "type": 70, - "valid": 8, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25426,7 +25426,7 @@ "text": "清理所有怪物5" }, "type": 70, - "valid": 9, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25450,7 +25450,7 @@ "text": "清理所有怪物6" }, "type": 70, - "valid": 10, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25474,7 +25474,7 @@ "text": "检查所有可疑点1" }, "type": 206, - "valid": 11, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25496,7 +25496,7 @@ "text": "检查所有可疑点2" }, "type": 206, - "valid": 12, + "valid": 0, "head": { "a": "attr", "t": "gold", @@ -25518,7 +25518,7 @@ "text": "检查所有可疑点3" }, "type": 206, - "valid": 13, + "valid": 0, "head": { "a": "attr", "t": "gold", diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 185ff0b3e..461a0e1e0 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -5845,7 +5845,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -5859,7 +5859,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -5873,7 +5873,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-招募", "901" ], "event": [ @@ -5887,7 +5887,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -5901,7 +5901,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -5915,7 +5915,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-招募", "901" ], "event": [ @@ -5929,7 +5929,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -5943,7 +5943,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -5957,7 +5957,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-招募", "901" ], "event": [ @@ -5971,7 +5971,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -5985,7 +5985,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -5999,7 +5999,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-招募", "901" ], "event": [ @@ -6013,7 +6013,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -6027,7 +6027,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -6041,7 +6041,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-招募", "901" ], "event": [ @@ -6055,7 +6055,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -6069,7 +6069,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -6083,7 +6083,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-招募", "901" ], "event": [ @@ -6097,7 +6097,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -6111,7 +6111,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-维京远征", + "功能入口-招募", "901" ], "event": [ @@ -6125,7 +6125,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-招募", "901" ], "event": [ @@ -6349,7 +6349,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6363,7 +6363,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6377,7 +6377,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6391,7 +6391,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6405,7 +6405,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6419,7 +6419,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6433,7 +6433,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6447,7 +6447,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6461,7 +6461,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6475,7 +6475,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6489,7 +6489,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6503,7 +6503,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6517,7 +6517,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6531,7 +6531,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6545,7 +6545,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-竞技场", "901" ], "event": [ @@ -6573,7 +6573,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-藏书馆", "901" ], "event": [ @@ -6587,7 +6587,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-狩猎", "901" ], "event": [ @@ -6615,7 +6615,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-藏书馆", "901" ], "event": [ @@ -6629,7 +6629,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-狩猎", "901" ], "event": [ @@ -6657,7 +6657,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-藏书馆", "901" ], "event": [ @@ -6671,7 +6671,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-狩猎", "901" ], "event": [ @@ -6699,7 +6699,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-藏书馆", "901" ], "event": [ @@ -6713,7 +6713,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-狩猎", "901" ], "event": [ @@ -6741,7 +6741,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-藏书馆", "901" ], "event": [ @@ -6755,7 +6755,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-狩猎", "901" ], "event": [ @@ -6783,7 +6783,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-藏书馆", "901" ], "event": [ @@ -6797,7 +6797,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-狩猎", "901" ], "event": [ @@ -6811,7 +6811,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6825,7 +6825,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-商人", "901" ], "event": [ @@ -6839,7 +6839,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6853,7 +6853,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6867,7 +6867,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-商人", "901" ], "event": [ @@ -6881,7 +6881,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6895,7 +6895,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6909,7 +6909,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-商人", "901" ], "event": [ @@ -6923,7 +6923,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6937,7 +6937,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6951,7 +6951,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-商人", "901" ], "event": [ @@ -6965,7 +6965,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6979,7 +6979,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ @@ -6993,7 +6993,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-浇水拼图", + "功能入口-商人", "901" ], "event": [ @@ -7007,7 +7007,7 @@ "heroid": 25001, "datas": [ "GameMain", - "功能入口-烹饪", + "功能入口-商人", "901" ], "event": [ diff --git a/modules/wtask/modelWTask.go b/modules/wtask/modelWTask.go index 471e71d8c..095f374a4 100644 --- a/modules/wtask/modelWTask.go +++ b/modules/wtask/modelWTask.go @@ -46,6 +46,7 @@ func (this *ModelWTask) getUserWTasks(uid string) (results *pb.DBWTask, err erro Completes: make([]int32, 0), Groups: make(map[int32]int32), Boxs: make(map[int32]*pb.DBWTaskBox), + Exchange: make(map[int32]int32), } err = this.Add(uid, results) } @@ -61,6 +62,7 @@ func (this *ModelWTask) updateUserWTasks(uid string, data *pb.DBWTask) (err erro "groups": data.Groups, "boxs": data.Boxs, "dailytaskgroup": data.Dailytaskgroup, + "exchange": data.Exchange, }); err != nil { this.module.Error("更新用户任务数据 错误!", log.Field{Key: "err", Value: err.Error()}) return