From 20e5472621442d10a5a00e3a0e84f7a2eaac2e12 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 2 Nov 2023 15:09:17 +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=88=98=E6=96=97=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 561 ++++++++++++++++-- bin/json/game_consumebox.json | 96 ++- bin/json/game_consumehero.json | 4 +- bin/json/game_consumeintegral.json | 126 +++- bin/json/game_integral.json | 126 +++- bin/json/game_mainachievement.json | 108 ++-- bin/json/game_mainstage.json | 2 +- bin/json/game_worldbattle.json | 136 +++-- bin/json/game_worldtask.json | 41 +- modules/wtask/api_battlefinish.go | 17 +- pb/wtask_msg.pb.go | 147 +++-- sys/configure/structs/Game.ConsumeBoxData.go | 12 + .../structs/Game.ConsumeIntegralData.go | 2 + sys/configure/structs/Game.IntegralData.go | 2 + sys/configure/structs/Game.WorldBattleData.go | 15 + 15 files changed, 1131 insertions(+), 264 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index f927dc30f..a18a4829f 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -31181,7 +31181,7 @@ "NPC": 0, "value": 10, "filter": [ - 10010 + 11001 ], "filter2": [] }, @@ -31213,7 +31213,7 @@ "filter2": [] }, { - "id": 16000001, + "id": 11002001, "rtype": 1, "ctype": 1, "notify": [ @@ -31222,6 +31222,493 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1080", + "text": "冒险之旅第二章认识原住民" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1102001 + ], + "filter2": [] + }, + { + "id": 11002002, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1081", + "text": "冒险之旅第二章抢鸟蛋" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1102003 + ], + "filter2": [] + }, + { + "id": 11002003, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1082", + "text": "冒险之旅第二章解开与食人鱼误会" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1102006 + ], + "filter2": [] + }, + { + "id": 11002004, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1083", + "text": "冒险之旅第二章见到3个东西" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1102011 + ], + "filter2": [] + }, + { + "id": 11002005, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1084", + "text": "冒险之旅第二章击败小伊" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1102018 + ], + "filter2": [] + }, + { + "id": 11002006, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1085", + "text": "冒险之旅打败大猩猩" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1102023 + ], + "filter2": [] + }, + { + "id": 11002007, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1086", + "text": "全阵容职业1通关石阵5" + }, + "type": 216, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1, + 10015 + ], + "filter2": [] + }, + { + "id": 11002008, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1087", + "text": "第二章商店购买10件商品" + }, + "type": 236, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 10, + "filter": [ + 11002 + ], + "filter2": [] + }, + { + "id": 11002009, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1088", + "text": "完成第二章所有探索" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1102083 + ], + "filter2": [] + }, + { + "id": 11003001, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1089", + "text": "冒险之旅第三章抓住刚越狱的果酱教授" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1103001 + ], + "filter2": [] + }, + { + "id": 11003002, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1090", + "text": "冒险之旅第三章营救沃尔夫" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1103004 + ], + "filter2": [] + }, + { + "id": 11003003, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1091", + "text": "冒险之旅第三章护送月光原石" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1103006 + ], + "filter2": [] + }, + { + "id": 11003004, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1092", + "text": "冒险之旅第三章追击黑衣人" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1103010 + ], + "filter2": [] + }, + { + "id": 11003005, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1093", + "text": "冒险之旅第三章击败豚鼠灵" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1103011 + ], + "filter2": [] + }, + { + "id": 11003006, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1094", + "text": "冒险之旅第三章通关冒险难度挑战" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1103029 + ], + "filter2": [] + }, + { + "id": 11003007, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1095", + "text": "冒险之旅第三章通关困难难度挑战" + }, + "type": 216, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1103037 + ], + "filter2": [] + }, + { + "id": 11003008, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1096", + "text": "第三章商店购买10件商品" + }, + "type": 236, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 10, + "filter": [ + 11003 + ], + "filter2": [] + }, + { + "id": 11003009, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1097", + "text": "完成第三章所有探索" + }, + "type": 61, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1103048 + ], + "filter2": [] + }, + { + "id": 16000001, + "rtype": 1, + "ctype": 1, + "notify": [ + "achieve" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1098", "text": "让邦尼兔升到2级" }, "type": 4, @@ -31248,7 +31735,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1081", + "key": "buried_buried_condi_tasktxt_1099", "text": "让邦尼兔升到3级" }, "type": 4, @@ -31275,7 +31762,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1082", + "key": "buried_buried_condi_tasktxt_1100", "text": "让邦尼兔升到4级" }, "type": 4, @@ -31302,7 +31789,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1083", + "key": "buried_buried_condi_tasktxt_1101", "text": "让邦尼兔升到5级" }, "type": 4, @@ -31329,7 +31816,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1084", + "key": "buried_buried_condi_tasktxt_1102", "text": "让邦尼兔升到6级" }, "type": 4, @@ -31356,7 +31843,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1085", + "key": "buried_buried_condi_tasktxt_1103", "text": "让邦尼兔升到7级" }, "type": 4, @@ -31383,7 +31870,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1086", + "key": "buried_buried_condi_tasktxt_1104", "text": "让邦尼兔升到8级" }, "type": 4, @@ -31410,7 +31897,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1087", + "key": "buried_buried_condi_tasktxt_1105", "text": "让邦尼兔升到9级" }, "type": 4, @@ -31437,7 +31924,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1088", + "key": "buried_buried_condi_tasktxt_1106", "text": "让邦尼兔升到10级" }, "type": 4, @@ -31464,7 +31951,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1089", + "key": "buried_buried_condi_tasktxt_1107", "text": "让邦尼兔升到11级" }, "type": 4, @@ -31491,7 +31978,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1090", + "key": "buried_buried_condi_tasktxt_1108", "text": "让邦尼兔升到12级" }, "type": 4, @@ -31518,7 +32005,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1091", + "key": "buried_buried_condi_tasktxt_1109", "text": "让邦尼兔升到13级" }, "type": 4, @@ -31545,7 +32032,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1092", + "key": "buried_buried_condi_tasktxt_1110", "text": "让邦尼兔升到14级" }, "type": 4, @@ -31572,7 +32059,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1093", + "key": "buried_buried_condi_tasktxt_1111", "text": "让邦尼兔升到15级" }, "type": 4, @@ -31599,7 +32086,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1094", + "key": "buried_buried_condi_tasktxt_1112", "text": "让邦尼兔升到16级" }, "type": 4, @@ -31626,7 +32113,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1095", + "key": "buried_buried_condi_tasktxt_1113", "text": "让邦尼兔升到17级" }, "type": 4, @@ -31653,7 +32140,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1096", + "key": "buried_buried_condi_tasktxt_1114", "text": "让邦尼兔升到18级" }, "type": 4, @@ -31680,7 +32167,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1097", + "key": "buried_buried_condi_tasktxt_1115", "text": "让邦尼兔升到19级" }, "type": 4, @@ -31707,7 +32194,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1098", + "key": "buried_buried_condi_tasktxt_1116", "text": "让邦尼兔升到20级" }, "type": 4, @@ -31734,7 +32221,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1099", + "key": "buried_buried_condi_tasktxt_1117", "text": "让邦尼兔升到21级" }, "type": 4, @@ -31761,7 +32248,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1100", + "key": "buried_buried_condi_tasktxt_1118", "text": "让邦尼兔升到22级" }, "type": 4, @@ -31788,7 +32275,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1101", + "key": "buried_buried_condi_tasktxt_1119", "text": "让邦尼兔升到23级" }, "type": 4, @@ -31815,7 +32302,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1102", + "key": "buried_buried_condi_tasktxt_1120", "text": "让邦尼兔升到24级" }, "type": 4, @@ -31842,7 +32329,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1103", + "key": "buried_buried_condi_tasktxt_1121", "text": "让邦尼兔升到25级" }, "type": 4, @@ -31869,7 +32356,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1104", + "key": "buried_buried_condi_tasktxt_1122", "text": "让邦尼兔升到26级" }, "type": 4, @@ -31896,7 +32383,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1105", + "key": "buried_buried_condi_tasktxt_1123", "text": "让邦尼兔升到27级" }, "type": 4, @@ -31923,7 +32410,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1106", + "key": "buried_buried_condi_tasktxt_1124", "text": "让邦尼兔升到28级" }, "type": 4, @@ -31950,7 +32437,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1107", + "key": "buried_buried_condi_tasktxt_1125", "text": "让邦尼兔升到29级" }, "type": 4, @@ -31977,7 +32464,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1108", + "key": "buried_buried_condi_tasktxt_1126", "text": "让邦尼兔升到30级" }, "type": 4, @@ -32004,7 +32491,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1109", + "key": "buried_buried_condi_tasktxt_1127", "text": "让邦尼兔升到31级" }, "type": 4, @@ -32031,7 +32518,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1110", + "key": "buried_buried_condi_tasktxt_1128", "text": "让邦尼兔升到32级" }, "type": 4, @@ -32058,7 +32545,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1111", + "key": "buried_buried_condi_tasktxt_1129", "text": "让邦尼兔升到33级" }, "type": 4, @@ -32085,7 +32572,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1112", + "key": "buried_buried_condi_tasktxt_1130", "text": "让邦尼兔升到34级" }, "type": 4, @@ -32112,7 +32599,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1113", + "key": "buried_buried_condi_tasktxt_1131", "text": "让邦尼兔升到35级" }, "type": 4, @@ -32139,7 +32626,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1114", + "key": "buried_buried_condi_tasktxt_1132", "text": "让邦尼兔升到36级" }, "type": 4, @@ -32166,7 +32653,7 @@ ], "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1115", + "key": "buried_buried_condi_tasktxt_1133", "text": "让邦尼兔升到37级" }, "type": 4, diff --git a/bin/json/game_consumebox.json b/bin/json/game_consumebox.json index 2c5611fd6..2f701e406 100644 --- a/bin/json/game_consumebox.json +++ b/bin/json/game_consumebox.json @@ -1,22 +1,98 @@ [ { - "boxid": 27000100, - "cd": 5 + "boxid": 1001, + "color": 0, + "name": { + "key": "", + "text": "" + }, + "txt": { + "key": "", + "text": "" + }, + "icon": "", + "group": 0, + "cd": 0, + "weight": 1000 }, { - "boxid": 27000101, - "cd": 10 + "boxid": 1002, + "color": 1, + "name": { + "key": "consume_consume_box_name_01", + "text": "普通宝箱" + }, + "txt": { + "key": "consume_consume_box_txt_01", + "text": "普通宝箱，好东西" + }, + "icon": "item_17010001", + "group": 18001001, + "cd": 5, + "weight": 1000 }, { - "boxid": 27000102, - "cd": 15 + "boxid": 1003, + "color": 2, + "name": { + "key": "consume_consume_box_name_02", + "text": "稀有宝箱" + }, + "txt": { + "key": "consume_consume_box_txt_02", + "text": "稀有宝箱，好东西" + }, + "icon": "item_17020001", + "group": 18001002, + "cd": 10, + "weight": 1000 }, { - "boxid": 27000103, - "cd": 20 + "boxid": 1004, + "color": 3, + "name": { + "key": "consume_consume_box_name_03", + "text": "珍贵宝箱" + }, + "txt": { + "key": "consume_consume_box_txt_03", + "text": "珍贵宝箱，好东西" + }, + "icon": "item_17030001", + "group": 18001003, + "cd": 15, + "weight": 1000 }, { - "boxid": 27000104, - "cd": 25 + "boxid": 1005, + "color": 4, + "name": { + "key": "consume_consume_box_name_04", + "text": "完美宝箱" + }, + "txt": { + "key": "consume_consume_box_txt_04", + "text": "完美宝箱，好东西" + }, + "icon": "item_17050001", + "group": 17050001, + "cd": 20, + "weight": 1000 + }, + { + "boxid": 1006, + "color": 5, + "name": { + "key": "consume_consume_box_name_05", + "text": "七彩宝箱" + }, + "txt": { + "key": "consume_consume_box_txt_05", + "text": "七彩宝箱，好东西" + }, + "icon": "item_17050002", + "group": 17050002, + "cd": 25, + "weight": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json index e62454b25..9a588a165 100644 --- a/bin/json/game_consumehero.json +++ b/bin/json/game_consumehero.json @@ -48,7 +48,7 @@ "n": 10 } ], - "skilltype": 2, + "skilltype": 1, "skillload": 7, "skilleffect": 2, "skillvalue": 0 @@ -138,7 +138,7 @@ "n": 20 } ], - "skilltype": 2, + "skilltype": 1, "skillload": 7, "skilleffect": 5, "skillvalue": 0 diff --git a/bin/json/game_consumeintegral.json b/bin/json/game_consumeintegral.json index 793f44b94..c1b11529e 100644 --- a/bin/json/game_consumeintegral.json +++ b/bin/json/game_consumeintegral.json @@ -8,7 +8,11 @@ "deductrewards": [], "name": { "key": "consume_consume_integral_name_01", - "text": "S1:卧龙凤雏" + "text": "三消小游戏" + }, + "txt": { + "key": "consume_consume_integral_txt_01", + "text": "三消游戏十分的不错，快来玩吧。" } }, { @@ -38,6 +42,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -67,6 +75,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -96,6 +108,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -125,6 +141,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -154,6 +174,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -183,6 +207,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -212,6 +240,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -241,6 +273,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -270,6 +306,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -299,6 +339,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -328,6 +372,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -357,6 +405,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -386,6 +438,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -415,6 +471,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -444,6 +504,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -473,6 +537,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -502,6 +570,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -531,6 +603,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -560,6 +636,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -589,6 +669,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -618,6 +702,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": " ", + "text": "" } }, { @@ -647,6 +735,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -676,6 +768,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -705,6 +801,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -734,6 +834,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -763,6 +867,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -792,6 +900,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -821,6 +933,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -850,6 +966,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -879,6 +999,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } } ] \ No newline at end of file diff --git a/bin/json/game_integral.json b/bin/json/game_integral.json index 793f44b94..c1b11529e 100644 --- a/bin/json/game_integral.json +++ b/bin/json/game_integral.json @@ -8,7 +8,11 @@ "deductrewards": [], "name": { "key": "consume_consume_integral_name_01", - "text": "S1:卧龙凤雏" + "text": "三消小游戏" + }, + "txt": { + "key": "consume_consume_integral_txt_01", + "text": "三消游戏十分的不错，快来玩吧。" } }, { @@ -38,6 +42,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -67,6 +75,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -96,6 +108,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -125,6 +141,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -154,6 +174,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -183,6 +207,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -212,6 +240,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -241,6 +273,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -270,6 +306,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -299,6 +339,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -328,6 +372,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -357,6 +405,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -386,6 +438,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -415,6 +471,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -444,6 +504,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -473,6 +537,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -502,6 +570,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -531,6 +603,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -560,6 +636,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -589,6 +669,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -618,6 +702,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": " ", + "text": "" } }, { @@ -647,6 +735,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -676,6 +768,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -705,6 +801,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -734,6 +834,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -763,6 +867,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -792,6 +900,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -821,6 +933,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -850,6 +966,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } }, { @@ -879,6 +999,10 @@ "name": { "key": "", "text": "" + }, + "txt": { + "key": "", + "text": "" } } ] \ No newline at end of file diff --git a/bin/json/game_mainachievement.json b/bin/json/game_mainachievement.json index 9440b4c1f..380c43de4 100644 --- a/bin/json/game_mainachievement.json +++ b/bin/json/game_mainachievement.json @@ -157,9 +157,9 @@ "id": 11002, "title": { "key": "mainchapter_main_achievement_title_10", - "text": "碎片10" + "text": "认识原住民" }, - "taskid": 11001001, + "taskid": 11002001, "reword": [ { "a": "item", @@ -167,16 +167,16 @@ "n": 20 } ], - "icon": "item_50013001" + "icon": "item_10000008" }, { "key": 110011, "id": 11002, "title": { "key": "mainchapter_main_achievement_title_11", - "text": "碎片11" + "text": "抢鸟蛋" }, - "taskid": 11001002, + "taskid": 11002002, "reword": [ { "a": "item", @@ -184,16 +184,16 @@ "n": 20 } ], - "icon": "item_50013001" + "icon": "item_10000008" }, { "key": 110012, "id": 11002, "title": { "key": "mainchapter_main_achievement_title_12", - "text": "碎片12" + "text": "解开与食人鱼误会" }, - "taskid": 11001003, + "taskid": 11002003, "reword": [ { "a": "item", @@ -201,16 +201,16 @@ "n": 10 } ], - "icon": "item_50013001" + "icon": "item_10000009" }, { "key": 110013, "id": 11002, "title": { "key": "mainchapter_main_achievement_title_13", - "text": "碎片13" + "text": "见到3个东西" }, - "taskid": 11001004, + "taskid": 11002004, "reword": [ { "a": "item", @@ -218,16 +218,16 @@ "n": 10 } ], - "icon": "item_50013001" + "icon": "item_10000009" }, { "key": 110014, "id": 11002, "title": { "key": "mainchapter_main_achievement_title_14", - "text": "碎片14" + "text": "击败小伊" }, - "taskid": 11001005, + "taskid": 11002005, "reword": [ { "a": "item", @@ -235,16 +235,16 @@ "n": 15 } ], - "icon": "item_50013001" + "icon": "item_10000009" }, { "key": 110015, "id": 11002, "title": { "key": "mainchapter_main_achievement_title_15", - "text": "碎片15" + "text": "打败大猩猩" }, - "taskid": 11001006, + "taskid": 11002006, "reword": [ { "a": "item", @@ -252,16 +252,16 @@ "n": 15 } ], - "icon": "item_50013001" + "icon": "item_10000009" }, { "key": 110016, "id": 11002, "title": { "key": "mainchapter_main_achievement_title_16", - "text": "碎片16" + "text": "全阵容职业1通关石阵5" }, - "taskid": 11001007, + "taskid": 11002007, "reword": [ { "a": "item", @@ -269,16 +269,16 @@ "n": 1 } ], - "icon": "item_50013001" + "icon": "item_10000001" }, { "key": 110017, "id": 11002, "title": { "key": "mainchapter_main_achievement_title_17", - "text": "碎片17" + "text": "原始购物狂" }, - "taskid": 11001007, + "taskid": 11002008, "reword": [ { "a": "item", @@ -286,16 +286,16 @@ "n": 1 } ], - "icon": "item_50013001" + "icon": "item_10000001" }, { "key": 110018, "id": 11002, "title": { "key": "mainchapter_main_achievement_title_18", - "text": "碎片18" + "text": "完成第二章所有探索" }, - "taskid": 11001009, + "taskid": 11002009, "reword": [ { "a": "item", @@ -303,16 +303,16 @@ "n": 1 } ], - "icon": "item_50013001" + "icon": "item_10000001" }, { "key": 110019, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_19", - "text": "碎片19" + "text": "抓住刚越狱的果酱教授" }, - "taskid": 11001001, + "taskid": 11003001, "reword": [ { "a": "item", @@ -320,16 +320,16 @@ "n": 30 } ], - "icon": "item_50013001" + "icon": "item_10000008" }, { "key": 110020, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_20", - "text": "碎片20" + "text": "营救沃尔夫" }, - "taskid": 11001002, + "taskid": 11003002, "reword": [ { "a": "item", @@ -337,16 +337,16 @@ "n": 30 } ], - "icon": "item_50013001" + "icon": "item_10000008" }, { "key": 110021, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_21", - "text": "碎片21" + "text": "护送月光原石" }, - "taskid": 11001003, + "taskid": 11003003, "reword": [ { "a": "item", @@ -354,16 +354,16 @@ "n": 15 } ], - "icon": "item_50013001" + "icon": "item_10000009" }, { "key": 110022, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_22", - "text": "碎片22" + "text": "追击黑衣人" }, - "taskid": 11001004, + "taskid": 11003004, "reword": [ { "a": "item", @@ -371,16 +371,16 @@ "n": 15 } ], - "icon": "item_50013001" + "icon": "item_10000009" }, { "key": 110023, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_23", - "text": "碎片23" + "text": "击败豚鼠灵" }, - "taskid": 11001005, + "taskid": 11003005, "reword": [ { "a": "item", @@ -388,16 +388,16 @@ "n": 20 } ], - "icon": "item_50013001" + "icon": "item_10000009" }, { "key": 110024, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_24", - "text": "碎片24" + "text": "通关冒险难度挑战" }, - "taskid": 11001006, + "taskid": 11003006, "reword": [ { "a": "item", @@ -405,16 +405,16 @@ "n": 20 } ], - "icon": "item_50013001" + "icon": "item_10000009" }, { "key": 110025, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_25", - "text": "碎片25" + "text": "通关困难难度挑战" }, - "taskid": 11001007, + "taskid": 11003007, "reword": [ { "a": "item", @@ -422,16 +422,16 @@ "n": 1 } ], - "icon": "item_50013001" + "icon": "item_10000001" }, { "key": 110026, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_26", - "text": "碎片26" + "text": "都市购物狂" }, - "taskid": 11001007, + "taskid": 11003008, "reword": [ { "a": "item", @@ -439,16 +439,16 @@ "n": 1 } ], - "icon": "item_50013001" + "icon": "item_10000001" }, { "key": 110027, "id": 11003, "title": { "key": "mainchapter_main_achievement_title_27", - "text": "碎片27" + "text": "完成第三章所有探索" }, - "taskid": 11001009, + "taskid": 11003009, "reword": [ { "a": "item", @@ -456,7 +456,7 @@ "n": 1 } ], - "icon": "item_50013001" + "icon": "item_10000001" }, { "key": 110028, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 98a4ff2ae..57e3d5b54 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -2759,7 +2759,7 @@ ], "BattleReadyID": 10100001, "FormatList": [ - 101211, + 101121, 101122, 101123 ], diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 0db44f1ec..0e04f18e0 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -12,7 +12,24 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "10000008", + "n": 3 + }, + { + "a": "attr", + "t": "diamond", + "n": 20 + } + ] }, { "id": 102, @@ -27,7 +44,29 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "10000008", + "n": 3 + }, + { + "a": "attr", + "t": "diamond", + "n": 20 + }, + { + "a": "hero", + "t": "24004", + "n": 1 + } + ] }, { "id": 103, @@ -42,7 +81,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 104, @@ -57,7 +97,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 105, @@ -74,7 +115,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 106, @@ -89,7 +131,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 107, @@ -106,7 +149,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 108, @@ -121,7 +165,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 109, @@ -136,7 +181,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 110, @@ -151,7 +197,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 111, @@ -166,7 +213,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 112, @@ -181,7 +229,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 113, @@ -196,7 +245,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 114, @@ -211,7 +261,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 115, @@ -226,7 +277,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 116, @@ -241,7 +293,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 117, @@ -256,7 +309,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 118, @@ -271,7 +325,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 119, @@ -286,7 +341,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 120, @@ -301,7 +357,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 121, @@ -316,7 +373,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 122, @@ -331,7 +389,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 123, @@ -346,7 +405,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 124, @@ -361,7 +421,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 125, @@ -376,7 +437,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 126, @@ -391,7 +453,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 180, @@ -406,7 +469,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 501, @@ -421,7 +485,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 502, @@ -436,7 +501,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 503, @@ -451,7 +517,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 504, @@ -466,7 +533,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 505, @@ -481,7 +549,8 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] }, { "id": 506, @@ -496,6 +565,7 @@ "n": 5 }, "carexe": 500, - "reward": 0 + "reward": 0, + "exreward": [] } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index b71cad61f..9cc612c98 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -91,23 +91,7 @@ "auto_accept": 0, "tasktips": 0, "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - }, - { - "a": "item", - "t": "10000008", - "n": 3 - }, - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ], + "reword": [], "module": [] }, { @@ -199,28 +183,7 @@ "auto_accept": 0, "tasktips": 0, "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - }, - { - "a": "item", - "t": "10000008", - "n": 3 - }, - { - "a": "attr", - "t": "diamond", - "n": 20 - }, - { - "a": "hero", - "t": "24004", - "n": 1 - } - ], + "reword": [], "module": [] }, { diff --git a/modules/wtask/api_battlefinish.go b/modules/wtask/api_battlefinish.go index a16a24a8d..62f5c54e4 100644 --- a/modules/wtask/api_battlefinish.go +++ b/modules/wtask/api_battlefinish.go @@ -29,7 +29,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle var ( conf *cfg.GameWorldBattleData prop []*cfg.Gameatn - award []*pb.UserAssets + atno []*pb.UserAtno tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) err error isWin bool @@ -83,16 +83,9 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle return } } - award = make([]*pb.UserAssets, 0) - prop = append(prop, conf.Playexp) //经验不返回前端展示 - for _, v := range prop { - award = append(award, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } - if errdata = this.module.DispenseRes(session, prop, true); errdata != nil { + prop = append(prop, conf.Playexp) //经验不返回前端展示 + prop = append(prop, conf.Exreward...) //经验不返回前端展示 + if errdata, atno = this.module.DispenseAtno(session, prop, true); errdata != nil { this.module.Error("世界任务战斗玩家经验结算", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "playerExp", Value: conf.Playexp}, @@ -104,7 +97,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle } else { tasks = append(tasks, comm.GetBuriedParam(comm.Rtype227, 1, req.BattleConfId)) } - session.SendMsg(string(this.module.GetType()), "battlefinish", &pb.WTaskBattleFinishResp{BattleConfId: req.BattleConfId, Award: award}) + session.SendMsg(string(this.module.GetType()), "battlefinish", &pb.WTaskBattleFinishResp{BattleConfId: req.BattleConfId, Award: atno}) if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go index 5eccb5df8..779b03895 100644 --- a/pb/wtask_msg.pb.go +++ b/pb/wtask_msg.pb.go @@ -841,8 +841,8 @@ type WTaskBattleFinishResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID - Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 + BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID + Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 } func (x *WTaskBattleFinishResp) Reset() { @@ -884,7 +884,7 @@ func (x *WTaskBattleFinishResp) GetBattleConfId() int32 { return 0 } -func (x *WTaskBattleFinishResp) GetAward() []*UserAssets { +func (x *WTaskBattleFinishResp) GetAward() []*UserAtno { if x != nil { return x.Award } @@ -1664,80 +1664,80 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{ 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, 0x5e, 0x0a, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x5c, 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, 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, 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, 0x22, 0x3c, 0x0a, - 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x22, 0x5e, 0x0a, 0x13, 0x57, + 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, + 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 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, 0x22, 0x3c, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, - 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, - 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x57, - 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, - 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x65, 0x69, - 0x64, 0x22, 0x46, 0x0a, 0x11, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x05, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, - 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, - 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x57, 0x54, 0x61, - 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 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, 0x42, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x22, 0x5e, 0x0a, 0x13, 0x57, 0x54, 0x61, + 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, + 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, + 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x57, 0x54, 0x61, + 0x73, 0x6b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, + 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x65, 0x69, 0x64, 0x22, + 0x46, 0x0a, 0x11, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, + 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 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, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x6b, 0x0a, 0x13, 0x57, 0x54, - 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 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, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x0a, - 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 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, 0x63, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x72, 0x6f, 0x75, 0x70, 0x22, 0x42, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 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, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x6b, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, + 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 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, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x15, - 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, - 0x74, 0x65, 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, 0x12, 0x14, 0x0a, 0x05, 0x65, - 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, - 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 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, 0x65, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, - 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 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, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, - 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1f, - 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, - 0x64, 0x0a, 0x18, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, - 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x0e, 0x64, - 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0e, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, - 0x6f, 0x75, 0x70, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 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, 0x63, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 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, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x15, 0x57, 0x54, + 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, + 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, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, + 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, + 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 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, 0x65, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 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, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x05, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x64, 0x0a, + 0x18, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x43, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x61, 0x69, + 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0e, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, 0x6f, 0x75, + 0x70, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -1790,8 +1790,7 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*BattleFormation)(nil), // 33: BattleFormation (*BattleInfo)(nil), // 34: BattleInfo (*BattleReport)(nil), // 35: BattleReport - (*UserAssets)(nil), // 36: UserAssets - (*DBWTaskBox)(nil), // 37: DBWTaskBox + (*DBWTaskBox)(nil), // 36: DBWTaskBox } var file_wtask_wtask_msg_proto_depIdxs = []int32{ 30, // 0: WTaskInfoResp.info:type_name -> DBWTask @@ -1805,7 +1804,7 @@ var file_wtask_wtask_msg_proto_depIdxs = []int32{ 33, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation 34, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo 35, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport - 36, // 11: WTaskBattleFinishResp.award:type_name -> UserAssets + 32, // 11: WTaskBattleFinishResp.award:type_name -> UserAtno 29, // 12: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry 32, // 13: WTaskBoxReceiveResp.award:type_name -> UserAtno 32, // 14: WTaskExchangeResp.award:type_name -> UserAtno @@ -1813,7 +1812,7 @@ var file_wtask_wtask_msg_proto_depIdxs = []int32{ 34, // 16: WTaskBattleEventResp.info:type_name -> BattleInfo 35, // 17: WTaskEventCompleteReq.report:type_name -> BattleReport 32, // 18: WTaskEventCompleteResp.award:type_name -> UserAtno - 37, // 19: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox + 36, // 19: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox 20, // [20:20] is the sub-list for method output_type 20, // [20:20] is the sub-list for method input_type 20, // [20:20] is the sub-list for extension type_name diff --git a/sys/configure/structs/Game.ConsumeBoxData.go b/sys/configure/structs/Game.ConsumeBoxData.go index 8df498ca2..0a2d076df 100644 --- a/sys/configure/structs/Game.ConsumeBoxData.go +++ b/sys/configure/structs/Game.ConsumeBoxData.go @@ -12,7 +12,13 @@ import "errors" type GameConsumeBoxData struct { Boxid int32 + Color int32 + Name string + Txt string + Icon string + Group int32 Cd int32 + Weight int32 } const TypeId_GameConsumeBoxData = -456316427 @@ -23,7 +29,13 @@ func (*GameConsumeBoxData) GetTypeId() int32 { func (_v *GameConsumeBoxData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boxid"].(float64); !_ok_ { err = errors.New("boxid error"); return }; _v.Boxid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cd"].(float64); !_ok_ { err = errors.New("cd error"); return }; _v.Cd = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.ConsumeIntegralData.go b/sys/configure/structs/Game.ConsumeIntegralData.go index 323f53c8d..a1bb3f977 100644 --- a/sys/configure/structs/Game.ConsumeIntegralData.go +++ b/sys/configure/structs/Game.ConsumeIntegralData.go @@ -18,6 +18,7 @@ type GameConsumeIntegralData struct { Boxid int32 Deductrewards []*Gameatn Name string + Txt string } const TypeId_GameConsumeIntegralData = -1538782826 @@ -73,6 +74,7 @@ func (_v *GameConsumeIntegralData)Deserialize(_buf map[string]interface{}) (err } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/Game.IntegralData.go b/sys/configure/structs/Game.IntegralData.go index f9899515f..6a72e96be 100644 --- a/sys/configure/structs/Game.IntegralData.go +++ b/sys/configure/structs/Game.IntegralData.go @@ -18,6 +18,7 @@ type GameIntegralData struct { Boxid int32 Deductrewards []*Gameatn Name string + Txt string } const TypeId_GameIntegralData = 1942319090 @@ -73,6 +74,7 @@ func (_v *GameIntegralData)Deserialize(_buf map[string]interface{}) (err error) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go index de3fcfa84..976955e05 100644 --- a/sys/configure/structs/Game.WorldBattleData.go +++ b/sys/configure/structs/Game.WorldBattleData.go @@ -18,6 +18,7 @@ type GameWorldBattleData struct { Playexp *Gameatn Carexe int32 Reward int32 + Exreward []*Gameatn } const TypeId_GameWorldBattleData = 1096332216 @@ -60,6 +61,20 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["carexe"].(float64); !_ok_ { err = errors.New("carexe error"); return }; _v.Carexe = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reward"].(float64); !_ok_ { err = errors.New("reward error"); return }; _v.Reward = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["exreward"].([]interface{}); !_ok_ { err = errors.New("exreward error"); return } + + _v.Exreward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Exreward = append(_v.Exreward, _list_v_) + } + } + return }