From cddf0dfc5453788772dc54ea5b883a2fae5ccef2 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Tue, 25 Jul 2023 18:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B7=A5=E4=BC=9Aboos?=
=?UTF-8?q?=E6=88=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_global.json | 16 +-
bin/json/game_guildboss.json | 605 ++++--
bin/json/game_hero.json | 294 +--
bin/json/game_item.json | 37 +
bin/json/game_lottery.json | 24 +
bin/json/game_mainstage.json | 1672 ++++++++++++-----
bin/json/game_opencond.json | 100 +-
bin/json/game_playerlv.json | 180 +-
bin/json/game_ruledesc.json | 8 +-
bin/json/game_stronebuff.json | 236 ++-
bin/json/game_stroneevent.json | 84 +-
bin/json/game_stroneroom.json | 6 +-
bin/json/game_worldall.json | 195 ++
comm/const.go | 8 +-
comm/imodule.go | 3 +
modules/{uniongve => guildgve}/api.go | 6 +-
.../{uniongve => guildgve}/api_challenge.go | 50 +-
.../api_challengefinish.go | 65 +-
modules/guildgve/api_info.go | 65 +
modules/{uniongve => guildgve}/api_rank.go | 14 +-
.../{uniongve => guildgve}/api_roulette.go | 10 +-
modules/{uniongve => guildgve}/api_setfire.go | 20 +-
.../{uniongve => guildgve}/comp_configure.go | 6 +-
modules/{uniongve => guildgve}/core.go | 2 +-
modules/guildgve/modelGuildMember.go | 84 +
.../modelUnionRoulette.go | 30 +-
.../{uniongve => guildgve}/modelUniongve.go | 60 +-
modules/{uniongve => guildgve}/modelrank.go | 14 +-
modules/{uniongve => guildgve}/module.go | 24 +-
modules/sociaty/model_sociaty.go | 2 +-
modules/tools/comp_configure.go | 18 +-
modules/tools/module.go | 25 +
modules/uniongve/api_info.go | 41 -
pb/guildgve_db.pb.go | 733 ++++++++
pb/guildgve_msg.pb.go | 1362 ++++++++++++++
pb/sociaty_db.pb.go | 267 ++-
pb/uniongve_db.pb.go | 632 -------
pb/uniongve_msg.pb.go | 1332 -------------
pb/wtask_db.pb.go | 289 +--
pb/wtask_msg.pb.go | 457 +----
services/worker/main.go | 4 +-
sys/configure/structs/Game.GuildBossData.go | 19 +-
sys/configure/structs/Game.MainStageData.go | 4 +
sys/configure/structs/Game.StroneBuffData.go | 4 -
sys/configure/structs/Game.StroneEventData.go | 15 +
sys/configure/structs/game.globalData.go | 30 +
sys/configure/structs/game.playerlvData.go | 2 +
47 files changed, 5192 insertions(+), 3962 deletions(-)
rename modules/{uniongve => guildgve}/api.go (85%)
rename modules/{uniongve => guildgve}/api_challenge.go (51%)
rename modules/{uniongve => guildgve}/api_challengefinish.go (65%)
create mode 100644 modules/guildgve/api_info.go
rename modules/{uniongve => guildgve}/api_rank.go (67%)
rename modules/{uniongve => guildgve}/api_roulette.go (85%)
rename modules/{uniongve => guildgve}/api_setfire.go (62%)
rename modules/{uniongve => guildgve}/comp_configure.go (98%)
rename modules/{uniongve => guildgve}/core.go (76%)
create mode 100644 modules/guildgve/modelGuildMember.go
rename modules/{uniongve => guildgve}/modelUnionRoulette.go (75%)
rename modules/{uniongve => guildgve}/modelUniongve.go (82%)
rename modules/{uniongve => guildgve}/modelrank.go (91%)
rename modules/{uniongve => guildgve}/module.go (75%)
delete mode 100644 modules/uniongve/api_info.go
create mode 100644 pb/guildgve_db.pb.go
create mode 100644 pb/guildgve_msg.pb.go
delete mode 100644 pb/uniongve_db.pb.go
delete mode 100644 pb/uniongve_msg.pb.go
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index b0d432f51..c2f40ed11 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -775,6 +775,20 @@
"a": "attr",
"t": "arenacoin",
"n": 1000
- }
+ },
+ "guildboss_kill_Preview": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "guildboss_challenge_preview": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_guildboss.json b/bin/json/game_guildboss.json
index aa4666deb..be6d4607a 100644
--- a/bin/json/game_guildboss.json
+++ b/bin/json/game_guildboss.json
@@ -9,7 +9,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "14007",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -21,7 +28,7 @@
301013
],
"score": 1,
- "buff": 50000001,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_1",
"text": "大家集中火力，优先攻打希卡普"
@@ -37,7 +44,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "14007",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -49,7 +63,7 @@
301016
],
"score": 1,
- "buff": 50000002,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_2",
"text": "大家集中火力，优先攻打希卡普"
@@ -65,7 +79,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "14007",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -77,7 +98,7 @@
301019
],
"score": 1,
- "buff": 50000003,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_3",
"text": "大家集中火力，优先攻打希卡普"
@@ -93,7 +114,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "14007",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -105,7 +133,7 @@
301013
],
"score": 1,
- "buff": 50000004,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_4",
"text": "大家集中火力，优先攻打希卡普"
@@ -121,7 +149,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "14007",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -133,7 +168,7 @@
301016
],
"score": 1,
- "buff": 50000005,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_5",
"text": "大家集中火力，优先攻打希卡普"
@@ -149,7 +184,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -161,7 +203,7 @@
301019
],
"score": 1,
- "buff": 50000006,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_6",
"text": "大家集中火力，优先攻打希卡普"
@@ -177,7 +219,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -189,7 +238,7 @@
301013
],
"score": 1,
- "buff": 50000007,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_7",
"text": "大家集中火力，优先攻打希卡普"
@@ -205,7 +254,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -217,7 +273,7 @@
301016
],
"score": 1,
- "buff": 50000008,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_8",
"text": "大家集中火力，优先攻打希卡普"
@@ -233,7 +289,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -245,7 +308,7 @@
301019
],
"score": 1,
- "buff": 50000009,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_9",
"text": "大家集中火力，优先攻打希卡普"
@@ -261,7 +324,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -273,7 +343,7 @@
301013
],
"score": 1,
- "buff": 50000010,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_10",
"text": "大家集中火力，优先攻打希卡普"
@@ -289,7 +359,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -301,7 +378,7 @@
301016
],
"score": 1,
- "buff": 50000011,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_11",
"text": "大家集中火力，优先攻打希卡普"
@@ -317,7 +394,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -329,7 +413,7 @@
301019
],
"score": 1,
- "buff": 50000012,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_12",
"text": "大家集中火力，优先攻打希卡普"
@@ -345,7 +429,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -357,7 +448,7 @@
301013
],
"score": 1,
- "buff": 50000013,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_13",
"text": "大家集中火力，优先攻打希卡普"
@@ -373,7 +464,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -385,7 +483,7 @@
301016
],
"score": 1,
- "buff": 50000014,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_14",
"text": "大家集中火力，优先攻打希卡普"
@@ -401,7 +499,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -413,7 +518,7 @@
301019
],
"score": 1,
- "buff": 50000015,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_15",
"text": "大家集中火力，优先攻打希卡普"
@@ -429,7 +534,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -441,7 +553,7 @@
301013
],
"score": 1,
- "buff": 50000016,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_16",
"text": "大家集中火力，优先攻打希卡普"
@@ -457,7 +569,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -469,7 +588,7 @@
301016
],
"score": 1,
- "buff": 50000017,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_17",
"text": "大家集中火力，优先攻打希卡普"
@@ -485,7 +604,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -497,7 +623,7 @@
301019
],
"score": 1,
- "buff": 50000018,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_18",
"text": "大家集中火力，优先攻打希卡普"
@@ -513,7 +639,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -525,7 +658,7 @@
301013
],
"score": 1,
- "buff": 50000019,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_19",
"text": "大家集中火力，优先攻打希卡普"
@@ -541,7 +674,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "15004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -553,7 +693,7 @@
301016
],
"score": 1,
- "buff": 50000020,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_20",
"text": "大家集中火力，优先攻打希卡普"
@@ -569,7 +709,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "23004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -581,7 +728,7 @@
301019
],
"score": 1,
- "buff": 50000021,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_21",
"text": "大家集中火力，优先攻打希卡普"
@@ -597,7 +744,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "23004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -609,7 +763,7 @@
301013
],
"score": 1,
- "buff": 50000022,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_22",
"text": "大家集中火力，优先攻打希卡普"
@@ -625,7 +779,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "23004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -637,7 +798,7 @@
301016
],
"score": 1,
- "buff": 50000023,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_23",
"text": "大家集中火力，优先攻打希卡普"
@@ -653,7 +814,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "23004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -665,7 +833,7 @@
301019
],
"score": 1,
- "buff": 50000024,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_24",
"text": "大家集中火力，优先攻打希卡普"
@@ -681,7 +849,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "23004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -693,7 +868,7 @@
301013
],
"score": 1,
- "buff": 50000025,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_25",
"text": "大家集中火力，优先攻打希卡普"
@@ -709,7 +884,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -721,7 +903,7 @@
301016
],
"score": 1,
- "buff": 50000026,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_26",
"text": "大家集中火力，优先攻打希卡普"
@@ -737,7 +919,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -749,7 +938,7 @@
301019
],
"score": 1,
- "buff": 50000027,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_27",
"text": "大家集中火力，优先攻打希卡普"
@@ -765,7 +954,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -777,7 +973,7 @@
301013
],
"score": 1,
- "buff": 50000028,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_28",
"text": "大家集中火力，优先攻打希卡普"
@@ -793,7 +989,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -805,7 +1008,7 @@
301016
],
"score": 1,
- "buff": 50000029,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_29",
"text": "大家集中火力，优先攻打希卡普"
@@ -821,7 +1024,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24002",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -833,7 +1043,7 @@
301019
],
"score": 1,
- "buff": 50000030,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_30",
"text": "大家集中火力，优先攻打希卡普"
@@ -849,7 +1059,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -861,7 +1078,7 @@
301013
],
"score": 1,
- "buff": 50000031,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_31",
"text": "大家集中火力，优先攻打希卡普"
@@ -877,7 +1094,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -889,7 +1113,7 @@
301016
],
"score": 1,
- "buff": 50000032,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_32",
"text": "大家集中火力，优先攻打希卡普"
@@ -905,7 +1129,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -917,7 +1148,7 @@
301019
],
"score": 1,
- "buff": 50000033,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_33",
"text": "大家集中火力，优先攻打希卡普"
@@ -933,7 +1164,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -945,7 +1183,7 @@
301013
],
"score": 1,
- "buff": 50000034,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_34",
"text": "大家集中火力，优先攻打希卡普"
@@ -961,7 +1199,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24003",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -973,7 +1218,7 @@
301016
],
"score": 1,
- "buff": 50000035,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_35",
"text": "大家集中火力，优先攻打希卡普"
@@ -989,7 +1234,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1001,7 +1253,7 @@
301019
],
"score": 1,
- "buff": 50000036,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_36",
"text": "大家集中火力，优先攻打希卡普"
@@ -1017,7 +1269,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1029,7 +1288,7 @@
301013
],
"score": 1,
- "buff": 50000037,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_37",
"text": "大家集中火力，优先攻打希卡普"
@@ -1045,7 +1304,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1057,7 +1323,7 @@
301016
],
"score": 1,
- "buff": 50000038,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_38",
"text": "大家集中火力，优先攻打希卡普"
@@ -1073,7 +1339,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1085,7 +1358,7 @@
301019
],
"score": 1,
- "buff": 50000039,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_39",
"text": "大家集中火力，优先攻打希卡普"
@@ -1101,7 +1374,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24004",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1113,7 +1393,7 @@
301013
],
"score": 1,
- "buff": 50000040,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_40",
"text": "大家集中火力，优先攻打希卡普"
@@ -1129,7 +1409,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24005",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1141,7 +1428,7 @@
301016
],
"score": 1,
- "buff": 50000041,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_41",
"text": "大家集中火力，优先攻打希卡普"
@@ -1157,7 +1444,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24005",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1169,7 +1463,7 @@
301019
],
"score": 1,
- "buff": 50000042,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_42",
"text": "大家集中火力，优先攻打希卡普"
@@ -1185,7 +1479,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24005",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1197,7 +1498,7 @@
301013
],
"score": 1,
- "buff": 50000043,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_43",
"text": "大家集中火力，优先攻打希卡普"
@@ -1213,7 +1514,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24005",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1225,7 +1533,7 @@
301016
],
"score": 1,
- "buff": 50000044,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_44",
"text": "大家集中火力，优先攻打希卡普"
@@ -1241,7 +1549,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24005",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1253,7 +1568,7 @@
301019
],
"score": 1,
- "buff": 50000045,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_45",
"text": "大家集中火力，优先攻打希卡普"
@@ -1269,7 +1584,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24008",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1281,7 +1603,7 @@
301013
],
"score": 1,
- "buff": 50000046,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_46",
"text": "大家集中火力，优先攻打希卡普"
@@ -1297,7 +1619,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24008",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1309,7 +1638,7 @@
301016
],
"score": 1,
- "buff": 50000047,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_47",
"text": "大家集中火力，优先攻打希卡普"
@@ -1325,7 +1654,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24008",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1337,7 +1673,7 @@
301019
],
"score": 1,
- "buff": 50000048,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_48",
"text": "大家集中火力，优先攻打希卡普"
@@ -1353,7 +1689,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24008",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1365,7 +1708,7 @@
301013
],
"score": 1,
- "buff": 50000049,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_49",
"text": "大家集中火力，优先攻打希卡普"
@@ -1381,7 +1724,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24008",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1393,7 +1743,7 @@
301016
],
"score": 1,
- "buff": 50000050,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_50",
"text": "大家集中火力，优先攻打希卡普"
@@ -1409,7 +1759,14 @@
"boss_lv": 1,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24009",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1421,7 +1778,7 @@
301019
],
"score": 1,
- "buff": 50000051,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_51",
"text": "大家集中火力，优先攻打希卡普"
@@ -1437,7 +1794,14 @@
"boss_lv": 2,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24009",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1449,7 +1813,7 @@
301013
],
"score": 1,
- "buff": 50000052,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_52",
"text": "大家集中火力，优先攻打希卡普"
@@ -1465,7 +1829,14 @@
"boss_lv": 3,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24009",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1477,7 +1848,7 @@
301016
],
"score": 1,
- "buff": 50000053,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_53",
"text": "大家集中火力，优先攻打希卡普"
@@ -1493,7 +1864,14 @@
"boss_lv": 4,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24009",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1505,7 +1883,7 @@
301019
],
"score": 1,
- "buff": 50000054,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_54",
"text": "大家集中火力，优先攻打希卡普"
@@ -1521,7 +1899,14 @@
"boss_lv": 5,
"hp": 10,
"BattleReadyID": 121,
- "boss_img": 11009,
+ "heroId": "24009",
+ "preview_reward": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 50
+ }
+ ],
"kill_reward": [
{
"a": "attr",
@@ -1533,7 +1918,7 @@
301013
],
"score": 1,
- "buff": 50000055,
+ "buff": 14,
"boss_des": {
"key": "guild_guild_boss_boss_name_55",
"text": "大家集中火力，优先攻打希卡普"
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 5522a38d0..9af82ac02 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -95,7 +95,7 @@
"tujing": [
107
],
- "detailwindow": "effect_chezhan",
+ "detailwindow": "effect_huaidanlianmeng",
"intr": {
"key": "",
"text": ""
@@ -243,7 +243,7 @@
"tujing": [
107
],
- "detailwindow": "effect_chezhan",
+ "detailwindow": "effect_shilaike",
"intr": {
"key": "",
"text": ""
@@ -391,7 +391,7 @@
"tujing": [
107
],
- "detailwindow": "effect_chezhan",
+ "detailwindow": "effect_xunlong",
"intr": {
"key": "",
"text": ""
@@ -465,7 +465,7 @@
"tujing": [
107
],
- "detailwindow": "effect_chezhan",
+ "detailwindow": "effect_gongfuxiongmao",
"intr": {
"key": "",
"text": ""
@@ -539,7 +539,7 @@
"tujing": [
107
],
- "detailwindow": "effect_chezhan",
+ "detailwindow": "effect_xunlong",
"intr": {
"key": "",
"text": ""
@@ -613,7 +613,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -761,7 +761,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -835,7 +835,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -909,7 +909,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -983,7 +983,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1057,7 +1057,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1131,7 +1131,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1205,7 +1205,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1279,7 +1279,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_shilaike",
"intr": {
"key": "",
"text": ""
@@ -1353,7 +1353,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1427,7 +1427,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1575,7 +1575,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1649,7 +1649,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1723,7 +1723,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1797,7 +1797,7 @@
"tujing": [
107
],
- "detailwindow": "effect_shilaike",
+ "detailwindow": "effect_gongfuxiongmao",
"intr": {
"key": "",
"text": ""
@@ -1871,7 +1871,7 @@
"tujing": [
107
],
- "detailwindow": "effect_shilaike",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -1945,7 +1945,7 @@
"tujing": [
107
],
- "detailwindow": "effect_shilaike",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -2019,7 +2019,7 @@
"tujing": [
107
],
- "detailwindow": "effect_shilaike",
+ "detailwindow": "effect_xunlong",
"intr": {
"key": "",
"text": ""
@@ -2093,7 +2093,7 @@
"tujing": [
107
],
- "detailwindow": "effect_shilaike",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -2167,7 +2167,7 @@
"tujing": [
107
],
- "detailwindow": "effect_shilaike",
+ "detailwindow": "effect_gongfuxiongmao",
"intr": {
"key": "",
"text": ""
@@ -2241,7 +2241,7 @@
"tujing": [
107
],
- "detailwindow": "effect_shilaike",
+ "detailwindow": "effect_huaidanlianmeng",
"intr": {
"key": "",
"text": ""
@@ -2315,7 +2315,7 @@
"tujing": [
107
],
- "detailwindow": "effect_shilaike",
+ "detailwindow": "effect_xunlong",
"intr": {
"key": "",
"text": ""
@@ -2389,7 +2389,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -2463,7 +2463,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -2537,7 +2537,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -2611,7 +2611,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_shilaike",
"intr": {
"key": "",
"text": ""
@@ -2685,7 +2685,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -2833,7 +2833,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -2907,7 +2907,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_shilaike",
"intr": {
"key": "",
"text": ""
@@ -2981,7 +2981,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -3055,7 +3055,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -3129,7 +3129,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -3203,7 +3203,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -3277,7 +3277,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -3351,7 +3351,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_shilaike",
"intr": {
"key": "",
"text": ""
@@ -3425,7 +3425,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_xunlong",
"intr": {
"key": "",
"text": ""
@@ -3573,7 +3573,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_xunlong",
"intr": {
"key": "",
"text": ""
@@ -3647,7 +3647,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -3795,7 +3795,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -3869,7 +3869,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_gongfuxiongmao",
"intr": {
"key": "",
"text": ""
@@ -3943,7 +3943,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -4091,7 +4091,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -4165,7 +4165,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_shilaike",
"intr": {
"key": "",
"text": ""
@@ -4239,7 +4239,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_gongfuxiongmao",
"intr": {
"key": "",
"text": ""
@@ -4313,7 +4313,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -4461,7 +4461,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_huaidanlianmeng",
"intr": {
"key": "",
"text": ""
@@ -4535,7 +4535,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_huaidanlianmeng",
"intr": {
"key": "",
"text": ""
@@ -4609,7 +4609,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_shilaike",
"intr": {
"key": "",
"text": ""
@@ -4683,7 +4683,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_huaidanlianmeng",
"intr": {
"key": "",
"text": ""
@@ -4757,7 +4757,7 @@
"tujing": [
107
],
- "detailwindow": "effect_chezhan",
+ "detailwindow": "effect_gongfuxiongmao",
"intr": {
"key": "",
"text": ""
@@ -4831,7 +4831,7 @@
"tujing": [
107
],
- "detailwindow": "effect_chezhan",
+ "detailwindow": "effect_gongfuxiongmao",
"intr": {
"key": "",
"text": ""
@@ -5053,7 +5053,7 @@
"tujing": [
107
],
- "detailwindow": "effect_chezhan",
+ "detailwindow": "effect_shilaike",
"intr": {
"key": "",
"text": ""
@@ -5349,7 +5349,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -5423,7 +5423,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -5497,7 +5497,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -5571,7 +5571,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -5645,7 +5645,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -5719,7 +5719,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -5793,7 +5793,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -5867,7 +5867,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -5941,7 +5941,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6015,7 +6015,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6089,7 +6089,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6163,7 +6163,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6237,7 +6237,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6311,7 +6311,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6385,7 +6385,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6459,7 +6459,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6533,7 +6533,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6607,7 +6607,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6681,7 +6681,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6755,7 +6755,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6829,7 +6829,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6903,7 +6903,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -6977,7 +6977,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -7051,7 +7051,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -7719,7 +7719,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -7793,7 +7793,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -7867,7 +7867,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -7941,7 +7941,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8015,7 +8015,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8089,7 +8089,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8163,7 +8163,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8237,7 +8237,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8311,7 +8311,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8385,7 +8385,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8459,7 +8459,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8533,7 +8533,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8607,7 +8607,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8681,7 +8681,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8755,7 +8755,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8829,7 +8829,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8903,7 +8903,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -8977,7 +8977,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -9051,7 +9051,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -9125,7 +9125,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -9199,7 +9199,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -9273,7 +9273,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -9347,7 +9347,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -9421,7 +9421,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10087,7 +10087,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10161,7 +10161,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10235,7 +10235,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10309,7 +10309,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10383,7 +10383,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10457,7 +10457,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10531,7 +10531,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10605,7 +10605,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10679,7 +10679,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10753,7 +10753,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10827,7 +10827,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10901,7 +10901,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -10975,7 +10975,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11049,7 +11049,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11123,7 +11123,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11197,7 +11197,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11271,7 +11271,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11345,7 +11345,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11419,7 +11419,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11493,7 +11493,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11567,7 +11567,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11641,7 +11641,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11715,7 +11715,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -11789,7 +11789,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -12455,7 +12455,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -12529,7 +12529,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -12603,7 +12603,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -12677,7 +12677,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -12751,7 +12751,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -12825,7 +12825,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -12899,7 +12899,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -12973,7 +12973,7 @@
"tujing": [
107
],
- "detailwindow": "effect_gongfuxiongmao",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13047,7 +13047,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13121,7 +13121,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13195,7 +13195,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13269,7 +13269,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13343,7 +13343,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13417,7 +13417,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13491,7 +13491,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13565,7 +13565,7 @@
"tujing": [
107
],
- "detailwindow": "effect_huaidanlianmeng",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13639,7 +13639,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
@@ -13713,7 +13713,7 @@
"tujing": [
107
],
- "detailwindow": "effect_xunlong",
+ "detailwindow": "effect_chezhan",
"intr": {
"key": "",
"text": ""
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 552697281..0cff22cd4 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -14679,5 +14679,42 @@
"n": 1000
}
]
+ },
+ {
+ "id": "10000036",
+ "name": {
+ "key": "item_item_name_347",
+ "text": "石阵玩法货币"
+ },
+ "usetype": 1,
+ "color": 5,
+ "bagtype": 1,
+ "index": 1,
+ "special_type": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_10000035",
+ "intr": {
+ "key": "item_item_intr_378",
+ "text": "暂无包装"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index 1e6fa87e6..d52b94838 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -23470,5 +23470,29 @@
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
+ },
+ {
+ "id": 979,
+ "lotteryid": 21160001,
+ "description": "石阵秘境捡垃圾事件",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000036",
+ "n": 1
+ },
+ "itemdes": "石阵玩法货币",
+ "itemwt": 1000,
+ "min": 5,
+ "max": 10,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 411a09e27..4eb256eb1 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -11,10 +11,11 @@
"venturemodel": "",
"venturetype": 1,
"ventureavatar": [
- "Person/15004/15004_exhibition.prefab",
- "Person/15002/15002_exhibition.prefab",
- "Person/15003/15003_exhibition.prefab"
+ "Person/44004/44004_exhibition.prefab",
+ "Person/34004/34004_exhibition.prefab",
+ "Person/13005/13005_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "zxgq_js_34004",
"bubbletext": {
"key": "main_stage_bubbletext_1",
@@ -97,7 +98,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100102,
@@ -117,6 +119,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "attr_diamond",
"bubbletext": {
"key": "main_stage_bubbletext_2",
@@ -199,7 +202,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100103,
@@ -219,6 +223,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "attr_diamond",
"bubbletext": {
"key": "main_stage_bubbletext_3",
@@ -301,7 +306,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100104,
@@ -321,6 +327,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "zxgq_js_33001",
"bubbletext": {
"key": "main_stage_bubbletext_4",
@@ -355,7 +362,8 @@
"FormatList": [],
"star": [],
"star_type": [],
- "star_value": []
+ "star_value": [],
+ "challengeward": 0
},
{
"id": 1100105,
@@ -375,6 +383,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "attr_diamond",
"bubbletext": {
"key": "main_stage_bubbletext_5",
@@ -415,7 +424,8 @@
"FormatList": [],
"star": [],
"star_type": [],
- "star_value": []
+ "star_value": [],
+ "challengeward": 0
},
{
"id": 1100106,
@@ -435,6 +445,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "zxgq_js_51004",
"bubbletext": {
"key": "main_stage_bubbletext_6",
@@ -511,7 +522,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100107,
@@ -531,6 +543,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "zxgq_js_13002",
"bubbletext": {
"key": "main_stage_bubbletext_7",
@@ -613,7 +626,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100108,
@@ -633,6 +647,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "zxgq_js_44005",
"bubbletext": {
"key": "main_stage_bubbletext_8",
@@ -710,7 +725,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100109,
@@ -730,6 +746,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "attr_diamond",
"bubbletext": {
"key": "main_stage_bubbletext_9",
@@ -764,7 +781,8 @@
"FormatList": [],
"star": [],
"star_type": [],
- "star_value": []
+ "star_value": [],
+ "challengeward": 0
},
{
"id": 1100110,
@@ -784,6 +802,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "zxgq_js_44005",
"bubbletext": {
"key": "main_stage_bubbletext_10",
@@ -866,7 +885,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100111,
@@ -886,15 +906,16 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "attr_diamond",
"bubbletext": {
"key": "main_stage_bubbletext_11",
"text": "隐藏宝箱"
},
"animation": "",
- "hide": 0,
+ "hide": 1,
"destroy": 0,
- "progress": 1,
+ "progress": 0,
"frontstoryid": 0,
"afterstoryid": 0,
"mainlineName": {
@@ -920,7 +941,8 @@
"FormatList": [],
"star": [],
"star_type": [],
- "star_value": []
+ "star_value": [],
+ "challengeward": 0
},
{
"id": 1100112,
@@ -929,7 +951,7 @@
"previous_group_id": [
100110
],
- "previoustage": 1100107,
+ "previoustage": 0,
"Episodetype": 4,
"openlevel": 1,
"EditorStage": 0,
@@ -940,6 +962,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "attr_gold",
"bubbletext": {
"key": "main_stage_bubbletext_12",
@@ -948,7 +971,7 @@
"animation": "",
"hide": 0,
"destroy": 0,
- "progress": 1,
+ "progress": 0,
"frontstoryid": 0,
"afterstoryid": 0,
"mainlineName": {
@@ -974,7 +997,8 @@
"FormatList": [],
"star": [],
"star_type": [],
- "star_value": []
+ "star_value": [],
+ "challengeward": 0
},
{
"id": 1100113,
@@ -994,6 +1018,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "zxgq_js_13002",
"bubbletext": {
"key": "main_stage_bubbletext_13",
@@ -1028,7 +1053,8 @@
"FormatList": [],
"star": [],
"star_type": [],
- "star_value": []
+ "star_value": [],
+ "challengeward": 0
},
{
"id": 1100114,
@@ -1048,6 +1074,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_14",
@@ -1130,7 +1157,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100115,
@@ -1150,6 +1178,7 @@
"Person/15002/15002_exhibition.prefab",
"Person/15003/15003_exhibition.prefab"
],
+ "herocolor": 1,
"heroimg": "attr_diamond",
"bubbletext": {
"key": "main_stage_bubbletext_15",
@@ -1158,7 +1187,7 @@
"animation": "",
"hide": 0,
"destroy": 0,
- "progress": 0,
+ "progress": 1,
"frontstoryid": 10322,
"afterstoryid": 0,
"mainlineName": {
@@ -1190,7 +1219,8 @@
"FormatList": [],
"star": [],
"star_type": [],
- "star_value": []
+ "star_value": [],
+ "challengeward": 0
},
{
"id": 1100116,
@@ -1208,6 +1238,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 2,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_16",
@@ -1290,7 +1321,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 12001
},
{
"id": 1100117,
@@ -1308,6 +1340,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 2,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_17",
@@ -1390,7 +1423,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 12001
},
{
"id": 1100118,
@@ -1408,6 +1442,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 2,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_18",
@@ -1490,7 +1525,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 12001
},
{
"id": 1100119,
@@ -1508,6 +1544,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 2,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_19",
@@ -1590,7 +1627,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 12001
},
{
"id": 1100120,
@@ -1608,6 +1646,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 2,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_20",
@@ -1690,7 +1729,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 12001
},
{
"id": 1100121,
@@ -1708,6 +1748,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 2,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_21",
@@ -1790,7 +1831,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 12001
},
{
"id": 1100122,
@@ -1808,6 +1850,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 2,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_22",
@@ -1890,7 +1933,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 12001
},
{
"id": 1100123,
@@ -1908,6 +1952,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 2,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_23",
@@ -1990,7 +2035,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 12001
},
{
"id": 1100124,
@@ -2008,6 +2054,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 3,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_24",
@@ -2090,7 +2137,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 13001
},
{
"id": 1100125,
@@ -2108,6 +2156,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 3,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_25",
@@ -2190,7 +2239,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 13001
},
{
"id": 1100126,
@@ -2208,6 +2258,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 3,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_26",
@@ -2290,7 +2341,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 13001
},
{
"id": 1100127,
@@ -2308,6 +2360,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 3,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_27",
@@ -2390,7 +2443,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 13001
},
{
"id": 1100128,
@@ -2408,6 +2462,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 3,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_28",
@@ -2490,7 +2545,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 13001
},
{
"id": 1100129,
@@ -2508,6 +2564,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 3,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_29",
@@ -2590,7 +2647,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 13001
},
{
"id": 1100130,
@@ -2608,6 +2666,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 3,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_30",
@@ -2690,7 +2749,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 13001
},
{
"id": 1100131,
@@ -2708,6 +2768,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 3,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_31",
@@ -2790,7 +2851,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 13001
},
{
"id": 1100132,
@@ -2808,6 +2870,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 4,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_32",
@@ -2890,7 +2953,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 14001
},
{
"id": 1100133,
@@ -2908,6 +2972,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 4,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_33",
@@ -2990,7 +3055,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 14001
},
{
"id": 1100134,
@@ -3008,6 +3074,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 4,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_34",
@@ -3090,7 +3157,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 14001
},
{
"id": 1100135,
@@ -3108,6 +3176,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 4,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_35",
@@ -3190,7 +3259,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 14001
},
{
"id": 1100136,
@@ -3208,6 +3278,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 4,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_36",
@@ -3290,7 +3361,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 14001
},
{
"id": 1100137,
@@ -3308,6 +3380,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 4,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_37",
@@ -3390,7 +3463,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 14001
},
{
"id": 1100138,
@@ -3408,6 +3482,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 4,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_38",
@@ -3490,7 +3565,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 14001
},
{
"id": 1100139,
@@ -3508,6 +3584,7 @@
"ventureavatar": [
"zxgq_js_44005"
],
+ "herocolor": 4,
"heroimg": "zxgq_js_55002",
"bubbletext": {
"key": "main_stage_bubbletext_39",
@@ -3590,7 +3667,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 14001
},
{
"id": 1100201,
@@ -3604,6 +3682,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -3686,7 +3765,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100202,
@@ -3700,6 +3780,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -3782,7 +3863,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100203,
@@ -3796,6 +3878,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -3878,7 +3961,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100204,
@@ -3892,6 +3976,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -3974,7 +4059,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100205,
@@ -3988,6 +4074,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4070,7 +4157,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100206,
@@ -4084,6 +4172,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4166,7 +4255,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100207,
@@ -4180,6 +4270,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4262,7 +4353,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100208,
@@ -4276,6 +4368,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4358,7 +4451,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100209,
@@ -4372,6 +4466,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4454,7 +4549,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100210,
@@ -4468,6 +4564,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4550,7 +4647,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100211,
@@ -4564,6 +4662,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4646,7 +4745,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100212,
@@ -4660,6 +4760,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4742,7 +4843,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100213,
@@ -4756,6 +4858,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4838,7 +4941,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100214,
@@ -4852,6 +4956,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -4934,7 +5039,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100215,
@@ -4948,6 +5054,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5030,7 +5137,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100216,
@@ -5044,6 +5152,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5126,7 +5235,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100217,
@@ -5140,6 +5250,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5222,7 +5333,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100218,
@@ -5236,6 +5348,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5318,7 +5431,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100219,
@@ -5332,6 +5446,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5414,7 +5529,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100220,
@@ -5428,6 +5544,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5510,7 +5627,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100221,
@@ -5524,6 +5642,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5606,7 +5725,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100222,
@@ -5620,6 +5740,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5702,7 +5823,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100223,
@@ -5716,6 +5838,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5798,7 +5921,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100224,
@@ -5812,6 +5936,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5894,7 +6019,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100225,
@@ -5908,6 +6034,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -5990,7 +6117,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100226,
@@ -6004,6 +6132,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6086,7 +6215,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100227,
@@ -6100,6 +6230,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6182,7 +6313,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100228,
@@ -6196,6 +6328,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6278,7 +6411,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100229,
@@ -6292,6 +6426,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6374,7 +6509,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100230,
@@ -6388,6 +6524,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6470,7 +6607,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100231,
@@ -6484,6 +6622,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6566,7 +6705,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100232,
@@ -6580,6 +6720,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6662,7 +6803,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100233,
@@ -6676,6 +6818,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6758,7 +6901,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100234,
@@ -6772,6 +6916,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6854,7 +6999,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100235,
@@ -6868,6 +7014,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -6950,7 +7097,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100236,
@@ -6964,6 +7112,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7046,7 +7195,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100237,
@@ -7060,6 +7210,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7142,7 +7293,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100238,
@@ -7156,6 +7308,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7238,7 +7391,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100239,
@@ -7252,6 +7406,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7334,7 +7489,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100240,
@@ -7348,6 +7504,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7430,7 +7587,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100241,
@@ -7444,6 +7602,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7526,7 +7685,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100242,
@@ -7540,6 +7700,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7622,7 +7783,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100243,
@@ -7636,6 +7798,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7718,7 +7881,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100244,
@@ -7732,6 +7896,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7814,7 +7979,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100245,
@@ -7828,6 +7994,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -7910,7 +8077,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100246,
@@ -7924,6 +8092,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8006,7 +8175,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100247,
@@ -8020,6 +8190,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8102,7 +8273,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100248,
@@ -8116,6 +8288,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8198,7 +8371,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100249,
@@ -8212,6 +8386,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8294,7 +8469,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100250,
@@ -8308,6 +8484,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8390,7 +8567,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100251,
@@ -8404,6 +8582,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8486,7 +8665,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100252,
@@ -8500,6 +8680,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8582,7 +8763,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100253,
@@ -8596,6 +8778,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8678,7 +8861,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100254,
@@ -8692,6 +8876,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8774,7 +8959,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100255,
@@ -8788,6 +8974,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8870,7 +9057,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100256,
@@ -8884,6 +9072,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -8966,7 +9155,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100257,
@@ -8980,6 +9170,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9062,7 +9253,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100258,
@@ -9076,6 +9268,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9158,7 +9351,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100259,
@@ -9172,6 +9366,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9254,7 +9449,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100260,
@@ -9268,6 +9464,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9350,7 +9547,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100261,
@@ -9364,6 +9562,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9446,7 +9645,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100262,
@@ -9460,6 +9660,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9542,7 +9743,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100263,
@@ -9556,6 +9758,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9638,7 +9841,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100264,
@@ -9652,6 +9856,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9734,7 +9939,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100265,
@@ -9748,6 +9954,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9830,7 +10037,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100266,
@@ -9844,6 +10052,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -9926,7 +10135,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100267,
@@ -9940,6 +10150,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10022,7 +10233,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100268,
@@ -10036,6 +10248,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10118,7 +10331,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100269,
@@ -10132,6 +10346,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10214,7 +10429,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100270,
@@ -10228,6 +10444,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10310,7 +10527,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100271,
@@ -10324,6 +10542,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10406,7 +10625,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100272,
@@ -10420,6 +10640,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10502,7 +10723,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100273,
@@ -10516,6 +10738,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10598,7 +10821,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100274,
@@ -10612,6 +10836,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10694,7 +10919,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100275,
@@ -10708,6 +10934,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10790,7 +11017,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100276,
@@ -10804,6 +11032,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10886,7 +11115,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100277,
@@ -10900,6 +11130,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -10982,7 +11213,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100278,
@@ -10996,6 +11228,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11078,7 +11311,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100279,
@@ -11092,6 +11326,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11174,7 +11409,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100280,
@@ -11188,6 +11424,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11270,7 +11507,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100281,
@@ -11284,6 +11522,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11366,7 +11605,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100282,
@@ -11380,6 +11620,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11462,7 +11703,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100283,
@@ -11476,6 +11718,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11558,7 +11801,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100284,
@@ -11572,6 +11816,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11654,7 +11899,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100285,
@@ -11668,6 +11914,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11750,7 +11997,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100286,
@@ -11764,6 +12012,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11846,7 +12095,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100287,
@@ -11860,6 +12110,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -11942,7 +12193,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100288,
@@ -11956,6 +12208,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12038,7 +12291,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100289,
@@ -12052,6 +12306,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12134,7 +12389,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100290,
@@ -12148,6 +12404,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12230,7 +12487,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100291,
@@ -12244,6 +12502,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12326,7 +12585,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100292,
@@ -12340,6 +12600,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12422,7 +12683,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100293,
@@ -12436,6 +12698,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12518,7 +12781,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100294,
@@ -12532,6 +12796,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12614,7 +12879,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100295,
@@ -12628,6 +12894,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12710,7 +12977,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100296,
@@ -12724,6 +12992,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12806,7 +13075,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100297,
@@ -12820,6 +13090,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12902,7 +13173,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100298,
@@ -12916,6 +13188,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -12998,7 +13271,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100299,
@@ -13012,6 +13286,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13094,7 +13369,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100300,
@@ -13108,6 +13384,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13190,7 +13467,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100301,
@@ -13204,6 +13482,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13286,7 +13565,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100302,
@@ -13300,6 +13580,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13382,7 +13663,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100303,
@@ -13396,6 +13678,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13478,7 +13761,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100304,
@@ -13492,6 +13776,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13574,7 +13859,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100305,
@@ -13588,6 +13874,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13670,7 +13957,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100306,
@@ -13684,6 +13972,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13766,7 +14055,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100307,
@@ -13780,6 +14070,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13862,7 +14153,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100308,
@@ -13876,6 +14168,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -13958,7 +14251,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100309,
@@ -13972,6 +14266,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14054,7 +14349,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100310,
@@ -14068,6 +14364,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14150,7 +14447,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100311,
@@ -14164,6 +14462,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14246,7 +14545,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100312,
@@ -14260,6 +14560,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14342,7 +14643,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100313,
@@ -14356,6 +14658,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14438,7 +14741,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100314,
@@ -14452,6 +14756,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14534,7 +14839,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100315,
@@ -14548,6 +14854,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14630,7 +14937,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100316,
@@ -14644,6 +14952,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14726,7 +15035,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100317,
@@ -14740,6 +15050,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14822,7 +15133,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100318,
@@ -14836,6 +15148,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -14918,7 +15231,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100319,
@@ -14932,6 +15246,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15014,7 +15329,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100320,
@@ -15028,6 +15344,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15110,7 +15427,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100321,
@@ -15124,6 +15442,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15206,7 +15525,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100322,
@@ -15220,6 +15540,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15302,7 +15623,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100323,
@@ -15316,6 +15638,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15398,7 +15721,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100324,
@@ -15412,6 +15736,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15494,7 +15819,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100325,
@@ -15508,6 +15834,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15590,7 +15917,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100326,
@@ -15604,6 +15932,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15686,7 +16015,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100327,
@@ -15700,6 +16030,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15782,7 +16113,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100328,
@@ -15796,6 +16128,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15878,7 +16211,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100329,
@@ -15892,6 +16226,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -15974,7 +16309,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100330,
@@ -15988,6 +16324,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16070,7 +16407,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100331,
@@ -16084,6 +16422,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16166,7 +16505,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100332,
@@ -16180,6 +16520,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16262,7 +16603,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100333,
@@ -16276,6 +16618,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16358,7 +16701,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100334,
@@ -16372,6 +16716,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16454,7 +16799,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100335,
@@ -16468,6 +16814,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16550,7 +16897,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100336,
@@ -16564,6 +16912,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16646,7 +16995,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100337,
@@ -16660,6 +17010,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16742,7 +17093,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100338,
@@ -16756,6 +17108,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16838,7 +17191,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100339,
@@ -16852,6 +17206,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -16934,7 +17289,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100340,
@@ -16948,6 +17304,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17030,7 +17387,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100341,
@@ -17044,6 +17402,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17126,7 +17485,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100342,
@@ -17140,6 +17500,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17222,7 +17583,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100343,
@@ -17236,6 +17598,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17318,7 +17681,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100344,
@@ -17332,6 +17696,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17414,7 +17779,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100345,
@@ -17428,6 +17794,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17510,7 +17877,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100346,
@@ -17524,6 +17892,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17606,7 +17975,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100347,
@@ -17620,6 +17990,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17702,7 +18073,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100348,
@@ -17716,6 +18088,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17798,7 +18171,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100349,
@@ -17812,6 +18186,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17894,7 +18269,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100350,
@@ -17908,6 +18284,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -17990,7 +18367,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100351,
@@ -18004,6 +18382,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18086,7 +18465,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100352,
@@ -18100,6 +18480,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18182,7 +18563,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100353,
@@ -18196,6 +18578,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18278,7 +18661,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100354,
@@ -18292,6 +18676,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18374,7 +18759,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100355,
@@ -18388,6 +18774,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18470,7 +18857,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100356,
@@ -18484,6 +18872,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18566,7 +18955,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100357,
@@ -18580,6 +18970,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18662,7 +19053,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100358,
@@ -18676,6 +19068,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18758,7 +19151,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100359,
@@ -18772,6 +19166,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18854,7 +19249,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100360,
@@ -18868,6 +19264,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -18950,7 +19347,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100361,
@@ -18964,6 +19362,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19046,7 +19445,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100362,
@@ -19060,6 +19460,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19142,7 +19543,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100363,
@@ -19156,6 +19558,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19238,7 +19641,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100364,
@@ -19252,6 +19656,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19334,7 +19739,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100365,
@@ -19348,6 +19754,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19430,7 +19837,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100366,
@@ -19444,6 +19852,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19526,7 +19935,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100367,
@@ -19540,6 +19950,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19622,7 +20033,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100368,
@@ -19636,6 +20048,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19718,7 +20131,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100369,
@@ -19732,6 +20146,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19814,7 +20229,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100370,
@@ -19828,6 +20244,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -19910,7 +20327,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100371,
@@ -19924,6 +20342,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20006,7 +20425,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100372,
@@ -20020,6 +20440,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20102,7 +20523,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100373,
@@ -20116,6 +20538,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20198,7 +20621,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100374,
@@ -20212,6 +20636,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20294,7 +20719,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100375,
@@ -20308,6 +20734,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20390,7 +20817,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100376,
@@ -20404,6 +20832,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20486,7 +20915,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100377,
@@ -20500,6 +20930,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20582,7 +21013,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100378,
@@ -20596,6 +21028,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20678,7 +21111,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100379,
@@ -20692,6 +21126,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20774,7 +21209,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100380,
@@ -20788,6 +21224,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20870,7 +21307,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100381,
@@ -20884,6 +21322,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -20966,7 +21405,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100382,
@@ -20980,6 +21420,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21062,7 +21503,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100383,
@@ -21076,6 +21518,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21158,7 +21601,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100384,
@@ -21172,6 +21616,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21254,7 +21699,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100385,
@@ -21268,6 +21714,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21350,7 +21797,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100386,
@@ -21364,6 +21812,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21446,7 +21895,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100387,
@@ -21460,6 +21910,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21542,7 +21993,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100388,
@@ -21556,6 +22008,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21638,7 +22091,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100389,
@@ -21652,6 +22106,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21734,7 +22189,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100390,
@@ -21748,6 +22204,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21830,7 +22287,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100391,
@@ -21844,6 +22302,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -21926,7 +22385,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100392,
@@ -21940,6 +22400,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22022,7 +22483,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100393,
@@ -22036,6 +22498,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22118,7 +22581,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100394,
@@ -22132,6 +22596,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22214,7 +22679,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100395,
@@ -22228,6 +22694,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22310,7 +22777,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100396,
@@ -22324,6 +22792,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22406,7 +22875,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100397,
@@ -22420,6 +22890,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22502,7 +22973,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100398,
@@ -22516,6 +22988,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22598,7 +23071,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100399,
@@ -22612,6 +23086,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22694,7 +23169,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100400,
@@ -22708,6 +23184,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22790,7 +23267,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100401,
@@ -22804,6 +23282,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22886,7 +23365,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100402,
@@ -22900,6 +23380,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -22982,7 +23463,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100403,
@@ -22996,6 +23478,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23078,7 +23561,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100404,
@@ -23092,6 +23576,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23174,7 +23659,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100405,
@@ -23188,6 +23674,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23270,7 +23757,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100406,
@@ -23284,6 +23772,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23366,7 +23855,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100407,
@@ -23380,6 +23870,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23462,7 +23953,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100408,
@@ -23476,6 +23968,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23558,7 +24051,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100409,
@@ -23572,6 +24066,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23654,7 +24149,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100410,
@@ -23668,6 +24164,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23750,7 +24247,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100411,
@@ -23764,6 +24262,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23846,7 +24345,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100412,
@@ -23860,6 +24360,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -23942,7 +24443,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100413,
@@ -23956,6 +24458,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24038,7 +24541,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100414,
@@ -24052,6 +24556,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24134,7 +24639,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100415,
@@ -24148,6 +24654,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24230,7 +24737,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100416,
@@ -24244,6 +24752,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24326,7 +24835,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100417,
@@ -24340,6 +24850,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24422,7 +24933,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100418,
@@ -24436,6 +24948,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24518,7 +25031,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100419,
@@ -24532,6 +25046,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24614,7 +25129,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100420,
@@ -24628,6 +25144,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24710,7 +25227,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100421,
@@ -24724,6 +25242,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24806,7 +25325,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100422,
@@ -24820,6 +25340,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24902,7 +25423,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100423,
@@ -24916,6 +25438,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -24998,7 +25521,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100424,
@@ -25012,6 +25536,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25094,7 +25619,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100425,
@@ -25108,6 +25634,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25190,7 +25717,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100426,
@@ -25204,6 +25732,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25286,7 +25815,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100427,
@@ -25300,6 +25830,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25382,7 +25913,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100428,
@@ -25396,6 +25928,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25478,7 +26011,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100429,
@@ -25492,6 +26026,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25574,7 +26109,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100430,
@@ -25588,6 +26124,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25670,7 +26207,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100431,
@@ -25684,6 +26222,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25766,7 +26305,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100432,
@@ -25780,6 +26320,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25862,7 +26403,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100433,
@@ -25876,6 +26418,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -25958,7 +26501,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100434,
@@ -25972,6 +26516,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26054,7 +26599,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100435,
@@ -26068,6 +26614,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26150,7 +26697,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100436,
@@ -26164,6 +26712,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26246,7 +26795,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100437,
@@ -26260,6 +26810,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26342,7 +26893,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100438,
@@ -26356,6 +26908,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26438,7 +26991,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100439,
@@ -26452,6 +27006,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26534,7 +27089,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100440,
@@ -26548,6 +27104,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26630,7 +27187,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100441,
@@ -26644,6 +27202,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26726,7 +27285,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100442,
@@ -26740,6 +27300,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26822,7 +27383,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100443,
@@ -26836,6 +27398,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -26918,7 +27481,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100444,
@@ -26932,6 +27496,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27014,7 +27579,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100445,
@@ -27028,6 +27594,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27110,7 +27677,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100446,
@@ -27124,6 +27692,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27206,7 +27775,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100447,
@@ -27220,6 +27790,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27302,7 +27873,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100448,
@@ -27316,6 +27888,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27398,7 +27971,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100449,
@@ -27412,6 +27986,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27494,7 +28069,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100450,
@@ -27508,6 +28084,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27590,7 +28167,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100451,
@@ -27604,6 +28182,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27686,7 +28265,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100452,
@@ -27700,6 +28280,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27782,7 +28363,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100453,
@@ -27796,6 +28378,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27878,7 +28461,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100454,
@@ -27892,6 +28476,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -27974,7 +28559,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100455,
@@ -27988,6 +28574,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28070,7 +28657,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100456,
@@ -28084,6 +28672,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28166,7 +28755,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100457,
@@ -28180,6 +28770,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28262,7 +28853,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100458,
@@ -28276,6 +28868,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28358,7 +28951,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100459,
@@ -28372,6 +28966,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28454,7 +29049,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100460,
@@ -28468,6 +29064,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28550,7 +29147,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100461,
@@ -28564,6 +29162,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28646,7 +29245,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100462,
@@ -28660,6 +29260,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28742,7 +29343,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100463,
@@ -28756,6 +29358,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28838,7 +29441,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100464,
@@ -28852,6 +29456,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -28934,7 +29539,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100465,
@@ -28948,6 +29554,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29030,7 +29637,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100466,
@@ -29044,6 +29652,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29126,7 +29735,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100467,
@@ -29140,6 +29750,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29222,7 +29833,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100468,
@@ -29236,6 +29848,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29318,7 +29931,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100469,
@@ -29332,6 +29946,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29414,7 +30029,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100470,
@@ -29428,6 +30044,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29510,7 +30127,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100471,
@@ -29524,6 +30142,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29606,7 +30225,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100472,
@@ -29620,6 +30240,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29702,7 +30323,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100473,
@@ -29716,6 +30338,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29798,7 +30421,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100474,
@@ -29812,6 +30436,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29894,7 +30519,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100475,
@@ -29908,6 +30534,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -29990,7 +30617,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100476,
@@ -30004,6 +30632,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30086,7 +30715,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100477,
@@ -30100,6 +30730,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30182,7 +30813,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100478,
@@ -30196,6 +30828,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30278,7 +30911,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100479,
@@ -30292,6 +30926,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30374,7 +31009,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100480,
@@ -30388,6 +31024,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30470,7 +31107,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100481,
@@ -30484,6 +31122,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30566,7 +31205,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100482,
@@ -30580,6 +31220,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30662,7 +31303,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100483,
@@ -30676,6 +31318,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30758,7 +31401,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100484,
@@ -30772,6 +31416,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30854,7 +31499,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100485,
@@ -30868,6 +31514,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -30950,7 +31597,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100486,
@@ -30964,6 +31612,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31046,7 +31695,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100487,
@@ -31060,6 +31710,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31142,7 +31793,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100488,
@@ -31156,6 +31808,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31238,7 +31891,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100489,
@@ -31252,6 +31906,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31334,7 +31989,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100490,
@@ -31348,6 +32004,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31430,7 +32087,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100491,
@@ -31444,6 +32102,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31526,7 +32185,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100492,
@@ -31540,6 +32200,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31622,7 +32283,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100493,
@@ -31636,6 +32298,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31718,7 +32381,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100494,
@@ -31732,6 +32396,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31814,7 +32479,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100495,
@@ -31828,6 +32494,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -31910,7 +32577,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100496,
@@ -31924,6 +32592,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32006,7 +32675,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100497,
@@ -32020,6 +32690,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32102,7 +32773,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100498,
@@ -32116,6 +32788,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32198,7 +32871,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100499,
@@ -32212,6 +32886,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32294,7 +32969,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100500,
@@ -32308,6 +32984,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32390,7 +33067,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100501,
@@ -32404,6 +33082,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32486,7 +33165,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100502,
@@ -32500,6 +33180,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32582,7 +33263,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100503,
@@ -32596,6 +33278,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32678,7 +33361,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100504,
@@ -32692,6 +33376,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32774,7 +33459,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100505,
@@ -32788,6 +33474,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32870,7 +33557,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100506,
@@ -32884,6 +33572,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -32966,7 +33655,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100507,
@@ -32980,6 +33670,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33062,7 +33753,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100508,
@@ -33076,6 +33768,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33158,7 +33851,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100509,
@@ -33172,6 +33866,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33254,7 +33949,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100510,
@@ -33268,6 +33964,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33350,7 +34047,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100511,
@@ -33364,6 +34062,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33446,7 +34145,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100512,
@@ -33460,6 +34160,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33542,7 +34243,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100513,
@@ -33556,6 +34258,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33638,7 +34341,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100514,
@@ -33652,6 +34356,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33734,7 +34439,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100515,
@@ -33748,6 +34454,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33830,7 +34537,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100516,
@@ -33844,6 +34552,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -33926,7 +34635,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100517,
@@ -33940,6 +34650,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34022,7 +34733,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100518,
@@ -34036,6 +34748,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34118,7 +34831,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100519,
@@ -34132,6 +34846,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34214,7 +34929,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100520,
@@ -34228,6 +34944,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34310,7 +35027,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100521,
@@ -34324,6 +35042,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34406,7 +35125,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100522,
@@ -34420,6 +35140,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34502,7 +35223,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100523,
@@ -34516,6 +35238,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34598,7 +35321,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100524,
@@ -34612,6 +35336,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34694,7 +35419,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100525,
@@ -34708,6 +35434,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34790,7 +35517,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100526,
@@ -34804,6 +35532,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34886,7 +35615,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100527,
@@ -34900,6 +35630,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -34982,7 +35713,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100528,
@@ -34996,6 +35728,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35078,7 +35811,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100529,
@@ -35092,6 +35826,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35174,7 +35909,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100530,
@@ -35188,6 +35924,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35270,7 +36007,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100531,
@@ -35284,6 +36022,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35366,7 +36105,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100532,
@@ -35380,6 +36120,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35462,7 +36203,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100533,
@@ -35476,6 +36218,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35558,7 +36301,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100534,
@@ -35572,6 +36316,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35654,7 +36399,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100535,
@@ -35668,6 +36414,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35750,7 +36497,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100536,
@@ -35764,6 +36512,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35846,7 +36595,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100537,
@@ -35860,6 +36610,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -35942,7 +36693,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100538,
@@ -35956,6 +36708,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36038,7 +36791,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100539,
@@ -36052,6 +36806,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36134,7 +36889,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100540,
@@ -36148,6 +36904,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36230,7 +36987,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100541,
@@ -36244,6 +37002,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36326,7 +37085,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100542,
@@ -36340,6 +37100,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36422,7 +37183,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100543,
@@ -36436,6 +37198,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36518,7 +37281,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100544,
@@ -36532,6 +37296,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36614,7 +37379,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100545,
@@ -36628,6 +37394,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36710,7 +37477,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100546,
@@ -36724,6 +37492,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36806,7 +37575,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100547,
@@ -36820,6 +37590,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36902,7 +37673,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100548,
@@ -36916,6 +37688,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -36998,7 +37771,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100549,
@@ -37012,6 +37786,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37094,7 +37869,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100550,
@@ -37108,6 +37884,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37190,7 +37967,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100551,
@@ -37204,6 +37982,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37286,7 +38065,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100552,
@@ -37300,6 +38080,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37382,7 +38163,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100553,
@@ -37396,6 +38178,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37478,7 +38261,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100554,
@@ -37492,6 +38276,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37574,7 +38359,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100555,
@@ -37588,6 +38374,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37670,7 +38457,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100556,
@@ -37684,6 +38472,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37766,7 +38555,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100557,
@@ -37780,6 +38570,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37862,7 +38653,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100558,
@@ -37876,6 +38668,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -37958,7 +38751,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100559,
@@ -37972,6 +38766,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38054,7 +38849,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100560,
@@ -38068,6 +38864,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38150,7 +38947,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100561,
@@ -38164,6 +38962,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38246,7 +39045,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100562,
@@ -38260,6 +39060,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38342,7 +39143,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100563,
@@ -38356,6 +39158,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38438,7 +39241,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100564,
@@ -38452,6 +39256,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38534,7 +39339,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100565,
@@ -38548,6 +39354,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38630,7 +39437,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100566,
@@ -38644,6 +39452,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38726,7 +39535,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100567,
@@ -38740,6 +39550,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38822,7 +39633,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100568,
@@ -38836,6 +39648,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -38918,7 +39731,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100569,
@@ -38932,6 +39746,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -39014,7 +39829,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100570,
@@ -39028,6 +39844,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -39110,7 +39927,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100571,
@@ -39124,6 +39942,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -39206,7 +40025,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100572,
@@ -39220,6 +40040,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -39302,7 +40123,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100573,
@@ -39316,6 +40138,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -39398,7 +40221,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100574,
@@ -39412,6 +40236,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -39494,7 +40319,8 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
},
{
"id": 1100575,
@@ -39508,6 +40334,7 @@
"venturemodel": "",
"venturetype": 0,
"ventureavatar": [],
+ "herocolor": 0,
"heroimg": "",
"bubbletext": {
"key": "",
@@ -39590,6 +40417,7 @@
0,
2,
1
- ]
+ ],
+ "challengeward": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 42df9b46b..5c4ea5188 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -28,12 +28,7 @@
"key": "opencond_opencond_name_2",
"text": "守护者回响"
},
- "main": [
- {
- "key": 2,
- "param": 1100308
- }
- ],
+ "main": [],
"wkqbx": 2,
"kqbx": 0,
"img": "zc_icon_01",
@@ -120,12 +115,7 @@
"key": "opencond_opencond_name_6",
"text": "商城"
},
- "main": [
- {
- "key": 2,
- "param": 1100108
- }
- ],
+ "main": [],
"wkqbx": 2,
"kqbx": 0,
"img": "zc_icon_01",
@@ -580,12 +570,7 @@
"key": "opencond_opencond_name_26",
"text": "藏书馆"
},
- "main": [
- {
- "key": 2,
- "param": 1100608
- }
- ],
+ "main": [],
"wkqbx": 2,
"kqbx": 0,
"img": "zc_icon_01",
@@ -695,12 +680,7 @@
"key": "opencond_opencond_name_31",
"text": "狩猎"
},
- "main": [
- {
- "key": 2,
- "param": 1100308
- }
- ],
+ "main": [],
"wkqbx": 0,
"kqbx": 0,
"img": "zc_icon_01",
@@ -764,12 +744,7 @@
"key": "opencond_opencond_name_34",
"text": "公会聊天"
},
- "main": [
- {
- "key": 2,
- "param": 1100304
- }
- ],
+ "main": [],
"wkqbx": 0,
"kqbx": 0,
"img": "zc_icon_01",
@@ -879,12 +854,7 @@
"key": "opencond_opencond_name_39",
"text": "竞技场"
},
- "main": [
- {
- "key": 2,
- "param": 1100508
- }
- ],
+ "main": [],
"wkqbx": 0,
"kqbx": 0,
"img": "zc_icon_01",
@@ -1251,10 +1221,6 @@
{
"key": 1,
"param": 1
- },
- {
- "key": 2,
- "param": 1100408
}
],
"wkqbx": 0,
@@ -1389,12 +1355,7 @@
"key": "opencond_opencond_name_61",
"text": "维京远征总入口"
},
- "main": [
- {
- "key": 2,
- "param": 1100107
- }
- ],
+ "main": [],
"wkqbx": 1,
"kqbx": 0,
"img": "zc_icon_01",
@@ -1504,12 +1465,7 @@
"key": "opencond_opencond_name_66",
"text": "功夫大师挑战塔"
},
- "main": [
- {
- "key": 2,
- "param": 1100108
- }
- ],
+ "main": [],
"wkqbx": 1,
"kqbx": 0,
"img": "",
@@ -1625,12 +1581,7 @@
"key": "opencond_opencond_name_71",
"text": "经验副本"
},
- "main": [
- {
- "key": 2,
- "param": 1100204
- }
- ],
+ "main": [],
"wkqbx": 0,
"kqbx": 0,
"img": "",
@@ -1702,10 +1653,6 @@
{
"key": 1,
"param": 1
- },
- {
- "key": 2,
- "param": 1100808
}
],
"wkqbx": 0,
@@ -1729,10 +1676,6 @@
{
"key": 1,
"param": 1
- },
- {
- "key": 2,
- "param": 1301208
}
],
"wkqbx": 0,
@@ -1752,12 +1695,7 @@
"key": "opencond_opencond_name_76",
"text": "波比周常"
},
- "main": [
- {
- "key": 2,
- "param": 1100208
- }
- ],
+ "main": [],
"wkqbx": 0,
"kqbx": 0,
"img": "",
@@ -1776,10 +1714,6 @@
"text": "每日一练"
},
"main": [
- {
- "key": 2,
- "param": 1100504
- },
{
"key": 3,
"param": 20080
@@ -1802,12 +1736,7 @@
"key": "opencond_opencond_name_78",
"text": "悬赏任务"
},
- "main": [
- {
- "key": 2,
- "param": 1100504
- }
- ],
+ "main": [],
"wkqbx": 0,
"kqbx": 0,
"img": "",
@@ -1843,12 +1772,7 @@
"key": "opencond_opencond_name_80",
"text": "烹饪功能"
},
- "main": [
- {
- "key": 2,
- "param": 1100608
- }
- ],
+ "main": [],
"wkqbx": 0,
"kqbx": 0,
"img": "",
diff --git a/bin/json/game_playerlv.json b/bin/json/game_playerlv.json
index 432dab873..10caaac37 100644
--- a/bin/json/game_playerlv.json
+++ b/bin/json/game_playerlv.json
@@ -5,7 +5,8 @@
"reward": [],
"ps_ceiling": 180,
"cops_ps_ceiling": 60,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 2,
@@ -24,7 +25,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 62,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 3,
@@ -43,7 +45,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 64,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 4,
@@ -62,7 +65,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 66,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 5,
@@ -81,7 +85,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 68,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 6,
@@ -100,7 +105,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 70,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 7,
@@ -119,7 +125,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 72,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 8,
@@ -138,7 +145,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 74,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 9,
@@ -157,7 +165,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 76,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 10,
@@ -176,7 +185,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 78,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 11,
@@ -195,7 +205,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 80,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 12,
@@ -214,7 +225,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 82,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 13,
@@ -233,7 +245,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 84,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 14,
@@ -252,7 +265,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 86,
- "hero_lv": 20
+ "hero_lv": 20,
+ "guild_boss_ceiling": 1
},
{
"lv": 15,
@@ -271,7 +285,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 88,
- "hero_lv": 25
+ "hero_lv": 25,
+ "guild_boss_ceiling": 1
},
{
"lv": 16,
@@ -290,7 +305,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 90,
- "hero_lv": 25
+ "hero_lv": 25,
+ "guild_boss_ceiling": 1
},
{
"lv": 17,
@@ -309,7 +325,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 92,
- "hero_lv": 25
+ "hero_lv": 25,
+ "guild_boss_ceiling": 1
},
{
"lv": 18,
@@ -328,7 +345,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 94,
- "hero_lv": 25
+ "hero_lv": 25,
+ "guild_boss_ceiling": 1
},
{
"lv": 19,
@@ -347,7 +365,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 96,
- "hero_lv": 25
+ "hero_lv": 25,
+ "guild_boss_ceiling": 1
},
{
"lv": 20,
@@ -366,7 +385,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 98,
- "hero_lv": 25
+ "hero_lv": 25,
+ "guild_boss_ceiling": 1
},
{
"lv": 21,
@@ -385,7 +405,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 100,
- "hero_lv": 30
+ "hero_lv": 30,
+ "guild_boss_ceiling": 2
},
{
"lv": 22,
@@ -404,7 +425,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 102,
- "hero_lv": 30
+ "hero_lv": 30,
+ "guild_boss_ceiling": 2
},
{
"lv": 23,
@@ -423,7 +445,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 104,
- "hero_lv": 30
+ "hero_lv": 30,
+ "guild_boss_ceiling": 2
},
{
"lv": 24,
@@ -442,7 +465,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 106,
- "hero_lv": 30
+ "hero_lv": 30,
+ "guild_boss_ceiling": 2
},
{
"lv": 25,
@@ -461,7 +485,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 108,
- "hero_lv": 30
+ "hero_lv": 30,
+ "guild_boss_ceiling": 2
},
{
"lv": 26,
@@ -480,7 +505,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 110,
- "hero_lv": 35
+ "hero_lv": 35,
+ "guild_boss_ceiling": 2
},
{
"lv": 27,
@@ -499,7 +525,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 112,
- "hero_lv": 35
+ "hero_lv": 35,
+ "guild_boss_ceiling": 2
},
{
"lv": 28,
@@ -518,7 +545,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 114,
- "hero_lv": 35
+ "hero_lv": 35,
+ "guild_boss_ceiling": 2
},
{
"lv": 29,
@@ -537,7 +565,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 116,
- "hero_lv": 35
+ "hero_lv": 35,
+ "guild_boss_ceiling": 2
},
{
"lv": 30,
@@ -556,7 +585,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 118,
- "hero_lv": 35
+ "hero_lv": 35,
+ "guild_boss_ceiling": 2
},
{
"lv": 31,
@@ -575,7 +605,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 120,
- "hero_lv": 40
+ "hero_lv": 40,
+ "guild_boss_ceiling": 2
},
{
"lv": 32,
@@ -594,7 +625,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 122,
- "hero_lv": 40
+ "hero_lv": 40,
+ "guild_boss_ceiling": 2
},
{
"lv": 33,
@@ -613,7 +645,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 124,
- "hero_lv": 40
+ "hero_lv": 40,
+ "guild_boss_ceiling": 2
},
{
"lv": 34,
@@ -632,7 +665,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 126,
- "hero_lv": 40
+ "hero_lv": 40,
+ "guild_boss_ceiling": 2
},
{
"lv": 35,
@@ -651,7 +685,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 128,
- "hero_lv": 40
+ "hero_lv": 40,
+ "guild_boss_ceiling": 2
},
{
"lv": 36,
@@ -670,7 +705,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 130,
- "hero_lv": 45
+ "hero_lv": 45,
+ "guild_boss_ceiling": 2
},
{
"lv": 37,
@@ -689,7 +725,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 132,
- "hero_lv": 45
+ "hero_lv": 45,
+ "guild_boss_ceiling": 2
},
{
"lv": 38,
@@ -708,7 +745,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 134,
- "hero_lv": 45
+ "hero_lv": 45,
+ "guild_boss_ceiling": 2
},
{
"lv": 39,
@@ -727,7 +765,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 136,
- "hero_lv": 45
+ "hero_lv": 45,
+ "guild_boss_ceiling": 2
},
{
"lv": 40,
@@ -746,7 +785,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 138,
- "hero_lv": 45
+ "hero_lv": 45,
+ "guild_boss_ceiling": 2
},
{
"lv": 41,
@@ -765,7 +805,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 140,
- "hero_lv": 50
+ "hero_lv": 50,
+ "guild_boss_ceiling": 3
},
{
"lv": 42,
@@ -784,7 +825,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 142,
- "hero_lv": 50
+ "hero_lv": 50,
+ "guild_boss_ceiling": 3
},
{
"lv": 43,
@@ -803,7 +845,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 144,
- "hero_lv": 50
+ "hero_lv": 50,
+ "guild_boss_ceiling": 3
},
{
"lv": 44,
@@ -822,7 +865,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 146,
- "hero_lv": 50
+ "hero_lv": 50,
+ "guild_boss_ceiling": 3
},
{
"lv": 45,
@@ -841,7 +885,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 148,
- "hero_lv": 50
+ "hero_lv": 50,
+ "guild_boss_ceiling": 3
},
{
"lv": 46,
@@ -860,7 +905,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 150,
- "hero_lv": 55
+ "hero_lv": 55,
+ "guild_boss_ceiling": 3
},
{
"lv": 47,
@@ -879,7 +925,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 152,
- "hero_lv": 55
+ "hero_lv": 55,
+ "guild_boss_ceiling": 3
},
{
"lv": 48,
@@ -898,7 +945,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 154,
- "hero_lv": 55
+ "hero_lv": 55,
+ "guild_boss_ceiling": 3
},
{
"lv": 49,
@@ -917,7 +965,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 156,
- "hero_lv": 55
+ "hero_lv": 55,
+ "guild_boss_ceiling": 3
},
{
"lv": 50,
@@ -936,7 +985,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 158,
- "hero_lv": 55
+ "hero_lv": 55,
+ "guild_boss_ceiling": 3
},
{
"lv": 51,
@@ -955,7 +1005,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 160,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 52,
@@ -974,7 +1025,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 162,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 53,
@@ -993,7 +1045,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 164,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 54,
@@ -1012,7 +1065,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 166,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 55,
@@ -1031,7 +1085,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 168,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 56,
@@ -1050,7 +1105,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 170,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 57,
@@ -1069,7 +1125,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 172,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 58,
@@ -1088,7 +1145,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 174,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 59,
@@ -1107,7 +1165,8 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 176,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 60,
@@ -1126,6 +1185,7 @@
],
"ps_ceiling": 180,
"cops_ps_ceiling": 178,
- "hero_lv": 60
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
}
]
\ No newline at end of file
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 9974508c5..23c127304 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -51,7 +51,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_5",
- "text": "这里可以查看各种功夫陪练，完成陪练可以获得高额奖励。
完成3/6/9次的陪练还有格外奖励可以领取。"
+ "text": "这里可以查看各种功夫陪练，完成陪练可以获得高额奖励。
完成3/6/9次的陪练还有额外奖励可以领取。"
}
},
{
@@ -62,7 +62,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_6",
- "text": "这里可以选择守护者去完成陪练任务，每个陪练任务有不同的等级与阵容要求，满足格外需求还可以获得格外的道具奖励，完成任务可以获得高额奖励。"
+ "text": "这里可以选择守护者去完成陪练任务，每个陪练任务有不同的等级与阵容要求，满足额外需求还可以获得额外的道具奖励，完成任务可以获得高额奖励。"
}
},
{
@@ -260,7 +260,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_24",
- "text": "这里可以查看关卡星完成条件，积累一定的关卡星可以获得格外的道具奖励。"
+ "text": "这里可以查看关卡星完成条件，积累一定的关卡星可以获得额外的道具奖励。"
}
},
{
@@ -381,7 +381,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_35",
- "text": "这里可以登记不同职业类别，登记类别提升后，该类别的守护者可以获得格外的木桩锻炼经验加成。"
+ "text": "这里可以登记不同职业类别，登记类别提升后，该类别的守护者可以获得额外的木桩锻炼经验加成。"
}
},
{
diff --git a/bin/json/game_stronebuff.json b/bin/json/game_stronebuff.json
index f02faeea4..181242e33 100644
--- a/bin/json/game_stronebuff.json
+++ b/bin/json/game_stronebuff.json
@@ -1,242 +1,222 @@
[
{
- "BuffId": 251023111,
+ "BuffId": 143006311,
"BuffGroupId": 1001,
"Type": 1,
"BuffLevel": 1,
"Quality": 1,
"BuffIcon": "",
- "buffName": {
- "key": "stonehenge_eventconfig_buffName_1",
- "text": "攻击buff"
- },
- "BuffDescription": {
- "key": "stonehenge_buffconfig_BuffDescription_1",
- "text": "描述描述描述"
- },
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_1",
- "text": "描述描述描述"
+ "text": "描述描述描述1"
},
"BuffUpgradeCost": {
- "a": "attr",
- "t": "gold",
- "n": 1
+ "a": "atn",
+ "t": "10000002",
+ "n": 10
},
"BuffSell": {
- "a": "attr",
- "t": "gold",
- "n": 2
+ "a": "atn",
+ "t": "10000002",
+ "n": 10
}
},
{
- "BuffId": 251023112,
+ "BuffId": 125004311,
"BuffGroupId": 1001,
"Type": 1,
"BuffLevel": 2,
"Quality": 1,
"BuffIcon": "",
- "buffName": {
- "key": "stonehenge_eventconfig_buffName_2",
- "text": "攻击buff"
- },
- "BuffDescription": {
- "key": "stonehenge_buffconfig_BuffDescription_2",
- "text": "描述描述描述"
- },
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_2",
- "text": "描述描述描述"
+ "text": "描述描述描述2"
},
"BuffUpgradeCost": {
- "a": "attr",
- "t": "gold",
- "n": 1
+ "a": "atn",
+ "t": "10000002",
+ "n": 11
},
"BuffSell": {
- "a": "attr",
- "t": "gold",
- "n": 2
+ "a": "atn",
+ "t": "10000002",
+ "n": 11
}
},
{
- "BuffId": 200000001,
+ "BuffId": 135006211,
"BuffGroupId": 1002,
"Type": 2,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
- "buffName": {
- "key": "stonehenge_eventconfig_buffName_3",
- "text": "防御buff"
- },
- "BuffDescription": {
- "key": "stonehenge_buffconfig_BuffDescription_3",
- "text": "描述描述描述"
- },
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_3",
- "text": "描述描述描述"
+ "text": "描述描述描述3"
},
"BuffUpgradeCost": {
- "a": "attr",
- "t": "gold",
- "n": 2
+ "a": "atn",
+ "t": "10000002",
+ "n": 12
},
"BuffSell": {
- "a": "attr",
- "t": "gold",
- "n": 3
+ "a": "atn",
+ "t": "10000002",
+ "n": 12
}
},
{
- "BuffId": 200000002,
+ "BuffId": 135006311,
"BuffGroupId": 1002,
"Type": 2,
"BuffLevel": 2,
"Quality": 2,
"BuffIcon": "",
- "buffName": {
- "key": "stonehenge_eventconfig_buffName_4",
- "text": "防御buff"
- },
- "BuffDescription": {
- "key": "stonehenge_buffconfig_BuffDescription_4",
- "text": "描述描述描述"
- },
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_4",
- "text": "描述描述描述"
+ "text": "描述描述描述4"
},
"BuffUpgradeCost": {
- "a": "attr",
- "t": "gold",
- "n": 3
+ "a": "atn",
+ "t": "10000002",
+ "n": 13
},
"BuffSell": {
- "a": "attr",
- "t": "gold",
- "n": 4
+ "a": "atn",
+ "t": "10000002",
+ "n": 13
}
},
{
- "BuffId": 253005111,
+ "BuffId": 144004311,
"BuffGroupId": 1003,
"Type": 3,
"BuffLevel": 1,
"Quality": 1,
"BuffIcon": "",
- "buffName": {
- "key": "stonehenge_eventconfig_buffName_5",
- "text": "辅助buff"
- },
- "BuffDescription": {
- "key": "stonehenge_buffconfig_BuffDescription_5",
- "text": "描述描述描述"
- },
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_5",
- "text": "描述描述描述"
+ "text": "描述描述描述5"
},
"BuffUpgradeCost": {
- "a": "attr",
- "t": "gold",
- "n": 4
+ "a": "atn",
+ "t": "10000002",
+ "n": 14
},
"BuffSell": {
- "a": "attr",
- "t": "gold",
- "n": 5
+ "a": "atn",
+ "t": "10000002",
+ "n": 14
}
},
{
- "BuffId": 253005112,
+ "BuffId": 124006311,
"BuffGroupId": 1003,
"Type": 3,
"BuffLevel": 2,
"Quality": 1,
"BuffIcon": "",
- "buffName": {
- "key": "stonehenge_eventconfig_buffName_6",
- "text": "辅助buff"
- },
- "BuffDescription": {
- "key": "stonehenge_buffconfig_BuffDescription_6",
- "text": "描述描述描述"
- },
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_6",
- "text": "描述描述描述"
+ "text": "描述描述描述6"
},
"BuffUpgradeCost": {
- "a": "attr",
- "t": "gold",
- "n": 5
+ "a": "atn",
+ "t": "10000002",
+ "n": 15
},
"BuffSell": {
- "a": "attr",
- "t": "gold",
- "n": 6
+ "a": "atn",
+ "t": "10000002",
+ "n": 15
}
},
{
- "BuffId": 225002011,
+ "BuffId": 144002311,
"BuffGroupId": 1004,
"Type": 4,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
- "buffName": {
- "key": "stonehenge_eventconfig_buffName_7",
- "text": "控制buff"
- },
- "BuffDescription": {
- "key": "stonehenge_buffconfig_BuffDescription_7",
- "text": "描述描述描述"
- },
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_7",
- "text": "描述描述描述"
+ "text": "描述描述描述7"
},
"BuffUpgradeCost": {
- "a": "attr",
- "t": "gold",
- "n": 6
+ "a": "atn",
+ "t": "10000002",
+ "n": 16
},
"BuffSell": {
- "a": "attr",
- "t": "gold",
- "n": 7
+ "a": "atn",
+ "t": "10000002",
+ "n": 16
}
},
{
- "BuffId": 225002012,
+ "BuffId": 151513211,
"BuffGroupId": 1004,
"Type": 4,
"BuffLevel": 2,
"Quality": 2,
"BuffIcon": "",
- "buffName": {
- "key": "stonehenge_eventconfig_buffName_8",
- "text": "控制buff"
- },
- "BuffDescription": {
- "key": "stonehenge_buffconfig_BuffDescription_8",
- "text": "描述描述描述"
- },
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_8",
- "text": "描述描述描述"
+ "text": "描述描述描述8"
},
"BuffUpgradeCost": {
- "a": "attr",
- "t": "gold",
- "n": 7
+ "a": "atn",
+ "t": "10000002",
+ "n": 17
},
"BuffSell": {
- "a": "attr",
- "t": "gold",
- "n": 8
+ "a": "atn",
+ "t": "10000002",
+ "n": 17
+ }
+ },
+ {
+ "BuffId": 143002311,
+ "BuffGroupId": 1005,
+ "Type": 4,
+ "BuffLevel": 1,
+ "Quality": 3,
+ "BuffIcon": "",
+ "BuffStory": {
+ "key": "stonehenge_buffconfig_BuffStory_9",
+ "text": "描述描述描述9"
+ },
+ "BuffUpgradeCost": {
+ "a": "atn",
+ "t": "10000002",
+ "n": 18
+ },
+ "BuffSell": {
+ "a": "atn",
+ "t": "10000002",
+ "n": 18
+ }
+ },
+ {
+ "BuffId": 115005311,
+ "BuffGroupId": 1005,
+ "Type": 4,
+ "BuffLevel": 2,
+ "Quality": 3,
+ "BuffIcon": "",
+ "BuffStory": {
+ "key": "stonehenge_buffconfig_BuffStory_10",
+ "text": "描述描述描述10"
+ },
+ "BuffUpgradeCost": {
+ "a": "atn",
+ "t": "10000002",
+ "n": 19
+ },
+ "BuffSell": {
+ "a": "atn",
+ "t": "10000002",
+ "n": 19
}
}
]
\ No newline at end of file
diff --git a/bin/json/game_stroneevent.json b/bin/json/game_stroneevent.json
index 0c992f0b9..6bc243b47 100644
--- a/bin/json/game_stroneevent.json
+++ b/bin/json/game_stroneevent.json
@@ -1,91 +1,17 @@
[
{
- "EventId": 10000001,
+ "EventId": 160101,
"EventTitle": {
- "key": "stonehenge_eventconfig_EventTitle_1",
- "text": "预留用"
+ "key": "",
+ "text": ""
},
"EventType": 16,
"EventResource": "",
- "Value1": 10001001,
- "Value2": 0,
- "Value3": 0,
- "Value4": 0,
- "PostEvent": 11000002,
- "probability": 500
- },
- {
- "EventId": 10000002,
- "EventTitle": {
- "key": "stonehenge_eventconfig_EventTitle_2",
- "text": "预留用"
- },
- "EventType": 16,
- "EventResource": "",
- "Value1": 10001001,
- "Value2": 0,
- "Value3": 0,
- "Value4": 0,
- "PostEvent": 0,
- "probability": 0
- },
- {
- "EventId": 10000003,
- "EventTitle": {
- "key": "stonehenge_eventconfig_EventTitle_3",
- "text": "预留用"
- },
- "EventType": 16,
- "EventResource": "",
- "Value1": 10001001,
- "Value2": 0,
- "Value3": 0,
- "Value4": 0,
- "PostEvent": 0,
- "probability": 0
- },
- {
- "EventId": 10000004,
- "EventTitle": {
- "key": "stonehenge_eventconfig_EventTitle_4",
- "text": "预留用"
- },
- "EventType": 16,
- "EventResource": "",
- "Value1": 10001001,
- "Value2": 0,
- "Value3": 0,
- "Value4": 0,
- "PostEvent": 0,
- "probability": 0
- },
- {
- "EventId": 10000005,
- "EventTitle": {
- "key": "stonehenge_eventconfig_EventTitle_5",
- "text": "预留用"
- },
- "EventType": 16,
- "EventResource": "",
- "Value1": 10001001,
- "Value2": 0,
- "Value3": 0,
- "Value4": 0,
- "PostEvent": 0,
- "probability": 0
- },
- {
- "EventId": 10000006,
- "EventTitle": {
- "key": "stonehenge_eventconfig_EventTitle_6",
- "text": "预留用"
- },
- "EventType": 16,
- "EventResource": "",
- "Value1": 10001001,
+ "Value1": 10001,
"Value2": 0,
"Value3": 0,
"Value4": 0,
+ "CostItem": [],
"PostEvent": 0,
"probability": 0
}
diff --git a/bin/json/game_stroneroom.json b/bin/json/game_stroneroom.json
index d07c18c8d..973e525f7 100644
--- a/bin/json/game_stroneroom.json
+++ b/bin/json/game_stroneroom.json
@@ -5,7 +5,7 @@
"key": "stonehenge_roomconfig_RoomName_1",
"text": "战斗"
},
- "SceneName": "",
+ "SceneName": "scenesfight_secret_realm_01",
"PortalName": "",
"EventrewardGroup": 1001001,
"EventBattleGroup": 0,
@@ -21,7 +21,7 @@
"key": "stonehenge_roomconfig_RoomName_2",
"text": "战斗"
},
- "SceneName": "",
+ "SceneName": "scenesfight_secret_realm_01",
"PortalName": "",
"EventrewardGroup": 1001001,
"EventBattleGroup": 0,
@@ -37,7 +37,7 @@
"key": "stonehenge_roomconfig_RoomName_3",
"text": "战斗"
},
- "SceneName": "",
+ "SceneName": "scenesfight_secret_realm_01",
"PortalName": "",
"EventrewardGroup": 1001001,
"EventBattleGroup": 0,
diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json
index 55d0a3926..75e053b4a 100644
--- a/bin/json/game_worldall.json
+++ b/bin/json/game_worldall.json
@@ -106,5 +106,200 @@
"text": ""
},
"reword": []
+ },
+ {
+ "id": 302,
+ "name": {
+ "key": "worldtask_world_all_name_7",
+ "text": "支线测试A"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 303,
+ "name": {
+ "key": "worldtask_world_all_name_8",
+ "text": "支线测试B"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 304,
+ "name": {
+ "key": "worldtask_world_all_name_9",
+ "text": "支线测试C"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 305,
+ "name": {
+ "key": "worldtask_world_all_name_10",
+ "text": "支线测试D"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1010,
+ "name": {
+ "key": "worldtask_world_all_name_11",
+ "text": "日常测试1"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1020,
+ "name": {
+ "key": "worldtask_world_all_name_12",
+ "text": "日常测试2"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1030,
+ "name": {
+ "key": "worldtask_world_all_name_13",
+ "text": "日常测试3"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1040,
+ "name": {
+ "key": "worldtask_world_all_name_14",
+ "text": "日常测试4"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1050,
+ "name": {
+ "key": "worldtask_world_all_name_15",
+ "text": "日常测试5"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1060,
+ "name": {
+ "key": "worldtask_world_all_name_16",
+ "text": "日常测试6"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1070,
+ "name": {
+ "key": "worldtask_world_all_name_17",
+ "text": "日常测试7"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1080,
+ "name": {
+ "key": "worldtask_world_all_name_18",
+ "text": "日常测试8"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1090,
+ "name": {
+ "key": "worldtask_world_all_name_19",
+ "text": "日常测试9"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1100,
+ "name": {
+ "key": "worldtask_world_all_name_20",
+ "text": "日常测试10"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
+ },
+ {
+ "id": 1110,
+ "name": {
+ "key": "worldtask_world_all_name_21",
+ "text": "日常测试11"
+ },
+ "task_icon": "",
+ "task_txt": {
+ "key": "",
+ "text": ""
+ },
+ "reword": []
}
]
\ No newline at end of file
diff --git a/comm/const.go b/comm/const.go
index a20db2e08..bb6cf91f2 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -91,7 +91,7 @@ const (
ModuleWtask core.M_Modules = "wtask" //世界任务
ModulePasson core.M_Modules = "passon" //传功房
ModuleWarorder core.M_Modules = "warorder" //战令
- ModuleUnionGve core.M_Modules = "uniongve" //工会boos战
+ ModuleGuildGve core.M_Modules = "guildgve" //工会boos战
ModuleDailytask core.M_Modules = "dailytask" //每日任务
ModuleQuestionnaire core.M_Modules = "questionnaire" //问卷调查
)
@@ -294,7 +294,11 @@ const (
TableRaceRecord = "pagodarace"
///工会战
- TableUniongve = "uniongve"
+ TableGuildgve = "guildgve"
+
+ ///工会成员表
+ TableGuildMember = "guildmember"
+
///工会轮盘
TableUnionroulette = "unionroulette"
///工会排行榜
diff --git a/comm/imodule.go b/comm/imodule.go
index 6fff25a09..f4c1b2d0b 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -516,6 +516,9 @@ type (
GetGrormetLlame(id string) (data int32, err error)
GetGroupDataByLotteryId(id int32) (data *cfg.GameLotteryData, err error)
+ //获取用户等级配置
+ GetPlayerlvConf(uid string) (conf *cfg.GamePlayerlvData, errdata *pb.ErrorData)
+
//读取全局表 db层
GetGlobalData(key string, v interface{}) (err error)
//更新全局表 db层
diff --git a/modules/uniongve/api.go b/modules/guildgve/api.go
similarity index 85%
rename from modules/uniongve/api.go
rename to modules/guildgve/api.go
index d83afdf69..f7a715d4a 100644
--- a/modules/uniongve/api.go
+++ b/modules/guildgve/api.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"go_dreamfactory/lego/base"
@@ -9,12 +9,12 @@ import (
type apiComp struct {
modules.MCompGate
service base.IRPCXService
- module *UnionGve
+ module *GuildGve
}
func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
_ = this.MCompGate.Init(service, module, comp, options)
this.service = service.(base.IRPCXService)
- this.module = module.(*UnionGve)
+ this.module = module.(*GuildGve)
return
}
diff --git a/modules/uniongve/api_challenge.go b/modules/guildgve/api_challenge.go
similarity index 51%
rename from modules/uniongve/api_challenge.go
rename to modules/guildgve/api_challenge.go
index d8838bff3..ea94af108 100644
--- a/modules/uniongve/api_challenge.go
+++ b/modules/guildgve/api_challenge.go
@@ -1,14 +1,16 @@
-package uniongve
+package guildgve
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
+ "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
+ "go_dreamfactory/utils"
)
// 参数校验
-func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.UniongveChallengeReq) (errdata *pb.ErrorData) {
- if req.Unionid == "" || req.Boosid == 0 {
+func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.GuildGveChallengeReq) (errdata *pb.ErrorData) {
+ if req.Guildid == "" || req.Boosid == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
@@ -19,11 +21,13 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.UniongveC
}
// 获取工会boos战信息
-func (this *apiComp) Challenge(session comm.IUserSession, req *pb.UniongveChallengeReq) (errdata *pb.ErrorData) {
+func (this *apiComp) Challenge(session comm.IUserSession, req *pb.GuildGveChallengeReq) (errdata *pb.ErrorData) {
var (
- record *pb.DBBattleRecord
- conf *cfg.GameGuildBossData
- err error
+ member *pb.DBGuildMember
+ record *pb.DBBattleRecord
+ playerlvconf *cfg.GamePlayerlvData
+ conf *cfg.GameGuildBossData
+ err error
)
if errdata = this.ChallengeCheck(session, req); errdata != nil {
@@ -39,6 +43,31 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.UniongveChalle
return
}
+ if member, err = this.module.modelGuildMember.getGuildMember(req.Guildid, session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ if !utils.IsToday(member.Refreshtime) {
+ if playerlvconf, errdata = this.module.ModuleTools.GetPlayerlvConf(session.GetUserId()); errdata != nil {
+ member.Boosticket = playerlvconf.GuildBossCeiling
+ member.Refreshtime = configure.Now().Unix()
+ this.module.modelGuildMember.updateGuildMember(member)
+ return
+ }
+ }
+ if member.Boosticket == 0 {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+
if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_moonfantasy,
Format: req.Battle,
@@ -46,9 +75,10 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.UniongveChalle
}); err != nil {
return
}
- session.SendMsg(string(this.module.GetType()), "challenge", &pb.UniongveChallengeResp{
- Unionid: req.Unionid,
- Boosid: req.Boosid,
+ session.SendMsg(string(this.module.GetType()), "challenge", &pb.GuildGveChallengeResp{
+ Guildid: req.Guildid,
+ Boosid: req.Boosid,
+ Boosticket: member.Boosticket,
Info: &pb.BattleInfo{
Id: record.Id,
Rulesid: conf.BattleReadyID,
diff --git a/modules/uniongve/api_challengefinish.go b/modules/guildgve/api_challengefinish.go
similarity index 65%
rename from modules/uniongve/api_challengefinish.go
rename to modules/guildgve/api_challengefinish.go
index 1e89bda60..5213f32ce 100644
--- a/modules/uniongve/api_challengefinish.go
+++ b/modules/guildgve/api_challengefinish.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"fmt"
@@ -10,21 +10,22 @@ import (
)
// 参数校验
-func (this *apiComp) ChallengeFinishCheck(session comm.IUserSession, req *pb.UniongveChallengeFinishReq) (errdata *pb.ErrorData) {
+func (this *apiComp) ChallengeFinishCheck(session comm.IUserSession, req *pb.GuildGveChallengeFinishReq) (errdata *pb.ErrorData) {
return
}
// 获取工会boos战信息
-func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.UniongveChallengeFinishReq) (errdata *pb.ErrorData) {
+func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGveChallengeFinishReq) (errdata *pb.ErrorData) {
var (
- conf *cfg.GameGuildBossData
- score *cfg.GameGuildBossScoreData
- info *pb.DBUnionGve
- prop []*cfg.Gameatn
- award []*pb.UserAssets
- ok bool
- err error
+ conf *cfg.GameGuildBossData
+ member *pb.DBGuildMember
+ score *cfg.GameGuildBossScoreData
+ info *pb.DBGuildGve
+ prop []*cfg.Gameatn
+ award []*pb.UserAssets
+ ok bool
+ err error
)
if errdata = this.ChallengeFinishCheck(session, req); errdata != nil {
return
@@ -48,16 +49,33 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.Uniongve
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
+ return
+ }
+ if member, err = this.module.modelGuildMember.getGuildMember(req.Guildid, session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ if member.Boosticket <= 0 {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: fmt.Sprintf("Boosticket is ", member.Boosticket),
+ }
+ return
}
- lock, _ := this.module.modelUniongve.userlock(req.Unionid)
+ lock, _ := this.module.modelGuildGve.userlock(req.Guildid)
err = lock.Lock()
if err != nil {
- this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: req.Unionid}, log.Field{Key: "err", Value: err.Error()})
+ this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: req.Guildid}, log.Field{Key: "err", Value: err.Error()})
return
}
defer lock.Unlock()
- if info, err = this.module.modelUniongve.getUnionGve(req.Unionid); err != nil {
+ if info, err = this.module.modelGuildGve.getGuildGve(req.Guildid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@@ -83,13 +101,13 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.Uniongve
}
}
v.Record = append(v.Record)
- go this.module.modelUniongve.booshpchangepush(req.Unionid, info)
+ go this.module.modelGuildGve.booshpchangepush(req.Guildid, info)
if v.Hp < 0 {
v.Hp = 0
info.Kills++
info.Lastkilltime = configure.Now().Unix()
this.module.modelRank.updateRank(info)
- go this.module.modelUniongve.booskill(req.Unionid, req.Boosid, info)
+ go this.module.modelGuildGve.booskill(req.Guildid, req.Boosid, info)
}
}
break
@@ -97,6 +115,8 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.Uniongve
}
if ok {
+ member.Boosticket--
+ this.module.modelGuildMember.updateGuildMember(member)
user := this.module.ModuleUser.GetUser(session.GetUserId())
if prop = this.module.ModuleTools.GetGroupDataByLottery(score.Drop, user.Vip, user.Lv); len(prop) == 0 {
errdata = &pb.ErrorData{
@@ -118,7 +138,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.Uniongve
})
}
- if err = this.module.modelUniongve.updateUnionGve(info); err != nil {
+ if err = this.module.modelGuildGve.updateGuildGve(info); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@@ -128,12 +148,13 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.Uniongve
}
}
- session.SendMsg(string(this.module.GetType()), "challengefinish", &pb.UniongveChallengeFinishResp{
- Unionid: req.Unionid,
- Boosid: req.Boosid,
- Efficient: ok,
- Award: award,
- Score: score.Id,
+ session.SendMsg(string(this.module.GetType()), "challengefinish", &pb.GuildGveChallengeFinishResp{
+ Guildid: req.Guildid,
+ Boosid: req.Boosid,
+ Efficient: ok,
+ Award: award,
+ Score: score.Id,
+ Boosticket: member.Boosticket,
})
return
}
diff --git a/modules/guildgve/api_info.go b/modules/guildgve/api_info.go
new file mode 100644
index 000000000..35e8d9ef6
--- /dev/null
+++ b/modules/guildgve/api_info.go
@@ -0,0 +1,65 @@
+package guildgve
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/sys/log"
+ "go_dreamfactory/pb"
+ "go_dreamfactory/sys/configure"
+ cfg "go_dreamfactory/sys/configure/structs"
+ "go_dreamfactory/utils"
+)
+
+// 参数校验
+func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.GuildGveInfoReq) (errdata *pb.ErrorData) {
+
+ return
+}
+
+// 获取工会boos战信息
+func (this *apiComp) Info(session comm.IUserSession, req *pb.GuildGveInfoReq) (errdata *pb.ErrorData) {
+ var (
+ conf *cfg.GamePlayerlvData
+ member *pb.DBGuildMember
+ info *pb.DBGuildGve
+ err error
+ )
+ if errdata = this.InfoCheck(session, req); errdata != nil {
+ return
+ }
+
+ if member, err = this.module.modelGuildMember.getGuildMember(req.Guildid, session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if !utils.IsToday(member.Refreshtime) {
+ if conf, errdata = this.module.ModuleTools.GetPlayerlvConf(session.GetUserId()); errdata != nil {
+ member.Boosticket = conf.GuildBossCeiling
+ member.Refreshtime = configure.Now().Unix()
+ this.module.modelGuildMember.updateGuildMember(member)
+ return
+ }
+ }
+
+ lock, _ := this.module.modelGuildGve.userlock(req.Guildid)
+ err = lock.Lock()
+ if err != nil {
+ this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: req.Guildid}, log.Field{Key: "err", Value: err.Error()})
+ return
+ }
+ defer lock.Unlock()
+ if info, err = this.module.modelGuildGve.getGuildGve(req.Guildid); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "info", &pb.GuildGveInfoResp{Info: info, Boosticket: member.Boosticket})
+ return
+}
diff --git a/modules/uniongve/api_rank.go b/modules/guildgve/api_rank.go
similarity index 67%
rename from modules/uniongve/api_rank.go
rename to modules/guildgve/api_rank.go
index 859eec159..b375fa500 100644
--- a/modules/uniongve/api_rank.go
+++ b/modules/guildgve/api_rank.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"go_dreamfactory/comm"
@@ -6,18 +6,18 @@ import (
)
// 参数校验
-func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.UniongveRankReq) (errdata *pb.ErrorData) {
+func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.GuildGveRankReq) (errdata *pb.ErrorData) {
return
}
// 获取工会boos战信息
-func (this *apiComp) Rank(session comm.IUserSession, req *pb.UniongveRankReq) (errdata *pb.ErrorData) {
+func (this *apiComp) Rank(session comm.IUserSession, req *pb.GuildGveRankReq) (errdata *pb.ErrorData) {
var (
err error
ids []string
sociatys []*pb.DBSociaty
- ranks []*pb.UniongveRankItem
+ ranks []*pb.GuildGveRankItem
)
if errdata = this.RankCheck(session, req); errdata != nil {
return
@@ -36,12 +36,12 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.UniongveRankReq) (e
}
for i, v := range sociatys {
- ranks = append(ranks, &pb.UniongveRankItem{
- Unionid: v.Id,
+ ranks = append(ranks, &pb.GuildGveRankItem{
+ Guildid: v.Id,
Name: v.Name,
Rank: int32(i),
})
}
- session.SendMsg(string(this.module.GetType()), "rank", &pb.UniongveRankResp{List: ranks})
+ session.SendMsg(string(this.module.GetType()), "rank", &pb.GuildGveRankResp{List: ranks})
return
}
diff --git a/modules/uniongve/api_roulette.go b/modules/guildgve/api_roulette.go
similarity index 85%
rename from modules/uniongve/api_roulette.go
rename to modules/guildgve/api_roulette.go
index 3aab57e34..53cdee192 100644
--- a/modules/uniongve/api_roulette.go
+++ b/modules/guildgve/api_roulette.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"go_dreamfactory/comm"
@@ -7,13 +7,13 @@ import (
)
// 参数校验
-func (this *apiComp) RouletteCheck(session comm.IUserSession, req *pb.UniongveRouletteReq) (errdata *pb.ErrorData) {
+func (this *apiComp) RouletteCheck(session comm.IUserSession, req *pb.GuildGveRouletteReq) (errdata *pb.ErrorData) {
return
}
// 获取工会 转轮
-func (this *apiComp) Roulette(session comm.IUserSession, req *pb.UniongveRouletteReq) (errdata *pb.ErrorData) {
+func (this *apiComp) Roulette(session comm.IUserSession, req *pb.GuildGveRouletteReq) (errdata *pb.ErrorData) {
var (
confs []*cfg.GameGuildBossRouletteData
award []*pb.UserAssets = make([]*pb.UserAssets, 0)
@@ -58,9 +58,9 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.UniongveRoulett
}
if confs[index].Push == 1 { //推送通知
- go this.module.modelUnionroulette.roulettechangePush(req.Unionid, session.GetUserId(), award)
+ go this.module.modelUnionroulette.roulettechangePush(req.Guildid, session.GetUserId(), award)
}
- session.SendMsg(string(this.module.GetType()), "roulette", &pb.UniongveRouletteResp{Cid: confs[index].Id, Award: award})
+ session.SendMsg(string(this.module.GetType()), "roulette", &pb.GuildGveRouletteResp{Cid: confs[index].Id, Award: award})
return
}
diff --git a/modules/uniongve/api_setfire.go b/modules/guildgve/api_setfire.go
similarity index 62%
rename from modules/uniongve/api_setfire.go
rename to modules/guildgve/api_setfire.go
index 315edef04..1b39cfedf 100644
--- a/modules/uniongve/api_setfire.go
+++ b/modules/guildgve/api_setfire.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"go_dreamfactory/comm"
@@ -7,30 +7,30 @@ import (
)
// 参数校验
-func (this *apiComp) SetFireCheck(session comm.IUserSession, req *pb.UniongveSetFireReq) (errdata *pb.ErrorData) {
+func (this *apiComp) SetFireCheck(session comm.IUserSession, req *pb.GuildGveSetFireReq) (errdata *pb.ErrorData) {
return
}
// 获取工会设置集火
-func (this *apiComp) SetFire(session comm.IUserSession, req *pb.UniongveSetFireReq) (errdata *pb.ErrorData) {
+func (this *apiComp) SetFire(session comm.IUserSession, req *pb.GuildGveSetFireReq) (errdata *pb.ErrorData) {
var (
- info *pb.DBUnionGve
+ info *pb.DBGuildGve
err error
)
if errdata = this.SetFireCheck(session, req); errdata != nil {
return
}
- lock, _ := this.module.modelUniongve.userlock(req.Unionid)
+ lock, _ := this.module.modelGuildGve.userlock(req.Guildid)
err = lock.Lock()
if err != nil {
- this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: req.Unionid}, log.Field{Key: "err", Value: err.Error()})
+ this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: req.Guildid}, log.Field{Key: "err", Value: err.Error()})
return
}
defer lock.Unlock()
- if info, err = this.module.modelUniongve.getUnionGve(req.Unionid); err != nil {
+ if info, err = this.module.modelGuildGve.getGuildGve(req.Guildid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@@ -41,7 +41,7 @@ func (this *apiComp) SetFire(session comm.IUserSession, req *pb.UniongveSetFireR
info.Notice = req.Notice
info.Fire = req.Boosid
- if err = this.module.modelUniongve.updateUnionGve(info); err != nil {
+ if err = this.module.modelGuildGve.updateGuildGve(info); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@@ -49,7 +49,7 @@ func (this *apiComp) SetFire(session comm.IUserSession, req *pb.UniongveSetFireR
}
return
}
- go this.module.modelUniongve.infochangepush(req.Unionid, info)
- session.SendMsg(string(this.module.GetType()), "info", &pb.UniongveInfoResp{Info: info})
+ go this.module.modelGuildGve.infochangepush(req.Guildid, info)
+ session.SendMsg(string(this.module.GetType()), "info", &pb.GuildGveInfoResp{Info: info})
return
}
diff --git a/modules/uniongve/comp_configure.go b/modules/guildgve/comp_configure.go
similarity index 98%
rename from modules/uniongve/comp_configure.go
rename to modules/guildgve/comp_configure.go
index 1c44186cc..a7af14207 100644
--- a/modules/uniongve/comp_configure.go
+++ b/modules/guildgve/comp_configure.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"fmt"
@@ -18,13 +18,13 @@ const (
// /配置管理基础组件
type MCompConfigure struct {
modules.MCompConfigure
- module *UnionGve
+ module *GuildGve
}
// 组件初始化接口
func (this *MCompConfigure) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.ModuleCompBase.Init(service, module, comp, options)
- this.module = module.(*UnionGve)
+ this.module = module.(*GuildGve)
err = this.LoadMultiConfigure(map[string]interface{}{
game_guildboss: cfg.NewGameGuildBoss,
game_guildbossrank: cfg.NewGameGuildBossRank,
diff --git a/modules/uniongve/core.go b/modules/guildgve/core.go
similarity index 76%
rename from modules/uniongve/core.go
rename to modules/guildgve/core.go
index ccd98d3c2..c5d55f8b4 100644
--- a/modules/uniongve/core.go
+++ b/modules/guildgve/core.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
const (
UnionGveBoosCoonfKey = "UnionGveBoosCoonf"
diff --git a/modules/guildgve/modelGuildMember.go b/modules/guildgve/modelGuildMember.go
new file mode 100644
index 000000000..0dfabedda
--- /dev/null
+++ b/modules/guildgve/modelGuildMember.go
@@ -0,0 +1,84 @@
+package guildgve
+
+import (
+ "errors"
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/sys/log"
+ "go_dreamfactory/lego/sys/mgo"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+ "go_dreamfactory/sys/configure"
+ cfg "go_dreamfactory/sys/configure/structs"
+ "sync"
+
+ "go.mongodb.org/mongo-driver/bson/primitive"
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/x/bsonx"
+)
+
+type ModelGuildMember struct {
+ modules.MCompModel
+ module *GuildGve
+ conflock sync.RWMutex
+ bossconf *pb.DBGuildGveBossConf
+}
+
+func (this *ModelGuildMember) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ err = this.MCompModel.Init(service, module, comp, options)
+ this.TableName = comm.TableGuildMember
+ this.module = module.(*GuildGve)
+ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+ })
+ return
+}
+
+func (this *ModelGuildMember) Start() (err error) {
+ err = this.MCompModel.Start()
+ return
+}
+
+// 获取用户全部的埋点数据
+func (this *ModelGuildMember) getGuildMember(guild, uid string) (results *pb.DBGuildMember, err error) {
+ var (
+ conf *cfg.GamePlayerlvData
+ errdata *pb.ErrorData
+ )
+ results = &pb.DBGuildMember{}
+ if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil {
+ this.module.Errorln(err)
+ return
+ }
+ if err == mgo.MongodbNil {
+ if conf, errdata = this.module.ModuleTools.GetPlayerlvConf(uid); errdata != nil {
+ err = errors.New(errdata.Message)
+ this.module.Errorln(errdata)
+ return
+ }
+ results = &pb.DBGuildMember{
+ Id: primitive.NewObjectID().Hex(),
+ Uid: uid,
+ Guild: guild,
+ Boosticket: conf.GuildBossCeiling,
+ Refreshtime: configure.Now().Unix(),
+ }
+ err = this.Add(uid, results)
+ }
+ if results.Guild != guild {
+ results.Guild = guild
+ }
+ return
+}
+
+func (this *ModelGuildMember) updateGuildMember(data *pb.DBGuildMember) (err error) {
+ if err = this.Change(data.Uid, map[string]interface{}{
+ "guild": data.Guild,
+ "boosticket": data.Boosticket,
+ "refreshtime": data.Refreshtime,
+ }); err != nil {
+ this.module.Error("更新工会成员信息 错误!", log.Field{Key: "err", Value: err.Error()})
+ return
+ }
+ return
+}
diff --git a/modules/uniongve/modelUnionRoulette.go b/modules/guildgve/modelUnionRoulette.go
similarity index 75%
rename from modules/uniongve/modelUnionRoulette.go
rename to modules/guildgve/modelUnionRoulette.go
index 0bdfd0145..66e7c0902 100644
--- a/modules/uniongve/modelUnionRoulette.go
+++ b/modules/guildgve/modelUnionRoulette.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"fmt"
@@ -14,15 +14,15 @@ import (
type ModelUnionroulette struct {
modules.MCompModel
- module *UnionGve
+ module *GuildGve
conflock sync.RWMutex
- bossconf *pb.DBUnionGveBossConf
+ bossconf *pb.DBGuildGveBossConf
}
func (this *ModelUnionroulette) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompModel.Init(service, module, comp, options)
this.TableName = comm.TableUnionroulette
- this.module = module.(*UnionGve)
+ this.module = module.(*GuildGve)
return
}
@@ -32,24 +32,24 @@ func (this *ModelUnionroulette) Start() (err error) {
}
// 获取用户全部的埋点数据
-func (this *ModelUnionroulette) getUnionRoulette(unionid string) (results *pb.DBUnionRouletteRecord, err error) {
- results = &pb.DBUnionRouletteRecord{}
- if err = this.Get(unionid, results); err != nil && err != mgo.MongodbNil {
+func (this *ModelUnionroulette) getUnionRoulette(Guildid string) (results *pb.DBGuildRouletteRecord, err error) {
+ results = &pb.DBGuildRouletteRecord{}
+ if err = this.Get(Guildid, results); err != nil && err != mgo.MongodbNil {
this.module.Errorln(err)
return
}
if err == mgo.MongodbNil {
- results = &pb.DBUnionRouletteRecord{
- Unionid: unionid,
+ results = &pb.DBGuildRouletteRecord{
+ Guildid: Guildid,
Roulette: make([]*pb.DBGveRouletteRecord, 0),
}
- err = this.Add(unionid, results)
+ err = this.Add(Guildid, results)
}
return
}
-func (this *ModelUnionroulette) updateUnionRoulette(data *pb.DBUnionRouletteRecord) (err error) {
- if err = this.Change(data.Unionid, map[string]interface{}{
+func (this *ModelUnionroulette) updateUnionRoulette(data *pb.DBGuildRouletteRecord) (err error) {
+ if err = this.Change(data.Guildid, map[string]interface{}{
"roulette": data.Roulette,
}); err != nil {
this.module.Error("更新用户任务数据 错误!", log.Field{Key: "err", Value: err.Error()})
@@ -66,7 +66,7 @@ func (this *ModelUnionroulette) userlock(id string) (result *redis.RedisMutex, e
// boos 信息变化推送
func (this *ModelUnionroulette) roulettechangePush(unionid string, uid string, award []*pb.UserAssets) {
var (
- info *pb.DBUnionRouletteRecord
+ info *pb.DBGuildRouletteRecord
members []*pb.SociatyMemberInfo
users []string = make([]string, 0)
errdata *pb.ErrorData
@@ -80,7 +80,7 @@ func (this *ModelUnionroulette) roulettechangePush(unionid string, uid string, a
users = append(users, v.Uid)
}
- lock, _ := this.module.modelUniongve.userlock(unionid)
+ lock, _ := this.module.modelGuildGve.userlock(unionid)
err = lock.Lock()
if err != nil {
this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: unionid}, log.Field{Key: "err", Value: err.Error()})
@@ -96,7 +96,7 @@ func (this *ModelUnionroulette) roulettechangePush(unionid string, uid string, a
Award: award,
})
- this.module.SendMsgToUsers(string(this.module.GetType()), "roulettechange", &pb.UniongveRouletteChangePush{
+ this.module.SendMsgToUsers(string(this.module.GetType()), "roulettechange", &pb.GuildGveRouletteChangePush{
Record: info,
}, users...)
}
diff --git a/modules/uniongve/modelUniongve.go b/modules/guildgve/modelUniongve.go
similarity index 82%
rename from modules/uniongve/modelUniongve.go
rename to modules/guildgve/modelUniongve.go
index 01ac99550..d24942d9c 100644
--- a/modules/uniongve/modelUniongve.go
+++ b/modules/guildgve/modelUniongve.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"fmt"
@@ -18,15 +18,15 @@ import (
type ModelUniongve struct {
modules.MCompModel
- module *UnionGve
+ module *GuildGve
conflock sync.RWMutex
- bossconf *pb.DBUnionGveBossConf
+ bossconf *pb.DBGuildGveBossConf
}
func (this *ModelUniongve) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompModel.Init(service, module, comp, options)
- this.TableName = comm.TableUniongve
- this.module = module.(*UnionGve)
+ this.TableName = comm.TableGuildgve
+ this.module = module.(*GuildGve)
return
}
@@ -41,15 +41,15 @@ func (this *ModelUniongve) Start() (err error) {
}
// 获取用户全部的埋点数据
-func (this *ModelUniongve) getUnionGve(unionid string) (results *pb.DBUnionGve, err error) {
+func (this *ModelUniongve) getGuildGve(guildid string) (results *pb.DBGuildGve, err error) {
var (
- confs *pb.DBUnionGveBossConf
+ confs *pb.DBGuildGveBossConf
conf *cfg.GameGuildBossData
)
- results = &pb.DBUnionGve{
- Boos: make([]*pb.DBUnionGveBoss, 0),
+ results = &pb.DBGuildGve{
+ Boos: make([]*pb.DBGuildGveBoss, 0),
}
- if err = this.GetByID(unionid, results); err != nil && err != mgo.MongodbNil {
+ if err = this.GetByID(guildid, results); err != nil && err != mgo.MongodbNil {
this.module.Errorln(err)
return
}
@@ -58,29 +58,29 @@ func (this *ModelUniongve) getUnionGve(unionid string) (results *pb.DBUnionGve,
return
}
- results = &pb.DBUnionGve{
- Unionid: unionid,
+ results = &pb.DBGuildGve{
+ Guildid: guildid,
Currstage: 0,
Rtime: confs.Rtime,
- Boos: make([]*pb.DBUnionGveBoss, 0),
+ Boos: make([]*pb.DBGuildGveBoss, 0),
}
for _, v := range confs.Boos {
if conf, err = this.module.configure.getguildbossByid(v); err != nil {
return
}
- results.Boos = append(results.Boos, &pb.DBUnionGveBoss{
+ results.Boos = append(results.Boos, &pb.DBGuildGveBoss{
Boosid: v,
Hp: conf.Hp,
Record: make([]*pb.DBGveRecord, 0),
})
}
- err = this.Add(unionid, results)
+ err = this.Add(guildid, results)
}
return
}
-func (this *ModelUniongve) updateUnionGve(data *pb.DBUnionGve) (err error) {
- if err = this.Change(data.Unionid, map[string]interface{}{
+func (this *ModelUniongve) updateGuildGve(data *pb.DBGuildGve) (err error) {
+ if err = this.Change(data.Guildid, map[string]interface{}{
"fire": data.Fire,
"notice": data.Notice,
"currstage": data.Currstage,
@@ -99,7 +99,7 @@ func (this *ModelUniongve) updateUnionGve(data *pb.DBUnionGve) (err error) {
// 刷新全局配置
func (this *ModelUniongve) loadGlobalBoos() (err error) {
var (
- bossconf *pb.DBUnionGveBossConf = &pb.DBUnionGveBossConf{}
+ bossconf *pb.DBGuildGveBossConf = &pb.DBGuildGveBossConf{}
)
if err = this.module.ModuleTools.GetGlobalData(UnionGveBoosCoonfKey, bossconf); err != nil && err != mgo.MongodbNil {
this.module.Errorln(err)
@@ -116,9 +116,9 @@ func (this *ModelUniongve) loadGlobalBoos() (err error) {
return
}
-func (this *ModelUniongve) getGlobalBoos() (conf *pb.DBUnionGveBossConf, err error) {
+func (this *ModelUniongve) getGlobalBoos() (conf *pb.DBGuildGveBossConf, err error) {
var (
- bossconf *pb.DBUnionGveBossConf
+ bossconf *pb.DBGuildGveBossConf
)
this.conflock.RLock()
bossconf = this.bossconf
@@ -136,7 +136,7 @@ func (this *ModelUniongve) getGlobalBoos() (conf *pb.DBUnionGveBossConf, err err
}
// 刷新全局配置
-func (this *ModelUniongve) refreshGlobalBoos() (conf *pb.DBUnionGveBossConf, err error) {
+func (this *ModelUniongve) refreshGlobalBoos() (conf *pb.DBGuildGveBossConf, err error) {
var (
booss []*cfg.GameGuildBossData
rands []int
@@ -149,7 +149,7 @@ func (this *ModelUniongve) refreshGlobalBoos() (conf *pb.DBUnionGveBossConf, err
return
}
rands = comm.RandShuffle(len(booss))
- conf = &pb.DBUnionGveBossConf{
+ conf = &pb.DBGuildGveBossConf{
Key: UnionGveBoosCoonfKey,
Rtime: configure.Now().Unix(),
Boos: make([]int32, 5),
@@ -173,7 +173,7 @@ func (this *ModelUniongve) userlock(id string) (result *redis.RedisMutex, err er
}
// boos 血量变化推送
-func (this *ModelUniongve) booshpchangepush(unionid string, info *pb.DBUnionGve) {
+func (this *ModelUniongve) booshpchangepush(unionid string, info *pb.DBGuildGve) {
var (
members []*pb.SociatyMemberInfo
users []string = make([]string, 0)
@@ -187,13 +187,13 @@ func (this *ModelUniongve) booshpchangepush(unionid string, info *pb.DBUnionGve)
users = append(users, v.Uid)
}
- this.module.SendMsgToUsers(string(this.module.GetType()), "booschange", &pb.UniongveBoosChangePush{
+ this.module.SendMsgToUsers(string(this.module.GetType()), "booschange", &pb.GuildGveBoosChangePush{
Info: info,
}, users...)
}
// 击杀boos
-func (this *ModelUniongve) booskill(unionid string, boosid int32, info *pb.DBUnionGve) {
+func (this *ModelUniongve) booskill(unionid string, boosid int32, info *pb.DBGuildGve) {
var (
conf *cfg.GameGuildBossData
members []*pb.SociatyMemberInfo
@@ -222,7 +222,7 @@ func (this *ModelUniongve) booskill(unionid string, boosid int32, info *pb.DBUni
}
}
- lock, _ := this.module.modelUniongve.userlock(unionid)
+ lock, _ := this.module.modelGuildGve.userlock(unionid)
err = lock.Lock()
if err != nil {
this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: unionid}, log.Field{Key: "err", Value: err.Error()})
@@ -241,17 +241,17 @@ func (this *ModelUniongve) booskill(unionid string, boosid int32, info *pb.DBUni
v.Hp = v.Hp
v.Record = make([]*pb.DBGveRecord, 0)
}
- if err = this.updateUnionGve(info); err != nil {
+ if err = this.updateGuildGve(info); err != nil {
this.module.Errorln(err)
return
}
- this.module.SendMsgToUsers(string(this.module.GetType()), "stagechange", &pb.UniongveStageChangePush{
+ this.module.SendMsgToUsers(string(this.module.GetType()), "stagechange", &pb.GuildGveStageChangePush{
Info: info,
}, users...)
}
// boos 信息变化推送
-func (this *ModelUniongve) infochangepush(unionid string, info *pb.DBUnionGve) {
+func (this *ModelUniongve) infochangepush(unionid string, info *pb.DBGuildGve) {
var (
members []*pb.SociatyMemberInfo
users []string = make([]string, 0)
@@ -265,7 +265,7 @@ func (this *ModelUniongve) infochangepush(unionid string, info *pb.DBUnionGve) {
users = append(users, v.Uid)
}
- this.module.SendMsgToUsers(string(this.module.GetType()), "infochange", &pb.UniongveInfoChangePush{
+ this.module.SendMsgToUsers(string(this.module.GetType()), "infochange", &pb.GuildGveInfoChangePush{
Info: info,
}, users...)
}
diff --git a/modules/uniongve/modelrank.go b/modules/guildgve/modelrank.go
similarity index 91%
rename from modules/uniongve/modelrank.go
rename to modules/guildgve/modelrank.go
index efc8b8c61..f20b4be27 100644
--- a/modules/uniongve/modelrank.go
+++ b/modules/guildgve/modelrank.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"context"
@@ -18,15 +18,15 @@ import (
type modelRank struct {
modules.MCompModel
- module *UnionGve
+ module *GuildGve
conflock sync.RWMutex
- bossconf *pb.DBUnionGveBossConf
+ bossconf *pb.DBGuildGveBossConf
}
func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompModel.Init(service, module, comp, options)
this.TableName = comm.TableUnionrank
- this.module = module.(*UnionGve)
+ this.module = module.(*GuildGve)
return
}
@@ -52,7 +52,7 @@ func (this *modelRank) queryRankUser() (ranks []string, err error) {
}
// 更新排名
-func (this *modelRank) updateRank(guilds ...*pb.DBUnionGve) (err error) {
+func (this *modelRank) updateRank(guilds ...*pb.DBGuildGve) (err error) {
var (
pipe *pipe.RedisPipe = this.DBModel.Redis.RedisPipe(context.TODO())
menbers []*redis.Z
@@ -66,13 +66,13 @@ func (this *modelRank) updateRank(guilds ...*pb.DBUnionGve) (err error) {
start := time.Unix(v.Lastkilltime, 0)
seconds := endtime.Sub(start).Seconds()
Integral := float64(v.Kills)*float64(10000000000) + seconds
- menbers[i] = &redis.Z{Score: Integral, Member: v.Unionid}
+ menbers[i] = &redis.Z{Score: Integral, Member: v.Guildid}
}
if cmd = pipe.ZAdd(this.TableName, menbers...); err != nil {
this.module.Errorln(err)
}
for i, v := range guilds {
- menbersCmd[i] = pipe.ZRevRank(this.TableName, v.Unionid)
+ menbersCmd[i] = pipe.ZRevRank(this.TableName, v.Guildid)
}
if _, err = pipe.Exec(); err != nil {
this.module.Errorln(err)
diff --git a/modules/uniongve/module.go b/modules/guildgve/module.go
similarity index 75%
rename from modules/uniongve/module.go
rename to modules/guildgve/module.go
index e4d57b141..b06432c2b 100644
--- a/modules/uniongve/module.go
+++ b/modules/guildgve/module.go
@@ -1,4 +1,4 @@
-package uniongve
+package guildgve
import (
"context"
@@ -9,35 +9,36 @@ import (
)
func NewModule() core.IModule {
- m := new(UnionGve)
+ m := new(GuildGve)
return m
}
-type UnionGve struct {
+type GuildGve struct {
modules.ModuleBase
service comm.IService
sociaty comm.ISociaty
mail comm.Imail
battle comm.IBattle
api *apiComp
- modelUniongve *ModelUniongve
+ modelGuildGve *ModelUniongve
modelUnionroulette *ModelUnionroulette
+ modelGuildMember *ModelGuildMember
modelRank *modelRank
configure *MCompConfigure
}
// 模块名
-func (this *UnionGve) GetType() core.M_Modules {
- return comm.ModuleUnionGve
+func (this *GuildGve) GetType() core.M_Modules {
+ return comm.ModuleGuildGve
}
// 模块初始化接口 注册用户创建角色事件
-func (this *UnionGve) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
+func (this *GuildGve) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options)
this.service = service.(comm.IService)
return
}
-func (this *UnionGve) Start() (err error) {
+func (this *GuildGve) Start() (err error) {
err = this.ModuleBase.Start()
var module core.IModule
if module, err = this.service.GetModule(comm.ModuleSociaty); err != nil {
@@ -57,17 +58,18 @@ func (this *UnionGve) Start() (err error) {
}
// 装备组件
-func (this *UnionGve) OnInstallComp() {
+func (this *GuildGve) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
this.configure = this.RegisterComp(new(MCompConfigure)).(*MCompConfigure)
- this.modelUniongve = this.RegisterComp(new(ModelUniongve)).(*ModelUniongve)
+ this.modelGuildGve = this.RegisterComp(new(ModelUniongve)).(*ModelUniongve)
+ this.modelGuildMember = this.RegisterComp(new(ModelGuildMember)).(*ModelGuildMember)
this.modelUnionroulette = this.RegisterComp(new(ModelUnionroulette)).(*ModelUnionroulette)
this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank)
}
// 工会Boos战结算通知
-func (this *UnionGve) Rpc_ModuleGuildBossSettlement(ctx context.Context, req *pb.EmptyReq, resp interface{}) (err error) {
+func (this *GuildGve) Rpc_ModuleGuildBossSettlement(ctx context.Context, req *pb.EmptyReq, resp interface{}) (err error) {
this.Debug("Rpc_ModuleGuildBossSettlement 工会Boos战结算通知 !")
this.modelRank.raceSettlement()
return
diff --git a/modules/sociaty/model_sociaty.go b/modules/sociaty/model_sociaty.go
index 4fe2935dc..42a9b8fee 100644
--- a/modules/sociaty/model_sociaty.go
+++ b/modules/sociaty/model_sociaty.go
@@ -663,7 +663,7 @@ func (this *ModelSociaty) extendJob(srcMasterId string, sociaty *pb.DBSociaty) e
// 选举新会长
func (this *ModelSociaty) electNewMaster(srcMasterId string, sociaty *pb.DBSociaty) error {
- vpIds := []*pb.SociatyMember{} // 副会长
+ vpIds := []*pb.SociatyMember{} //副会长
aIds := []*pb.SociatyMember{} //管理员
mIds := []*pb.SociatyMember{} //普通成员
diff --git a/modules/tools/comp_configure.go b/modules/tools/comp_configure.go
index 0b04731c6..0caf6d86b 100644
--- a/modules/tools/comp_configure.go
+++ b/modules/tools/comp_configure.go
@@ -37,6 +37,7 @@ const (
// /配置管理基础组件
type MCompConfigure struct {
cbase.ModuleCompBase
+ module *Tools
hlock sync.RWMutex
_dropMap map[int32][]*cfg.GameDropData // 掉落表 key 是DiropId
_sign map[int32]*cfg.GameSignData
@@ -60,6 +61,7 @@ type MCompConfigure struct {
// 组件初始化接口
func (this *MCompConfigure) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.ModuleCompBase.Init(service, module, comp, options)
+ this.module = module.(*Tools)
err = this.LoadConfigure(game_global, cfg.NewGameGlobal)
err = this.LoadConfigure(game_initial, cfg.NewGameInitial)
err = this.LoadConfigure(new_hero, cfg.NewGameHero)
@@ -402,17 +404,17 @@ func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.GamePlayerlvData)
}
// 玩家等级经验配置表
-func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.GamePlayerlvData) {
- if v, err := this.GetConfigure(game_playerlv); err != nil {
+func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.GamePlayerlvData, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+ if v, err = this.GetConfigure(game_playerlv); err != nil {
return
} else {
- if configure, ok := v.(*cfg.GamePlayerlv); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_playerlv", v)
+ if data, ok = v.(*cfg.GamePlayerlv).GetDataMap()[lv]; !ok {
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_playerlv, lv)
return
- } else {
- if configure != nil {
- data = configure.GetDataMap()[lv]
- }
}
}
return
diff --git a/modules/tools/module.go b/modules/tools/module.go
index 8070a85da..140e40c67 100644
--- a/modules/tools/module.go
+++ b/modules/tools/module.go
@@ -1,9 +1,11 @@
package tools
import (
+ "fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
+ "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
@@ -67,6 +69,29 @@ func (this *Tools) GetGroupDataByLotteryId(id int32) (data *cfg.GameLotteryData,
func (this *Tools) GetGlobalConf() *cfg.GameGlobalData {
return this.configure.GetGlobalConf()
}
+func (this *Tools) GetPlayerlvConf(uid string) (conf *cfg.GamePlayerlvData, errdata *pb.ErrorData) {
+ var (
+ user *pb.DBUser
+ err error
+ )
+ if user = this.ModuleUser.GetUser(uid); user != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: fmt.Sprintf("found user:%s", uid),
+ }
+ return
+ }
+ if conf, err = this.configure.GetPlayerlvConf(user.Lv); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+ return
+}
func (this *Tools) GetPriceGroupCost(pricegroupId int32, purchase int32) (res []*cfg.Gameatn, err error) {
return this.configure.GetPriceGroupCost(pricegroupId, purchase)
diff --git a/modules/uniongve/api_info.go b/modules/uniongve/api_info.go
deleted file mode 100644
index a30471266..000000000
--- a/modules/uniongve/api_info.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package uniongve
-
-import (
- "go_dreamfactory/comm"
- "go_dreamfactory/lego/sys/log"
- "go_dreamfactory/pb"
-)
-
-// 参数校验
-func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.UniongveInfoReq) (errdata *pb.ErrorData) {
-
- return
-}
-
-// 获取工会boos战信息
-func (this *apiComp) Info(session comm.IUserSession, req *pb.UniongveInfoReq) (errdata *pb.ErrorData) {
- var (
- info *pb.DBUnionGve
- err error
- )
- if errdata = this.InfoCheck(session, req); errdata != nil {
- return
- }
- lock, _ := this.module.modelUniongve.userlock(req.Unionid)
- err = lock.Lock()
- if err != nil {
- this.module.Error("公会战分布式锁 err!", log.Field{Key: "Unionid", Value: req.Unionid}, log.Field{Key: "err", Value: err.Error()})
- return
- }
- defer lock.Unlock()
- if info, err = this.module.modelUniongve.getUnionGve(req.Unionid); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_DBError,
- Title: pb.ErrorCode_DBError.ToString(),
- Message: err.Error(),
- }
- return
- }
- session.SendMsg(string(this.module.GetType()), "info", &pb.UniongveInfoResp{Info: info})
- return
-}
diff --git a/pb/guildgve_db.pb.go b/pb/guildgve_db.pb.go
new file mode 100644
index 000000000..dc77c9699
--- /dev/null
+++ b/pb/guildgve_db.pb.go
@@ -0,0 +1,733 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.28.0
+// protoc v3.20.0
+// source: guildgve/guildgve_db.proto
+
+package pb
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+//工会boos战 全局配置数据
+type DBGuildGveBossConf struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key" bson:"_id"` //唯一ID
+ Rtime int64 `protobuf:"varint,2,opt,name=rtime,proto3" json:"rtime"` //刷新时间
+ Boos []int32 `protobuf:"varint,3,rep,packed,name=boos,proto3" json:"boos"` //boosid
+}
+
+func (x *DBGuildGveBossConf) Reset() {
+ *x = DBGuildGveBossConf{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBGuildGveBossConf) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGuildGveBossConf) ProtoMessage() {}
+
+func (x *DBGuildGveBossConf) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[0]
+ 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 DBGuildGveBossConf.ProtoReflect.Descriptor instead.
+func (*DBGuildGveBossConf) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *DBGuildGveBossConf) GetKey() string {
+ if x != nil {
+ return x.Key
+ }
+ return ""
+}
+
+func (x *DBGuildGveBossConf) GetRtime() int64 {
+ if x != nil {
+ return x.Rtime
+ }
+ return 0
+}
+
+func (x *DBGuildGveBossConf) GetBoos() []int32 {
+ if x != nil {
+ return x.Boos
+ }
+ return nil
+}
+
+//工会战Boos
+type DBGuildGve struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid" bson:"_id"`
+ Notice string `protobuf:"bytes,2,opt,name=notice,proto3" json:"notice"` //公告
+ Fire int32 `protobuf:"varint,3,opt,name=fire,proto3" json:"fire"` //火力
+ Currstage int32 `protobuf:"varint,4,opt,name=currstage,proto3" json:"currstage"` //当前第几阶段
+ Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"` //刷新时间
+ Kills int32 `protobuf:"varint,6,opt,name=kills,proto3" json:"kills"` //击杀数
+ Lastkilltime int64 `protobuf:"varint,7,opt,name=lastkilltime,proto3" json:"lastkilltime"` //最后击杀时间
+ Rank int32 `protobuf:"varint,8,opt,name=rank,proto3" json:"rank"` //排名
+ Boos []*DBGuildGveBoss `protobuf:"bytes,9,rep,name=boos,proto3" json:"boos"` //boos列表
+}
+
+func (x *DBGuildGve) Reset() {
+ *x = DBGuildGve{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBGuildGve) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGuildGve) ProtoMessage() {}
+
+func (x *DBGuildGve) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_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 DBGuildGve.ProtoReflect.Descriptor instead.
+func (*DBGuildGve) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *DBGuildGve) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+func (x *DBGuildGve) GetNotice() string {
+ if x != nil {
+ return x.Notice
+ }
+ return ""
+}
+
+func (x *DBGuildGve) GetFire() int32 {
+ if x != nil {
+ return x.Fire
+ }
+ return 0
+}
+
+func (x *DBGuildGve) GetCurrstage() int32 {
+ if x != nil {
+ return x.Currstage
+ }
+ return 0
+}
+
+func (x *DBGuildGve) GetRtime() int64 {
+ if x != nil {
+ return x.Rtime
+ }
+ return 0
+}
+
+func (x *DBGuildGve) GetKills() int32 {
+ if x != nil {
+ return x.Kills
+ }
+ return 0
+}
+
+func (x *DBGuildGve) GetLastkilltime() int64 {
+ if x != nil {
+ return x.Lastkilltime
+ }
+ return 0
+}
+
+func (x *DBGuildGve) GetRank() int32 {
+ if x != nil {
+ return x.Rank
+ }
+ return 0
+}
+
+func (x *DBGuildGve) GetBoos() []*DBGuildGveBoss {
+ if x != nil {
+ return x.Boos
+ }
+ return nil
+}
+
+//工会成员信息
+type DBGuildMember struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`
+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id
+ Guild string `protobuf:"bytes,3,opt,name=guild,proto3" json:"guild"` //工会id
+ Boosticket int32 `protobuf:"varint,4,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
+ Refreshtime int64 `protobuf:"varint,5,opt,name=refreshtime,proto3" json:"refreshtime"` //门票刷新时间
+}
+
+func (x *DBGuildMember) Reset() {
+ *x = DBGuildMember{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBGuildMember) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGuildMember) ProtoMessage() {}
+
+func (x *DBGuildMember) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[2]
+ 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 DBGuildMember.ProtoReflect.Descriptor instead.
+func (*DBGuildMember) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *DBGuildMember) GetId() string {
+ if x != nil {
+ return x.Id
+ }
+ return ""
+}
+
+func (x *DBGuildMember) GetUid() string {
+ if x != nil {
+ return x.Uid
+ }
+ return ""
+}
+
+func (x *DBGuildMember) GetGuild() string {
+ if x != nil {
+ return x.Guild
+ }
+ return ""
+}
+
+func (x *DBGuildMember) GetBoosticket() int32 {
+ if x != nil {
+ return x.Boosticket
+ }
+ return 0
+}
+
+func (x *DBGuildMember) GetRefreshtime() int64 {
+ if x != nil {
+ return x.Refreshtime
+ }
+ return 0
+}
+
+//工会轮盘记录
+type DBGuildRouletteRecord struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"` //工会id
+ Roulette []*DBGveRouletteRecord `protobuf:"bytes,7,rep,name=roulette,proto3" json:"roulette"` //轮盘记录
+}
+
+func (x *DBGuildRouletteRecord) Reset() {
+ *x = DBGuildRouletteRecord{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBGuildRouletteRecord) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGuildRouletteRecord) ProtoMessage() {}
+
+func (x *DBGuildRouletteRecord) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[3]
+ 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 DBGuildRouletteRecord.ProtoReflect.Descriptor instead.
+func (*DBGuildRouletteRecord) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *DBGuildRouletteRecord) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+func (x *DBGuildRouletteRecord) GetRoulette() []*DBGveRouletteRecord {
+ if x != nil {
+ return x.Roulette
+ }
+ return nil
+}
+
+//工会boos
+type DBGuildGveBoss struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"`
+ Hp int32 `protobuf:"varint,2,opt,name=hp,proto3" json:"hp"`
+ Record []*DBGveRecord `protobuf:"bytes,3,rep,name=record,proto3" json:"record"`
+}
+
+func (x *DBGuildGveBoss) Reset() {
+ *x = DBGuildGveBoss{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBGuildGveBoss) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGuildGveBoss) ProtoMessage() {}
+
+func (x *DBGuildGveBoss) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[4]
+ 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 DBGuildGveBoss.ProtoReflect.Descriptor instead.
+func (*DBGuildGveBoss) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *DBGuildGveBoss) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *DBGuildGveBoss) GetHp() int32 {
+ if x != nil {
+ return x.Hp
+ }
+ return 0
+}
+
+func (x *DBGuildGveBoss) GetRecord() []*DBGveRecord {
+ if x != nil {
+ return x.Record
+ }
+ return nil
+}
+
+//战斗记录
+type DBGveRecord struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //uid
+ Formation []string `protobuf:"bytes,2,rep,name=formation,proto3" json:"formation"` //阵型
+ Rating int32 `protobuf:"varint,3,opt,name=rating,proto3" json:"rating"` //评级
+ Harm int32 `protobuf:"varint,4,opt,name=harm,proto3" json:"harm"` //伤害血量
+}
+
+func (x *DBGveRecord) Reset() {
+ *x = DBGveRecord{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBGveRecord) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGveRecord) ProtoMessage() {}
+
+func (x *DBGveRecord) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[5]
+ 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 DBGveRecord.ProtoReflect.Descriptor instead.
+func (*DBGveRecord) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *DBGveRecord) GetUid() string {
+ if x != nil {
+ return x.Uid
+ }
+ return ""
+}
+
+func (x *DBGveRecord) GetFormation() []string {
+ if x != nil {
+ return x.Formation
+ }
+ return nil
+}
+
+func (x *DBGveRecord) GetRating() int32 {
+ if x != nil {
+ return x.Rating
+ }
+ return 0
+}
+
+func (x *DBGveRecord) GetHarm() int32 {
+ if x != nil {
+ return x.Harm
+ }
+ return 0
+}
+
+type DBGveRouletteRecord struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+ Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
+}
+
+func (x *DBGveRouletteRecord) Reset() {
+ *x = DBGveRouletteRecord{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBGveRouletteRecord) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGveRouletteRecord) ProtoMessage() {}
+
+func (x *DBGveRouletteRecord) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_db_proto_msgTypes[6]
+ 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 DBGveRouletteRecord.ProtoReflect.Descriptor instead.
+func (*DBGveRouletteRecord) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *DBGveRouletteRecord) GetUid() string {
+ if x != nil {
+ return x.Uid
+ }
+ return ""
+}
+
+func (x *DBGveRouletteRecord) GetAward() []*UserAssets {
+ if x != nil {
+ return x.Award
+ }
+ return nil
+}
+
+var File_guildgve_guildgve_db_proto protoreflect.FileDescriptor
+
+var file_guildgve_guildgve_db_proto_rawDesc = []byte{
+ 0x0a, 0x1a, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x2f, 0x67, 0x75, 0x69, 0x6c, 0x64,
+ 0x67, 0x76, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f,
+ 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x50, 0x0a, 0x12, 0x44, 0x42, 0x47, 0x75,
+ 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x12, 0x10,
+ 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
+ 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+ 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x03,
+ 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x22, 0xf9, 0x01, 0x0a, 0x0a, 0x44,
+ 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69,
+ 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c,
+ 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66,
+ 0x69, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x69, 0x72, 0x65, 0x12,
+ 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x72, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x09, 0x63, 0x75, 0x72, 0x72, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a,
+ 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74,
+ 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6b, 0x69, 0x6c, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x05, 0x6b, 0x69, 0x6c, 0x6c, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73,
+ 0x74, 0x6b, 0x69, 0x6c, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52,
+ 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6b, 0x69, 0x6c, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a,
+ 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e,
+ 0x6b, 0x12, 0x23, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x0f, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x73, 0x73,
+ 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x22, 0x89, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x47, 0x75, 0x69,
+ 0x6c, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 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, 0x14, 0x0a, 0x05, 0x67, 0x75,
+ 0x69, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x75, 0x69, 0x6c, 0x64,
+ 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+ 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x18,
+ 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69,
+ 0x6d, 0x65, 0x22, 0x63, 0x0a, 0x15, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x6f, 0x75,
+ 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75,
+ 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x30, 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74,
+ 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52,
+ 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x08, 0x72,
+ 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x22, 0x5e, 0x0a, 0x0e, 0x44, 0x42, 0x47, 0x75, 0x69,
+ 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f,
+ 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69,
+ 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68,
+ 0x70, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52,
+ 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x69, 0x0a, 0x0b, 0x44, 0x42, 0x47, 0x76, 0x65,
+ 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d,
+ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x6f, 0x72,
+ 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x12,
+ 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x61,
+ 0x72, 0x6d, 0x22, 0x4a, 0x0a, 0x13, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65,
+ 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 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, 0x42, 0x06,
+ 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_guildgve_guildgve_db_proto_rawDescOnce sync.Once
+ file_guildgve_guildgve_db_proto_rawDescData = file_guildgve_guildgve_db_proto_rawDesc
+)
+
+func file_guildgve_guildgve_db_proto_rawDescGZIP() []byte {
+ file_guildgve_guildgve_db_proto_rawDescOnce.Do(func() {
+ file_guildgve_guildgve_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_guildgve_guildgve_db_proto_rawDescData)
+ })
+ return file_guildgve_guildgve_db_proto_rawDescData
+}
+
+var file_guildgve_guildgve_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_guildgve_guildgve_db_proto_goTypes = []interface{}{
+ (*DBGuildGveBossConf)(nil), // 0: DBGuildGveBossConf
+ (*DBGuildGve)(nil), // 1: DBGuildGve
+ (*DBGuildMember)(nil), // 2: DBGuildMember
+ (*DBGuildRouletteRecord)(nil), // 3: DBGuildRouletteRecord
+ (*DBGuildGveBoss)(nil), // 4: DBGuildGveBoss
+ (*DBGveRecord)(nil), // 5: DBGveRecord
+ (*DBGveRouletteRecord)(nil), // 6: DBGveRouletteRecord
+ (*UserAssets)(nil), // 7: UserAssets
+}
+var file_guildgve_guildgve_db_proto_depIdxs = []int32{
+ 4, // 0: DBGuildGve.boos:type_name -> DBGuildGveBoss
+ 6, // 1: DBGuildRouletteRecord.roulette:type_name -> DBGveRouletteRecord
+ 5, // 2: DBGuildGveBoss.record:type_name -> DBGveRecord
+ 7, // 3: DBGveRouletteRecord.award:type_name -> UserAssets
+ 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_guildgve_guildgve_db_proto_init() }
+func file_guildgve_guildgve_db_proto_init() {
+ if File_guildgve_guildgve_db_proto != nil {
+ return
+ }
+ file_comm_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_guildgve_guildgve_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBGuildGveBossConf); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBGuildGve); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBGuildMember); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBGuildRouletteRecord); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBGuildGveBoss); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBGveRecord); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBGveRouletteRecord); 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{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_guildgve_guildgve_db_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 7,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_guildgve_guildgve_db_proto_goTypes,
+ DependencyIndexes: file_guildgve_guildgve_db_proto_depIdxs,
+ MessageInfos: file_guildgve_guildgve_db_proto_msgTypes,
+ }.Build()
+ File_guildgve_guildgve_db_proto = out.File
+ file_guildgve_guildgve_db_proto_rawDesc = nil
+ file_guildgve_guildgve_db_proto_goTypes = nil
+ file_guildgve_guildgve_db_proto_depIdxs = nil
+}
diff --git a/pb/guildgve_msg.pb.go b/pb/guildgve_msg.pb.go
new file mode 100644
index 000000000..5c21d7f5c
--- /dev/null
+++ b/pb/guildgve_msg.pb.go
@@ -0,0 +1,1362 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.28.0
+// protoc v3.20.0
+// source: guildgve/guildgve_msg.proto
+
+package pb
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+//工会boos战斗 信息请求
+type GuildGveInfoReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+}
+
+func (x *GuildGveInfoReq) Reset() {
+ *x = GuildGveInfoReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveInfoReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveInfoReq) ProtoMessage() {}
+
+func (x *GuildGveInfoReq) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[0]
+ 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 GuildGveInfoReq.ProtoReflect.Descriptor instead.
+func (*GuildGveInfoReq) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *GuildGveInfoReq) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+type GuildGveInfoResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Info *DBGuildGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+ Boosticket int32 `protobuf:"varint,2,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
+}
+
+func (x *GuildGveInfoResp) Reset() {
+ *x = GuildGveInfoResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveInfoResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveInfoResp) ProtoMessage() {}
+
+func (x *GuildGveInfoResp) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_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 GuildGveInfoResp.ProtoReflect.Descriptor instead.
+func (*GuildGveInfoResp) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *GuildGveInfoResp) GetInfo() *DBGuildGve {
+ if x != nil {
+ return x.Info
+ }
+ return nil
+}
+
+func (x *GuildGveInfoResp) GetBoosticket() int32 {
+ if x != nil {
+ return x.Boosticket
+ }
+ return 0
+}
+
+//集火设置
+type GuildGveSetFireReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
+ Notice string `protobuf:"bytes,3,opt,name=notice,proto3" json:"notice"`
+}
+
+func (x *GuildGveSetFireReq) Reset() {
+ *x = GuildGveSetFireReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveSetFireReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveSetFireReq) ProtoMessage() {}
+
+func (x *GuildGveSetFireReq) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[2]
+ 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 GuildGveSetFireReq.ProtoReflect.Descriptor instead.
+func (*GuildGveSetFireReq) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *GuildGveSetFireReq) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+func (x *GuildGveSetFireReq) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *GuildGveSetFireReq) GetNotice() string {
+ if x != nil {
+ return x.Notice
+ }
+ return ""
+}
+
+//集火设置 回应
+type GuildGveSetFireResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *GuildGveSetFireResp) Reset() {
+ *x = GuildGveSetFireResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveSetFireResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveSetFireResp) ProtoMessage() {}
+
+func (x *GuildGveSetFireResp) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[3]
+ 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 GuildGveSetFireResp.ProtoReflect.Descriptor instead.
+func (*GuildGveSetFireResp) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{3}
+}
+
+//排行榜请求
+type GuildGveRankReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+}
+
+func (x *GuildGveRankReq) Reset() {
+ *x = GuildGveRankReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveRankReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveRankReq) ProtoMessage() {}
+
+func (x *GuildGveRankReq) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[4]
+ 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 GuildGveRankReq.ProtoReflect.Descriptor instead.
+func (*GuildGveRankReq) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *GuildGveRankReq) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+//工会排名对象
+type GuildGveRankItem struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
+ Rank int32 `protobuf:"varint,3,opt,name=rank,proto3" json:"rank"`
+}
+
+func (x *GuildGveRankItem) Reset() {
+ *x = GuildGveRankItem{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveRankItem) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveRankItem) ProtoMessage() {}
+
+func (x *GuildGveRankItem) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[5]
+ 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 GuildGveRankItem.ProtoReflect.Descriptor instead.
+func (*GuildGveRankItem) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *GuildGveRankItem) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+func (x *GuildGveRankItem) GetName() string {
+ if x != nil {
+ return x.Name
+ }
+ return ""
+}
+
+func (x *GuildGveRankItem) GetRank() int32 {
+ if x != nil {
+ return x.Rank
+ }
+ return 0
+}
+
+//排行榜请求
+type GuildGveRankResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ List []*GuildGveRankItem `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+}
+
+func (x *GuildGveRankResp) Reset() {
+ *x = GuildGveRankResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveRankResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveRankResp) ProtoMessage() {}
+
+func (x *GuildGveRankResp) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[6]
+ 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 GuildGveRankResp.ProtoReflect.Descriptor instead.
+func (*GuildGveRankResp) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *GuildGveRankResp) GetList() []*GuildGveRankItem {
+ if x != nil {
+ return x.List
+ }
+ return nil
+}
+
+//工会轮盘
+type GuildGveRouletteReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+}
+
+func (x *GuildGveRouletteReq) Reset() {
+ *x = GuildGveRouletteReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[7]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveRouletteReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveRouletteReq) ProtoMessage() {}
+
+func (x *GuildGveRouletteReq) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[7]
+ 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 GuildGveRouletteReq.ProtoReflect.Descriptor instead.
+func (*GuildGveRouletteReq) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *GuildGveRouletteReq) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+//工会轮盘
+type GuildGveRouletteResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Cid int32 `protobuf:"varint,1,opt,name=cid,proto3" json:"cid"`
+ Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
+}
+
+func (x *GuildGveRouletteResp) Reset() {
+ *x = GuildGveRouletteResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[8]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveRouletteResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveRouletteResp) ProtoMessage() {}
+
+func (x *GuildGveRouletteResp) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[8]
+ 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 GuildGveRouletteResp.ProtoReflect.Descriptor instead.
+func (*GuildGveRouletteResp) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *GuildGveRouletteResp) GetCid() int32 {
+ if x != nil {
+ return x.Cid
+ }
+ return 0
+}
+
+func (x *GuildGveRouletteResp) GetAward() []*UserAssets {
+ if x != nil {
+ return x.Award
+ }
+ return nil
+}
+
+//挑战请求
+type GuildGveChallengeReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
+ Battle *BattleFormation `protobuf:"bytes,3,opt,name=battle,proto3" json:"battle"` //战斗类型
+}
+
+func (x *GuildGveChallengeReq) Reset() {
+ *x = GuildGveChallengeReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[9]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveChallengeReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveChallengeReq) ProtoMessage() {}
+
+func (x *GuildGveChallengeReq) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[9]
+ 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 GuildGveChallengeReq.ProtoReflect.Descriptor instead.
+func (*GuildGveChallengeReq) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *GuildGveChallengeReq) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+func (x *GuildGveChallengeReq) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *GuildGveChallengeReq) GetBattle() *BattleFormation {
+ if x != nil {
+ return x.Battle
+ }
+ return nil
+}
+
+//挑战回应
+type GuildGveChallengeResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
+ Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"` //战斗信息
+ Boosticket int32 `protobuf:"varint,4,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
+}
+
+func (x *GuildGveChallengeResp) Reset() {
+ *x = GuildGveChallengeResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[10]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveChallengeResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveChallengeResp) ProtoMessage() {}
+
+func (x *GuildGveChallengeResp) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[10]
+ 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 GuildGveChallengeResp.ProtoReflect.Descriptor instead.
+func (*GuildGveChallengeResp) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *GuildGveChallengeResp) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+func (x *GuildGveChallengeResp) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *GuildGveChallengeResp) GetInfo() *BattleInfo {
+ if x != nil {
+ return x.Info
+ }
+ return nil
+}
+
+func (x *GuildGveChallengeResp) GetBoosticket() int32 {
+ if x != nil {
+ return x.Boosticket
+ }
+ return 0
+}
+
+//战斗 完成请求
+type GuildGveChallengeFinishReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
+ Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报
+}
+
+func (x *GuildGveChallengeFinishReq) Reset() {
+ *x = GuildGveChallengeFinishReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[11]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveChallengeFinishReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveChallengeFinishReq) ProtoMessage() {}
+
+func (x *GuildGveChallengeFinishReq) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[11]
+ 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 GuildGveChallengeFinishReq.ProtoReflect.Descriptor instead.
+func (*GuildGveChallengeFinishReq) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *GuildGveChallengeFinishReq) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+func (x *GuildGveChallengeFinishReq) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *GuildGveChallengeFinishReq) GetReport() *BattleReport {
+ if x != nil {
+ return x.Report
+ }
+ return nil
+}
+
+//战斗 完成请求 回应
+type GuildGveChallengeFinishResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
+ Award []*UserAssets `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励
+ Efficient bool `protobuf:"varint,4,opt,name=efficient,proto3" json:"efficient"` //是否有效
+ Score int32 `protobuf:"varint,5,opt,name=score,proto3" json:"score"` //评级id
+ Boosticket int32 `protobuf:"varint,6,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
+}
+
+func (x *GuildGveChallengeFinishResp) Reset() {
+ *x = GuildGveChallengeFinishResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[12]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveChallengeFinishResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveChallengeFinishResp) ProtoMessage() {}
+
+func (x *GuildGveChallengeFinishResp) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[12]
+ 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 GuildGveChallengeFinishResp.ProtoReflect.Descriptor instead.
+func (*GuildGveChallengeFinishResp) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{12}
+}
+
+func (x *GuildGveChallengeFinishResp) GetGuildid() string {
+ if x != nil {
+ return x.Guildid
+ }
+ return ""
+}
+
+func (x *GuildGveChallengeFinishResp) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *GuildGveChallengeFinishResp) GetAward() []*UserAssets {
+ if x != nil {
+ return x.Award
+ }
+ return nil
+}
+
+func (x *GuildGveChallengeFinishResp) GetEfficient() bool {
+ if x != nil {
+ return x.Efficient
+ }
+ return false
+}
+
+func (x *GuildGveChallengeFinishResp) GetScore() int32 {
+ if x != nil {
+ return x.Score
+ }
+ return 0
+}
+
+func (x *GuildGveChallengeFinishResp) GetBoosticket() int32 {
+ if x != nil {
+ return x.Boosticket
+ }
+ return 0
+}
+
+//工会战 信息变化
+type GuildGveInfoChangePush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Info *DBGuildGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+}
+
+func (x *GuildGveInfoChangePush) Reset() {
+ *x = GuildGveInfoChangePush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[13]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveInfoChangePush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveInfoChangePush) ProtoMessage() {}
+
+func (x *GuildGveInfoChangePush) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[13]
+ 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 GuildGveInfoChangePush.ProtoReflect.Descriptor instead.
+func (*GuildGveInfoChangePush) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *GuildGveInfoChangePush) GetInfo() *DBGuildGve {
+ if x != nil {
+ return x.Info
+ }
+ return nil
+}
+
+//工会战 阶段变化
+type GuildGveStageChangePush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Info *DBGuildGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+}
+
+func (x *GuildGveStageChangePush) Reset() {
+ *x = GuildGveStageChangePush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[14]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveStageChangePush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveStageChangePush) ProtoMessage() {}
+
+func (x *GuildGveStageChangePush) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[14]
+ 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 GuildGveStageChangePush.ProtoReflect.Descriptor instead.
+func (*GuildGveStageChangePush) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{14}
+}
+
+func (x *GuildGveStageChangePush) GetInfo() *DBGuildGve {
+ if x != nil {
+ return x.Info
+ }
+ return nil
+}
+
+//工会战 bos变化
+type GuildGveBoosChangePush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Info *DBGuildGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+}
+
+func (x *GuildGveBoosChangePush) Reset() {
+ *x = GuildGveBoosChangePush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[15]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveBoosChangePush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveBoosChangePush) ProtoMessage() {}
+
+func (x *GuildGveBoosChangePush) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[15]
+ 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 GuildGveBoosChangePush.ProtoReflect.Descriptor instead.
+func (*GuildGveBoosChangePush) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *GuildGveBoosChangePush) GetInfo() *DBGuildGve {
+ if x != nil {
+ return x.Info
+ }
+ return nil
+}
+
+//工会战 轮盘变化推送
+type GuildGveRouletteChangePush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Record *DBGuildRouletteRecord `protobuf:"bytes,1,opt,name=record,proto3" json:"record"`
+}
+
+func (x *GuildGveRouletteChangePush) Reset() {
+ *x = GuildGveRouletteChangePush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_guildgve_guildgve_msg_proto_msgTypes[16]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GuildGveRouletteChangePush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GuildGveRouletteChangePush) ProtoMessage() {}
+
+func (x *GuildGveRouletteChangePush) ProtoReflect() protoreflect.Message {
+ mi := &file_guildgve_guildgve_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 GuildGveRouletteChangePush.ProtoReflect.Descriptor instead.
+func (*GuildGveRouletteChangePush) Descriptor() ([]byte, []int) {
+ return file_guildgve_guildgve_msg_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *GuildGveRouletteChangePush) GetRecord() *DBGuildRouletteRecord {
+ if x != nil {
+ return x.Record
+ }
+ return nil
+}
+
+var File_guildgve_guildgve_msg_proto protoreflect.FileDescriptor
+
+var file_guildgve_guildgve_msg_proto_rawDesc = []byte{
+ 0x0a, 0x1b, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x2f, 0x67, 0x75, 0x69, 0x6c, 0x64,
+ 0x67, 0x76, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x67,
+ 0x75, 0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x2f, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x67, 0x76, 0x65,
+ 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2b,
+ 0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
+ 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x53, 0x0a, 0x10, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12,
+ 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+ 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+ 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+ 0x22, 0x5e, 0x0a, 0x12, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46,
+ 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64,
+ 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69,
+ 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65,
+ 0x22, 0x15, 0x0a, 0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46,
+ 0x69, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64,
+ 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75,
+ 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69,
+ 0x6c, 0x64, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
+ 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c,
+ 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64,
+ 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x03,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x39, 0x0a, 0x10, 0x47, 0x75,
+ 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25,
+ 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52,
+ 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76,
+ 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
+ 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47,
+ 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
+ 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 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, 0x22, 0x72, 0x0a, 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43,
+ 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75,
+ 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 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, 0x8a, 0x01, 0x0a, 0x15, 0x47, 0x75, 0x69, 0x6c,
+ 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62,
+ 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f,
+ 0x73, 0x69, 0x64, 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, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b,
+ 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69,
+ 0x63, 0x6b, 0x65, 0x74, 0x22, 0x75, 0x0a, 0x1a, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
+ 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
+ 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
+ 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f,
+ 0x6f, 0x73, 0x69, 0x64, 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, 0xc6, 0x01, 0x0a, 0x1b,
+ 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+ 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75,
+ 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a,
+ 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 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, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x14,
+ 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
+ 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b,
+ 0x65, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69,
+ 0x63, 0x6b, 0x65, 0x74, 0x22, 0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
+ 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f,
+ 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44,
+ 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
+ 0x3a, 0x0a, 0x17, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x74, 0x61, 0x67, 0x65,
+ 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e,
+ 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69,
+ 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x39, 0x0a, 0x16, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67,
+ 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
+ 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4c, 0x0a, 0x1a, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47,
+ 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
+ 0x50, 0x75, 0x73, 0x68, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x6f,
+ 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65,
+ 0x63, 0x6f, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_guildgve_guildgve_msg_proto_rawDescOnce sync.Once
+ file_guildgve_guildgve_msg_proto_rawDescData = file_guildgve_guildgve_msg_proto_rawDesc
+)
+
+func file_guildgve_guildgve_msg_proto_rawDescGZIP() []byte {
+ file_guildgve_guildgve_msg_proto_rawDescOnce.Do(func() {
+ file_guildgve_guildgve_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_guildgve_guildgve_msg_proto_rawDescData)
+ })
+ return file_guildgve_guildgve_msg_proto_rawDescData
+}
+
+var file_guildgve_guildgve_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
+var file_guildgve_guildgve_msg_proto_goTypes = []interface{}{
+ (*GuildGveInfoReq)(nil), // 0: GuildGveInfoReq
+ (*GuildGveInfoResp)(nil), // 1: GuildGveInfoResp
+ (*GuildGveSetFireReq)(nil), // 2: GuildGveSetFireReq
+ (*GuildGveSetFireResp)(nil), // 3: GuildGveSetFireResp
+ (*GuildGveRankReq)(nil), // 4: GuildGveRankReq
+ (*GuildGveRankItem)(nil), // 5: GuildGveRankItem
+ (*GuildGveRankResp)(nil), // 6: GuildGveRankResp
+ (*GuildGveRouletteReq)(nil), // 7: GuildGveRouletteReq
+ (*GuildGveRouletteResp)(nil), // 8: GuildGveRouletteResp
+ (*GuildGveChallengeReq)(nil), // 9: GuildGveChallengeReq
+ (*GuildGveChallengeResp)(nil), // 10: GuildGveChallengeResp
+ (*GuildGveChallengeFinishReq)(nil), // 11: GuildGveChallengeFinishReq
+ (*GuildGveChallengeFinishResp)(nil), // 12: GuildGveChallengeFinishResp
+ (*GuildGveInfoChangePush)(nil), // 13: GuildGveInfoChangePush
+ (*GuildGveStageChangePush)(nil), // 14: GuildGveStageChangePush
+ (*GuildGveBoosChangePush)(nil), // 15: GuildGveBoosChangePush
+ (*GuildGveRouletteChangePush)(nil), // 16: GuildGveRouletteChangePush
+ (*DBGuildGve)(nil), // 17: DBGuildGve
+ (*UserAssets)(nil), // 18: UserAssets
+ (*BattleFormation)(nil), // 19: BattleFormation
+ (*BattleInfo)(nil), // 20: BattleInfo
+ (*BattleReport)(nil), // 21: BattleReport
+ (*DBGuildRouletteRecord)(nil), // 22: DBGuildRouletteRecord
+}
+var file_guildgve_guildgve_msg_proto_depIdxs = []int32{
+ 17, // 0: GuildGveInfoResp.info:type_name -> DBGuildGve
+ 5, // 1: GuildGveRankResp.list:type_name -> GuildGveRankItem
+ 18, // 2: GuildGveRouletteResp.award:type_name -> UserAssets
+ 19, // 3: GuildGveChallengeReq.battle:type_name -> BattleFormation
+ 20, // 4: GuildGveChallengeResp.info:type_name -> BattleInfo
+ 21, // 5: GuildGveChallengeFinishReq.report:type_name -> BattleReport
+ 18, // 6: GuildGveChallengeFinishResp.award:type_name -> UserAssets
+ 17, // 7: GuildGveInfoChangePush.info:type_name -> DBGuildGve
+ 17, // 8: GuildGveStageChangePush.info:type_name -> DBGuildGve
+ 17, // 9: GuildGveBoosChangePush.info:type_name -> DBGuildGve
+ 22, // 10: GuildGveRouletteChangePush.record:type_name -> DBGuildRouletteRecord
+ 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
+}
+
+func init() { file_guildgve_guildgve_msg_proto_init() }
+func file_guildgve_guildgve_msg_proto_init() {
+ if File_guildgve_guildgve_msg_proto != nil {
+ return
+ }
+ file_guildgve_guildgve_db_proto_init()
+ file_battle_battle_msg_proto_init()
+ file_comm_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_guildgve_guildgve_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveInfoReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveInfoResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveSetFireReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveSetFireResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveRankReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveRankItem); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveRankResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveRouletteReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveRouletteResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveChallengeReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveChallengeResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveChallengeFinishReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveChallengeFinishResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveInfoChangePush); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveStageChangePush); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveBoosChangePush); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_guildgve_guildgve_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GuildGveRouletteChangePush); 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{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_guildgve_guildgve_msg_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 17,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_guildgve_guildgve_msg_proto_goTypes,
+ DependencyIndexes: file_guildgve_guildgve_msg_proto_depIdxs,
+ MessageInfos: file_guildgve_guildgve_msg_proto_msgTypes,
+ }.Build()
+ File_guildgve_guildgve_msg_proto = out.File
+ file_guildgve_guildgve_msg_proto_rawDesc = nil
+ file_guildgve_guildgve_msg_proto_goTypes = nil
+ file_guildgve_guildgve_msg_proto_depIdxs = nil
+}
diff --git a/pb/sociaty_db.pb.go b/pb/sociaty_db.pb.go
index 1ee7eafa5..57d8bbf17 100644
--- a/pb/sociaty_db.pb.go
+++ b/pb/sociaty_db.pb.go
@@ -321,11 +321,10 @@ type SociatyMember struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //成员ID
- Job SociatyJob `protobuf:"varint,2,opt,name=job,proto3,enum=SociatyJob" json:"job" bson:"job"` //职位
- Ctime int64 `protobuf:"varint,3,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //入会时间
- Contribution int32 `protobuf:"varint,4,opt,name=contribution,proto3" json:"contribution" bson:"contribution"` //贡献值
- Teams map[int32]*ChallengeTeam `protobuf:"bytes,5,rep,name=teams,proto3" json:"teams" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"teams"` // 公会BOSS 队伍
+ Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //成员ID
+ Job SociatyJob `protobuf:"varint,2,opt,name=job,proto3,enum=SociatyJob" json:"job" bson:"job"` //职位
+ Ctime int64 `protobuf:"varint,3,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //入会时间
+ Contribution int32 `protobuf:"varint,4,opt,name=contribution,proto3" json:"contribution" bson:"contribution"` //贡献值
}
func (x *SociatyMember) Reset() {
@@ -388,13 +387,6 @@ func (x *SociatyMember) GetContribution() int32 {
return 0
}
-func (x *SociatyMember) GetTeams() map[int32]*ChallengeTeam {
- if x != nil {
- return x.Teams
- }
- return nil
-}
-
// 日志
type SociatyLog struct {
state protoimpl.MessageState
@@ -1220,116 +1212,108 @@ var file_sociaty_sociaty_db_proto_rawDesc = []byte{
0x35, 0x0a, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10,
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
- 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xf5, 0x01, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f,
- 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69,
- 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12,
- 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18,
- 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74,
- 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62,
- 0x65, 0x72, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74,
- 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 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, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54,
- 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3c,
- 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x12, 0x18, 0x0a, 0x07,
- 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63,
- 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x4d, 0x0a, 0x0c,
- 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x12, 0x1c, 0x0a, 0x09,
- 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69,
- 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0xc7, 0x01, 0x0a, 0x0d,
- 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x1c, 0x0a,
- 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
- 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x28, 0x0a,
- 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74,
- 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x34, 0x0a, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x76,
- 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
- 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52,
- 0x0c, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a,
- 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18,
- 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74,
- 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x7c, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x54, 0x61, 0x73, 0x6b, 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, 0x16, 0x0a, 0x06,
- 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74,
- 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64,
- 0x12, 0x21, 0x0a, 0x04, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
- 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x04, 0x63,
- 0x6f, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63,
- 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x83,
- 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b,
+ 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x7a, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d,
+ 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x22,
+ 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69,
+ 0x6f, 0x6e, 0x22, 0x3c, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67,
+ 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74,
+ 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65,
+ 0x22, 0x4d, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67,
0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x12,
- 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
- 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
- 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x04,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x14,
- 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63,
- 0x74, 0x69, 0x6d, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
- 0x65, 0x54, 0x65, 0x61, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72,
- 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49,
- 0x64, 0x22, 0x3f, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65,
- 0x61, 0x6d, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
- 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
- 0x6f, 0x6e, 0x22, 0x6b, 0x0a, 0x13, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
- 0x6f, 0x73, 0x73, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64,
- 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54,
- 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
- 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x73, 0x65, 0x74,
- 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75,
- 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x75, 0x69, 0x64, 0x73, 0x22,
- 0xdc, 0x01, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63,
- 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65,
- 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
- 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
- 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
- 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14,
- 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72,
- 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 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, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54,
- 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3f,
- 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 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, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
- 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22,
- 0xe1, 0x01, 0x0a, 0x13, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73,
- 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72,
- 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
- 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72,
- 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
- 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x67,
- 0x72, 0x61, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x03, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x65,
- 0x67, 0x72, 0x61, 0x6c, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
- 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x24, 0x0a,
- 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43,
- 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61,
- 0x73, 0x6b, 0x73, 0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f,
- 0x62, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06,
- 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x44, 0x4d, 0x49,
- 0x4e, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45, 0x50, 0x52, 0x45, 0x53, 0x49,
- 0x44, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52, 0x45, 0x53, 0x49, 0x44,
- 0x45, 0x4e, 0x54, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1f,
+ 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22,
+ 0xc7, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73,
+ 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12,
+ 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+ 0x64, 0x12, 0x28, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73,
+ 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x34, 0x0a, 0x0c, 0x61,
+ 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76,
+ 0x69, 0x74, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73,
+ 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54,
+ 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x55,
+ 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x7c, 0x0a, 0x0b, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 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, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65,
+ 0x69, 0x76, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65,
+ 0x69, 0x76, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73,
+ 0x73, 0x52, 0x04, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74,
+ 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74,
+ 0x75, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
+ 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
+ 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+ 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x6c,
+ 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a,
+ 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68,
+ 0x65, 0x72, 0x6f, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+ 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+ 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74,
+ 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72,
+ 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6b, 0x0a, 0x13, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73, 0x73, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x18, 0x0a,
+ 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07,
+ 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c,
+ 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+ 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12,
+ 0x12, 0x0a, 0x04, 0x75, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x75,
+ 0x69, 0x64, 0x73, 0x22, 0xdc, 0x01, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+ 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73,
+ 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+ 0x67, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e,
+ 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e,
+ 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69,
+ 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69,
+ 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d,
+ 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, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
+ 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+ 0x38, 0x01, 0x22, 0x3f, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54,
+ 0x61, 0x73, 0x6b, 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, 0x16, 0x0a, 0x06, 0x73,
+ 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61,
+ 0x74, 0x75, 0x73, 0x22, 0xe1, 0x01, 0x0a, 0x13, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
+ 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x72,
+ 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x43, 0x68,
+ 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72,
+ 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x69,
+ 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x03, 0x52, 0x09,
+ 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61,
+ 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+ 0x73, 0x12, 0x24, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b,
+ 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10, 0x00,
+ 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05,
+ 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45, 0x50,
+ 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52,
+ 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+ 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1345,7 +1329,7 @@ func file_sociaty_sociaty_db_proto_rawDescGZIP() []byte {
}
var file_sociaty_sociaty_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_sociaty_sociaty_db_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
+var file_sociaty_sociaty_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
var file_sociaty_sociaty_db_proto_goTypes = []interface{}{
(SociatyJob)(0), // 0: SociatyJob
(*DBSociaty)(nil), // 1: DBSociaty
@@ -1363,31 +1347,28 @@ var file_sociaty_sociaty_db_proto_goTypes = []interface{}{
(*ChallengeRecord)(nil), // 13: ChallengeRecord
(*ChallengeTask)(nil), // 14: ChallengeTask
(*DBSociatyBossRecord)(nil), // 15: DBSociatyBossRecord
- nil, // 16: SociatyMember.TeamsEntry
- nil, // 17: ChallengeRecord.TeamsEntry
- (*ConIProgress)(nil), // 18: ConIProgress
- (*BattleFormation)(nil), // 19: BattleFormation
+ nil, // 16: ChallengeRecord.TeamsEntry
+ (*ConIProgress)(nil), // 17: ConIProgress
+ (*BattleFormation)(nil), // 18: BattleFormation
}
var file_sociaty_sociaty_db_proto_depIdxs = []int32{
2, // 0: DBSociaty.applyRecord:type_name -> ApplyRecord
3, // 1: DBSociaty.members:type_name -> SociatyMember
0, // 2: SociatyMember.job:type_name -> SociatyJob
- 16, // 3: SociatyMember.teams:type_name -> SociatyMember.TeamsEntry
- 4, // 4: DBSociatyLog.list:type_name -> SociatyLog
- 7, // 5: DBSociatyTask.taskList:type_name -> SociatyTask
- 8, // 6: DBSociatyTask.activityList:type_name -> SociatyActivity
- 18, // 7: SociatyTask.cond:type_name -> ConIProgress
- 19, // 8: ChallengeTeam.formation:type_name -> BattleFormation
- 17, // 9: ChallengeRecord.teams:type_name -> ChallengeRecord.TeamsEntry
- 13, // 10: DBSociatyBossRecord.record:type_name -> ChallengeRecord
- 14, // 11: DBSociatyBossRecord.tasks:type_name -> ChallengeTask
- 11, // 12: SociatyMember.TeamsEntry.value:type_name -> ChallengeTeam
- 11, // 13: ChallengeRecord.TeamsEntry.value:type_name -> ChallengeTeam
- 14, // [14:14] is the sub-list for method output_type
- 14, // [14:14] is the sub-list for method input_type
- 14, // [14:14] is the sub-list for extension type_name
- 14, // [14:14] is the sub-list for extension extendee
- 0, // [0:14] is the sub-list for field type_name
+ 4, // 3: DBSociatyLog.list:type_name -> SociatyLog
+ 7, // 4: DBSociatyTask.taskList:type_name -> SociatyTask
+ 8, // 5: DBSociatyTask.activityList:type_name -> SociatyActivity
+ 17, // 6: SociatyTask.cond:type_name -> ConIProgress
+ 18, // 7: ChallengeTeam.formation:type_name -> BattleFormation
+ 16, // 8: ChallengeRecord.teams:type_name -> ChallengeRecord.TeamsEntry
+ 13, // 9: DBSociatyBossRecord.record:type_name -> ChallengeRecord
+ 14, // 10: DBSociatyBossRecord.tasks:type_name -> ChallengeTask
+ 11, // 11: ChallengeRecord.TeamsEntry.value:type_name -> ChallengeTeam
+ 12, // [12:12] is the sub-list for method output_type
+ 12, // [12:12] is the sub-list for method input_type
+ 12, // [12:12] is the sub-list for extension type_name
+ 12, // [12:12] is the sub-list for extension extendee
+ 0, // [0:12] is the sub-list for field type_name
}
func init() { file_sociaty_sociaty_db_proto_init() }
@@ -1585,7 +1566,7 @@ func file_sociaty_sociaty_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_sociaty_sociaty_db_proto_rawDesc,
NumEnums: 1,
- NumMessages: 17,
+ NumMessages: 16,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/uniongve_db.pb.go b/pb/uniongve_db.pb.go
deleted file mode 100644
index c5144b331..000000000
--- a/pb/uniongve_db.pb.go
+++ /dev/null
@@ -1,632 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// protoc-gen-go v1.28.0
-// protoc v3.20.0
-// source: uniongve/uniongve_db.proto
-
-package pb
-
-import (
- protoreflect "google.golang.org/protobuf/reflect/protoreflect"
- protoimpl "google.golang.org/protobuf/runtime/protoimpl"
- reflect "reflect"
- sync "sync"
-)
-
-const (
- // Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-//工会boos战 全局配置数据
-type DBUnionGveBossConf struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key" bson:"_id"` //唯一ID
- Rtime int64 `protobuf:"varint,2,opt,name=rtime,proto3" json:"rtime"` //刷新时间
- Boos []int32 `protobuf:"varint,3,rep,packed,name=boos,proto3" json:"boos"` //boosid
-}
-
-func (x *DBUnionGveBossConf) Reset() {
- *x = DBUnionGveBossConf{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[0]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBUnionGveBossConf) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBUnionGveBossConf) ProtoMessage() {}
-
-func (x *DBUnionGveBossConf) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[0]
- 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 DBUnionGveBossConf.ProtoReflect.Descriptor instead.
-func (*DBUnionGveBossConf) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_db_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *DBUnionGveBossConf) GetKey() string {
- if x != nil {
- return x.Key
- }
- return ""
-}
-
-func (x *DBUnionGveBossConf) GetRtime() int64 {
- if x != nil {
- return x.Rtime
- }
- return 0
-}
-
-func (x *DBUnionGveBossConf) GetBoos() []int32 {
- if x != nil {
- return x.Boos
- }
- return nil
-}
-
-//工会战Boos
-type DBUnionGve struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid" bson:"_id"` // 背包格子Id
- Notice string `protobuf:"bytes,2,opt,name=notice,proto3" json:"notice"` //公告
- Fire int32 `protobuf:"varint,3,opt,name=fire,proto3" json:"fire"` //火力
- Currstage int32 `protobuf:"varint,4,opt,name=currstage,proto3" json:"currstage"` //当前第几阶段
- Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"` //刷新时间
- Kills int32 `protobuf:"varint,6,opt,name=kills,proto3" json:"kills"` //击杀数
- Lastkilltime int64 `protobuf:"varint,7,opt,name=lastkilltime,proto3" json:"lastkilltime"` //最后击杀时间
- Rank int32 `protobuf:"varint,8,opt,name=rank,proto3" json:"rank"` //排名
- Boos []*DBUnionGveBoss `protobuf:"bytes,9,rep,name=boos,proto3" json:"boos"` //boos列表
-}
-
-func (x *DBUnionGve) Reset() {
- *x = DBUnionGve{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[1]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBUnionGve) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBUnionGve) ProtoMessage() {}
-
-func (x *DBUnionGve) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_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 DBUnionGve.ProtoReflect.Descriptor instead.
-func (*DBUnionGve) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_db_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *DBUnionGve) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-func (x *DBUnionGve) GetNotice() string {
- if x != nil {
- return x.Notice
- }
- return ""
-}
-
-func (x *DBUnionGve) GetFire() int32 {
- if x != nil {
- return x.Fire
- }
- return 0
-}
-
-func (x *DBUnionGve) GetCurrstage() int32 {
- if x != nil {
- return x.Currstage
- }
- return 0
-}
-
-func (x *DBUnionGve) GetRtime() int64 {
- if x != nil {
- return x.Rtime
- }
- return 0
-}
-
-func (x *DBUnionGve) GetKills() int32 {
- if x != nil {
- return x.Kills
- }
- return 0
-}
-
-func (x *DBUnionGve) GetLastkilltime() int64 {
- if x != nil {
- return x.Lastkilltime
- }
- return 0
-}
-
-func (x *DBUnionGve) GetRank() int32 {
- if x != nil {
- return x.Rank
- }
- return 0
-}
-
-func (x *DBUnionGve) GetBoos() []*DBUnionGveBoss {
- if x != nil {
- return x.Boos
- }
- return nil
-}
-
-//工会轮盘记录
-type DBUnionRouletteRecord struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"` //工会id
- Roulette []*DBGveRouletteRecord `protobuf:"bytes,7,rep,name=roulette,proto3" json:"roulette"` //轮盘记录
-}
-
-func (x *DBUnionRouletteRecord) Reset() {
- *x = DBUnionRouletteRecord{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[2]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBUnionRouletteRecord) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBUnionRouletteRecord) ProtoMessage() {}
-
-func (x *DBUnionRouletteRecord) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[2]
- 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 DBUnionRouletteRecord.ProtoReflect.Descriptor instead.
-func (*DBUnionRouletteRecord) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_db_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *DBUnionRouletteRecord) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-func (x *DBUnionRouletteRecord) GetRoulette() []*DBGveRouletteRecord {
- if x != nil {
- return x.Roulette
- }
- return nil
-}
-
-//工会boos
-type DBUnionGveBoss struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"`
- Hp int32 `protobuf:"varint,2,opt,name=hp,proto3" json:"hp"`
- Record []*DBGveRecord `protobuf:"bytes,3,rep,name=record,proto3" json:"record"`
-}
-
-func (x *DBUnionGveBoss) Reset() {
- *x = DBUnionGveBoss{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[3]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBUnionGveBoss) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBUnionGveBoss) ProtoMessage() {}
-
-func (x *DBUnionGveBoss) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[3]
- 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 DBUnionGveBoss.ProtoReflect.Descriptor instead.
-func (*DBUnionGveBoss) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_db_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *DBUnionGveBoss) GetBoosid() int32 {
- if x != nil {
- return x.Boosid
- }
- return 0
-}
-
-func (x *DBUnionGveBoss) GetHp() int32 {
- if x != nil {
- return x.Hp
- }
- return 0
-}
-
-func (x *DBUnionGveBoss) GetRecord() []*DBGveRecord {
- if x != nil {
- return x.Record
- }
- return nil
-}
-
-//战斗记录
-type DBGveRecord struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //uid
- Formation []string `protobuf:"bytes,2,rep,name=formation,proto3" json:"formation"` //阵型
- Rating int32 `protobuf:"varint,3,opt,name=rating,proto3" json:"rating"` //评级
- Harm int32 `protobuf:"varint,4,opt,name=harm,proto3" json:"harm"` //伤害血量
-}
-
-func (x *DBGveRecord) Reset() {
- *x = DBGveRecord{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[4]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBGveRecord) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBGveRecord) ProtoMessage() {}
-
-func (x *DBGveRecord) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[4]
- 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 DBGveRecord.ProtoReflect.Descriptor instead.
-func (*DBGveRecord) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_db_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *DBGveRecord) GetUid() string {
- if x != nil {
- return x.Uid
- }
- return ""
-}
-
-func (x *DBGveRecord) GetFormation() []string {
- if x != nil {
- return x.Formation
- }
- return nil
-}
-
-func (x *DBGveRecord) GetRating() int32 {
- if x != nil {
- return x.Rating
- }
- return 0
-}
-
-func (x *DBGveRecord) GetHarm() int32 {
- if x != nil {
- return x.Harm
- }
- return 0
-}
-
-type DBGveRouletteRecord struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
- Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
-}
-
-func (x *DBGveRouletteRecord) Reset() {
- *x = DBGveRouletteRecord{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[5]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBGveRouletteRecord) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBGveRouletteRecord) ProtoMessage() {}
-
-func (x *DBGveRouletteRecord) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_db_proto_msgTypes[5]
- 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 DBGveRouletteRecord.ProtoReflect.Descriptor instead.
-func (*DBGveRouletteRecord) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_db_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *DBGveRouletteRecord) GetUid() string {
- if x != nil {
- return x.Uid
- }
- return ""
-}
-
-func (x *DBGveRouletteRecord) GetAward() []*UserAssets {
- if x != nil {
- return x.Award
- }
- return nil
-}
-
-var File_uniongve_uniongve_db_proto protoreflect.FileDescriptor
-
-var file_uniongve_uniongve_db_proto_rawDesc = []byte{
- 0x0a, 0x1a, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x2f, 0x75, 0x6e, 0x69, 0x6f, 0x6e,
- 0x67, 0x76, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f,
- 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x50, 0x0a, 0x12, 0x44, 0x42, 0x55, 0x6e,
- 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x12, 0x10,
- 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
- 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
- 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x03,
- 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x22, 0xf9, 0x01, 0x0a, 0x0a, 0x44,
- 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69,
- 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f,
- 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66,
- 0x69, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x69, 0x72, 0x65, 0x12,
- 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x72, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x09, 0x63, 0x75, 0x72, 0x72, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a,
- 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74,
- 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6b, 0x69, 0x6c, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x6b, 0x69, 0x6c, 0x6c, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73,
- 0x74, 0x6b, 0x69, 0x6c, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52,
- 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6b, 0x69, 0x6c, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a,
- 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e,
- 0x6b, 0x12, 0x23, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0f, 0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x73, 0x73,
- 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x22, 0x63, 0x0a, 0x15, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f,
- 0x6e, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12,
- 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x30, 0x0a, 0x08, 0x72, 0x6f, 0x75,
- 0x6c, 0x65, 0x74, 0x74, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
- 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72,
- 0x64, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x22, 0x5e, 0x0a, 0x0e, 0x44,
- 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x12, 0x16, 0x0a,
- 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
- 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18,
- 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63,
- 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x69, 0x0a, 0x0b, 0x44,
- 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
- 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
- 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x61,
- 0x74, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x61, 0x74, 0x69,
- 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x22, 0x4a, 0x0a, 0x13, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52,
- 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a,
- 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x33,
-}
-
-var (
- file_uniongve_uniongve_db_proto_rawDescOnce sync.Once
- file_uniongve_uniongve_db_proto_rawDescData = file_uniongve_uniongve_db_proto_rawDesc
-)
-
-func file_uniongve_uniongve_db_proto_rawDescGZIP() []byte {
- file_uniongve_uniongve_db_proto_rawDescOnce.Do(func() {
- file_uniongve_uniongve_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_uniongve_uniongve_db_proto_rawDescData)
- })
- return file_uniongve_uniongve_db_proto_rawDescData
-}
-
-var file_uniongve_uniongve_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_uniongve_uniongve_db_proto_goTypes = []interface{}{
- (*DBUnionGveBossConf)(nil), // 0: DBUnionGveBossConf
- (*DBUnionGve)(nil), // 1: DBUnionGve
- (*DBUnionRouletteRecord)(nil), // 2: DBUnionRouletteRecord
- (*DBUnionGveBoss)(nil), // 3: DBUnionGveBoss
- (*DBGveRecord)(nil), // 4: DBGveRecord
- (*DBGveRouletteRecord)(nil), // 5: DBGveRouletteRecord
- (*UserAssets)(nil), // 6: UserAssets
-}
-var file_uniongve_uniongve_db_proto_depIdxs = []int32{
- 3, // 0: DBUnionGve.boos:type_name -> DBUnionGveBoss
- 5, // 1: DBUnionRouletteRecord.roulette:type_name -> DBGveRouletteRecord
- 4, // 2: DBUnionGveBoss.record:type_name -> DBGveRecord
- 6, // 3: DBGveRouletteRecord.award:type_name -> UserAssets
- 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_uniongve_uniongve_db_proto_init() }
-func file_uniongve_uniongve_db_proto_init() {
- if File_uniongve_uniongve_db_proto != nil {
- return
- }
- file_comm_proto_init()
- if !protoimpl.UnsafeEnabled {
- file_uniongve_uniongve_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBUnionGveBossConf); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBUnionGve); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBUnionRouletteRecord); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBUnionGveBoss); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBGveRecord); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBGveRouletteRecord); 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{
- File: protoimpl.DescBuilder{
- GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
- RawDescriptor: file_uniongve_uniongve_db_proto_rawDesc,
- NumEnums: 0,
- NumMessages: 6,
- NumExtensions: 0,
- NumServices: 0,
- },
- GoTypes: file_uniongve_uniongve_db_proto_goTypes,
- DependencyIndexes: file_uniongve_uniongve_db_proto_depIdxs,
- MessageInfos: file_uniongve_uniongve_db_proto_msgTypes,
- }.Build()
- File_uniongve_uniongve_db_proto = out.File
- file_uniongve_uniongve_db_proto_rawDesc = nil
- file_uniongve_uniongve_db_proto_goTypes = nil
- file_uniongve_uniongve_db_proto_depIdxs = nil
-}
diff --git a/pb/uniongve_msg.pb.go b/pb/uniongve_msg.pb.go
deleted file mode 100644
index 2c0626204..000000000
--- a/pb/uniongve_msg.pb.go
+++ /dev/null
@@ -1,1332 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// protoc-gen-go v1.28.0
-// protoc v3.20.0
-// source: uniongve/uniongve_msg.proto
-
-package pb
-
-import (
- protoreflect "google.golang.org/protobuf/reflect/protoreflect"
- protoimpl "google.golang.org/protobuf/runtime/protoimpl"
- reflect "reflect"
- sync "sync"
-)
-
-const (
- // Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-//工会boos战斗 信息请求
-type UniongveInfoReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
-}
-
-func (x *UniongveInfoReq) Reset() {
- *x = UniongveInfoReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[0]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveInfoReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveInfoReq) ProtoMessage() {}
-
-func (x *UniongveInfoReq) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[0]
- 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 UniongveInfoReq.ProtoReflect.Descriptor instead.
-func (*UniongveInfoReq) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *UniongveInfoReq) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-type UniongveInfoResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Info *DBUnionGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
-}
-
-func (x *UniongveInfoResp) Reset() {
- *x = UniongveInfoResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[1]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveInfoResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveInfoResp) ProtoMessage() {}
-
-func (x *UniongveInfoResp) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_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 UniongveInfoResp.ProtoReflect.Descriptor instead.
-func (*UniongveInfoResp) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *UniongveInfoResp) GetInfo() *DBUnionGve {
- if x != nil {
- return x.Info
- }
- return nil
-}
-
-//集火设置
-type UniongveSetFireReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
- Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
- Notice string `protobuf:"bytes,3,opt,name=notice,proto3" json:"notice"`
-}
-
-func (x *UniongveSetFireReq) Reset() {
- *x = UniongveSetFireReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[2]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveSetFireReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveSetFireReq) ProtoMessage() {}
-
-func (x *UniongveSetFireReq) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[2]
- 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 UniongveSetFireReq.ProtoReflect.Descriptor instead.
-func (*UniongveSetFireReq) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *UniongveSetFireReq) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-func (x *UniongveSetFireReq) GetBoosid() int32 {
- if x != nil {
- return x.Boosid
- }
- return 0
-}
-
-func (x *UniongveSetFireReq) GetNotice() string {
- if x != nil {
- return x.Notice
- }
- return ""
-}
-
-//集火设置 回应
-type UniongveSetFireResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-}
-
-func (x *UniongveSetFireResp) Reset() {
- *x = UniongveSetFireResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[3]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveSetFireResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveSetFireResp) ProtoMessage() {}
-
-func (x *UniongveSetFireResp) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[3]
- 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 UniongveSetFireResp.ProtoReflect.Descriptor instead.
-func (*UniongveSetFireResp) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{3}
-}
-
-//排行榜请求
-type UniongveRankReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
-}
-
-func (x *UniongveRankReq) Reset() {
- *x = UniongveRankReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[4]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveRankReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveRankReq) ProtoMessage() {}
-
-func (x *UniongveRankReq) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[4]
- 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 UniongveRankReq.ProtoReflect.Descriptor instead.
-func (*UniongveRankReq) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *UniongveRankReq) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-//工会排名对象
-type UniongveRankItem struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
- Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
- Rank int32 `protobuf:"varint,3,opt,name=rank,proto3" json:"rank"`
-}
-
-func (x *UniongveRankItem) Reset() {
- *x = UniongveRankItem{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[5]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveRankItem) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveRankItem) ProtoMessage() {}
-
-func (x *UniongveRankItem) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[5]
- 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 UniongveRankItem.ProtoReflect.Descriptor instead.
-func (*UniongveRankItem) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *UniongveRankItem) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-func (x *UniongveRankItem) GetName() string {
- if x != nil {
- return x.Name
- }
- return ""
-}
-
-func (x *UniongveRankItem) GetRank() int32 {
- if x != nil {
- return x.Rank
- }
- return 0
-}
-
-//排行榜请求
-type UniongveRankResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- List []*UniongveRankItem `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
-}
-
-func (x *UniongveRankResp) Reset() {
- *x = UniongveRankResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[6]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveRankResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveRankResp) ProtoMessage() {}
-
-func (x *UniongveRankResp) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[6]
- 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 UniongveRankResp.ProtoReflect.Descriptor instead.
-func (*UniongveRankResp) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *UniongveRankResp) GetList() []*UniongveRankItem {
- if x != nil {
- return x.List
- }
- return nil
-}
-
-//工会轮盘
-type UniongveRouletteReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
-}
-
-func (x *UniongveRouletteReq) Reset() {
- *x = UniongveRouletteReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[7]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveRouletteReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveRouletteReq) ProtoMessage() {}
-
-func (x *UniongveRouletteReq) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[7]
- 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 UniongveRouletteReq.ProtoReflect.Descriptor instead.
-func (*UniongveRouletteReq) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *UniongveRouletteReq) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-//工会轮盘
-type UniongveRouletteResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Cid int32 `protobuf:"varint,1,opt,name=cid,proto3" json:"cid"`
- Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
-}
-
-func (x *UniongveRouletteResp) Reset() {
- *x = UniongveRouletteResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[8]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveRouletteResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveRouletteResp) ProtoMessage() {}
-
-func (x *UniongveRouletteResp) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[8]
- 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 UniongveRouletteResp.ProtoReflect.Descriptor instead.
-func (*UniongveRouletteResp) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *UniongveRouletteResp) GetCid() int32 {
- if x != nil {
- return x.Cid
- }
- return 0
-}
-
-func (x *UniongveRouletteResp) GetAward() []*UserAssets {
- if x != nil {
- return x.Award
- }
- return nil
-}
-
-//挑战请求
-type UniongveChallengeReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
- Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
- Battle *BattleFormation `protobuf:"bytes,3,opt,name=battle,proto3" json:"battle"` //战斗类型
-}
-
-func (x *UniongveChallengeReq) Reset() {
- *x = UniongveChallengeReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[9]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveChallengeReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveChallengeReq) ProtoMessage() {}
-
-func (x *UniongveChallengeReq) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[9]
- 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 UniongveChallengeReq.ProtoReflect.Descriptor instead.
-func (*UniongveChallengeReq) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *UniongveChallengeReq) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-func (x *UniongveChallengeReq) GetBoosid() int32 {
- if x != nil {
- return x.Boosid
- }
- return 0
-}
-
-func (x *UniongveChallengeReq) GetBattle() *BattleFormation {
- if x != nil {
- return x.Battle
- }
- return nil
-}
-
-//挑战回应
-type UniongveChallengeResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
- Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
- Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"` //战斗信息
-}
-
-func (x *UniongveChallengeResp) Reset() {
- *x = UniongveChallengeResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[10]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveChallengeResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveChallengeResp) ProtoMessage() {}
-
-func (x *UniongveChallengeResp) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[10]
- 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 UniongveChallengeResp.ProtoReflect.Descriptor instead.
-func (*UniongveChallengeResp) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *UniongveChallengeResp) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-func (x *UniongveChallengeResp) GetBoosid() int32 {
- if x != nil {
- return x.Boosid
- }
- return 0
-}
-
-func (x *UniongveChallengeResp) GetInfo() *BattleInfo {
- if x != nil {
- return x.Info
- }
- return nil
-}
-
-//战斗 完成请求
-type UniongveChallengeFinishReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
- Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
- Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报
-}
-
-func (x *UniongveChallengeFinishReq) Reset() {
- *x = UniongveChallengeFinishReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[11]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveChallengeFinishReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveChallengeFinishReq) ProtoMessage() {}
-
-func (x *UniongveChallengeFinishReq) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[11]
- 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 UniongveChallengeFinishReq.ProtoReflect.Descriptor instead.
-func (*UniongveChallengeFinishReq) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *UniongveChallengeFinishReq) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-func (x *UniongveChallengeFinishReq) GetBoosid() int32 {
- if x != nil {
- return x.Boosid
- }
- return 0
-}
-
-func (x *UniongveChallengeFinishReq) GetReport() *BattleReport {
- if x != nil {
- return x.Report
- }
- return nil
-}
-
-//战斗 完成请求 回应
-type UniongveChallengeFinishResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Unionid string `protobuf:"bytes,1,opt,name=unionid,proto3" json:"unionid"`
- Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
- Award []*UserAssets `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励
- Efficient bool `protobuf:"varint,4,opt,name=efficient,proto3" json:"efficient"` //是否有效
- Score int32 `protobuf:"varint,5,opt,name=score,proto3" json:"score"` //评级id
-}
-
-func (x *UniongveChallengeFinishResp) Reset() {
- *x = UniongveChallengeFinishResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[12]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveChallengeFinishResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveChallengeFinishResp) ProtoMessage() {}
-
-func (x *UniongveChallengeFinishResp) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[12]
- 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 UniongveChallengeFinishResp.ProtoReflect.Descriptor instead.
-func (*UniongveChallengeFinishResp) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *UniongveChallengeFinishResp) GetUnionid() string {
- if x != nil {
- return x.Unionid
- }
- return ""
-}
-
-func (x *UniongveChallengeFinishResp) GetBoosid() int32 {
- if x != nil {
- return x.Boosid
- }
- return 0
-}
-
-func (x *UniongveChallengeFinishResp) GetAward() []*UserAssets {
- if x != nil {
- return x.Award
- }
- return nil
-}
-
-func (x *UniongveChallengeFinishResp) GetEfficient() bool {
- if x != nil {
- return x.Efficient
- }
- return false
-}
-
-func (x *UniongveChallengeFinishResp) GetScore() int32 {
- if x != nil {
- return x.Score
- }
- return 0
-}
-
-//工会战 信息变化
-type UniongveInfoChangePush struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Info *DBUnionGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
-}
-
-func (x *UniongveInfoChangePush) Reset() {
- *x = UniongveInfoChangePush{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[13]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveInfoChangePush) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveInfoChangePush) ProtoMessage() {}
-
-func (x *UniongveInfoChangePush) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[13]
- 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 UniongveInfoChangePush.ProtoReflect.Descriptor instead.
-func (*UniongveInfoChangePush) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *UniongveInfoChangePush) GetInfo() *DBUnionGve {
- if x != nil {
- return x.Info
- }
- return nil
-}
-
-//工会战 阶段变化
-type UniongveStageChangePush struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Info *DBUnionGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
-}
-
-func (x *UniongveStageChangePush) Reset() {
- *x = UniongveStageChangePush{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[14]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveStageChangePush) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveStageChangePush) ProtoMessage() {}
-
-func (x *UniongveStageChangePush) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[14]
- 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 UniongveStageChangePush.ProtoReflect.Descriptor instead.
-func (*UniongveStageChangePush) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *UniongveStageChangePush) GetInfo() *DBUnionGve {
- if x != nil {
- return x.Info
- }
- return nil
-}
-
-//工会战 bos变化
-type UniongveBoosChangePush struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Info *DBUnionGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
-}
-
-func (x *UniongveBoosChangePush) Reset() {
- *x = UniongveBoosChangePush{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[15]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveBoosChangePush) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveBoosChangePush) ProtoMessage() {}
-
-func (x *UniongveBoosChangePush) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[15]
- 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 UniongveBoosChangePush.ProtoReflect.Descriptor instead.
-func (*UniongveBoosChangePush) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *UniongveBoosChangePush) GetInfo() *DBUnionGve {
- if x != nil {
- return x.Info
- }
- return nil
-}
-
-//工会战 轮盘变化推送
-type UniongveRouletteChangePush struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Record *DBUnionRouletteRecord `protobuf:"bytes,1,opt,name=record,proto3" json:"record"`
-}
-
-func (x *UniongveRouletteChangePush) Reset() {
- *x = UniongveRouletteChangePush{}
- if protoimpl.UnsafeEnabled {
- mi := &file_uniongve_uniongve_msg_proto_msgTypes[16]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *UniongveRouletteChangePush) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UniongveRouletteChangePush) ProtoMessage() {}
-
-func (x *UniongveRouletteChangePush) ProtoReflect() protoreflect.Message {
- mi := &file_uniongve_uniongve_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 UniongveRouletteChangePush.ProtoReflect.Descriptor instead.
-func (*UniongveRouletteChangePush) Descriptor() ([]byte, []int) {
- return file_uniongve_uniongve_msg_proto_rawDescGZIP(), []int{16}
-}
-
-func (x *UniongveRouletteChangePush) GetRecord() *DBUnionRouletteRecord {
- if x != nil {
- return x.Record
- }
- return nil
-}
-
-var File_uniongve_uniongve_msg_proto protoreflect.FileDescriptor
-
-var file_uniongve_uniongve_msg_proto_rawDesc = []byte{
- 0x0a, 0x1b, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x2f, 0x75, 0x6e, 0x69, 0x6f, 0x6e,
- 0x67, 0x76, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x75,
- 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x2f, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65,
- 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2b,
- 0x0a, 0x0f, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
- 0x71, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x22, 0x33, 0x0a, 0x10, 0x55,
- 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12,
- 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
- 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
- 0x22, 0x5e, 0x0a, 0x12, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46,
- 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64,
- 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69,
- 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65,
- 0x22, 0x15, 0x0a, 0x13, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46,
- 0x69, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0f, 0x55, 0x6e, 0x69, 0x6f, 0x6e,
- 0x67, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e,
- 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69,
- 0x6f, 0x6e, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x10, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65,
- 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f,
- 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e,
- 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x39, 0x0a, 0x10, 0x55, 0x6e,
- 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25,
- 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x55,
- 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52,
- 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x13, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76,
- 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
- 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75,
- 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x14, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67,
- 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
- 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 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, 0x22, 0x72, 0x0a, 0x14, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x43,
- 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x75,
- 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e,
- 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 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, 0x6a, 0x0a, 0x15, 0x55, 0x6e, 0x69, 0x6f, 0x6e,
- 0x67, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70,
- 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f,
- 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73,
- 0x69, 0x64, 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, 0x75, 0x0a, 0x1a, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x43,
- 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
- 0x71, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62,
- 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f,
- 0x73, 0x69, 0x64, 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, 0xa6, 0x01, 0x0a, 0x1b, 0x55,
- 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
- 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e,
- 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69,
- 0x6f, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05,
- 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 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, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01,
- 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a,
- 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63,
- 0x6f, 0x72, 0x65, 0x22, 0x39, 0x0a, 0x16, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x49,
- 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a,
- 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42,
- 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x3a,
- 0x0a, 0x17, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x53, 0x74, 0x61, 0x67, 0x65, 0x43,
- 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66,
- 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f,
- 0x6e, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x39, 0x0a, 0x16, 0x55, 0x6e,
- 0x69, 0x6f, 0x6e, 0x67, 0x76, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
- 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x47, 0x76, 0x65, 0x52,
- 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4c, 0x0a, 0x1a, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x67, 0x76,
- 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50,
- 0x75, 0x73, 0x68, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x75,
- 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63,
- 0x6f, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x33,
-}
-
-var (
- file_uniongve_uniongve_msg_proto_rawDescOnce sync.Once
- file_uniongve_uniongve_msg_proto_rawDescData = file_uniongve_uniongve_msg_proto_rawDesc
-)
-
-func file_uniongve_uniongve_msg_proto_rawDescGZIP() []byte {
- file_uniongve_uniongve_msg_proto_rawDescOnce.Do(func() {
- file_uniongve_uniongve_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_uniongve_uniongve_msg_proto_rawDescData)
- })
- return file_uniongve_uniongve_msg_proto_rawDescData
-}
-
-var file_uniongve_uniongve_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
-var file_uniongve_uniongve_msg_proto_goTypes = []interface{}{
- (*UniongveInfoReq)(nil), // 0: UniongveInfoReq
- (*UniongveInfoResp)(nil), // 1: UniongveInfoResp
- (*UniongveSetFireReq)(nil), // 2: UniongveSetFireReq
- (*UniongveSetFireResp)(nil), // 3: UniongveSetFireResp
- (*UniongveRankReq)(nil), // 4: UniongveRankReq
- (*UniongveRankItem)(nil), // 5: UniongveRankItem
- (*UniongveRankResp)(nil), // 6: UniongveRankResp
- (*UniongveRouletteReq)(nil), // 7: UniongveRouletteReq
- (*UniongveRouletteResp)(nil), // 8: UniongveRouletteResp
- (*UniongveChallengeReq)(nil), // 9: UniongveChallengeReq
- (*UniongveChallengeResp)(nil), // 10: UniongveChallengeResp
- (*UniongveChallengeFinishReq)(nil), // 11: UniongveChallengeFinishReq
- (*UniongveChallengeFinishResp)(nil), // 12: UniongveChallengeFinishResp
- (*UniongveInfoChangePush)(nil), // 13: UniongveInfoChangePush
- (*UniongveStageChangePush)(nil), // 14: UniongveStageChangePush
- (*UniongveBoosChangePush)(nil), // 15: UniongveBoosChangePush
- (*UniongveRouletteChangePush)(nil), // 16: UniongveRouletteChangePush
- (*DBUnionGve)(nil), // 17: DBUnionGve
- (*UserAssets)(nil), // 18: UserAssets
- (*BattleFormation)(nil), // 19: BattleFormation
- (*BattleInfo)(nil), // 20: BattleInfo
- (*BattleReport)(nil), // 21: BattleReport
- (*DBUnionRouletteRecord)(nil), // 22: DBUnionRouletteRecord
-}
-var file_uniongve_uniongve_msg_proto_depIdxs = []int32{
- 17, // 0: UniongveInfoResp.info:type_name -> DBUnionGve
- 5, // 1: UniongveRankResp.list:type_name -> UniongveRankItem
- 18, // 2: UniongveRouletteResp.award:type_name -> UserAssets
- 19, // 3: UniongveChallengeReq.battle:type_name -> BattleFormation
- 20, // 4: UniongveChallengeResp.info:type_name -> BattleInfo
- 21, // 5: UniongveChallengeFinishReq.report:type_name -> BattleReport
- 18, // 6: UniongveChallengeFinishResp.award:type_name -> UserAssets
- 17, // 7: UniongveInfoChangePush.info:type_name -> DBUnionGve
- 17, // 8: UniongveStageChangePush.info:type_name -> DBUnionGve
- 17, // 9: UniongveBoosChangePush.info:type_name -> DBUnionGve
- 22, // 10: UniongveRouletteChangePush.record:type_name -> DBUnionRouletteRecord
- 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
-}
-
-func init() { file_uniongve_uniongve_msg_proto_init() }
-func file_uniongve_uniongve_msg_proto_init() {
- if File_uniongve_uniongve_msg_proto != nil {
- return
- }
- file_uniongve_uniongve_db_proto_init()
- file_battle_battle_msg_proto_init()
- file_comm_proto_init()
- if !protoimpl.UnsafeEnabled {
- file_uniongve_uniongve_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveInfoReq); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveInfoResp); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveSetFireReq); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveSetFireResp); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveRankReq); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveRankItem); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveRankResp); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveRouletteReq); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveRouletteResp); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveChallengeReq); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveChallengeResp); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveChallengeFinishReq); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveChallengeFinishResp); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveInfoChangePush); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveStageChangePush); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveBoosChangePush); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_uniongve_uniongve_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*UniongveRouletteChangePush); 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{
- File: protoimpl.DescBuilder{
- GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
- RawDescriptor: file_uniongve_uniongve_msg_proto_rawDesc,
- NumEnums: 0,
- NumMessages: 17,
- NumExtensions: 0,
- NumServices: 0,
- },
- GoTypes: file_uniongve_uniongve_msg_proto_goTypes,
- DependencyIndexes: file_uniongve_uniongve_msg_proto_depIdxs,
- MessageInfos: file_uniongve_uniongve_msg_proto_msgTypes,
- }.Build()
- File_uniongve_uniongve_msg_proto = out.File
- file_uniongve_uniongve_msg_proto_rawDesc = nil
- file_uniongve_uniongve_msg_proto_goTypes = nil
- file_uniongve_uniongve_msg_proto_depIdxs = nil
-}
diff --git a/pb/wtask_db.pb.go b/pb/wtask_db.pb.go
index 56370604d..015c81092 100644
--- a/pb/wtask_db.pb.go
+++ b/pb/wtask_db.pb.go
@@ -172,204 +172,6 @@ func (x *DBWTaskItem) GetConlds() []*ConIProgress {
return nil
}
-//日常任务
-type DBWTaskDaily struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`
- Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
- Key int32 `protobuf:"varint,3,opt,name=key,proto3" json:"key"`
- Groups []*DBWTaskDailyGroup `protobuf:"bytes,4,rep,name=groups,proto3" json:"groups"`
- Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"`
-}
-
-func (x *DBWTaskDaily) Reset() {
- *x = DBWTaskDaily{}
- if protoimpl.UnsafeEnabled {
- mi := &file_wtask_wtask_db_proto_msgTypes[2]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBWTaskDaily) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBWTaskDaily) ProtoMessage() {}
-
-func (x *DBWTaskDaily) ProtoReflect() protoreflect.Message {
- mi := &file_wtask_wtask_db_proto_msgTypes[2]
- 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 DBWTaskDaily.ProtoReflect.Descriptor instead.
-func (*DBWTaskDaily) Descriptor() ([]byte, []int) {
- return file_wtask_wtask_db_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *DBWTaskDaily) GetId() string {
- if x != nil {
- return x.Id
- }
- return ""
-}
-
-func (x *DBWTaskDaily) GetUid() string {
- if x != nil {
- return x.Uid
- }
- return ""
-}
-
-func (x *DBWTaskDaily) GetKey() int32 {
- if x != nil {
- return x.Key
- }
- return 0
-}
-
-func (x *DBWTaskDaily) GetGroups() []*DBWTaskDailyGroup {
- if x != nil {
- return x.Groups
- }
- return nil
-}
-
-func (x *DBWTaskDaily) GetRtime() int64 {
- if x != nil {
- return x.Rtime
- }
- return 0
-}
-
-type DBWTaskDailyGroup struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Group int32 `protobuf:"varint,1,opt,name=group,proto3" json:"group"`
- Tasks []int32 `protobuf:"varint,2,rep,packed,name=tasks,proto3" json:"tasks"`
- Complete bool `protobuf:"varint,3,opt,name=complete,proto3" json:"complete"`
-}
-
-func (x *DBWTaskDailyGroup) Reset() {
- *x = DBWTaskDailyGroup{}
- if protoimpl.UnsafeEnabled {
- mi := &file_wtask_wtask_db_proto_msgTypes[3]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBWTaskDailyGroup) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBWTaskDailyGroup) ProtoMessage() {}
-
-func (x *DBWTaskDailyGroup) ProtoReflect() protoreflect.Message {
- mi := &file_wtask_wtask_db_proto_msgTypes[3]
- 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 DBWTaskDailyGroup.ProtoReflect.Descriptor instead.
-func (*DBWTaskDailyGroup) Descriptor() ([]byte, []int) {
- return file_wtask_wtask_db_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *DBWTaskDailyGroup) GetGroup() int32 {
- if x != nil {
- return x.Group
- }
- return 0
-}
-
-func (x *DBWTaskDailyGroup) GetTasks() []int32 {
- if x != nil {
- return x.Tasks
- }
- return nil
-}
-
-func (x *DBWTaskDailyGroup) GetComplete() bool {
- if x != nil {
- return x.Complete
- }
- return false
-}
-
-type DBWTaskDailyGroupProgress struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Group int32 `protobuf:"varint,3,opt,name=group,proto3" json:"group"`
- Tasks []*DBWTaskItem `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks"`
-}
-
-func (x *DBWTaskDailyGroupProgress) Reset() {
- *x = DBWTaskDailyGroupProgress{}
- if protoimpl.UnsafeEnabled {
- mi := &file_wtask_wtask_db_proto_msgTypes[4]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBWTaskDailyGroupProgress) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBWTaskDailyGroupProgress) ProtoMessage() {}
-
-func (x *DBWTaskDailyGroupProgress) ProtoReflect() protoreflect.Message {
- mi := &file_wtask_wtask_db_proto_msgTypes[4]
- 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 DBWTaskDailyGroupProgress.ProtoReflect.Descriptor instead.
-func (*DBWTaskDailyGroupProgress) Descriptor() ([]byte, []int) {
- return file_wtask_wtask_db_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *DBWTaskDailyGroupProgress) GetGroup() int32 {
- if x != nil {
- return x.Group
- }
- return 0
-}
-
-func (x *DBWTaskDailyGroupProgress) GetTasks() []*DBWTaskItem {
- if x != nil {
- return x.Tasks
- }
- return nil
-}
-
var File_wtask_wtask_db_proto protoreflect.FileDescriptor
var file_wtask_wtask_db_proto_rawDesc = []byte{
@@ -397,28 +199,8 @@ var file_wtask_wtask_db_proto_rawDesc = []byte{
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,
- 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x22, 0x84, 0x01, 0x0a, 0x0c, 0x44, 0x42,
- 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 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, 0x10, 0x0a, 0x03,
- 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a,
- 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12,
- 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x47, 0x72, 0x6f,
- 0x75, 0x70, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74,
- 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65,
- 0x22, 0x5b, 0x0a, 0x11, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79,
- 0x47, 0x72, 0x6f, 0x75, 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, 0x74,
- 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b,
- 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x03, 0x20,
- 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x22, 0x55, 0x0a,
- 0x19, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x47, 0x72, 0x6f,
- 0x75, 0x70, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72,
- 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70,
- 0x12, 0x22, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x74,
- 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x33,
+ 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+ 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -433,26 +215,21 @@ 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, 6)
+var file_wtask_wtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_wtask_wtask_db_proto_goTypes = []interface{}{
- (*DBWTask)(nil), // 0: DBWTask
- (*DBWTaskItem)(nil), // 1: DBWTaskItem
- (*DBWTaskDaily)(nil), // 2: DBWTaskDaily
- (*DBWTaskDailyGroup)(nil), // 3: DBWTaskDailyGroup
- (*DBWTaskDailyGroupProgress)(nil), // 4: DBWTaskDailyGroupProgress
- nil, // 5: DBWTask.GroupsEntry
- (*ConIProgress)(nil), // 6: ConIProgress
+ (*DBWTask)(nil), // 0: DBWTask
+ (*DBWTaskItem)(nil), // 1: DBWTaskItem
+ nil, // 2: DBWTask.GroupsEntry
+ (*ConIProgress)(nil), // 3: ConIProgress
}
var file_wtask_wtask_db_proto_depIdxs = []int32{
- 5, // 0: DBWTask.groups:type_name -> DBWTask.GroupsEntry
- 6, // 1: DBWTaskItem.conlds:type_name -> ConIProgress
- 3, // 2: DBWTaskDaily.groups:type_name -> DBWTaskDailyGroup
- 1, // 3: DBWTaskDailyGroupProgress.tasks:type_name -> DBWTaskItem
- 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
+ 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
}
func init() { file_wtask_wtask_db_proto_init() }
@@ -486,42 +263,6 @@ func file_wtask_wtask_db_proto_init() {
return nil
}
}
- file_wtask_wtask_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBWTaskDaily); 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[3].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBWTaskDailyGroup); 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[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBWTaskDailyGroupProgress); 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{
@@ -529,7 +270,7 @@ func file_wtask_wtask_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_wtask_wtask_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 6,
+ NumMessages: 3,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go
index 27afb264f..2ada7f219 100644
--- a/pb/wtask_msg.pb.go
+++ b/pb/wtask_msg.pb.go
@@ -67,7 +67,6 @@ type WTaskInfoResp struct {
Info *DBWTask `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //可接取任务列表
Accepts []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表
- Daytask *DBWTaskDaily `protobuf:"bytes,3,opt,name=daytask,proto3" json:"daytask"`
}
func (x *WTaskInfoResp) Reset() {
@@ -116,13 +115,6 @@ func (x *WTaskInfoResp) GetAccepts() []*DBWTaskItem {
return nil
}
-func (x *WTaskInfoResp) GetDaytask() *DBWTaskDaily {
- if x != nil {
- return x.Daytask
- }
- return nil
-}
-
// 接取任务 请求
type WTaskAcceptReq struct {
state protoimpl.MessageState
@@ -891,180 +883,6 @@ func (x *WTaskBattleFinishResp) GetBattleConfId() int32 {
return 0
}
-//日常任务信息获取
-type WTaskDailyInfoReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-}
-
-func (x *WTaskDailyInfoReq) Reset() {
- *x = WTaskDailyInfoReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_wtask_wtask_msg_proto_msgTypes[16]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *WTaskDailyInfoReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WTaskDailyInfoReq) ProtoMessage() {}
-
-func (x *WTaskDailyInfoReq) 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 WTaskDailyInfoReq.ProtoReflect.Descriptor instead.
-func (*WTaskDailyInfoReq) Descriptor() ([]byte, []int) {
- return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{16}
-}
-
-//日常任务信息获取 回应
-type WTaskDailyInfoResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Task []*DBWTaskDailyGroupProgress `protobuf:"bytes,1,rep,name=task,proto3" json:"task"`
-}
-
-func (x *WTaskDailyInfoResp) Reset() {
- *x = WTaskDailyInfoResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_wtask_wtask_msg_proto_msgTypes[17]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *WTaskDailyInfoResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WTaskDailyInfoResp) ProtoMessage() {}
-
-func (x *WTaskDailyInfoResp) ProtoReflect() protoreflect.Message {
- mi := &file_wtask_wtask_msg_proto_msgTypes[17]
- 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 WTaskDailyInfoResp.ProtoReflect.Descriptor instead.
-func (*WTaskDailyInfoResp) Descriptor() ([]byte, []int) {
- return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{17}
-}
-
-func (x *WTaskDailyInfoResp) GetTask() []*DBWTaskDailyGroupProgress {
- if x != nil {
- return x.Task
- }
- return nil
-}
-
-//日常任务 领奖请求
-type WTaskDailyReceiveReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-}
-
-func (x *WTaskDailyReceiveReq) Reset() {
- *x = WTaskDailyReceiveReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_wtask_wtask_msg_proto_msgTypes[18]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *WTaskDailyReceiveReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WTaskDailyReceiveReq) ProtoMessage() {}
-
-func (x *WTaskDailyReceiveReq) ProtoReflect() protoreflect.Message {
- mi := &file_wtask_wtask_msg_proto_msgTypes[18]
- 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 WTaskDailyReceiveReq.ProtoReflect.Descriptor instead.
-func (*WTaskDailyReceiveReq) Descriptor() ([]byte, []int) {
- return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{18}
-}
-
-//日常任务 领奖请求 回应
-type WTaskDailyReceiveResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Award []*UserAssets `protobuf:"bytes,1,rep,name=award,proto3" json:"award"` //奖励
-}
-
-func (x *WTaskDailyReceiveResp) Reset() {
- *x = WTaskDailyReceiveResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_wtask_wtask_msg_proto_msgTypes[19]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *WTaskDailyReceiveResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WTaskDailyReceiveResp) ProtoMessage() {}
-
-func (x *WTaskDailyReceiveResp) ProtoReflect() protoreflect.Message {
- mi := &file_wtask_wtask_msg_proto_msgTypes[19]
- 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 WTaskDailyReceiveResp.ProtoReflect.Descriptor instead.
-func (*WTaskDailyReceiveResp) Descriptor() ([]byte, []int) {
- return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{19}
-}
-
-func (x *WTaskDailyReceiveResp) GetAward() []*UserAssets {
- if x != nil {
- return x.Award
- }
- return nil
-}
-
var File_wtask_wtask_msg_proto protoreflect.FileDescriptor
var file_wtask_wtask_msg_proto_rawDesc = []byte{
@@ -1074,102 +892,88 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x22, 0x0e, 0x0a, 0x0c, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
- 0x65, 0x71, 0x22, 0x7e, 0x0a, 0x0d, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+ 0x65, 0x71, 0x22, 0x55, 0x0a, 0x0d, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x69, 0x6e, 0x66,
0x6f, 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, 0x12, 0x27, 0x0a, 0x07, 0x64, 0x61, 0x79,
- 0x74, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x57,
- 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x52, 0x07, 0x64, 0x61, 0x79, 0x74, 0x61,
- 0x73, 0x6b, 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, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e,
+ 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, 0x22, 0x13, 0x0a, 0x11, 0x57, 0x54, 0x61, 0x73, 0x6b,
- 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x44, 0x0a, 0x12,
- 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x47,
- 0x72, 0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x04, 0x74, 0x61,
- 0x73, 0x6b, 0x22, 0x16, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79,
- 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x57, 0x54,
- 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
- 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
- 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 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, 0x42, 0x06,
+ 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1184,7 +988,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, 21)
+var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
var file_wtask_wtask_msg_proto_goTypes = []interface{}{
(*WTaskInfoReq)(nil), // 0: WTaskInfoReq
(*WTaskInfoResp)(nil), // 1: WTaskInfoResp
@@ -1202,40 +1006,31 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{
(*WTaskBattleStartResp)(nil), // 13: WTaskBattleStartResp
(*WTaskBattleFinishReq)(nil), // 14: WTaskBattleFinishReq
(*WTaskBattleFinishResp)(nil), // 15: WTaskBattleFinishResp
- (*WTaskDailyInfoReq)(nil), // 16: WTaskDailyInfoReq
- (*WTaskDailyInfoResp)(nil), // 17: WTaskDailyInfoResp
- (*WTaskDailyReceiveReq)(nil), // 18: WTaskDailyReceiveReq
- (*WTaskDailyReceiveResp)(nil), // 19: WTaskDailyReceiveResp
- nil, // 20: WTaskFinishResp.GroupsEntry
- (*DBWTask)(nil), // 21: DBWTask
- (*DBWTaskItem)(nil), // 22: DBWTaskItem
- (*DBWTaskDaily)(nil), // 23: DBWTaskDaily
- (*UserAssets)(nil), // 24: UserAssets
- (*BattleFormation)(nil), // 25: BattleFormation
- (*BattleInfo)(nil), // 26: BattleInfo
- (*BattleReport)(nil), // 27: BattleReport
- (*DBWTaskDailyGroupProgress)(nil), // 28: DBWTaskDailyGroupProgress
+ 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
}
var file_wtask_wtask_msg_proto_depIdxs = []int32{
- 21, // 0: WTaskInfoResp.info:type_name -> DBWTask
- 22, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem
- 23, // 2: WTaskInfoResp.daytask:type_name -> DBWTaskDaily
- 22, // 3: WTaskAcceptResp.accepts:type_name -> DBWTaskItem
- 22, // 4: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem
- 24, // 5: WTaskFinishResp.award:type_name -> UserAssets
- 20, // 6: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry
- 24, // 7: WTaskChapterRewardResp.award:type_name -> UserAssets
- 22, // 8: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
- 25, // 9: WTaskBattleStartReq.battle:type_name -> BattleFormation
- 26, // 10: WTaskBattleStartResp.info:type_name -> BattleInfo
- 27, // 11: WTaskBattleFinishReq.report:type_name -> BattleReport
- 28, // 12: WTaskDailyInfoResp.task:type_name -> DBWTaskDailyGroupProgress
- 24, // 13: WTaskDailyReceiveResp.award:type_name -> UserAssets
- 14, // [14:14] is the sub-list for method output_type
- 14, // [14:14] is the sub-list for method input_type
- 14, // [14:14] is the sub-list for extension type_name
- 14, // [14:14] is the sub-list for extension extendee
- 0, // [0:14] is the sub-list for field type_name
+ 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
}
func init() { file_wtask_wtask_msg_proto_init() }
@@ -1439,54 +1234,6 @@ 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.(*WTaskDailyInfoReq); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_wtask_wtask_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*WTaskDailyInfoResp); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_wtask_wtask_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*WTaskDailyReceiveReq); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_wtask_wtask_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*WTaskDailyReceiveResp); 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{
@@ -1494,7 +1241,7 @@ func file_wtask_wtask_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_wtask_wtask_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 21,
+ NumMessages: 17,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/services/worker/main.go b/services/worker/main.go
index d71af07a3..6f9ed477f 100644
--- a/services/worker/main.go
+++ b/services/worker/main.go
@@ -22,6 +22,7 @@ import (
"go_dreamfactory/modules/gourmet"
"go_dreamfactory/modules/growtask"
"go_dreamfactory/modules/guidance"
+ "go_dreamfactory/modules/guildgve"
"go_dreamfactory/modules/hero"
"go_dreamfactory/modules/horoscope"
"go_dreamfactory/modules/hunting"
@@ -50,7 +51,6 @@ import (
"go_dreamfactory/modules/sys"
"go_dreamfactory/modules/task"
"go_dreamfactory/modules/tools"
- "go_dreamfactory/modules/uniongve"
"go_dreamfactory/modules/user"
"go_dreamfactory/modules/viking"
"go_dreamfactory/modules/warorder"
@@ -136,7 +136,7 @@ func main() {
wtask.NewModule(),
passon.NewModule(),
warorder.NewModule(),
- uniongve.NewModule(),
+ guildgve.NewModule(),
stonehenge.NewModule(),
dailytask.NewModule(),
questionnaire.NewModule(),
diff --git a/sys/configure/structs/Game.GuildBossData.go b/sys/configure/structs/Game.GuildBossData.go
index 9d6aa82ff..7fc9b7ac1 100644
--- a/sys/configure/structs/Game.GuildBossData.go
+++ b/sys/configure/structs/Game.GuildBossData.go
@@ -17,7 +17,8 @@ type GameGuildBossData struct {
BossLv int32
Hp int32
BattleReadyID int32
- BossImg int32
+ HeroId string
+ PreviewReward []*Gameatn
KillReward []*Gameatn
Boss []int32
Score int32
@@ -38,7 +39,21 @@ func (_v *GameGuildBossData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_lv"].(float64); !_ok_ { err = errors.New("boss_lv error"); return }; _v.BossLv = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_img"].(float64); !_ok_ { err = errors.New("boss_img error"); return }; _v.BossImg = int32(_tempNum_) }
+ { var _ok_ bool; if _v.HeroId, _ok_ = _buf["heroId"].(string); !_ok_ { err = errors.New("heroId error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["preview_reward"].([]interface{}); !_ok_ { err = errors.New("preview_reward error"); return }
+
+ _v.PreviewReward = 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.PreviewReward = append(_v.PreviewReward, _list_v_)
+ }
+ }
+
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Game.MainStageData.go b/sys/configure/structs/Game.MainStageData.go
index e718c4adc..7f3bf6347 100644
--- a/sys/configure/structs/Game.MainStageData.go
+++ b/sys/configure/structs/Game.MainStageData.go
@@ -22,6 +22,7 @@ type GameMainStageData struct {
Venturemodel string
Venturetype int32
Ventureavatar []string
+ Herocolor int32
Heroimg string
Bubbletext string
Animation string
@@ -45,6 +46,7 @@ type GameMainStageData struct {
Star []int32
StarType []int32
StarValue []int32
+ Challengeward int32
}
const TypeId_GameMainStageData = -1084910317
@@ -91,6 +93,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
}
}
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["herocolor"].(float64); !_ok_ { err = errors.New("herocolor error"); return }; _v.Herocolor = int32(_tempNum_) }
{ var _ok_ bool; if _v.Heroimg, _ok_ = _buf["heroimg"].(string); !_ok_ { err = errors.New("heroimg error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["bubbletext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Bubbletext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Bubbletext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Animation, _ok_ = _buf["animation"].(string); !_ok_ { err = errors.New("animation error"); return } }
@@ -218,6 +221,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
}
}
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["challengeward"].(float64); !_ok_ { err = errors.New("challengeward error"); return }; _v.Challengeward = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/Game.StroneBuffData.go b/sys/configure/structs/Game.StroneBuffData.go
index b4c243478..ec242408d 100644
--- a/sys/configure/structs/Game.StroneBuffData.go
+++ b/sys/configure/structs/Game.StroneBuffData.go
@@ -17,8 +17,6 @@ type GameStroneBuffData struct {
BuffLevel int32
Quality int32
BuffIcon string
- BuffName string
- BuffDescription string
BuffStory string
BuffUpgradeCost *Gameatn
BuffSell *Gameatn
@@ -37,8 +35,6 @@ func (_v *GameStroneBuffData)Deserialize(_buf map[string]interface{}) (err error
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffLevel"].(float64); !_ok_ { err = errors.New("BuffLevel error"); return }; _v.BuffLevel = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Quality"].(float64); !_ok_ { err = errors.New("Quality error"); return }; _v.Quality = int32(_tempNum_) }
{ var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["BuffIcon"].(string); !_ok_ { err = errors.New("BuffIcon error"); return } }
- {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["buffName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffName, _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["BuffDescription"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffDescription error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffDescription, _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["BuffStory"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffStory error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffStory, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffUpgradeCost"].(map[string]interface{}); !_ok_ { err = errors.New("BuffUpgradeCost error"); return }; if _v.BuffUpgradeCost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffSell"].(map[string]interface{}); !_ok_ { err = errors.New("BuffSell error"); return }; if _v.BuffSell, err = DeserializeGameatn(_x_); err != nil { return } }
diff --git a/sys/configure/structs/Game.StroneEventData.go b/sys/configure/structs/Game.StroneEventData.go
index ca2609fd1..020cfd55e 100644
--- a/sys/configure/structs/Game.StroneEventData.go
+++ b/sys/configure/structs/Game.StroneEventData.go
@@ -19,6 +19,7 @@ type GameStroneEventData struct {
Value2 int32
Value3 int32
Value4 int32
+ CostItem []*Gameatn
PostEvent int32
Probability int32
}
@@ -38,6 +39,20 @@ func (_v *GameStroneEventData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value2"].(float64); !_ok_ { err = errors.New("Value2 error"); return }; _v.Value2 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value3"].(float64); !_ok_ { err = errors.New("Value3 error"); return }; _v.Value3 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value4"].(float64); !_ok_ { err = errors.New("Value4 error"); return }; _v.Value4 = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["CostItem"].([]interface{}); !_ok_ { err = errors.New("CostItem error"); return }
+
+ _v.CostItem = 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.CostItem = append(_v.CostItem, _list_v_)
+ }
+ }
+
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PostEvent"].(float64); !_ok_ { err = errors.New("PostEvent error"); return }; _v.PostEvent = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
return
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 373fb9696..c475c0c36 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -249,6 +249,8 @@ type GameGlobalData struct {
Voucher *Gameatn
Passlvmax int32
GuildbossRoulette *Gameatn
+ GuildbossKillPreview []*Gameatn
+ GuildbossChallengePreview []*Gameatn
}
const TypeId_GameGlobalData = 477542761
@@ -1003,6 +1005,34 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["voucher"].(map[string]interface{}); !_ok_ { err = errors.New("voucher error"); return }; if _v.Voucher, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["passlvmax"].(float64); !_ok_ { err = errors.New("passlvmax error"); return }; _v.Passlvmax = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["guildboss_roulette"].(map[string]interface{}); !_ok_ { err = errors.New("guildboss_roulette error"); return }; if _v.GuildbossRoulette, err = DeserializeGameatn(_x_); err != nil { return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["guildboss_kill_Preview"].([]interface{}); !_ok_ { err = errors.New("guildboss_kill_Preview error"); return }
+
+ _v.GuildbossKillPreview = 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.GuildbossKillPreview = append(_v.GuildbossKillPreview, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["guildboss_challenge_preview"].([]interface{}); !_ok_ { err = errors.New("guildboss_challenge_preview error"); return }
+
+ _v.GuildbossChallengePreview = 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.GuildbossChallengePreview = append(_v.GuildbossChallengePreview, _list_v_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/game.playerlvData.go b/sys/configure/structs/game.playerlvData.go
index d3e9ff867..ece1c973e 100644
--- a/sys/configure/structs/game.playerlvData.go
+++ b/sys/configure/structs/game.playerlvData.go
@@ -17,6 +17,7 @@ type GamePlayerlvData struct {
PsCeiling int32
CopsPsCeiling int32
HeroLv int32
+ GuildBossCeiling int32
}
const TypeId_GamePlayerlvData = 927774449
@@ -45,6 +46,7 @@ func (_v *GamePlayerlvData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ps_ceiling"].(float64); !_ok_ { err = errors.New("ps_ceiling error"); return }; _v.PsCeiling = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_ps_ceiling"].(float64); !_ok_ { err = errors.New("cops_ps_ceiling error"); return }; _v.CopsPsCeiling = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero_lv"].(float64); !_ok_ { err = errors.New("hero_lv error"); return }; _v.HeroLv = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_boss_ceiling"].(float64); !_ok_ { err = errors.New("guild_boss_ceiling error"); return }; _v.GuildBossCeiling = int32(_tempNum_) }
return
}