From 362d6a72d73a1508283e935de6233241a4148896 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 26 Jul 2023 16:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=96=E7=95=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_guildbossscore.json | 38 +-- bin/json/game_mainchapter.json | 192 +++++------ bin/json/game_mainstage.json | 8 +- bin/json/game_searchitemall.json | 40 +-- comm/imodule.go | 2 + modules/library/model_fetterstory.go | 12 +- modules/linestory/model_linestory.go | 8 +- modules/sys/model_sys.go | 8 +- modules/wtask/configure.go | 2 + modules/wtask/module.go | 13 + pb/wtask_db.pb.go | 136 ++++++-- pb/wtask_msg.pb.go | 297 ++++++++++++------ .../structs/Game.SearchitemAllData.go | 8 +- 13 files changed, 478 insertions(+), 286 deletions(-) diff --git a/bin/json/game_guildbossscore.json b/bin/json/game_guildbossscore.json index 6d40622c2..27063d3f8 100644 --- a/bin/json/game_guildbossscore.json +++ b/bin/json/game_guildbossscore.json @@ -8,9 +8,9 @@ "score": 1, "rank_low": 0, "rank_up": 1500000, - "hp": 10, + "hp": 1, "drop": 10001001, - "grade": "png1" + "grade": "gh_img_a" }, { "id": 2, @@ -21,9 +21,9 @@ "score": 1, "rank_low": 1500001, "rank_up": 3000000, - "hp": 10, + "hp": 2, "drop": 10001002, - "grade": "png2" + "grade": "gh_img_b" }, { "id": 3, @@ -34,9 +34,9 @@ "score": 1, "rank_low": 3000001, "rank_up": 4500000, - "hp": 10, + "hp": 3, "drop": 10001003, - "grade": "png3" + "grade": "gh_img_c" }, { "id": 4, @@ -47,9 +47,9 @@ "score": 1, "rank_low": 4500001, "rank_up": 6000000, - "hp": 10, + "hp": 4, "drop": 10001003, - "grade": "png4" + "grade": "gh_img_d" }, { "id": 5, @@ -60,9 +60,9 @@ "score": 1, "rank_low": 6000001, "rank_up": 9000000, - "hp": 10, + "hp": 5, "drop": 10001003, - "grade": "png5" + "grade": "gh_img_e" }, { "id": 6, @@ -73,9 +73,9 @@ "score": 1, "rank_low": 9000001, "rank_up": 12000000, - "hp": 10, + "hp": 6, "drop": 10001003, - "grade": "png6" + "grade": "gh_img_ex3" }, { "id": 7, @@ -86,9 +86,9 @@ "score": 1, "rank_low": 12000001, "rank_up": 15000000, - "hp": 10, + "hp": 7, "drop": 10001003, - "grade": "png7" + "grade": "gh_img_s" }, { "id": 8, @@ -99,9 +99,9 @@ "score": 1, "rank_low": 15000001, "rank_up": 18000000, - "hp": 10, + "hp": 8, "drop": 10001003, - "grade": "png8" + "grade": "gh_img_ss" }, { "id": 9, @@ -112,9 +112,9 @@ "score": 1, "rank_low": 18000001, "rank_up": 21000000, - "hp": 10, + "hp": 9, "drop": 10001003, - "grade": "png9" + "grade": "gh_img_sss" }, { "id": 10, @@ -127,6 +127,6 @@ "rank_up": -1, "hp": 10, "drop": 10001003, - "grade": "png10" + "grade": "gh_img_sss1" } ] \ No newline at end of file diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json index 1abe20c9b..82cbfb0e4 100644 --- a/bin/json/game_mainchapter.json +++ b/bin/json/game_mainchapter.json @@ -3,14 +3,14 @@ "id": 11001, "name": { "key": "mainchapter_main_chapter_name_1", - "text": "第1章" + "text": "预言之声" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_1", - "text": "预言之声" + "text": "01" }, "desc": { "key": "mainchapter_main_chapter_desc_1", @@ -23,14 +23,14 @@ "id": 11002, "name": { "key": "mainchapter_main_chapter_name_2", - "text": "第2章" + "text": "大龙复仇记" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_2", - "text": "大龙复仇记" + "text": "02" }, "desc": { "key": "mainchapter_main_chapter_desc_2", @@ -43,14 +43,14 @@ "id": 11003, "name": { "key": "mainchapter_main_chapter_name_3", - "text": "第3章" + "text": "小偷与大盗" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_3", - "text": "小偷与大盗" + "text": "03" }, "desc": { "key": "mainchapter_main_chapter_desc_3", @@ -63,14 +63,14 @@ "id": 11004, "name": { "key": "mainchapter_main_chapter_name_4", - "text": "第4章" + "text": "智取邀请函" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_4", - "text": "智取邀请函" + "text": "04" }, "desc": { "key": "mainchapter_main_chapter_desc_4", @@ -83,14 +83,14 @@ "id": 11005, "name": { "key": "mainchapter_main_chapter_name_5", - "text": "第5章" + "text": "黑市风波" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_5", - "text": "黑市风波" + "text": "05" }, "desc": { "key": "mainchapter_main_chapter_desc_5", @@ -103,14 +103,14 @@ "id": 11006, "name": { "key": "mainchapter_main_chapter_name_6", - "text": "第6章" + "text": "小马王 · 一路向北" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_6", - "text": "小马王 · 一路向北" + "text": "06" }, "desc": { "key": "mainchapter_main_chapter_desc_6", @@ -123,14 +123,14 @@ "id": 11007, "name": { "key": "mainchapter_main_chapter_name_7", - "text": "第7章" + "text": "海洋之歌" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_7", - "text": "海洋之歌" + "text": "07" }, "desc": { "key": "mainchapter_main_chapter_desc_7", @@ -143,14 +143,14 @@ "id": 11008, "name": { "key": "mainchapter_main_chapter_name_8", - "text": "第8章" + "text": "布兰奇的逃亡" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_8", - "text": "布兰奇的逃亡" + "text": "08" }, "desc": { "key": "mainchapter_main_chapter_desc_8", @@ -163,14 +163,14 @@ "id": 11009, "name": { "key": "mainchapter_main_chapter_name_9", - "text": "第9章" + "text": "配方奶工厂" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_9", - "text": "配方奶工厂" + "text": "09" }, "desc": { "key": "mainchapter_main_chapter_desc_9", @@ -183,14 +183,14 @@ "id": 11010, "name": { "key": "mainchapter_main_chapter_name_10", - "text": "第10章" + "text": "预言之声" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_10", - "text": "预言之声" + "text": "10" }, "desc": { "key": "mainchapter_main_chapter_desc_10", @@ -203,14 +203,14 @@ "id": 11011, "name": { "key": "mainchapter_main_chapter_name_11", - "text": "第11章" + "text": "大龙复仇记" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_11", - "text": "大龙复仇记" + "text": "11" }, "desc": { "key": "mainchapter_main_chapter_desc_11", @@ -223,14 +223,14 @@ "id": 11012, "name": { "key": "mainchapter_main_chapter_name_12", - "text": "第12章" + "text": "小偷与大盗" }, "chapter_type": 1, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_12", - "text": "小偷与大盗" + "text": "12" }, "desc": { "key": "mainchapter_main_chapter_desc_12", @@ -243,14 +243,14 @@ "id": 12001, "name": { "key": "mainchapter_main_chapter_name_13", - "text": "第1章" + "text": "智取邀请函" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_13", - "text": "智取邀请函" + "text": "13" }, "desc": { "key": "mainchapter_main_chapter_desc_13", @@ -263,14 +263,14 @@ "id": 12002, "name": { "key": "mainchapter_main_chapter_name_14", - "text": "第2章" + "text": "黑市风波" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_14", - "text": "黑市风波" + "text": "14" }, "desc": { "key": "mainchapter_main_chapter_desc_14", @@ -283,14 +283,14 @@ "id": 12003, "name": { "key": "mainchapter_main_chapter_name_15", - "text": "第3章" + "text": "小马王 · 一路向北" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_15", - "text": "小马王 · 一路向北" + "text": "15" }, "desc": { "key": "mainchapter_main_chapter_desc_15", @@ -303,14 +303,14 @@ "id": 12004, "name": { "key": "mainchapter_main_chapter_name_16", - "text": "第4章" + "text": "海洋之歌" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_16", - "text": "海洋之歌" + "text": "16" }, "desc": { "key": "mainchapter_main_chapter_desc_16", @@ -323,14 +323,14 @@ "id": 12005, "name": { "key": "mainchapter_main_chapter_name_17", - "text": "第5章" + "text": "布兰奇的逃亡" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_17", - "text": "布兰奇的逃亡" + "text": "17" }, "desc": { "key": "mainchapter_main_chapter_desc_17", @@ -343,14 +343,14 @@ "id": 12006, "name": { "key": "mainchapter_main_chapter_name_18", - "text": "第6章" + "text": "配方奶工厂" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_18", - "text": "配方奶工厂" + "text": "18" }, "desc": { "key": "mainchapter_main_chapter_desc_18", @@ -363,14 +363,14 @@ "id": 12007, "name": { "key": "mainchapter_main_chapter_name_19", - "text": "第7章" + "text": "预言之声" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_19", - "text": "预言之声" + "text": "19" }, "desc": { "key": "mainchapter_main_chapter_desc_19", @@ -383,14 +383,14 @@ "id": 12008, "name": { "key": "mainchapter_main_chapter_name_20", - "text": "第8章" + "text": "大龙复仇记" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_20", - "text": "大龙复仇记" + "text": "20" }, "desc": { "key": "mainchapter_main_chapter_desc_20", @@ -403,14 +403,14 @@ "id": 12009, "name": { "key": "mainchapter_main_chapter_name_21", - "text": "第9章" + "text": "小偷与大盗" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_21", - "text": "小偷与大盗" + "text": "21" }, "desc": { "key": "mainchapter_main_chapter_desc_21", @@ -423,14 +423,14 @@ "id": 12010, "name": { "key": "mainchapter_main_chapter_name_22", - "text": "第10章" + "text": "智取邀请函" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_22", - "text": "智取邀请函" + "text": "22" }, "desc": { "key": "mainchapter_main_chapter_desc_22", @@ -443,14 +443,14 @@ "id": 12011, "name": { "key": "mainchapter_main_chapter_name_23", - "text": "第11章" + "text": "黑市风波" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_23", - "text": "黑市风波" + "text": "23" }, "desc": { "key": "mainchapter_main_chapter_desc_23", @@ -463,14 +463,14 @@ "id": 12012, "name": { "key": "mainchapter_main_chapter_name_24", - "text": "第12章" + "text": "小马王 · 一路向北" }, "chapter_type": 2, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_24", - "text": "小马王 · 一路向北" + "text": "24" }, "desc": { "key": "mainchapter_main_chapter_desc_24", @@ -483,14 +483,14 @@ "id": 13001, "name": { "key": "mainchapter_main_chapter_name_25", - "text": "第1章" + "text": "海洋之歌" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_13", - "text": "海洋之歌" + "text": "25" }, "desc": { "key": "mainchapter_main_chapter_desc_13", @@ -503,14 +503,14 @@ "id": 13002, "name": { "key": "mainchapter_main_chapter_name_26", - "text": "第2章" + "text": "布兰奇的逃亡" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_14", - "text": "布兰奇的逃亡" + "text": "26" }, "desc": { "key": "mainchapter_main_chapter_desc_14", @@ -523,14 +523,14 @@ "id": 13003, "name": { "key": "mainchapter_main_chapter_name_27", - "text": "第3章" + "text": "配方奶工厂" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_15", - "text": "配方奶工厂" + "text": "27" }, "desc": { "key": "mainchapter_main_chapter_desc_15", @@ -543,14 +543,14 @@ "id": 13004, "name": { "key": "mainchapter_main_chapter_name_28", - "text": "第4章" + "text": "预言之声" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_16", - "text": "预言之声" + "text": "28" }, "desc": { "key": "mainchapter_main_chapter_desc_16", @@ -563,14 +563,14 @@ "id": 13005, "name": { "key": "mainchapter_main_chapter_name_29", - "text": "第5章" + "text": "大龙复仇记" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_17", - "text": "大龙复仇记" + "text": "29" }, "desc": { "key": "mainchapter_main_chapter_desc_17", @@ -583,14 +583,14 @@ "id": 13006, "name": { "key": "mainchapter_main_chapter_name_30", - "text": "第6章" + "text": "小偷与大盗" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_18", - "text": "小偷与大盗" + "text": "30" }, "desc": { "key": "mainchapter_main_chapter_desc_18", @@ -603,14 +603,14 @@ "id": 13007, "name": { "key": "mainchapter_main_chapter_name_31", - "text": "第7章" + "text": "智取邀请函" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_19", - "text": "智取邀请函" + "text": "31" }, "desc": { "key": "mainchapter_main_chapter_desc_19", @@ -623,14 +623,14 @@ "id": 13008, "name": { "key": "mainchapter_main_chapter_name_32", - "text": "第8章" + "text": "黑市风波" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_20", - "text": "黑市风波" + "text": "32" }, "desc": { "key": "mainchapter_main_chapter_desc_20", @@ -643,14 +643,14 @@ "id": 13009, "name": { "key": "mainchapter_main_chapter_name_33", - "text": "第9章" + "text": "小马王 · 一路向北" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_21", - "text": "小马王 · 一路向北" + "text": "33" }, "desc": { "key": "mainchapter_main_chapter_desc_21", @@ -663,14 +663,14 @@ "id": 13010, "name": { "key": "mainchapter_main_chapter_name_34", - "text": "第10章" + "text": "海洋之歌" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_22", - "text": "海洋之歌" + "text": "34" }, "desc": { "key": "mainchapter_main_chapter_desc_22", @@ -683,14 +683,14 @@ "id": 13011, "name": { "key": "mainchapter_main_chapter_name_35", - "text": "第11章" + "text": "布兰奇的逃亡" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_23", - "text": "布兰奇的逃亡" + "text": "35" }, "desc": { "key": "mainchapter_main_chapter_desc_23", @@ -703,14 +703,14 @@ "id": 13012, "name": { "key": "mainchapter_main_chapter_name_36", - "text": "第12章" + "text": "配方奶工厂" }, "chapter_type": 3, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_24", - "text": "配方奶工厂" + "text": "36" }, "desc": { "key": "mainchapter_main_chapter_desc_24", @@ -723,14 +723,14 @@ "id": 14001, "name": { "key": "mainchapter_main_chapter_name_37", - "text": "第1章" + "text": "预言之声" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_13", - "text": "预言之声" + "text": "37" }, "desc": { "key": "mainchapter_main_chapter_desc_13", @@ -743,14 +743,14 @@ "id": 14002, "name": { "key": "mainchapter_main_chapter_name_38", - "text": "第2章" + "text": "大龙复仇记" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_14", - "text": "大龙复仇记" + "text": "38" }, "desc": { "key": "mainchapter_main_chapter_desc_14", @@ -763,14 +763,14 @@ "id": 14003, "name": { "key": "mainchapter_main_chapter_name_39", - "text": "第3章" + "text": "小偷与大盗" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_15", - "text": "小偷与大盗" + "text": "39" }, "desc": { "key": "mainchapter_main_chapter_desc_15", @@ -783,14 +783,14 @@ "id": 14004, "name": { "key": "mainchapter_main_chapter_name_40", - "text": "第4章" + "text": "智取邀请函" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_16", - "text": "智取邀请函" + "text": "40" }, "desc": { "key": "mainchapter_main_chapter_desc_16", @@ -803,14 +803,14 @@ "id": 14005, "name": { "key": "mainchapter_main_chapter_name_41", - "text": "第5章" + "text": "黑市风波" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_17", - "text": "黑市风波" + "text": "41" }, "desc": { "key": "mainchapter_main_chapter_desc_17", @@ -823,14 +823,14 @@ "id": 14006, "name": { "key": "mainchapter_main_chapter_name_42", - "text": "第6章" + "text": "小马王 · 一路向北" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_18", - "text": "小马王 · 一路向北" + "text": "42" }, "desc": { "key": "mainchapter_main_chapter_desc_18", @@ -843,14 +843,14 @@ "id": 14007, "name": { "key": "mainchapter_main_chapter_name_43", - "text": "第7章" + "text": "海洋之歌" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_19", - "text": "海洋之歌" + "text": "43" }, "desc": { "key": "mainchapter_main_chapter_desc_19", @@ -863,14 +863,14 @@ "id": 14008, "name": { "key": "mainchapter_main_chapter_name_44", - "text": "第8章" + "text": "布兰奇的逃亡" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_20", - "text": "布兰奇的逃亡" + "text": "44" }, "desc": { "key": "mainchapter_main_chapter_desc_20", @@ -883,14 +883,14 @@ "id": 14009, "name": { "key": "mainchapter_main_chapter_name_45", - "text": "第9章" + "text": "配方奶工厂" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_21", - "text": "配方奶工厂" + "text": "45" }, "desc": { "key": "mainchapter_main_chapter_desc_21", @@ -903,14 +903,14 @@ "id": 14010, "name": { "key": "mainchapter_main_chapter_name_46", - "text": "第10章" + "text": "预言之声" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_22", - "text": "预言之声" + "text": "46" }, "desc": { "key": "mainchapter_main_chapter_desc_22", @@ -923,14 +923,14 @@ "id": 14011, "name": { "key": "mainchapter_main_chapter_name_47", - "text": "第11章" + "text": "大龙复仇记" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_23", - "text": "大龙复仇记" + "text": "47" }, "desc": { "key": "mainchapter_main_chapter_desc_23", @@ -943,14 +943,14 @@ "id": 14012, "name": { "key": "mainchapter_main_chapter_name_48", - "text": "第12章" + "text": "小偷与大盗" }, "chapter_type": 4, "map": "scenes_chapter_01", "camera": "", "title": { "key": "mainchapter_main_chapter_title_24", - "text": "小偷与大盗" + "text": "48" }, "desc": { "key": "mainchapter_main_chapter_desc_24", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index de0768672..84c290c67 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -3829,8 +3829,10 @@ { "id": 1100201, "chapterid": 11002, - "group_id": 0, - "previous_group_id": [], + "group_id": 100201, + "previous_group_id": [ + 100117 + ], "previoustage": 1100201, "Episodetype": 1, "openlevel": 1, @@ -3847,7 +3849,7 @@ "animation": "", "hide": 0, "destroy": 0, - "progress": 0, + "progress": 1, "frontstoryid": 20105, "afterstoryid": 20107, "maingroupName": { diff --git a/bin/json/game_searchitemall.json b/bin/json/game_searchitemall.json index 07e4d64d5..eec664f6b 100644 --- a/bin/json/game_searchitemall.json +++ b/bin/json/game_searchitemall.json @@ -4,10 +4,10 @@ "tasktype": 1, "pointnum": 2, "point": [ - "位置1", - "位置2", - "位置3", - "位置4" + 1, + 2, + 3, + 4 ], "pointweight": [ 2000, @@ -22,10 +22,10 @@ "tasktype": 1, "pointnum": 2, "point": [ - "位置5", - "位置6", - "位置7", - "位置8" + 5, + 6, + 7, + 8 ], "pointweight": [ 2000, @@ -40,10 +40,10 @@ "tasktype": 1, "pointnum": 2, "point": [ - "位置9", - "位置10", - "位置11", - "位置12" + 9, + 10, + 11, + 12 ], "pointweight": [ 2000, @@ -58,10 +58,10 @@ "tasktype": 1, "pointnum": 2, "point": [ - "位置1", - "位置2", - "位置3", - "位置4" + 1, + 2, + 3, + 4 ], "pointweight": [ 2000, @@ -76,10 +76,10 @@ "tasktype": 1, "pointnum": 2, "point": [ - "位置5", - "位置6", - "位置7", - "位置8" + 5, + 6, + 7, + 8 ], "pointweight": [ 2000, diff --git a/comm/imodule.go b/comm/imodule.go index f4c1b2d0b..98d97f4c5 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -576,6 +576,8 @@ type ( ResetDailytaskTask(session IUserSession, groupId ...int32) (task map[int32][]int32, errdata *pb.ErrorData) //查询任务进度 InquireTaskProgress(session IUserSession, tasks ...int32) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) + //查询完成列表 + InquireCompletes(uid string) []int32 } //战令 IWarorder interface { diff --git a/modules/library/model_fetterstory.go b/modules/library/model_fetterstory.go index 29aaab377..a0b3c8b40 100644 --- a/modules/library/model_fetterstory.go +++ b/modules/library/model_fetterstory.go @@ -77,23 +77,23 @@ func (this *modelFetterstory) isPreFinished(finishTasks []int32, taskId int32) b // 获取玩家羁绊剧情-主线任务 func (this *modelFetterstory) getMaintasks(uid string, fetterId int32) (list []*pb.FetterTask) { // 调用世界任务接口groupId & taskId - if module, err := this.service.GetModule(comm.ModuleWorldtask); err == nil { - if iwt, ok := module.(comm.IWorldtask); ok { + if module, err := this.service.GetModule(comm.ModuleWtask); err == nil { + if iwt, ok := module.(comm.IWtask); ok { // 获取玩家世界任务 - wt := iwt.GetMyWorldtask(uid) + completes := iwt.InquireCompletes(uid) this.module.Debug("获取玩家世界任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "fetterId", Value: fetterId}, - log.Field{Key: "worldtask", Value: wt}, + log.Field{Key: "completes", Value: completes}, ) - if wt != nil { + if completes != nil { mainTasks := this.getFetterTasks(uid, fetterId) if mainTasks == nil { return } for _, taskId := range mainTasks.Tasks { // 遍历已完成的世界任务 - for _, task := range wt.TaskList { + for _, task := range completes { if taskId == task { list = append(list, &pb.FetterTask{ TaskId: taskId, diff --git a/modules/linestory/model_linestory.go b/modules/linestory/model_linestory.go index 256579a3b..5ebb5c844 100644 --- a/modules/linestory/model_linestory.go +++ b/modules/linestory/model_linestory.go @@ -73,10 +73,10 @@ func (this *ModelLinestory) isPreFinished(finishTasks []int32, taskId int32) boo // 获取玩家支线剧情-主线任务 func (this *ModelLinestory) getMaintasks(uid string, groupId int32) (list []*pb.TaskMain) { // 调用世界任务接口groupId & taskId - if module, err := this.service.GetModule(comm.ModuleWorldtask); err == nil { - if iwt, ok := module.(comm.IWorldtask); ok { + if module, err := this.service.GetModule(comm.ModuleWtask); err == nil { + if iwt, ok := module.(comm.IWtask); ok { // 获取玩家世界任务 - wt := iwt.GetMyWorldtask(uid) + wt := iwt.InquireCompletes(uid) this.moduleLinestory.Debug("获取玩家世界任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "groupId", Value: groupId}, @@ -86,7 +86,7 @@ func (this *ModelLinestory) getMaintasks(uid string, groupId int32) (list []*pb. mainTasks := this.moduleLinestory.configure.getMainTaskCfgByGroup(groupId) for _, conf := range mainTasks { // 遍历已完成的世界任务 - for _, task := range wt.TaskList { + for _, task := range wt { if conf.Id == task { list = append(list, &pb.TaskMain{ TaskId: conf.Id, diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go index 5b0b84040..c3373c497 100644 --- a/modules/sys/model_sys.go +++ b/modules/sys/model_sys.go @@ -79,15 +79,15 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri } case 3: //世界任务ID - module, err := this.service.GetModule(comm.ModuleWorldtask) + module, err := this.service.GetModule(comm.ModuleTask) if err != nil { this.moduleSys.Debugln(err) return "" } - if i, ok := module.(comm.IWorldtask); ok { - d := i.GetMyWorldtask(uid) + if i, ok := module.(comm.IWtask); ok { + d := i.InquireCompletes(uid) bFound := false - for _, taskId := range d.TaskList { + for _, taskId := range d { if taskId == conf.Param { bFound = true break diff --git a/modules/wtask/configure.go b/modules/wtask/configure.go index 354ed9244..fcc627725 100644 --- a/modules/wtask/configure.go +++ b/modules/wtask/configure.go @@ -16,6 +16,7 @@ const ( gameWorldAll = "game_worldall.json" gameburiedCond = "game_buriedcondi.json" gamerdtasknpc = "game_rdtasknpc.json" + gamesearchitemall = "game_searchitemall.json" ) type configureComp struct { @@ -39,6 +40,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp gameWorldAll: cfg.NewGameWorldAll, gameburiedCond: cfg.NewGameBuriedCondi, gamerdtasknpc: cfg.NewGameRdtaskNpc, + gamesearchitemall: cfg.NewGameSearchitemAll, }) this.condlTask = make(map[int32][]*cfg.GameWorldTaskData) configure.RegisterConfigure(gameWorldTask, cfg.NewGameBuriedCondi, this.updateconfigure) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 14071d8d5..f02b1c78f 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -333,6 +333,19 @@ func (this *WTask) ResetDailytaskTask(session comm.IUserSession, groupId ...int3 return } +// 查询完成列表 +func (this *WTask) InquireCompletes(uid string) []int32 { + var ( + wtask *pb.DBWTask + completes []int32 = make([]int32, 0) + err error + ) + if wtask, err = this.modelwtask.getUserWTasks(uid); err == nil { + completes = wtask.Completes + } + return completes +} + // 查询日常任务进度 func (this *WTask) InquireTaskProgress(session comm.IUserSession, tasks ...int32) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) { var ( diff --git a/pb/wtask_db.pb.go b/pb/wtask_db.pb.go index 015c81092..946b3c93e 100644 --- a/pb/wtask_db.pb.go +++ b/pb/wtask_db.pb.go @@ -26,13 +26,14 @@ type DBWTask struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID - Currchapter int32 `protobuf:"varint,3,opt,name=currchapter,proto3" json:"currchapter"` //当前所在章节 - Activations []int32 `protobuf:"varint,4,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 - Accepts []int32 `protobuf:"varint,5,rep,packed,name=accepts,proto3" json:"accepts"` //已接取任务列表 - Completes []int32 `protobuf:"varint,6,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 - Groups map[int32]int32 `protobuf:"bytes,7,rep,name=groups,proto3" json:"groups" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //任务组状态 key表示组id value:0 任务组未完成 1:任务组已完成 2:任务组奖励已领取 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID + Currchapter int32 `protobuf:"varint,3,opt,name=currchapter,proto3" json:"currchapter"` //当前所在章节 + Activations []int32 `protobuf:"varint,4,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 + Accepts []int32 `protobuf:"varint,5,rep,packed,name=accepts,proto3" json:"accepts"` //已接取任务列表 + Completes []int32 `protobuf:"varint,6,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 + Groups map[int32]int32 `protobuf:"bytes,7,rep,name=groups,proto3" json:"groups" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //任务组状态 key表示组id value:0 任务组未完成 1:任务组已完成 2:任务组奖励已领取 + Boxs map[int32]*DBWTaskBox `protobuf:"bytes,8,rep,name=boxs,proto3" json:"boxs" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //世界宝箱 } func (x *DBWTask) Reset() { @@ -116,6 +117,60 @@ func (x *DBWTask) GetGroups() map[int32]int32 { return nil } +func (x *DBWTask) GetBoxs() map[int32]*DBWTaskBox { + if x != nil { + return x.Boxs + } + return nil +} + +type DBWTaskBox struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Boxs []int32 `protobuf:"varint,1,rep,packed,name=boxs,proto3" json:"boxs"` +} + +func (x *DBWTaskBox) Reset() { + *x = DBWTaskBox{} + if protoimpl.UnsafeEnabled { + mi := &file_wtask_wtask_db_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBWTaskBox) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBWTaskBox) ProtoMessage() {} + +func (x *DBWTaskBox) ProtoReflect() protoreflect.Message { + mi := &file_wtask_wtask_db_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBWTaskBox.ProtoReflect.Descriptor instead. +func (*DBWTaskBox) Descriptor() ([]byte, []int) { + return file_wtask_wtask_db_proto_rawDescGZIP(), []int{1} +} + +func (x *DBWTaskBox) GetBoxs() []int32 { + if x != nil { + return x.Boxs + } + return nil +} + //世界任务详情 type DBWTaskItem struct { state protoimpl.MessageState @@ -129,7 +184,7 @@ type DBWTaskItem struct { func (x *DBWTaskItem) Reset() { *x = DBWTaskItem{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_db_proto_msgTypes[1] + mi := &file_wtask_wtask_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -142,7 +197,7 @@ func (x *DBWTaskItem) String() string { func (*DBWTaskItem) ProtoMessage() {} func (x *DBWTaskItem) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_db_proto_msgTypes[1] + mi := &file_wtask_wtask_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -155,7 +210,7 @@ func (x *DBWTaskItem) ProtoReflect() protoreflect.Message { // Deprecated: Use DBWTaskItem.ProtoReflect.Descriptor instead. func (*DBWTaskItem) Descriptor() ([]byte, []int) { - return file_wtask_wtask_db_proto_rawDescGZIP(), []int{1} + return file_wtask_wtask_db_proto_rawDescGZIP(), []int{2} } func (x *DBWTaskItem) GetTid() int32 { @@ -177,7 +232,7 @@ var File_wtask_wtask_db_proto protoreflect.FileDescriptor var file_wtask_wtask_db_proto_rawDesc = []byte{ 0x0a, 0x14, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, - 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x90, + 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x02, 0x0a, 0x07, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, @@ -191,11 +246,20 @@ var file_wtask_wtask_db_proto_rawDesc = []byte{ 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12, 0x2c, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x08, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x42, + 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, 0x39, + 0x0a, 0x0b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, + 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, + 0x20, 0x0a, 0x0a, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x12, 0x12, 0x0a, + 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x62, 0x6f, 0x78, + 0x73, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, @@ -215,21 +279,25 @@ func file_wtask_wtask_db_proto_rawDescGZIP() []byte { return file_wtask_wtask_db_proto_rawDescData } -var file_wtask_wtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_wtask_wtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_wtask_wtask_db_proto_goTypes = []interface{}{ (*DBWTask)(nil), // 0: DBWTask - (*DBWTaskItem)(nil), // 1: DBWTaskItem - nil, // 2: DBWTask.GroupsEntry - (*ConIProgress)(nil), // 3: ConIProgress + (*DBWTaskBox)(nil), // 1: DBWTaskBox + (*DBWTaskItem)(nil), // 2: DBWTaskItem + nil, // 3: DBWTask.GroupsEntry + nil, // 4: DBWTask.BoxsEntry + (*ConIProgress)(nil), // 5: ConIProgress } var file_wtask_wtask_db_proto_depIdxs = []int32{ - 2, // 0: DBWTask.groups:type_name -> DBWTask.GroupsEntry - 3, // 1: DBWTaskItem.conlds:type_name -> ConIProgress - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 3, // 0: DBWTask.groups:type_name -> DBWTask.GroupsEntry + 4, // 1: DBWTask.boxs:type_name -> DBWTask.BoxsEntry + 5, // 2: DBWTaskItem.conlds:type_name -> ConIProgress + 1, // 3: DBWTask.BoxsEntry.value:type_name -> DBWTaskBox + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name } func init() { file_wtask_wtask_db_proto_init() } @@ -252,6 +320,18 @@ func file_wtask_wtask_db_proto_init() { } } file_wtask_wtask_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBWTaskBox); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_wtask_wtask_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBWTaskItem); i { case 0: return &v.state @@ -270,7 +350,7 @@ func file_wtask_wtask_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_wtask_wtask_db_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 5, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go index 2ada7f219..3363fdbd0 100644 --- a/pb/wtask_msg.pb.go +++ b/pb/wtask_msg.pb.go @@ -169,9 +169,10 @@ type WTaskAcceptResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` - Activations []int32 `protobuf:"varint,2,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 - Accepts []*DBWTaskItem `protobuf:"bytes,3,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表 + Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` + Activations []int32 `protobuf:"varint,2,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 + Accepts []*DBWTaskItem `protobuf:"bytes,3,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表 + Boxs map[int32]*DBWTaskBox `protobuf:"bytes,4,rep,name=boxs,proto3" json:"boxs" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //世界宝箱 } func (x *WTaskAcceptResp) Reset() { @@ -227,6 +228,13 @@ func (x *WTaskAcceptResp) GetAccepts() []*DBWTaskItem { return nil } +func (x *WTaskAcceptResp) GetBoxs() map[int32]*DBWTaskBox { + if x != nil { + return x.Boxs + } + return nil +} + //完成子任务条件 type WTaskCompleteCondiReq struct { state protoimpl.MessageState @@ -883,6 +891,54 @@ func (x *WTaskBattleFinishResp) GetBattleConfId() int32 { return 0 } +//世界任务宝箱变化推送 +type WTaskBoxChangePush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Boxs map[int32]*DBWTaskBox `protobuf:"bytes,1,rep,name=boxs,proto3" json:"boxs" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //世界宝箱 +} + +func (x *WTaskBoxChangePush) Reset() { + *x = WTaskBoxChangePush{} + if protoimpl.UnsafeEnabled { + mi := &file_wtask_wtask_msg_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WTaskBoxChangePush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WTaskBoxChangePush) ProtoMessage() {} + +func (x *WTaskBoxChangePush) ProtoReflect() protoreflect.Message { + mi := &file_wtask_wtask_msg_proto_msgTypes[16] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WTaskBoxChangePush.ProtoReflect.Descriptor instead. +func (*WTaskBoxChangePush) Descriptor() ([]byte, []int) { + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{16} +} + +func (x *WTaskBoxChangePush) GetBoxs() map[int32]*DBWTaskBox { + if x != nil { + return x.Boxs + } + return nil +} + var File_wtask_wtask_msg_proto protoreflect.FileDescriptor var file_wtask_wtask_msg_proto_rawDesc = []byte{ @@ -899,81 +955,98 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{ 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x6d, 0x0a, - 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, - 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15, - 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, - 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, - 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x74, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, - 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, - 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, - 0x69, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x22, 0x22, 0x0a, - 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, - 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, - 0x64, 0x22, 0xd5, 0x01, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, - 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, - 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x39, - 0x0a, 0x0b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2d, 0x0a, 0x15, 0x57, 0x54, 0x61, - 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, - 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, - 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, - 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, - 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, - 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, - 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57, - 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, - 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13, - 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, - 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, - 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, - 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, - 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, - 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0xe3, 0x01, + 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x74, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, + 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x2e, 0x0a, + 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x57, 0x54, + 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x42, 0x6f, + 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, 0x44, 0x0a, + 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, + 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x49, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, + 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x74, + 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, + 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x08, 0x70, 0x72, + 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, + 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, + 0x72, 0x65, 0x73, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0xd5, 0x01, 0x0a, 0x0f, 0x57, 0x54, 0x61, + 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, + 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, + 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12, + 0x34, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, + 0x70, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, + 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x22, 0x2d, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, + 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, + 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, + 0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, + 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, + 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, + 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, + 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, + 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, + 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, + 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, + 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, + 0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, + 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, + 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, + 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, + 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, + 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x22, 0x8d, 0x01, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, + 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x31, 0x0a, 0x04, + 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x57, 0x54, 0x61, + 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, + 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, + 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -988,7 +1061,7 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte { return file_wtask_wtask_msg_proto_rawDescData } -var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17) +var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 20) var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskInfoReq)(nil), // 0: WTaskInfoReq (*WTaskInfoResp)(nil), // 1: WTaskInfoResp @@ -1006,31 +1079,39 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskBattleStartResp)(nil), // 13: WTaskBattleStartResp (*WTaskBattleFinishReq)(nil), // 14: WTaskBattleFinishReq (*WTaskBattleFinishResp)(nil), // 15: WTaskBattleFinishResp - nil, // 16: WTaskFinishResp.GroupsEntry - (*DBWTask)(nil), // 17: DBWTask - (*DBWTaskItem)(nil), // 18: DBWTaskItem - (*UserAssets)(nil), // 19: UserAssets - (*BattleFormation)(nil), // 20: BattleFormation - (*BattleInfo)(nil), // 21: BattleInfo - (*BattleReport)(nil), // 22: BattleReport + (*WTaskBoxChangePush)(nil), // 16: WTaskBoxChangePush + nil, // 17: WTaskAcceptResp.BoxsEntry + nil, // 18: WTaskFinishResp.GroupsEntry + nil, // 19: WTaskBoxChangePush.BoxsEntry + (*DBWTask)(nil), // 20: DBWTask + (*DBWTaskItem)(nil), // 21: DBWTaskItem + (*UserAssets)(nil), // 22: UserAssets + (*BattleFormation)(nil), // 23: BattleFormation + (*BattleInfo)(nil), // 24: BattleInfo + (*BattleReport)(nil), // 25: BattleReport + (*DBWTaskBox)(nil), // 26: DBWTaskBox } var file_wtask_wtask_msg_proto_depIdxs = []int32{ - 17, // 0: WTaskInfoResp.info:type_name -> DBWTask - 18, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem - 18, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem - 18, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem - 19, // 4: WTaskFinishResp.award:type_name -> UserAssets - 16, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry - 19, // 6: WTaskChapterRewardResp.award:type_name -> UserAssets - 18, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem - 20, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation - 21, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo - 22, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport - 11, // [11:11] is the sub-list for method output_type - 11, // [11:11] is the sub-list for method input_type - 11, // [11:11] is the sub-list for extension type_name - 11, // [11:11] is the sub-list for extension extendee - 0, // [0:11] is the sub-list for field type_name + 20, // 0: WTaskInfoResp.info:type_name -> DBWTask + 21, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem + 21, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem + 17, // 3: WTaskAcceptResp.boxs:type_name -> WTaskAcceptResp.BoxsEntry + 21, // 4: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem + 22, // 5: WTaskFinishResp.award:type_name -> UserAssets + 18, // 6: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry + 22, // 7: WTaskChapterRewardResp.award:type_name -> UserAssets + 21, // 8: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem + 23, // 9: WTaskBattleStartReq.battle:type_name -> BattleFormation + 24, // 10: WTaskBattleStartResp.info:type_name -> BattleInfo + 25, // 11: WTaskBattleFinishReq.report:type_name -> BattleReport + 19, // 12: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry + 26, // 13: WTaskAcceptResp.BoxsEntry.value:type_name -> DBWTaskBox + 26, // 14: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox + 15, // [15:15] is the sub-list for method output_type + 15, // [15:15] is the sub-list for method input_type + 15, // [15:15] is the sub-list for extension type_name + 15, // [15:15] is the sub-list for extension extendee + 0, // [0:15] is the sub-list for field type_name } func init() { file_wtask_wtask_msg_proto_init() } @@ -1234,6 +1315,18 @@ func file_wtask_wtask_msg_proto_init() { return nil } } + file_wtask_wtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WTaskBoxChangePush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1241,7 +1334,7 @@ func file_wtask_wtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_wtask_wtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 17, + NumMessages: 20, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.SearchitemAllData.go b/sys/configure/structs/Game.SearchitemAllData.go index ef93b1afa..4819906db 100644 --- a/sys/configure/structs/Game.SearchitemAllData.go +++ b/sys/configure/structs/Game.SearchitemAllData.go @@ -14,7 +14,7 @@ type GameSearchitemAllData struct { Taskid int32 Tasktype int32 Pointnum int32 - Point []string + Point []int32 Pointweight []int32 } @@ -33,11 +33,11 @@ func (_v *GameSearchitemAllData)Deserialize(_buf map[string]interface{}) (err er var _ok_ bool if _arr_, _ok_ = _buf["point"].([]interface{}); !_ok_ { err = errors.New("point error"); return } - _v.Point = make([]string, 0, len(_arr_)) + _v.Point = make([]int32, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } _v.Point = append(_v.Point, _list_v_) } }