liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
wh_zcy 2023-07-06 10:53:54 +08:00
commit 2ecc5b1f3d
33 changed files with 8478 additions and 1410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/json/game_battleready.json
View File

@ -476,5 +476,22 @@
"AssistTeam": 0, "AssistTeam": 0,
"CanFriendHelp": 0, "CanFriendHelp": 0,
"Numrounds": 0 "Numrounds": 0
},
{
"id": 128,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_dragon_01"
],
"disableAiCamera": 1,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
} }
] ]

4390
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_caravanevent.json
View File

@ -35,7 +35,7 @@
"eventweight": 40000, "eventweight": 40000,
"eventtype": 1, "eventtype": 1,
"mustdo": 2, "mustdo": 2,
"citystory": 50020011, "citystory": 50020010,
"citynormal": 50020030, "citynormal": 50020030,
"cityabnormal": 50020020, "cityabnormal": 50020020,
"worldtask": 510, "worldtask": 510,
@ -65,7 +65,7 @@
"eventweight": 20000, "eventweight": 20000,
"eventtype": 1, "eventtype": 1,
"mustdo": 1, "mustdo": 1,
"citystory": 50020012, "citystory": 50020010,
"citynormal": 50020030, "citynormal": 50020030,
"cityabnormal": 50020020, "cityabnormal": 50020020,
"worldtask": 520, "worldtask": 520,

980
bin/json/game_favorability.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_gm.json
View File

@ -236,7 +236,7 @@
"key": "GM_GM_text_25", "key": "GM_GM_text_25",
"text": "跳到主线关卡XX关（填关卡Id）" "text": "跳到主线关卡XX关（填关卡Id）"
}, },
"data": "1101001", "data": "1101201",
"prefix": "bingo:mainline,{0}" "prefix": "bingo:mainline,{0}"
}, },
{ {
@ -256,7 +256,7 @@
"key": "GM_GM_text_28", "key": "GM_GM_text_28",
"text": "跳到世界任务XX任务（分组,任务id）" "text": "跳到世界任务XX任务（分组,任务id）"
}, },
"data": "1,10100", "data": "10,20220",
"prefix": "bingo:worldtask,{0}" "prefix": "bingo:worldtask,{0}"
}, },
{ {

2002
bin/json/game_item.json
View File

File diff suppressed because it is too large Load Diff

126
bin/json/game_worldtask.json
View File

@ -1,6 +1,7 @@
[ [
{ {
"key": 20010, "key": 20010,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 0, "ontxe": 0,
@ -38,6 +39,7 @@
}, },
{ {
"key": 20011, "key": 20011,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
@ -75,6 +77,7 @@
}, },
{ {
"key": 20012, "key": 20012,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20011, "ontxe": 20011,
@ -117,6 +120,7 @@
}, },
{ {
"key": 20020, "key": 20020,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20012, "ontxe": 20012,
@ -154,6 +158,7 @@
}, },
{ {
"key": 20030, "key": 20030,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20020, "ontxe": 20020,
@ -191,6 +196,7 @@
}, },
{ {
"key": 20040, "key": 20040,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20030, "ontxe": 20030,
@ -233,6 +239,7 @@
}, },
{ {
"key": 20050, "key": 20050,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20040, "ontxe": 20040,
@ -275,6 +282,7 @@
}, },
{ {
"key": 20060, "key": 20060,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20050, "ontxe": 20050,
@ -312,6 +320,7 @@
}, },
{ {
"key": 20070, "key": 20070,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20060, "ontxe": 20060,
@ -349,6 +358,7 @@
}, },
{ {
"key": 20080, "key": 20080,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20070, "ontxe": 20070,
@ -388,6 +398,7 @@
}, },
{ {
"key": 20090, "key": 20090,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20080, "ontxe": 20080,
@ -430,6 +441,7 @@
}, },
{ {
"key": 20100, "key": 20100,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20090, "ontxe": 20090,
@ -492,6 +504,7 @@
}, },
{ {
"key": 20110, "key": 20110,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20100, "ontxe": 20100,
@ -529,6 +542,7 @@
}, },
{ {
"key": 20120, "key": 20120,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20110, "ontxe": 20110,
@ -566,6 +580,7 @@
}, },
{ {
"key": 20130, "key": 20130,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20120, "ontxe": 20120,
@ -603,6 +618,7 @@
}, },
{ {
"key": 20140, "key": 20140,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20130, "ontxe": 20130,
@ -665,6 +681,7 @@
}, },
{ {
"key": 20150, "key": 20150,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20140, "ontxe": 20140,
@ -702,6 +719,7 @@
}, },
{ {
"key": 20160, "key": 20160,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20150, "ontxe": 20150,
@ -739,6 +757,7 @@
}, },
{ {
"key": 20170, "key": 20170,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20160, "ontxe": 20160,
@ -781,6 +800,7 @@
}, },
{ {
"key": 20180, "key": 20180,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20170, "ontxe": 20170,
@ -823,6 +843,7 @@
}, },
{ {
"key": 20190, "key": 20190,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20180, "ontxe": 20180,
@ -860,6 +881,7 @@
}, },
{ {
"key": 20200, "key": 20200,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20190, "ontxe": 20190,
@ -897,6 +919,7 @@
}, },
{ {
"key": 20210, "key": 20210,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20200, "ontxe": 20200,
@ -934,6 +957,7 @@
}, },
{ {
"key": 20220, "key": 20220,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20210, "ontxe": 20210,
@ -971,6 +995,7 @@
}, },
{ {
"key": 20230, "key": 20230,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20220, "ontxe": 20220,
@ -1013,6 +1038,7 @@
}, },
{ {
"key": 20240, "key": 20240,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20230, "ontxe": 20230,
@ -1050,6 +1076,7 @@
}, },
{ {
"key": 20250, "key": 20250,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20240, "ontxe": 20240,
@ -1112,6 +1139,7 @@
}, },
{ {
"key": 20260, "key": 20260,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20250, "ontxe": 20250,
@ -1149,6 +1177,7 @@
}, },
{ {
"key": 20270, "key": 20270,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20260, "ontxe": 20260,
@ -1186,6 +1215,7 @@
}, },
{ {
"key": 20280, "key": 20280,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20270, "ontxe": 20270,
@ -1228,6 +1258,7 @@
}, },
{ {
"key": 20290, "key": 20290,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20280, "ontxe": 20280,
@ -1267,6 +1298,7 @@
}, },
{ {
"key": 20300, "key": 20300,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20290, "ontxe": 20290,
@ -1309,6 +1341,7 @@
}, },
{ {
"key": 20310, "key": 20310,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20300, "ontxe": 20300,
@ -1346,6 +1379,7 @@
}, },
{ {
"key": 20320, "key": 20320,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20310, "ontxe": 20310,
@ -1383,6 +1417,7 @@
}, },
{ {
"key": 20330, "key": 20330,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20320, "ontxe": 20320,
@ -1420,6 +1455,7 @@
}, },
{ {
"key": 20340, "key": 20340,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20330, "ontxe": 20330,
@ -1467,6 +1503,7 @@
}, },
{ {
"key": 20350, "key": 20350,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20340, "ontxe": 20340,
@ -1505,6 +1542,7 @@
}, },
{ {
"key": 20360, "key": 20360,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20350, "ontxe": 20350,
@ -1547,6 +1585,7 @@
}, },
{ {
"key": 20370, "key": 20370,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20360, "ontxe": 20360,
@ -1589,6 +1628,7 @@
}, },
{ {
"key": 20380, "key": 20380,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20370, "ontxe": 20370,
@ -1626,6 +1666,7 @@
}, },
{ {
"key": 20390, "key": 20390,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20380, "ontxe": 20380,
@ -1663,6 +1704,7 @@
}, },
{ {
"key": 20400, "key": 20400,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20390, "ontxe": 20390,
@ -1700,6 +1742,7 @@
}, },
{ {
"key": 20410, "key": 20410,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20400, "ontxe": 20400,
@ -1737,6 +1780,7 @@
}, },
{ {
"key": 20420, "key": 20420,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20410, "ontxe": 20410,
@ -1774,6 +1818,7 @@
}, },
{ {
"key": 20430, "key": 20430,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20420, "ontxe": 20420,
@ -1816,6 +1861,7 @@
}, },
{ {
"key": 20440, "key": 20440,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20430, "ontxe": 20430,
@ -1853,6 +1899,7 @@
}, },
{ {
"key": 20450, "key": 20450,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20440, "ontxe": 20440,
@ -1890,6 +1937,7 @@
}, },
{ {
"key": 20460, "key": 20460,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20450, "ontxe": 20450,
@ -1927,6 +1975,7 @@
}, },
{ {
"key": 20470, "key": 20470,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20460, "ontxe": 20460,
@ -1964,6 +2013,7 @@
}, },
{ {
"key": 20480, "key": 20480,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20470, "ontxe": 20470,
@ -2001,6 +2051,7 @@
}, },
{ {
"key": 20490, "key": 20490,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20480, "ontxe": 20480,
@ -2038,6 +2089,7 @@
}, },
{ {
"key": 20500, "key": 20500,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20490, "ontxe": 20490,
@ -2080,6 +2132,7 @@
}, },
{ {
"key": 20510, "key": 20510,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20500, "ontxe": 20500,
@ -2117,6 +2170,7 @@
}, },
{ {
"key": 20520, "key": 20520,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20510, "ontxe": 20510,
@ -2154,6 +2208,7 @@
}, },
{ {
"key": 20530, "key": 20530,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20520, "ontxe": 20520,
@ -2196,6 +2251,7 @@
}, },
{ {
"key": 20540, "key": 20540,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20530, "ontxe": 20530,
@ -2233,6 +2289,7 @@
}, },
{ {
"key": 20550, "key": 20550,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20540, "ontxe": 20540,
@ -2270,6 +2327,7 @@
}, },
{ {
"key": 20560, "key": 20560,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20550, "ontxe": 20550,
@ -2307,6 +2365,7 @@
}, },
{ {
"key": 20570, "key": 20570,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20560, "ontxe": 20560,
@ -2344,6 +2403,7 @@
}, },
{ {
"key": 20580, "key": 20580,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20570, "ontxe": 20570,
@ -2381,6 +2441,7 @@
}, },
{ {
"key": 20590, "key": 20590,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20580, "ontxe": 20580,
@ -2418,6 +2479,7 @@
}, },
{ {
"key": 20600, "key": 20600,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20590, "ontxe": 20590,
@ -2455,6 +2517,7 @@
}, },
{ {
"key": 20610, "key": 20610,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20600, "ontxe": 20600,
@ -2492,6 +2555,7 @@
}, },
{ {
"key": 20620, "key": 20620,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20610, "ontxe": 20610,
@ -2529,6 +2593,7 @@
}, },
{ {
"key": 20630, "key": 20630,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20620, "ontxe": 20620,
@ -2571,6 +2636,7 @@
}, },
{ {
"key": 20640, "key": 20640,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20630, "ontxe": 20630,
@ -2608,6 +2674,7 @@
}, },
{ {
"key": 20650, "key": 20650,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20640, "ontxe": 20640,
@ -2645,6 +2712,7 @@
}, },
{ {
"key": 20660, "key": 20660,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20650, "ontxe": 20650,
@ -2682,6 +2750,7 @@
}, },
{ {
"key": 20670, "key": 20670,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20660, "ontxe": 20660,
@ -2724,6 +2793,7 @@
}, },
{ {
"key": 20680, "key": 20680,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20670, "ontxe": 20670,
@ -2766,6 +2836,7 @@
}, },
{ {
"key": 20690, "key": 20690,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20680, "ontxe": 20680,
@ -2803,6 +2874,7 @@
}, },
{ {
"key": 20700, "key": 20700,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20690, "ontxe": 20690,
@ -2840,6 +2912,7 @@
}, },
{ {
"key": 20710, "key": 20710,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20700, "ontxe": 20700,
@ -2877,6 +2950,7 @@
}, },
{ {
"key": 20720, "key": 20720,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20710, "ontxe": 20710,
@ -2914,6 +2988,7 @@
}, },
{ {
"key": 20730, "key": 20730,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20720, "ontxe": 20720,
@ -2951,6 +3026,7 @@
}, },
{ {
"key": 20740, "key": 20740,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20730, "ontxe": 20730,
@ -2988,6 +3064,7 @@
}, },
{ {
"key": 20750, "key": 20750,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20740, "ontxe": 20740,
@ -3025,6 +3102,7 @@
}, },
{ {
"key": 20760, "key": 20760,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20750, "ontxe": 20750,
@ -3062,6 +3140,7 @@
}, },
{ {
"key": 20770, "key": 20770,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20760, "ontxe": 20760,
@ -3104,6 +3183,7 @@
}, },
{ {
"key": 20780, "key": 20780,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20770, "ontxe": 20770,
@ -3141,6 +3221,7 @@
}, },
{ {
"key": 20790, "key": 20790,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20780, "ontxe": 20780,
@ -3178,6 +3259,7 @@
}, },
{ {
"key": 20800, "key": 20800,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20790, "ontxe": 20790,
@ -3215,6 +3297,7 @@
}, },
{ {
"key": 20810, "key": 20810,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20800, "ontxe": 20800,
@ -3252,6 +3335,7 @@
}, },
{ {
"key": 20820, "key": 20820,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20810, "ontxe": 20810,
@ -3294,6 +3378,7 @@
}, },
{ {
"key": 20830, "key": 20830,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20820, "ontxe": 20820,
@ -3331,6 +3416,7 @@
}, },
{ {
"key": 20840, "key": 20840,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20830, "ontxe": 20830,
@ -3373,6 +3459,7 @@
}, },
{ {
"key": 20850, "key": 20850,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20840, "ontxe": 20840,
@ -3415,6 +3502,7 @@
}, },
{ {
"key": 20860, "key": 20860,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20850, "ontxe": 20850,
@ -3452,6 +3540,7 @@
}, },
{ {
"key": 20870, "key": 20870,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20860, "ontxe": 20860,
@ -3489,6 +3578,7 @@
}, },
{ {
"key": 20880, "key": 20880,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20870, "ontxe": 20870,
@ -3531,6 +3621,7 @@
}, },
{ {
"key": 20890, "key": 20890,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20880, "ontxe": 20880,
@ -3568,6 +3659,7 @@
}, },
{ {
"key": 20900, "key": 20900,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20890, "ontxe": 20890,
@ -3605,6 +3697,7 @@
}, },
{ {
"key": 20910, "key": 20910,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20900, "ontxe": 20900,
@ -3642,6 +3735,7 @@
}, },
{ {
"key": 20920, "key": 20920,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20910, "ontxe": 20910,
@ -3679,6 +3773,7 @@
}, },
{ {
"key": 20930, "key": 20930,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20920, "ontxe": 20920,
@ -3716,6 +3811,7 @@
}, },
{ {
"key": 20940, "key": 20940,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20930, "ontxe": 20930,
@ -3753,6 +3849,7 @@
}, },
{ {
"key": 20950, "key": 20950,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20940, "ontxe": 20940,
@ -3795,6 +3892,7 @@
}, },
{ {
"key": 20960, "key": 20960,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20950, "ontxe": 20950,
@ -3832,6 +3930,7 @@
}, },
{ {
"key": 20970, "key": 20970,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20960, "ontxe": 20960,
@ -3869,6 +3968,7 @@
}, },
{ {
"key": 20980, "key": 20980,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20970, "ontxe": 20970,
@ -3906,6 +4006,7 @@
}, },
{ {
"key": 20990, "key": 20990,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20980, "ontxe": 20980,
@ -3943,6 +4044,7 @@
}, },
{ {
"key": 21000, "key": 21000,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 20990, "ontxe": 20990,
@ -3980,6 +4082,7 @@
}, },
{ {
"key": 21010, "key": 21010,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21000, "ontxe": 21000,
@ -4017,6 +4120,7 @@
}, },
{ {
"key": 21020, "key": 21020,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21010, "ontxe": 21010,
@ -4054,6 +4158,7 @@
}, },
{ {
"key": 21030, "key": 21030,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21020, "ontxe": 21020,
@ -4091,6 +4196,7 @@
}, },
{ {
"key": 21040, "key": 21040,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21030, "ontxe": 21030,
@ -4128,6 +4234,7 @@
}, },
{ {
"key": 21050, "key": 21050,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21040, "ontxe": 21040,
@ -4165,6 +4272,7 @@
}, },
{ {
"key": 21060, "key": 21060,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21050, "ontxe": 21050,
@ -4202,6 +4310,7 @@
}, },
{ {
"key": 21070, "key": 21070,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21060, "ontxe": 21060,
@ -4239,6 +4348,7 @@
}, },
{ {
"key": 21080, "key": 21080,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21070, "ontxe": 21070,
@ -4276,6 +4386,7 @@
}, },
{ {
"key": 21090, "key": 21090,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21080, "ontxe": 21080,
@ -4313,6 +4424,7 @@
}, },
{ {
"key": 21100, "key": 21100,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21090, "ontxe": 21090,
@ -4350,6 +4462,7 @@
}, },
{ {
"key": 21110, "key": 21110,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21100, "ontxe": 21100,
@ -4387,6 +4500,7 @@
}, },
{ {
"key": 21120, "key": 21120,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21110, "ontxe": 21110,
@ -4424,6 +4538,7 @@
}, },
{ {
"key": 21130, "key": 21130,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21120, "ontxe": 21120,
@ -4461,6 +4576,7 @@
}, },
{ {
"key": 21140, "key": 21140,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21130, "ontxe": 21130,
@ -4498,6 +4614,7 @@
}, },
{ {
"key": 21150, "key": 21150,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21140, "ontxe": 21140,
@ -4535,6 +4652,7 @@
}, },
{ {
"key": 21160, "key": 21160,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21150, "ontxe": 21150,
@ -4572,6 +4690,7 @@
}, },
{ {
"key": 21170, "key": 21170,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21160, "ontxe": 21160,
@ -4609,6 +4728,7 @@
}, },
{ {
"key": 21180, "key": 21180,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21170, "ontxe": 21170,
@ -4646,6 +4766,7 @@
}, },
{ {
"key": 21190, "key": 21190,
"opencond": "",
"lock": 5, "lock": 5,
"lockend": 0, "lockend": 0,
"ontxe": 21180, "ontxe": 21180,
@ -4683,6 +4804,7 @@
}, },
{ {
"key": 500010, "key": 500010,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 0, "ontxe": 0,
@ -4722,6 +4844,7 @@
}, },
{ {
"key": 500020, "key": 500020,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 500010, "ontxe": 500010,
@ -4761,6 +4884,7 @@
}, },
{ {
"key": 500030, "key": 500030,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 500020, "ontxe": 500020,
@ -4800,6 +4924,7 @@
}, },
{ {
"key": 500040, "key": 500040,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 0, "ontxe": 0,
@ -4839,6 +4964,7 @@
}, },
{ {
"key": 500050, "key": 500050,
"opencond": "",
"lock": 1, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 0, "ontxe": 0,

519
bin/wordfilter.txt
View File

@ -49507,3 +49507,522 @@ AR15
泰国 泰国
打猎 打猎
精工 精工
北极鲶鱼
插管
暴力份子
回笼漂
45度青年
公Chan党
共Chan党
公chan党
共chan党
共chan谠
公chan谠
共CHAN谠
公CHAN谠
Av
aV
av
习明泽
迷情药
迷情水
迷情丸
TRUMP
Trump
trump
BIDEN
Biden
biden
新冠感染
流血
女基督派
杀孩子
平哥彭嫂
金正哲
反公
诅咒
击杀
圣女贞德
双规
傻叉
虐小孩
拿冰
求肉
出肉
肉商
男道友
女道友
反中斗士
反华斗士
暴菊
方方日记
芳芳日记
交欢
双飞
暴力分子
苍老师
好色
艹
站街女
三p
偷窥
迷幻剂
玩你
血腥
屠城
暴力
砍头
马勒戈壁
山口组
失身
母狗
李讷
浪货
少先队
左权
装13
李强
蔡奇
丁薛祥
李希
二十大
党的二十大
中共二十大
中国共产党第二十次全国代表大会
买了个表
中联部
佩洛西
溜冰
浮夸风
低端人口
低端人士
Av.约炮
搞基
麻辣隔壁
李书磊
台海战争
杀光
马拉个币
文革
毛东东
杨开慧
马德
玛德
安倍
核战争
女马德
齐b
齐B
毛新宇
苍井空
往事牛津大學出版社章詒和
一人傘下的人香港
八旗文化梁文傑矛盾與內幕
近藤大介谋略の100年史
大解體美達大和
西热达吉嘉乐顿珠
两个时代互不否定相互否定
滴血的数字沉重的祭奠
ISIL
爱滋
SEX
Sex
sex
蔡文胜
李兴平
曹政
洛海坚
國民黨
拉闸限电
秃驴
去中国化
齐逼短裙
傻叉
道友拿冰
银行卡
第三党
同性恋
灭门
孽杀
中组部
吸粉
跪压黑人
港区国安
冰道友
习大帝
刘晓波
BCI
bci
瑞士良好棉花发展协会
The Better Cotton Initiative
Better Cotton Initiative
抵制新疆棉花
新疆棉花
抵制新疆的棉花
新疆的棉花
制裁新疆
裁疆
H&M
h&m
HM
hm
强制劳动与侵犯人权
强制劳动
侵犯人权
海峡中线
台海中线
齐B短裙
飞行燃料
莎菲片
特么的
道有拿冰
两岸华语
杀小孩
报复社会
拜登
Isil
ISIl
isil
爆菊
菅义伟
特鲁多
约翰逊
鲍里斯
KMT
kmt
kkk
KKK
ISIS
三k党
太阳花运动
佔領中環
佔中
太陽花運動
西藏國
国安法
港区国安法
shit
612人道支援基金
人道支援基金
六一二人道支援基金
绝食
静坐
他娘
穆罕穆德
黄坤明
ISIS
Isis
isis
IsIs
ISis
ISIs
iSIS
isIS
isiS
isIS
社会制度的公平
资源分配的正义
法治精神的贯彻
政府治理的透明
人民参政的充分
撤回修例
调查警队
林郑下台
普选
赦免暴力示威者
五大诉求
武汉肺炎
新冠
新冠肺炎
新冠病毒
新型冠状病毒
新型冠状病毒肺炎
SARS
SARI
新冠疫情
武汉疫情
武汉病毒
野味病毒
穿山甲病毒
武汉病毒所
武汉汉病毒研究所
中国病毒
COVID-19
corona virus disease19
SARS-COV-2
NCP
病毒加油
野味肺炎
国际突发公共卫生事件
口罩
kn95
疫苗
防护服
护目镜
人传人
卫健委
国家卫生健康委员会
国家卫健委
湖北卫健委
武汉卫健委
红会
红十字
红十字会
红十字基金会
湖北省委书记
湖北政府
大换血
武汉市长
大鄂
鄂A0260W
鄂A零二六零W
核酸检测
核酸试剂盒
王贺胜
应勇
王晓东
蒋超良
涂远超
蔡杰
李文亮
王延轶
舒红兵
孙春兰
李兰娟
钟南山
吹哨人
双黄连
瑞德西韦
F4
协和医院
金银潭医院
方舱医院
火神山医院
雷神山医院
中央指导组
华南海鲜市场
确诊病例
疑似病例
重症患者
病死率
飞沫传播
输入性病例
二代病例
隐性感染
封城
武汉封城
武汉感染
钟南山感染
中国被感染
肺炎加油
被肺炎战胜
武汉肺炎加油
被武汉肺炎战胜
新冠肺炎加油
被新冠肺炎战胜
吃蝙蝠
蝙蝠肺炎加油
被蝙蝠肺炎战胜
得肺炎
得武汉肺炎
早日被感染
早日感染肺炎
早日感染武汉肺炎
被疫情战胜
患肺炎
患武汉肺炎
中国病毒
武汉病毒
特鲁多
鲍里斯约翰逊
政治类
犯罪词汇
谋杀
杀人
吸毒
贩毒
赌博
拐卖
走私
卖淫
造反
监狱
强奸
轮奸
抢劫
先奸后杀民国
习主席
习大大
全国人民代表大会
全国人大
侵华
下注
押大
押小
抽头
坐庄
赌马
赌球
筹码
老虎机
轮盘赌
安非他命
大麻
可卡因
海洛因
冰毒
摇头丸
杜冷丁
鸦片
罂粟
迷幻药
白粉
嗑药
吸毒
冰粉
中央
中南海
安拉
特朗普
朴槿惠
法轮功
爱的家庭
汪洋
栗战书
杨洁篪
郭声琨
王勇
孫中山
臺灣民國
台湾民国
金正恩
十九大
後庭
薹獨
Isis
文在寅
蓝鲸游戏
诱杀
世雄会
辣鸡
你妹
占领中环
爱情动作片
YY
马克龙
安拉
中南海
冰粉
台湾
十八大
十八大代表
十九大代表
十八摸
18摸
漏阴癖
真理教
转法轮
真善忍
瘸腿帮
张晓军
野鸡
野妓
野鷄
薄谷开来
薄瓜瓜
夜话紫禁城
耶稣
游荡爪牙
游蕩爪牙
中國
中华大地
中崋大地
偷窥洗澡
一陀粪
毒
特蕾莎梅
拉票贿选
伊莎贝尔
伊莎貝爾
偷窥视频
游戯
耐草
操
艹肏
游荡的士兵
游蕩的士兵
K粉
k粉
D&G
DG
杜嘉班纳
Dolce&Gabbana
dg
D& G
d&g
杜班
辱华
612人道支援基金
金三胖
蔡英文
香港建国
香港国
港独
香港独立
占领中环
占中
香港城邦论
太阳花学运
反国教运动
清真
浴盐
你奶奶
强暴幼女
ISIS,小眼佬
黄皮猴子
幼奸
萨德
毛泽東
文在寅
习总书记
古柯碱
恐怖分子
徒弟会
阁列岛
劉雲山
張高麗李長春
蔣經國
张高丽
金廷勋
锦涛
经济社会理事会
习主席
原子导弹
原子弹
氢弹
贩毒
核武器
吸毒
贩毒
革命
赌博
彭丽媛
薄熙来
王立军
胡紧涛
找小姐
兽兽门
东京热
a片
尼玛
裸聊
默罕默德
全能神教
全能神
尼玛逼
肏屄
先奸后杀
Is
IS
Isis
IS

4
comm/error.go
View File

@ -26,10 +26,10 @@ func NewCustomError(code pb.ErrorCode) error {
// 创建配置表错误对象 // 创建配置表错误对象
func NewNotFoundConfErr(moduleName string, filename string, id interface{}) error { func NewNotFoundConfErr(moduleName string, filename string, id interface{}) error {
return fmt.Errorf("服务端配置未找到!模块:%s ,配置文件:%s,目标数据:%v", moduleName, filename, id) return fmt.Errorf("NotFoundConf Err module:%s ,file:%s,id:%v", moduleName, filename, id)
} }
// 执行外部模块异常 // 执行外部模块异常
func NewExternalModuleErr(moduleName string, methodname string, parameter ...interface{}) error { func NewExternalModuleErr(moduleName string, methodname string, parameter ...interface{}) error {
return fmt.Errorf("执行外部模块错误 模块:%s ,配置文件:%s,目标数据:%v", moduleName, methodname, parameter) return fmt.Errorf("ExternalModule Err module:%s ,file:%s,parameter:%v", moduleName, methodname, parameter)
} }

7
modules/caravan/module.go
View File

@ -291,9 +291,10 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid int32) {
resp *pb.CaravanTaskCompletePush resp *pb.CaravanTaskCompletePush
) )
if !this.IsCross() { if !this.IsCross() {
if conf, err := this.configure.GetCaravanEventById(taskid); err == nil {
list, _ := this.modelCaravan.getCaravanList(session.GetUserId()) list, _ := this.modelCaravan.getCaravanList(session.GetUserId())
if list.Taskid == taskid { if list.Taskid == taskid {
if conf, err := this.configure.GetCaravanEventById(list.Eventid); err == nil {
this.CleanCaravanTask(session.GetUserId(), list) //任务完成 清理任务数据 this.CleanCaravanTask(session.GetUserId(), list) //任务完成 清理任务数据
resp = &pb.CaravanTaskCompletePush{} resp = &pb.CaravanTaskCompletePush{}
resp.Data = list resp.Data = list

58
modules/chat/module.go
View File

@ -39,17 +39,17 @@ type Chat struct {
modelChat *modelChatComp modelChat *modelChatComp
} }
//重构模块配置对象 // 重构模块配置对象
func (this *Chat) NewOptions() (options core.IModuleOptions) { func (this *Chat) NewOptions() (options core.IModuleOptions) {
return new(Options) return new(Options)
} }
//模块名 // 模块名
func (this *Chat) GetType() core.M_Modules { func (this *Chat) GetType() core.M_Modules {
return comm.ModuleChat return comm.ModuleChat
} }
//模块初始化接口 注册用户创建角色事件 // 模块初始化接口 注册用户创建角色事件
func (this *Chat) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { func (this *Chat) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options) err = this.ModuleBase.Init(service, module, options)
this.service = service.(base.IRPCXService) this.service = service.(base.IRPCXService)
@ -73,7 +73,7 @@ func (this *Chat) Start() (err error) {
return return
} }
//装备组件 // 装备组件
func (this *Chat) OnInstallComp() { func (this *Chat) OnInstallComp() {
this.ModuleBase.OnInstallComp() this.ModuleBase.OnInstallComp()
this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp) this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp)
@ -81,15 +81,15 @@ func (this *Chat) OnInstallComp() {
this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
} }
//Event------------------------------------------------------------------------------------------------------------ // Event------------------------------------------------------------------------------------------------------------
func (this *Chat) EventUserOffline(uid, sessionid string) { func (this *Chat) EventUserOffline(uid, sessionid string) {
if err := this.modelChat.removeCrossChannelMember(uid); err != nil { if err := this.modelChat.removeCrossChannelMember(uid); err != nil {
this.Error("EventUserOffline", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) this.Error("EventUserOffline", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
} }
} }
//RPC-------------------------------------------------------------------------------------------------------------- // RPC--------------------------------------------------------------------------------------------------------------
//推送聊天消息 // 推送聊天消息
func (this *Chat) Rpc_ModuleChatPushChat(ctx context.Context, args *pb.DBChat, reply *pb.EmptyResp) (err error) { func (this *Chat) Rpc_ModuleChatPushChat(ctx context.Context, args *pb.DBChat, reply *pb.EmptyResp) (err error) {
var ( var (
max_chat int32 max_chat int32
@ -133,8 +133,8 @@ func (this *Chat) Rpc_ModuleChatPushChat(ctx context.Context, args *pb.DBChat, r
return return
} }
//对外接口---------------------------------------------------------------------------------------------------------- // 对外接口----------------------------------------------------------------------------------------------------------
//向世界频道发送聊天消息 // 向世界频道发送聊天消息
func (this *Chat) SendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) { func (this *Chat) SendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
var ( var (
max_chat int32 max_chat int32
@ -173,7 +173,7 @@ func (this *Chat) SendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
return return
} }
//向工会发送聊天消息 // 向工会发送聊天消息
func (this *Chat) SendUnionChat(msg *pb.DBChat) (errdata *pb.ErrorData) { func (this *Chat) SendUnionChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
var ( var (
max_chat int32 max_chat int32
@ -212,7 +212,7 @@ func (this *Chat) SendUnionChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
return return
} }
//向个人发送聊天消息 // 向个人发送聊天消息
func (this *Chat) SendUserChat(msg *pb.DBChat) (errdata *pb.ErrorData) { func (this *Chat) SendUserChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
var ( var (
err error err error
@ -246,7 +246,7 @@ func (this *Chat) SendUserChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
return return
} }
//广播系统消息 // 广播系统消息
func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata interface{}, value0 int32, value1 int32, agrs ...string) (errdata *pb.ErrorData) { func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata interface{}, value0 int32, value1 int32, agrs ...string) (errdata *pb.ErrorData) {
var ( var (
jsonStr []byte jsonStr []byte
@ -263,7 +263,8 @@ func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata inter
AppendInt: int64(st.Key), AppendInt: int64(st.Key),
AppendStrs: agrs, AppendStrs: agrs,
} }
if ctype == comm.ChatSystem3 { //装备分享 switch ctype {
case comm.ChatSystem3:
msg.Ctype = pb.ChatType_Share msg.Ctype = pb.ChatType_Share
if appenddata != nil { if appenddata != nil {
if jsonStr, err = json.Marshal(appenddata); err != nil { if jsonStr, err = json.Marshal(appenddata); err != nil {
@ -280,6 +281,23 @@ func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata inter
msg.AppendStr = string(jsonStr) msg.AppendStr = string(jsonStr)
} }
} }
case comm.ChatSystem7, comm.ChatSystem8, comm.ChatSystem9, comm.ChatSystem10, comm.ChatSystem11:
msg.Ctype = pb.ChatType_Share
if appenddata != nil {
if jsonStr, err = json.Marshal(appenddata); err != nil {
this.Errorf("err:%v", err)
} else {
data := map[string]interface{}{
agrs[1]: map[string]interface{}{
"key": agrs[1],
"appendStr": string(jsonStr),
"itemType": pb.ChatType_HeroShare,
},
}
jsonStr, _ = json.Marshal(data)
msg.AppendStr = string(jsonStr)
}
}
} }
if this.IsCross() { if this.IsCross() {
@ -307,7 +325,7 @@ func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata inter
return return
} }
//广播系统消息 // 广播系统消息
func (this *Chat) SendSysChatToUser(session comm.IUserSession, ctype comm.ChatSystemType, value0, value1 int32, agrs ...string) (errdata *pb.ErrorData) { func (this *Chat) SendSysChatToUser(session comm.IUserSession, ctype comm.ChatSystemType, value0, value1 int32, agrs ...string) (errdata *pb.ErrorData) {
if st, ok := this.configure.GetCheckChatSystem(int32(ctype), value0, value1); ok { if st, ok := this.configure.GetCheckChatSystem(int32(ctype), value0, value1); ok {
msg := &pb.DBChat{ msg := &pb.DBChat{
@ -320,8 +338,8 @@ func (this *Chat) SendSysChatToUser(session comm.IUserSession, ctype comm.ChatSy
return return
} }
//Push-------------------------------------------------------------------------------------------------------------- // Push--------------------------------------------------------------------------------------------------------------
//推送消息到世界 // 推送消息到世界
func (this *Chat) pushChatToWorld(msg *pb.DBChat) (err error) { func (this *Chat) pushChatToWorld(msg *pb.DBChat) (err error) {
data, _ := anypb.New(&pb.ChatMessagePush{Chat: msg}) data, _ := anypb.New(&pb.ChatMessagePush{Chat: msg})
if err = this.service.AcrossClusterBroadcast(context.Background(), msg.Stag, comm.Service_Gateway, string(comm.Rpc_GatewaySendRadioMsg), pb.UserMessage{ if err = this.service.AcrossClusterBroadcast(context.Background(), msg.Stag, comm.Service_Gateway, string(comm.Rpc_GatewaySendRadioMsg), pb.UserMessage{
@ -334,7 +352,7 @@ func (this *Chat) pushChatToWorld(msg *pb.DBChat) (err error) {
return return
} }
//推送消息到工会 // 推送消息到工会
func (this *Chat) pushChatToUnion(msg *pb.DBChat) (err error) { func (this *Chat) pushChatToUnion(msg *pb.DBChat) (err error) {
if members := this.sociaty.MembersBySociatyId(msg.UnionId); members != nil { if members := this.sociaty.MembersBySociatyId(msg.UnionId); members != nil {
users := make([]string, 0, len(members)) users := make([]string, 0, len(members))
@ -348,7 +366,7 @@ func (this *Chat) pushChatToUnion(msg *pb.DBChat) (err error) {
return return
} }
//推送私聊消息 // 推送私聊消息
func (this *Chat) pushChatToPrivate(msg *pb.DBChat) (err error) { func (this *Chat) pushChatToPrivate(msg *pb.DBChat) (err error) {
var ( var (
session comm.IUserSession session comm.IUserSession
@ -369,7 +387,7 @@ func (this *Chat) pushChatToPrivate(msg *pb.DBChat) (err error) {
return return
} }
//推送跨服频道消息 // 推送跨服频道消息
func (this *Chat) pushChatToCross(msg *pb.DBChat) (err error) { func (this *Chat) pushChatToCross(msg *pb.DBChat) (err error) {
var ( var (
users []*pb.CacheUser users []*pb.CacheUser
@ -383,7 +401,7 @@ func (this *Chat) pushChatToCross(msg *pb.DBChat) (err error) {
return return
} }
//推送系统消息 // 推送系统消息
func (this *Chat) pushChatToSystem(msg *pb.DBChat) (err error) { func (this *Chat) pushChatToSystem(msg *pb.DBChat) (err error) {
data, _ := anypb.New(&pb.ChatMessagePush{Chat: msg}) data, _ := anypb.New(&pb.ChatMessagePush{Chat: msg})
if err = this.service.ClusterBroadcast(context.Background(), comm.Service_Gateway, string(comm.Rpc_GatewaySendRadioMsg), pb.UserMessage{ if err = this.service.ClusterBroadcast(context.Background(), comm.Service_Gateway, string(comm.Rpc_GatewaySendRadioMsg), pb.UserMessage{

6
modules/hero/api_strengthenUplv.go
View File

@ -7,7 +7,7 @@ import (
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
) )
//参数校验 // 参数校验
func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (errdata *pb.ErrorData) { func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (errdata *pb.ErrorData) {
if req.HeroObjID == "" || len(req.Item) == 0 { if req.HeroObjID == "" || len(req.Item) == 0 {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -20,7 +20,7 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero
return return
} }
/// 英雄升级 // / 英雄升级
func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (errdata *pb.ErrorData) { func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (errdata *pb.ErrorData) {
var ( var (
@ -96,7 +96,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
//英雄升级 【玩家名称】已将【英雄名称】培养至60级！ //英雄升级 【玩家名称】已将【英雄名称】培养至60级！
if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil {
this.chat.SendSysChatToWorld(comm.ChatSystem7, nil, _hero.Lv, 0, user.Name, _hero.HeroID) this.chat.SendSysChatToWorld(comm.ChatSystem7, _hero, _hero.Lv, 0, user.Name, _hero.HeroID)
} else { } else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId()) this.module.Errorf("no found userdata uid:%s", session.GetUserId())
} }

2
modules/hunting/api_challengeover.go
View File

@ -146,7 +146,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
for _, v := range req.Report.Info.Redflist[0].Team { for _, v := range req.Report.Info.Redflist[0].Team {
if cfgHunting.Heroexp > 0 && !v.Ishelp { // 助战英雄不加经验 if cfgHunting.Heroexp > 0 && !v.Ishelp { // 助战英雄不加经验
this.module.ModuleHero.AddHeroExp(session, v.Oid, cfgHunting.Heroexp) this.module.ModuleHero.AddHeroExp(session, v.Oid, cfgHunting.Heroexp)
changExp[v.HeroID] = cfgHunting.Heroexp changExp[v.Oid] = cfgHunting.Heroexp
} }
} }

14
modules/items/configure.go
View File

@ -18,7 +18,7 @@ const (
// game_propsgrouplist = "game_propsgrouplist.json" // game_propsgrouplist = "game_propsgrouplist.json"
) )
///背包配置管理组件 // /背包配置管理组件
type ConfigureComp struct { type ConfigureComp struct {
modules.MCompConfigure modules.MCompConfigure
module *Items module *Items
@ -26,7 +26,7 @@ type ConfigureComp struct {
// propsgroup map[int32][]*cfg.GamePropsgroupData // propsgroup map[int32][]*cfg.GamePropsgroupData
} }
//组件初始化接口 // 组件初始化接口
func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.MCompConfigure.Init(service, module, comp, options) this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Items) this.module = module.(*Items)
@ -53,7 +53,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp
return return
} }
//读取物品配置 // 读取物品配置
func (this *ConfigureComp) GetItemsConfigure() (items map[string]*cfg.GameItemData, err error) { func (this *ConfigureComp) GetItemsConfigure() (items map[string]*cfg.GameItemData, err error) {
var ( var (
v interface{} v interface{}
@ -67,7 +67,7 @@ func (this *ConfigureComp) GetItemsConfigure() (items map[string]*cfg.GameItemDa
return return
} }
//读取物品配置 // 读取物品配置
func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.GameItemData, err error) { func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.GameItemData, err error) {
var ( var (
v interface{} v interface{}
@ -86,7 +86,7 @@ func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.GameItemData,
return return
} }
//读取物品配置 // 读取物品配置
func (this *ConfigureComp) GetItemConfigures(ids []string) (item []*cfg.GameItemData, err error) { func (this *ConfigureComp) GetItemConfigures(ids []string) (item []*cfg.GameItemData, err error) {
var ( var (
v interface{} v interface{}
@ -108,7 +108,7 @@ func (this *ConfigureComp) GetItemConfigures(ids []string) (item []*cfg.GameItem
return return
} }
//获取指定类型的物品列表 // 获取指定类型的物品列表
func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, bagtype int32) (result []*pb.DB_UserItemData) { func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, bagtype int32) (result []*pb.DB_UserItemData) {
result = make([]*pb.DB_UserItemData, 0, len(itmes)) result = make([]*pb.DB_UserItemData, 0, len(itmes))
var ( var (
@ -164,7 +164,7 @@ func (this *ConfigureComp) GetchallengeData(buy int) (result *cfg.Gameatn) {
// return // return
// } // }
//读取物品配置 // 读取物品配置
func (this *ConfigureComp) GetMaterialConfigure(id int32) (configure *cfg.GamePotionsData, err error) { func (this *ConfigureComp) GetMaterialConfigure(id int32) (configure *cfg.GamePotionsData, err error) {
var ( var (
v interface{} v interface{}

43
modules/practice/api_getgymbuff.go
View File

@ -3,21 +3,25 @@ package practice
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/utils"
) )
//参数校验 // 参数校验
func (this *apiComp) GetGymBuffCheck(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (errdata *pb.ErrorData) { func (this *apiComp) GetGymBuffCheck(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (errdata *pb.ErrorData) {
return return
} }
///练功请求 // /练功请求
func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (errdata *pb.ErrorData) { func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (errdata *pb.ErrorData) {
var ( var (
mryl *cfg.GamePandamasMrylData mryl *cfg.GamePandamasMrylData
buff *cfg.GamePandamasBuffData buff *cfg.GamePandamasBuffData
err error room *pb.DBPracticeRoom
award []*pb.UserAssets
err error
) )
if mryl, err = this.module.configure.getPandamasMryl(req.Posture); err != nil { if mryl, err = this.module.configure.getPandamasMryl(req.Posture); err != nil {
@ -37,6 +41,33 @@ func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGy
return return
} }
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype185, 1)) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype185, 1))
session.SendMsg(string(this.module.GetType()), "getgymbuff", &pb.PracticeGetGymBuffResp{Buffid: buff.Id})
if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if !utils.IsToday(room.Lastgymtime) {
if errdata = this.module.DispenseRes(session, this.module.ModuleTools.GetGlobalConf().MrylReward, true); errdata != nil {
return
}
for _, v := range this.module.ModuleTools.GetGlobalConf().MrylReward {
award = append(award, &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
})
}
room.Lastgymtime = configure.Now().Unix()
this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
"lastgymtime": room.Lastgymtime,
})
}
session.SendMsg(string(this.module.GetType()), "getgymbuff", &pb.PracticeGetGymBuffResp{Buffid: buff.Id, Award: award})
return return
} }

4
modules/user/model_sign.go
View File

@ -31,7 +31,9 @@ func (this *ModelSign) Init(service core.IService, module core.IModule, comp cor
} }
func (this *ModelSign) GetUserSign(uid string) (result *pb.DBSign, err error) { func (this *ModelSign) GetUserSign(uid string) (result *pb.DBSign, err error) {
result = &pb.DBSign{} result = &pb.DBSign{
Puzzle: make([]int32, 31),
}
if err = this.module.modelSign.Get(uid, result); err != nil { if err = this.module.modelSign.Get(uid, result); err != nil {
if mongo.ErrNoDocuments == err { // 创建一条新的数据 if mongo.ErrNoDocuments == err { // 创建一条新的数据
_data := this.module.configure.GetSignConf(1, 1) _data := this.module.configure.GetSignConf(1, 1)

2
modules/viking/api_challengeover.go
View File

@ -152,7 +152,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
for _, v := range req.Report.Info.Redflist[0].Team { for _, v := range req.Report.Info.Redflist[0].Team {
if vikingCfg.Heroexp > 0 && !v.Ishelp { // 助战英雄不加经验 if vikingCfg.Heroexp > 0 && !v.Ishelp { // 助战英雄不加经验
this.module.ModuleHero.AddHeroExp(session, v.Oid, vikingCfg.Heroexp) this.module.ModuleHero.AddHeroExp(session, v.Oid, vikingCfg.Heroexp)
changExp[v.HeroID] = vikingCfg.Heroexp changExp[v.Oid] = vikingCfg.Heroexp
} }
if v.Ishelp { if v.Ishelp {
bHelp = true bHelp = true

1
modules/viking/api_ranklist.go
View File

@ -31,6 +31,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListR
return // 参数校验失败直接返回 return // 参数校验失败直接返回
} }
conn, _ := db.Local() conn, _ := db.Local()
dbModel := db.NewDBModel(comm.TableVikingRank, 0, conn) dbModel := db.NewDBModel(comm.TableVikingRank, 0, conn)
if !req.Friend { if !req.Friend {
var ( var (

62
modules/viking/module.go
View File

@ -8,10 +8,14 @@ package viking
import ( import (
"context" "context"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/base"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/redis/pipe" "go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/utils"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go_dreamfactory/sys/db" "go_dreamfactory/sys/db"
"math" "math"
"strconv" "strconv"
@ -27,9 +31,14 @@ type Viking struct {
configure *configureComp configure *configureComp
modulerank *ModelRank modulerank *ModelRank
battle comm.IBattle battle comm.IBattle
service core.IService service base.IRPCXService
} }
const (
Cycle int32 = 14 // 持续14天
Continued int32 = 30
)
func NewModule() core.IModule { func NewModule() core.IModule {
return &Viking{} return &Viking{}
} }
@ -40,7 +49,7 @@ func (this *Viking) GetType() core.M_Modules {
func (this *Viking) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { func (this *Viking) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options) err = this.ModuleBase.Init(service, module, options)
this.service = service this.service = service.(base.IRPCXService)
return return
} }
@ -72,6 +81,7 @@ func (this *Viking) Start() (err error) {
} }
this.battle = module.(comm.IBattle) this.battle = module.(comm.IBattle)
return return
} }
@ -341,8 +351,6 @@ func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleR
} }
} }
// 随机任务统计 // 随机任务统计
// this.ModuleBuried.SendToRtask(session, comm.Rtype73, difficulty, bossId, 1)
// this.ModuleBuried.SendToRtask(session, comm.Rtype78, difficulty, bossId, Report.Costtime)
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype73, 1, bossId, difficulty)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype73, 1, bossId, difficulty))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype78, difficulty, bossId, Report.Costtime)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype78, difficulty, bossId, Report.Costtime))
if Report != nil && Report.Info != nil && len(Report.Info.Redflist) > 0 { if Report != nil && Report.Info != nil && len(Report.Info.Redflist) > 0 {
@ -367,3 +375,49 @@ func (this *Viking) CheckBattelParameter(session comm.IUserSession, battle *pb.B
}) })
return return
} }
// 检查当前赛季是在本服还是在跨服
func (this *Viking) CheckCurSeasonData() (bLocal bool) {
openTime := this.service.GetOpentime().Unix()
this.Debugf("%d", openTime)
// 获取第一个赛季结束的时间
endSeasonTime := utils.GetTodayZeroTime(openTime) //+ int64((6-d)*3600*24)
this.Debugf("%d", endSeasonTime)
var c int32
if Continued%Cycle == 0 {
c = Continued / Cycle
} else {
c = Continued/Cycle + 1
}
// 只需判断当前时间是否大于第c个赛季即可
endSeasonTime += 14 * 3600 * 24 * int64(c)
if endSeasonTime <= configure.Now().Unix() {
return false
}
return true
}
// 检查上一个赛季实在本服还是在跨服
func (this *Viking) CheckPreSeasonData() (bLocal bool) {
openTime := this.service.GetOpentime().Unix()
this.Debugf("%d", openTime)
// 获取第一个赛季结束的时间
endSeasonTime := utils.GetTodayZeroTime(openTime) //+ int64((6-d)*3600*24)
this.Debugf("%d", endSeasonTime)
var c int32
if Continued%Cycle == 0 {
c = Continued / Cycle
} else {
c = Continued/Cycle + 1
}
// 只需判断当前时间是否大于第c个赛季即可
endSeasonTime += 3600 * 24 * int64(Cycle*c)
if endSeasonTime <= configure.Now().Unix()-int64(Cycle*3600*24) {
return false
}
return true
}

40
modules/worldtask/module.go
View File

@ -409,33 +409,33 @@ func (this *Worldtask) JumpTaskByTaskId(session comm.IUserSession, taskId int32)
// 返回任务ID // 返回任务ID
func (this *Worldtask) AcceptCaravanTask(session comm.IUserSession, groupId int32) (task *pb.Worldtask, errdata *pb.ErrorData) { func (this *Worldtask) AcceptCaravanTask(session comm.IUserSession, groupId int32) (task *pb.Worldtask, errdata *pb.ErrorData) {
uid := session.GetUserId() // uid := session.GetUserId()
var ( // var (
// curTaskConf *cfg.GameWorldTaskData // curTaskConf *cfg.GameWorldTaskData
// isfinsh bool // isfinsh bool
) // )
mytask, err := this.modelWorldtask.getWorldtask(uid) // mytask, err := this.modelWorldtask.getWorldtask(uid)
if err != nil { // if err != nil {
errdata = &pb.ErrorData{ // errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, // Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.String(), // Title: pb.ErrorCode_DBError.String(),
Message: "no found task data", // Message: "no found task data",
} // }
return // return
} // }
if gwt, err := this.configure.getWorldtaskCfg(); err == nil { if gwt, err := this.configure.getWorldtaskCfg(); err == nil {
for _, v := range gwt.GetDataList() { for _, v := range gwt.GetDataList() {
if v.Group == groupId && v.Des == 5 { if v.Group == groupId && v.Des == 5 {
if _, ok := utils.Findx(mytask.TaskList, v.Key); !ok { // if _, ok := utils.Findx(mytask.TaskList, v.Key); !ok {
task = &pb.Worldtask{ task = &pb.Worldtask{
TaskId: v.Key, TaskId: v.Key,
TaskType: v.Des, TaskType: v.Des,
NpcStatus: 1, NpcStatus: 1,
}
// curTaskConf = v
break
} }
// curTaskConf = v
break
// }
} }
} }
} }

83
modules/wtask/api_accept.go Normal file
View File

@ -0,0 +1,83 @@
package wtask
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WTaskAcceptReq) (errdata *pb.ErrorData) {
return
}
// /获取系统公告
func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) (errdata *pb.ErrorData) {
var (
wtask *pb.DBWTask
conf *cfg.GameWorldTaskData
ok bool
err error
)
if errdata = this.AcceptCheck(session, req); errdata != nil {
return
}
if conf, err = this.module.configure.gettaskconfconfigure(req.Tid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if wtask, err = this.module.modelwtask.getUserWTasks(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
ok = false
if conf.Des != 5 {
for _, v := range wtask.Activations {
if req.Tid == v {
ok = true
}
}
}
if !ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("task:%d no fund in Activations:%v", req.Tid, wtask.Activations),
}
}
for i, v := range wtask.Activations {
if v == req.Tid {
wtask.Activations = append(wtask.Activations[0:i], wtask.Activations[i+1:]...)
break
}
}
wtask.Accepts = append(wtask.Accepts, req.Tid)
session.SendMsg(string(this.module.GetType()), "accept", &pb.WTaskAcceptResp{Activations: wtask.Activations, Accepts: wtask.Accepts})
this.module.pushtaskprogress(session, wtask)
if err = this.module.modelwtask.Change(session.GetUserId(), map[string]interface{}{
"activations": wtask.Activations,
"accepts": wtask.Accepts,
}); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
return
}

77
modules/wtask/api_battlefinish.go Normal file
View File

@ -0,0 +1,77 @@
package wtask
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
func (this *apiComp) BattleFinishCheck(session comm.IUserSession, req *pb.WTaskBattleFinishReq) (errdata *pb.ErrorData) {
if req.BattleConfId == 0 || req.Report == nil {
this.module.Error("世界任务战斗开始参数错误",
log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "params", Value: req.String()},
)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: "BattleConfId is 0 or Report is null",
}
}
return
}
// /获取系统公告
func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattleFinishReq) (errdata *pb.ErrorData) {
var (
conf *cfg.GameWorldBattleData
err error
isWin bool
)
if errdata = this.BattleFinishCheck(session, req); errdata != nil {
return
}
if conf, err = this.module.configure.getWorldtaskBattleById(req.BattleConfId); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if errdata, isWin = this.module.modelBattle.CheckBattleReport(session, req.Report); errdata == nil {
return
}
if isWin {
if conf.Carexe > 0 {
if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
for _, v := range req.Report.Info.Redflist[0].Team {
if !v.Ishelp { // 助战英雄不加经验
this.module.ModuleHero.AddHeroExp(session, v.Oid, conf.Carexe)
}
}
}
}
if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{conf.Playexp}, true); errdata != nil {
this.module.Error("世界任务战斗玩家经验结算",
log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "playerExp", Value: conf.Playexp},
)
return
} else {
//触发任务
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype70, 1, req.BattleConfId))
}
} else {
this.module.Error("世界任务战斗失败",
log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "isWin", Value: isWin},
)
}
session.SendMsg(string(this.module.GetType()), "battlefinish", &pb.WTaskBattleFinishResp{BattleConfId: req.BattleConfId})
return
}

65
modules/wtask/api_battlestart.go Normal file
View File

@ -0,0 +1,65 @@
package wtask
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
)
// 参数校验
func (this *apiComp) BattleStartCheck(session comm.IUserSession, req *pb.WTaskBattleStartReq) (errdata *pb.ErrorData) {
if req.BattleConfId == 0 || req.Battle == nil {
this.module.Error("世界任务战斗开始参数错误",
log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "params", Value: req.String()},
)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: "BattleConfId is 0",
}
}
return
}
// /获取系统公告
func (this *apiComp) BattleStart(session comm.IUserSession, req *pb.WTaskBattleStartReq) (errdata *pb.ErrorData) {
var (
record *pb.DBBattleRecord
)
if errdata = this.BattleStartCheck(session, req); errdata != nil {
return
}
battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId)
if err != nil || battleConf == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if errdata, record = this.module.modelBattle.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_moonfantasy,
Format: req.Battle,
Mformat: battleConf.FormatList,
}); err != nil {
return
}
session.SendMsg(string(this.module.GetType()), "battle", &pb.WTaskBattleStartResp{
BattleConfId: req.BattleConfId,
Info: &pb.BattleInfo{
Id: record.Id,
Rulesid: battleConf.BattleReadyID,
Btype: record.Btype,
Ptype: record.Ptype,
RedCompId: record.RedCompId,
Redflist: record.Redflist,
BlueCompId: record.BlueCompId,
Buleflist: record.Buleflist,
Tasks: battleConf.EventList,
},
})
return
}

129
modules/wtask/api_finish.go Normal file
View File

@ -0,0 +1,129 @@
package wtask
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) {
return
}
// /获取系统公告
func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) {
var (
conf *cfg.GameWorldTaskData
wtask *pb.DBWTask
condis []*pb.ConIProgress
award []*pb.UserAssets
err error
isfinsh bool
ok bool
)
if errdata = this.FinishCheck(session, req); errdata != nil {
return
}
if conf, err = this.module.configure.gettaskconfconfigure(req.Tid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if wtask, err = this.module.modelwtask.getUserWTasks(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
ok = false
for _, v := range wtask.Accepts {
if v == req.Tid {
ok = true
}
}
if !ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("task:%d no in accepttask:%v", req.Tid, wtask.Accepts),
}
return
}
if len(conf.Completetask) > 0 {
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Completetask...); err != nil {
this.module.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: fmt.Sprintf("Progress:%s", err.Error()),
}
return
}
}
isfinsh = true
for _, v := range condis {
if v.State == pb.BuriedItemFinishState_buried_unfinish {
isfinsh = false
}
}
if !isfinsh {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskNoComplete,
Title: pb.ErrorCode_WorldtaskNoComplete.ToString(),
Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%+v", condis),
}
return
}
if len(conf.TaskendRemoveitem) > 0 { //交付物品
if errdata = this.module.ConsumeRes(session, conf.TaskendRemoveitem, true); errdata != nil {
return
}
}
if errdata = this.module.DispenseRes(session, conf.Reword, true); errdata != nil {
return
}
award = make([]*pb.UserAssets, 0)
for _, v := range conf.Reword {
award = append(award, &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
})
}
for i, v := range wtask.Accepts {
if v == req.Tid {
wtask.Accepts = append(wtask.Accepts[0:i], wtask.Accepts[i+1:]...)
break
}
}
wtask.Completes = append(wtask.Completes, req.Tid)
session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award})
this.module.fishtask(session, wtask)
if err = this.module.modelwtask.Change(session.GetUserId(), map[string]interface{}{
"activations": wtask.Activations,
"accepts": wtask.Accepts,
"completes": wtask.Completes,
}); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
return
}

6
modules/wtask/api_info.go
View File

@ -28,7 +28,9 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WTaskInfoReq) (errd
} }
return return
} }
if errdata = this.module.pushtaskprogress(session, wtask); errdata != nil {
session.SendMsg(string(this.module.GetType()), "info", &pb.WTaskInfoResp{Activations: wtask.Activations, Completes: wtask.Completes}) return
}
session.SendMsg(string(this.module.GetType()), "info", &pb.WTaskInfoResp{Activations: wtask.Activations, Accepts: wtask.Accepts, Completes: wtask.Completes})
return return
} }

44
modules/wtask/configure.go
View File

@ -2,6 +2,7 @@ package wtask
import ( import (
"fmt" "fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
@ -77,3 +78,46 @@ func (this *configureComp) updateconfigure() {
this.condlTask = worldtaskConf this.condlTask = worldtaskConf
this.lock.Unlock() this.lock.Unlock()
} }
func (this *configureComp) getcondlTask() map[int32][]*cfg.GameWorldTaskData {
this.lock.RLock()
defer this.lock.RUnlock()
return this.condlTask
}
func (this *configureComp) gettaskconfconfigure(tid int32) (conf *cfg.GameWorldTaskData, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(gameWorldTask); err != nil {
return
} else {
if conf, ok = v.(*cfg.GameWorldTask).GetDataMap()[tid]; !ok {
err = comm.NewNotFoundConfErr(modulename, gameWorldTask, tid)
this.module.Errorf("err:%v", err)
return
}
}
return
}
// 获取战斗配置
func (this *configureComp) getWorldtaskBattleById(confId int32) (conf *cfg.GameWorldBattleData, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(gameWorldtaskBattle); err != nil {
return
} else {
if conf, ok = v.(*cfg.GameWorldBattle).GetDataMap()[confId]; !ok {
err = comm.NewNotFoundConfErr(modulename, gameWorldTask, confId)
this.module.Errorf("err:%v", err)
return
}
}
return
}

2
modules/wtask/modelWTask.go
View File

@ -40,7 +40,7 @@ func (this *ModelWTask) getUserWTasks(uid string) (results *pb.DBWTask, err erro
Id: primitive.NewObjectID().Hex(), Id: primitive.NewObjectID().Hex(),
Uid: uid, Uid: uid,
Activations: make([]int32, 0), Activations: make([]int32, 0),
Accepttask: make([]int32, 0), Accepts: make([]int32, 0),
Completes: make([]int32, 0), Completes: make([]int32, 0),
} }
err = this.Add(uid, results) err = this.Add(uid, results)

266
modules/wtask/module.go
View File

@ -1,9 +1,12 @@
package wtask package wtask
import ( import (
"fmt"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
) )
@ -11,9 +14,12 @@ const modulename = "世界任务"
type WTask struct { type WTask struct {
modules.ModuleBase modules.ModuleBase
api *apiComp service core.IService
configure *configureComp modelBattle comm.IBattle
modelwtask *ModelWTask modelSys comm.ISys
api *apiComp
configure *configureComp
modelwtask *ModelWTask
} }
func NewModule() core.IModule { func NewModule() core.IModule {
@ -26,6 +32,21 @@ func (this *WTask) GetType() core.M_Modules {
func (this *WTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { func (this *WTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options) err = this.ModuleBase.Init(service, module, options)
this.service = service
return
}
func (this *WTask) Start() (err error) {
err = this.ModuleBase.Start()
var module core.IModule
if module, err = this.service.GetModule(comm.ModuleBattle); err != nil {
return
}
this.modelBattle = module.(comm.IBattle)
if module, err = this.service.GetModule(comm.ModuleSys); err != nil {
return
}
this.modelSys = module.(comm.ISys)
return return
} }
@ -37,39 +58,256 @@ func (this *WTask) OnInstallComp() {
} }
// 查询可接取任务列表 // 埋点通知
func (this *WTask) inquireActivations(lv int32, complete []int32, opencmd []string) (err error, activations []int32) { func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
var ( var (
conf *cfg.GameWorldTask session comm.IUserSession
completeMap map[int32]struct{} = make(map[int32]struct{}) condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
opencmdMap map[string]struct{} = make(map[string]struct{}) utask *pb.DBWTask
ok bool accepttaskMap map[int32]struct{} = make(map[int32]struct{})
condlTask map[int32][]*cfg.GameWorldTaskData
temptasks []*cfg.GameWorldTaskData
changetasks map[int32]*cfg.GameWorldTaskData = make(map[int32]*cfg.GameWorldTaskData)
checkcondlsMap map[int32]struct{} = make(map[int32]struct{})
checkcondls []int32 = make([]int32, 0)
detailstasks []*pb.DBWTaskItem = make([]*pb.DBWTaskItem, 0)
ok bool
needcheck bool //是否需要校验
err error
) )
activations = make([]int32, 0) if utask, err = this.modelwtask.getUserWTasks(uid); err != nil {
if conf, err = this.configure.getWorldtaskCfg(); err != nil { this.Error("读取玩家世界任务数据 失败", log.Field{Key: "err", Value: err.Error()})
return
}
condlTask = this.configure.getcondlTask()
for _, v := range condis {
condisMap[v.Conid] = v
}
for _, v := range utask.Accepts {
accepttaskMap[v] = struct{}{}
}
for _, v := range condis {
if temptasks, ok = condlTask[v.Conid]; ok {
for _, task := range temptasks {
if _, ok = accepttaskMap[task.Key]; ok { //任务列表进度有变化
if _, ok = changetasks[task.Key]; ok {
changetasks[task.Key] = task
for _, cid := range task.Completetask {
if _, ok = checkcondlsMap[cid]; !ok {
checkcondlsMap[cid] = struct{}{}
checkcondls = append(checkcondls, cid)
}
}
}
}
}
}
}
if len(changetasks) == 0 { //没有任务变化
return
}
for k, _ := range checkcondlsMap {
if _, ok = condisMap[k]; !ok {
needcheck = true
}
}
if needcheck { //校验有变化的任务 的完成条件
if condis, err = this.ModuleBuried.CheckCondition(uid, checkcondls...); err != nil {
this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
return
}
for _, v := range condis {
condisMap[v.Conid] = v
}
}
//推送进度变化消息
for k, v := range changetasks {
task := &pb.DBWTaskItem{
Tid: k,
Conlds: make([]*pb.ConIProgress, len(v.Completetask)),
}
for i, v := range v.Completetask {
task.Conlds[i] = condisMap[v]
}
detailstasks = append(detailstasks, task)
}
session, _ = this.GetUserSession(uid)
defer func() {
session.Push()
this.PutUserSession(session)
}()
//发送进度变化消息
session.SendMsg(string(this.GetType()), "accepttaskchange", &pb.WTaskAcceptChangePush{Accepts: detailstasks})
}
// 校验任务进度
func (this *WTask) pushtaskprogress(session comm.IUserSession, wtask *pb.DBWTask) (errdata *pb.ErrorData) {
var (
tasks []*pb.DBWTaskItem = make([]*pb.DBWTaskItem, 0)
checkcondlsMap map[int32]struct{} = make(map[int32]struct{})
checkcondls []int32 = make([]int32, 0)
conf *cfg.GameWorldTaskData
condis []*pb.ConIProgress = make([]*pb.ConIProgress, 0)
condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
err error
ok bool
)
if len(wtask.Accepts) == 0 {
return return
} }
for _, v := range complete { for _, v := range wtask.Accepts {
if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
for _, v := range conf.Completetask {
if _, ok = checkcondlsMap[v]; !ok {
checkcondlsMap[v] = struct{}{}
checkcondls = append(checkcondls, v)
}
}
}
if len(checkcondls) > 0 {
if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil {
this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%s", err.Error()),
}
return
}
for _, v := range condis {
condisMap[v.Conid] = v
}
}
for _, v := range wtask.Accepts {
if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
task := &pb.DBWTaskItem{
Tid: v,
Conlds: make([]*pb.ConIProgress, len(conf.Completetask)),
}
ok = true
for i, v := range conf.Completetask {
task.Conlds[i] = condisMap[v]
}
tasks = append(tasks, task)
}
session.SendMsg(string(this.GetType()), "acceptchange", &pb.WTaskAcceptChangePush{Accepts: tasks})
return
}
// 完成任务
func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask) {
var (
opencmdMap map[string]int32
opencmd []string
user *pb.DBUser
errdata *pb.ErrorData
)
if opencmdMap, errdata = this.modelSys.QueryOpenCondData(session.GetUserId()); errdata != nil {
this.Error("查询用户功能是否开启表 失败!", log.Field{Key: "key", Value: errdata})
return
}
opencmd = make([]string, 0)
for k, v := range opencmdMap {
if v == 2 {
opencmd = append(opencmd, k)
}
}
if user = this.ModuleUser.GetUser(session.GetUserId()); user != nil {
this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()})
return
}
this.inquireActivations(session, wtask, user.Lv, opencmd)
}
// 查询可接取任务列表
func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTask, lv int32, opencmd []string) (err error) {
var (
conf *cfg.GameWorldTask
activatMap map[int32]struct{} = make(map[int32]struct{})
acceptsMap map[int32]struct{} = make(map[int32]struct{})
completeMap map[int32]struct{} = make(map[int32]struct{})
opencmdMap map[string]struct{} = make(map[string]struct{})
ok bool
changeActiva bool
changeAccept bool
)
if conf, err = this.configure.getWorldtaskCfg(); err != nil {
return
}
for _, v := range wtask.Activations {
activatMap[v] = struct{}{}
}
for _, v := range wtask.Accepts {
acceptsMap[v] = struct{}{}
}
for _, v := range wtask.Completes {
completeMap[v] = struct{}{} completeMap[v] = struct{}{}
} }
for _, v := range opencmd { for _, v := range opencmd {
opencmdMap[v] = struct{}{} opencmdMap[v] = struct{}{}
} }
for _, v := range conf.GetDataList() { for _, v := range conf.GetDataList() {
if _, ok = completeMap[v.Key]; ok { //已完成 if _, ok = activatMap[v.Key]; ok { //已在可接取列表中
continue
}
if _, ok = acceptsMap[v.Key]; ok { //已在已接取任务列表中
continue
}
if _, ok = completeMap[v.Key]; ok { //已在完成列表中
continue continue
} }
if lv < v.Lock || lv > v.Lockend { //等级不符合 if lv < v.Lock || lv > v.Lockend { //等级不符合
continue continue
} }
if _, ok = opencmdMap[v.Opencond]; v.Opencond != "" && !ok { //功能未开启
continue
}
if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断 if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断
continue continue
} }
if v.Des == 5 { //商队任务不主动触发 if v.Des == 5 { //商队任务不主动触发
continue continue
} }
activations = append(activations, v.Key) if v.AutoAccept == 0 {
wtask.Activations = append(wtask.Activations, v.Key)
changeActiva = true
} else if v.AutoAccept == 1 { //自动接取任务
wtask.Accepts = append(wtask.Accepts, v.Key)
changeAccept = true
}
}
//有新任务接取
if changeActiva {
session.SendMsg(string(this.GetType()), "activations", &pb.WTaskActivationsChangePush{Activations: wtask.Activations})
}
if changeAccept {
this.pushtaskprogress(session, wtask)
} }
return return
} }

156
pb/practice_db.pb.go
View File

@ -399,19 +399,20 @@ type DBPracticeRoom struct {
Gymaction int32 `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"` //健身房动作 Gymaction int32 `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"` //健身房动作
Gymrefresh int32 `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"` //健身房刷新次数 Gymrefresh int32 `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"` //健身房刷新次数
Lastrefresh int64 `protobuf:"varint,5,opt,name=lastrefresh,proto3" json:"lastrefresh"` //最后刷新时间 Lastrefresh int64 `protobuf:"varint,5,opt,name=lastrefresh,proto3" json:"lastrefresh"` //最后刷新时间
Full map[int32]int32 `protobuf:"bytes,6,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //满级登记 Lastgymtime int64 `protobuf:"varint,6,opt,name=lastgymtime,proto3" json:"lastgymtime"` //上一次每日一练的时间
Knapsack map[string]*DBPracticeRes `protobuf:"bytes,7,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源 Full map[int32]int32 `protobuf:"bytes,7,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //满级登记
Pillar1 *DBPracticePillar `protobuf:"bytes,8,opt,name=pillar1,proto3" json:"pillar1"` //柱子1 Knapsack map[string]*DBPracticeRes `protobuf:"bytes,8,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源
Pillar2 *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar2,proto3" json:"pillar2"` //柱子2 Pillar1 *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar1,proto3" json:"pillar1"` //柱子1
Pillar3 *DBPracticePillar `protobuf:"bytes,10,opt,name=pillar3,proto3" json:"pillar3"` //柱子3 Pillar2 *DBPracticePillar `protobuf:"bytes,10,opt,name=pillar2,proto3" json:"pillar2"` //柱子2
Pillarf *DBPracticePillar `protobuf:"bytes,11,opt,name=pillarf,proto3" json:"pillarf"` //好友柱子 Pillar3 *DBPracticePillar `protobuf:"bytes,11,opt,name=pillar3,proto3" json:"pillar3"` //柱子3
Statuers []*DBPracticeStatuer `protobuf:"bytes,12,rep,name=statuers,proto3" json:"statuers"` //武馆雕像 Pillarf *DBPracticePillar `protobuf:"bytes,12,opt,name=pillarf,proto3" json:"pillarf"` //好友柱子
Currnpc int32 `protobuf:"varint,13,opt,name=currnpc,proto3" json:"currnpc"` //当前npc Statuers []*DBPracticeStatuer `protobuf:"bytes,13,rep,name=statuers,proto3" json:"statuers"` //武馆雕像
Npcstate int32 `protobuf:"varint,14,opt,name=npcstate,proto3" json:"npcstate"` //npc状态 -1未开启 0 未挑战 1 挑战失败 2挑战成功 3 CD中 Currnpc int32 `protobuf:"varint,14,opt,name=currnpc,proto3" json:"currnpc"` //当前npc
Refresh int64 `protobuf:"varint,15,opt,name=refresh,proto3" json:"refresh"` //刷新时间 Npcstate int32 `protobuf:"varint,15,opt,name=npcstate,proto3" json:"npcstate"` //npc状态 -1未开启 0 未挑战 1 挑战失败 2挑战成功 3 CD中
Battlenum int32 `protobuf:"varint,16,opt,name=battlenum,proto3" json:"battlenum"` //战斗次数 Refresh int64 `protobuf:"varint,16,opt,name=refresh,proto3" json:"refresh"` //刷新时间
Captain int32 `protobuf:"varint,17,opt,name=captain,proto3" json:"captain"` //战斗征信队长位 Battlenum int32 `protobuf:"varint,17,opt,name=battlenum,proto3" json:"battlenum"` //战斗次数
Formation []*BattleRole `protobuf:"bytes,18,rep,name=formation,proto3" json:"formation"` //战斗阵型 Captain int32 `protobuf:"varint,18,opt,name=captain,proto3" json:"captain"` //战斗征信队长位
Formation []*BattleRole `protobuf:"bytes,19,rep,name=formation,proto3" json:"formation"` //战斗阵型
} }
func (x *DBPracticeRoom) Reset() { func (x *DBPracticeRoom) Reset() {
@ -481,6 +482,13 @@ func (x *DBPracticeRoom) GetLastrefresh() int64 {
return 0 return 0
} }
func (x *DBPracticeRoom) GetLastgymtime() int64 {
if x != nil {
return x.Lastgymtime
}
return 0
}
func (x *DBPracticeRoom) GetFull() map[int32]int32 { func (x *DBPracticeRoom) GetFull() map[int32]int32 {
if x != nil { if x != nil {
return x.Full return x.Full
@ -762,7 +770,7 @@ var file_practice_practice_db_proto_rawDesc = []byte{
0x06, 0x75, 0x73, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, 0x06, 0x75, 0x73, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75,
0x73, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x75, 0x73, 0x65, 0x73, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x75, 0x73, 0x65,
0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74,
0x75, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x99, 0x06, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x72, 0x75, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xbb, 0x06, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x72,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 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, 0x1c, 0x0a, 0x09, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
@ -771,65 +779,67 @@ var file_practice_practice_db_proto_rawDesc = []byte{
0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61,
0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x2d, 0x0a, 0x04, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b,
0x66, 0x75, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x73, 0x74, 0x67, 0x79, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x67, 0x79, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2d,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, 0x6b, 0x0a, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44,
0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x46, 0x75,
0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x4b, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x12, 0x39, 0x0a,
0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x1d, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d,
0x31, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08,
0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c,
0x61, 0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, 0x09, 0x61, 0x72, 0x31, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69,
0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x6c, 0x6c, 0x61, 0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32,
0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74,
0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61,
0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b, 0x0a, 0x72, 0x32, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x18, 0x0b, 0x20,
0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12,
0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x12, 0x2e, 0x0a, 0x08, 0x73, 0x74, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b,
0x61, 0x74, 0x75, 0x65, 0x72, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c,
0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x12, 0x2e, 0x0a, 0x08,
0x52, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12,
0x72, 0x72, 0x6e, 0x70, 0x63, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75,
0x72, 0x6e, 0x70, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, 0x65, 0x72, 0x52, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x73, 0x12, 0x18, 0x0a, 0x07,
0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, 0x63, 0x75, 0x72, 0x72, 0x6e, 0x70, 0x63, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63,
0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x75, 0x72, 0x72, 0x6e, 0x70, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x70, 0x63, 0x73, 0x74, 0x61,
0x03, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x61, 0x74, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x70, 0x63, 0x73, 0x74, 0x61,
0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x10, 0x20,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x61, 0x70, 0x74, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09,
0x61, 0x69, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x61, 0x70, 0x74, 0x61, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52,
0x69, 0x6e, 0x12, 0x29, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x61,
0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x61, 0x70,
0x6c, 0x65, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, 0x74, 0x61, 0x69, 0x6e, 0x12, 0x29, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
0x09, 0x46, 0x75, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x6e, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x37, 0x0a, 0x09, 0x46, 0x75, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76,
0x02, 0x38, 0x01, 0x22, 0x48, 0x0a, 0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50,
0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x48, 0x0a, 0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74,
0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12,
0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xb5, 0x01, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
0x0a, 0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02,
0x75, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22,
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0xb5, 0x01, 0x0a, 0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x07, 0x74, 0x61, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x07,
0x76, 0x69, 0x74, 0x65, 0x52, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e,
0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f,
0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x18, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x52, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x12,
0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x69,
0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x12,
0x72, 0x6f, 0x74, 0x6f, 0x33, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52,
0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

426
pb/practice_msg.pb.go
View File

@ -1366,7 +1366,8 @@ type PracticeGetGymBuffResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Buffid int32 `protobuf:"varint,1,opt,name=buffid,proto3" json:"buffid"` Buffid int32 `protobuf:"varint,1,opt,name=buffid,proto3" json:"buffid"`
Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
} }
func (x *PracticeGetGymBuffResp) Reset() { func (x *PracticeGetGymBuffResp) Reset() {
@ -1408,6 +1409,13 @@ func (x *PracticeGetGymBuffResp) GetBuffid() int32 {
return 0 return 0
} }
func (x *PracticeGetGymBuffResp) GetAward() []*UserAssets {
if x != nil {
return x.Award
}
return nil
}
///健身 确认buff 请求 ///健身 确认buff 请求
type PracticeGymConfirmReq struct { type PracticeGymConfirmReq struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -2166,198 +2174,201 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 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, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x70, 0x76, 0x70, 0x2f, 0x70, 0x76, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x70, 0x76, 0x70, 0x2f, 0x70, 0x76, 0x70, 0x5f, 0x64, 0x62, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x11, 0x0a, 0x0f, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x10, 0x50, 0x72, 0x61, 0x63, 0x6f, 0x22, 0x11, 0x0a, 0x0f, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66,
0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x10, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74,
0x6f, 0x22, 0x3d, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6d, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x3d, 0x0a,
0x6d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6d, 0x6d, 0x43, 0x68, 0x61,
0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x22, 0x2b, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72, 0x69, 0x65, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2b, 0x0a, 0x15,
0x6e, 0x64, 0x52, 0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75, 0x69, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x6f,
0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x69, 0x64, 0x22, 0x9d, 0x01, 0x6d, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x03, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x69, 0x64, 0x22, 0x9d, 0x01, 0x0a, 0x16, 0x50, 0x72,
0x52, 0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x38, 0x0a, 0x05, 0x69, 0x6e, 0x66, 0x6f, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x6f, 0x6d, 0x6d,
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x52, 0x65, 0x73, 0x70, 0x12, 0x38, 0x0a, 0x05, 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x01, 0x20,
0x63, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72,
0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x6e, 0x66, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x49, 0x6e, 0x66,
0x6f, 0x73, 0x1a, 0x49, 0x0a, 0x0a, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x1a, 0x49,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x0a, 0x0a, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25,
0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
0x6f, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x29, 0x0a, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x05,
0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x29, 0x0a, 0x11, 0x50, 0x72, 0x61,
0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14,
0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x39, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69,
0x74, 0x69, 0x63, 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x39, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e,
0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61,
0x6e, 0x66, 0x6f, 0x22, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61,
0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01,
0x3b, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3b, 0x0a, 0x13, 0x50,
0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28,
0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x6d, 0x0a, 0x13, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x6d, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63,
0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12,
0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20,
0x07, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61,
0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x63,
0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x41, 0x0a, 0x14, 0x50, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x41, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74,
0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c,
0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x6b, 0x0a, 0x0f, 0x50, 0x72,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61,
0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x63,
0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28,
0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x55, 0x0a, 0x10, 0x50, 0x72, 0x61, 0x63, 0x74,
0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x66,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x02, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x6b, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x16,
0x0a, 0x0f, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73,
0x71, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xd1, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74,
0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x07, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c,
0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12, 0x40, 0x0a, 0x08, 0x6b,
0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x55, 0x0a, 0x10, 0x50, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f,
0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e,
0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61,
0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63,
0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c,
0x61, 0x72, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78,
0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xd1, 0x01, 0x0a, 0x15, 0x50,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e,
0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12,
0x40, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x24, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75,
0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61,
0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63,
0x6b, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe9,
0x01, 0x0a, 0x17, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x42, 0x65, 0x45, 0x78, 0x70,
0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x69, 0x64, 0x12, 0x29,
0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61,
0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12, 0x42, 0x0a, 0x08, 0x6b, 0x6e, 0x61,
0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x50, 0x72,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x42, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f,
0x6e, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a, 0x4b, 0x0a, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a, 0x4b, 0x0a,
0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x42, 0x0a, 0x12, 0x50, 0x72, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe9, 0x01, 0x0a, 0x17, 0x50,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x42, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69,
0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x6f, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75, 0x69, 0x64, 0x18, 0x01,
0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69,
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0xcd, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50,
0x01, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70,
0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12, 0x42, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x63, 0x65, 0x42, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x75, 0x73,
0x72, 0x12, 0x3e, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x68, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61,
0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05,
0x6b, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x42, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64,
0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01,
0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0xcd, 0x01, 0x0a, 0x13, 0x50,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65,
0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01,
0x40, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50,
0x6c, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12, 0x3e, 0x0a,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
0x6f, 0x22, 0x24, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4a, 0x58, 0x49, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e,
0x74, 0x65, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a, 0x4b, 0x0a,
0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x55, 0x0a, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x63, 0x74, 0x69, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52,
0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x63, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3f, 0x0a, 0x13, 0x50, 0x72,
0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x52, 0x65,
0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x68, 0x6e, 0x75, 0x6d, 0x22, 0x17, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
0x47, 0x79, 0x6d, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x65, 0x71, 0x22, 0x58, 0x0a, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x40, 0x0a, 0x14, 0x50,
0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x52, 0x65, 0x66, 0x72, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x52,
0x65, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01,
0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72,
0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a,
0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4a, 0x58, 0x49, 0x74, 0x65, 0x6d, 0x50,
0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x31, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
0x69, 0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x71, 0x02, 0x69, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47,
0x12, 0x18, 0x0a, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x79, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x55, 0x0a, 0x13, 0x50, 0x72, 0x61,
0x05, 0x52, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x22, 0x30, 0x0a, 0x16, 0x50, 0x72, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75, 0x66, 0x66, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01,
0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x2f, 0x0a, 0x15, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d,
0x22, 0x17, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x52,
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x65, 0x71, 0x22, 0x58, 0x0a, 0x16, 0x50, 0x72, 0x61,
0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52,
0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x63, 0x74, 0x69, 0x6f,
0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x63, 0x74,
0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75,
0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
0x6e, 0x75, 0x6d, 0x22, 0x31, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47,
0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70,
0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x22, 0x53, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70,
0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 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, 0x2f, 0x0a, 0x15, 0x50,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72,
0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x30, 0x0a, 0x16,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69,
0x72, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x18, 0x72, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x30, 0x0a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x25,
0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f,
0x69, 0x72, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x52, 0x03, 0x66, 0x69, 0x64, 0x22, 0x68, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x66,
0x6f, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x66, 0x69, 0x64, 0x12, 0x1a, 0x0a,
0x09, 0x52, 0x03, 0x66, 0x69, 0x64, 0x22, 0x68, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x08, 0x69, 0x73, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x08, 0x69, 0x73, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x12, 0x24, 0x0a, 0x06, 0x62, 0x61, 0x74,
0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x66, 0x69, 0x64, 0x12, 0x1a, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x50, 0x76,
0x0a, 0x08, 0x69, 0x73, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x70, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22,
0x52, 0x08, 0x69, 0x73, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x12, 0x24, 0x0a, 0x06, 0x62, 0x61, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x65, 0x70,
0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x50, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x76, 0x70, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x65, 0x63, 0x65, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06,
0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73,
0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x53, 0x75, 0x63, 0x63, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x50,
0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73,
0x65, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x60, 0x0a, 0x18, 0x50, 0x72, 0x61,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x6e, 0x6f, 0x74, 0x69, 0x66,
0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x60, 0x0a, 0x18, 0x50, 0x72, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x6e, 0x6f, 0x74, 0x69, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x6e,
0x66, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x47, 0x0a, 0x15, 0x50,
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c,
0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x65, 0x52, 0x65, 0x71, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
0x52, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x47, 0x0a, 0x15, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61,
0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x2e, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45,
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f,
0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x44, 0x0a, 0x1b, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61,
0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x25,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
0x22, 0x44, 0x0a, 0x1b, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72,
0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x36, 0x0a, 0x1c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18,
0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x36, 0x0a, 0x1c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x16, 0x0a,
0x63, 0x65, 0x4e, 0x50, 0x43, 0x42, 0x61, 0x74, 0x74, 0x6b, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c,
0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22, 0x2f, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x16, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
0x6c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22, 0x2f, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x63, 0x65, 0x4e, 0x50, 0x43, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -2422,12 +2433,13 @@ var file_practice_practice_msg_proto_goTypes = []interface{}{
nil, // 45: PracticeReceiveResp.KnapsackEntry nil, // 45: PracticeReceiveResp.KnapsackEntry
(*DBPracticeRoom)(nil), // 46: DBPracticeRoom (*DBPracticeRoom)(nil), // 46: DBPracticeRoom
(*DBPracticePillar)(nil), // 47: DBPracticePillar (*DBPracticePillar)(nil), // 47: DBPracticePillar
(*DBPvpBattle)(nil), // 48: DBPvpBattle (*UserAssets)(nil), // 48: UserAssets
(*BattleFormation)(nil), // 49: BattleFormation (*DBPvpBattle)(nil), // 49: DBPvpBattle
(ErrorCode)(0), // 50: ErrorCode (*BattleFormation)(nil), // 50: BattleFormation
(*BattleInfo)(nil), // 51: BattleInfo (ErrorCode)(0), // 51: ErrorCode
(*BattleReport)(nil), // 52: BattleReport (*BattleInfo)(nil), // 52: BattleInfo
(*DBPracticeRes)(nil), // 53: DBPracticeRes (*BattleReport)(nil), // 53: BattleReport
(*DBPracticeRes)(nil), // 54: DBPracticeRes
} }
var file_practice_practice_msg_proto_depIdxs = []int32{ var file_practice_practice_msg_proto_depIdxs = []int32{
46, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom 46, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
@ -2442,20 +2454,21 @@ var file_practice_practice_msg_proto_depIdxs = []int32{
44, // 9: PracticeBeExpulsionPush.knapsack:type_name -> PracticeBeExpulsionPush.KnapsackEntry 44, // 9: PracticeBeExpulsionPush.knapsack:type_name -> PracticeBeExpulsionPush.KnapsackEntry
47, // 10: PracticeReceiveResp.pillar:type_name -> DBPracticePillar 47, // 10: PracticeReceiveResp.pillar:type_name -> DBPracticePillar
45, // 11: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry 45, // 11: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry
48, // 12: PracticeQiecuoResp.battle:type_name -> DBPvpBattle 48, // 12: PracticeGetGymBuffResp.award:type_name -> UserAssets
49, // 13: PracticeNPCBattkleReq.formation:type_name -> BattleFormation 49, // 13: PracticeQiecuoResp.battle:type_name -> DBPvpBattle
50, // 14: PracticeNPCBattkleResp.code:type_name -> ErrorCode 50, // 14: PracticeNPCBattkleReq.formation:type_name -> BattleFormation
51, // 15: PracticeNPCBattkleResp.info:type_name -> BattleInfo 51, // 15: PracticeNPCBattkleResp.code:type_name -> ErrorCode
52, // 16: PracticeNPCBattkleFinishReq.report:type_name -> BattleReport 52, // 16: PracticeNPCBattkleResp.info:type_name -> BattleInfo
46, // 17: PracticeFriendRommResp.InfosEntry.value:type_name -> DBPracticeRoom 53, // 17: PracticeNPCBattkleFinishReq.report:type_name -> BattleReport
53, // 18: PracticeExpulsionResp.KnapsackEntry.value:type_name -> DBPracticeRes 46, // 18: PracticeFriendRommResp.InfosEntry.value:type_name -> DBPracticeRoom
53, // 19: PracticeBeExpulsionPush.KnapsackEntry.value:type_name -> DBPracticeRes 54, // 19: PracticeExpulsionResp.KnapsackEntry.value:type_name -> DBPracticeRes
53, // 20: PracticeReceiveResp.KnapsackEntry.value:type_name -> DBPracticeRes 54, // 20: PracticeBeExpulsionPush.KnapsackEntry.value:type_name -> DBPracticeRes
21, // [21:21] is the sub-list for method output_type 54, // 21: PracticeReceiveResp.KnapsackEntry.value:type_name -> DBPracticeRes
21, // [21:21] is the sub-list for method input_type 22, // [22:22] is the sub-list for method output_type
21, // [21:21] is the sub-list for extension type_name 22, // [22:22] is the sub-list for method input_type
21, // [21:21] is the sub-list for extension extendee 22, // [22:22] is the sub-list for extension type_name
0, // [0:21] is the sub-list for field type_name 22, // [22:22] is the sub-list for extension extendee
0, // [0:22] is the sub-list for field type_name
} }
func init() { file_practice_practice_msg_proto_init() } func init() { file_practice_practice_msg_proto_init() }
@ -2467,6 +2480,7 @@ func file_practice_practice_msg_proto_init() {
file_practice_practice_db_proto_init() file_practice_practice_db_proto_init()
file_battle_battle_msg_proto_init() file_battle_battle_msg_proto_init()
file_pvp_pvp_db_proto_init() file_pvp_pvp_db_proto_init()
file_comm_proto_init()
if !protoimpl.UnsafeEnabled { if !protoimpl.UnsafeEnabled {
file_practice_practice_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { file_practice_practice_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*PracticeInfoReq); i { switch v := v.(*PracticeInfoReq); i {

29
pb/wtask_db.pb.go
View File

@ -29,7 +29,7 @@ type DBWTask struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID
Activations []int32 `protobuf:"varint,3,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 Activations []int32 `protobuf:"varint,3,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
Accepttask []int32 `protobuf:"varint,4,rep,packed,name=accepttask,proto3" json:"accepttask"` //已接取任务列表 Accepts []int32 `protobuf:"varint,4,rep,packed,name=accepts,proto3" json:"accepts"` //已接取任务列表
Completes []int32 `protobuf:"varint,5,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 Completes []int32 `protobuf:"varint,5,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表
} }
@ -86,9 +86,9 @@ func (x *DBWTask) GetActivations() []int32 {
return nil return nil
} }
func (x *DBWTask) GetAccepttask() []int32 { func (x *DBWTask) GetAccepts() []int32 {
if x != nil { if x != nil {
return x.Accepttask return x.Accepts
} }
return nil return nil
} }
@ -161,22 +161,21 @@ var File_wtask_wtask_db_proto protoreflect.FileDescriptor
var file_wtask_wtask_db_proto_rawDesc = []byte{ var file_wtask_wtask_db_proto_rawDesc = []byte{
0x0a, 0x14, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x0a, 0x14, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62,
0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8b, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85,
0x01, 0x0a, 0x07, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b,
0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18,
0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52,
0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1c, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70,
0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d,
0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x46, 0x0a, 0x0b, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73,
0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64,
0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72,
0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x42, 0x06,
0x6e, 0x6c, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

318
pb/wtask_msg.pb.go
View File

@ -65,9 +65,9 @@ type WTaskInfoResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
Accepttask []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepttask,proto3" json:"accepttask"` //已接取任务列表 Accepts []int32 `protobuf:"varint,2,rep,packed,name=accepts,proto3" json:"accepts"` //已接取任务列表
Completes []int32 `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 Completes []int32 `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表
} }
func (x *WTaskInfoResp) Reset() { func (x *WTaskInfoResp) Reset() {
@ -109,9 +109,9 @@ func (x *WTaskInfoResp) GetActivations() []int32 {
return nil return nil
} }
func (x *WTaskInfoResp) GetAccepttask() []*DBWTaskItem { func (x *WTaskInfoResp) GetAccepts() []int32 {
if x != nil { if x != nil {
return x.Accepttask return x.Accepts
} }
return nil return nil
} }
@ -177,7 +177,8 @@ type WTaskAcceptResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Task *DBWTaskItem `protobuf:"bytes,1,opt,name=task,proto3" json:"task"` //接取任务数据 Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
Accepts []int32 `protobuf:"varint,2,rep,packed,name=accepts,proto3" json:"accepts"` //已接取任务列表
} }
func (x *WTaskAcceptResp) Reset() { func (x *WTaskAcceptResp) Reset() {
@ -212,9 +213,16 @@ func (*WTaskAcceptResp) Descriptor() ([]byte, []int) {
return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{3} return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{3}
} }
func (x *WTaskAcceptResp) GetTask() *DBWTaskItem { func (x *WTaskAcceptResp) GetActivations() []int32 {
if x != nil { if x != nil {
return x.Task return x.Activations
}
return nil
}
func (x *WTaskAcceptResp) GetAccepts() []int32 {
if x != nil {
return x.Accepts
} }
return nil return nil
} }
@ -281,7 +289,8 @@ type WTaskBattleStartResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //战斗信息 BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
Info *BattleInfo `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` //战斗信息
} }
func (x *WTaskBattleStartResp) Reset() { func (x *WTaskBattleStartResp) Reset() {
@ -316,6 +325,13 @@ func (*WTaskBattleStartResp) Descriptor() ([]byte, []int) {
return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{5} return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{5}
} }
func (x *WTaskBattleStartResp) GetBattleConfId() int32 {
if x != nil {
return x.BattleConfId
}
return 0
}
func (x *WTaskBattleStartResp) GetInfo() *BattleInfo { func (x *WTaskBattleStartResp) GetInfo() *BattleInfo {
if x != nil { if x != nil {
return x.Info return x.Info
@ -384,6 +400,8 @@ type WTaskBattleFinishResp struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
} }
func (x *WTaskBattleFinishResp) Reset() { func (x *WTaskBattleFinishResp) Reset() {
@ -418,6 +436,13 @@ func (*WTaskBattleFinishResp) Descriptor() ([]byte, []int) {
return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{7} return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{7}
} }
func (x *WTaskBattleFinishResp) GetBattleConfId() int32 {
if x != nil {
return x.BattleConfId
}
return 0
}
// 完成任务 请求 // 完成任务 请求
type WTaskFinishReq struct { type WTaskFinishReq struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -523,7 +548,7 @@ func (x *WTaskFinishResp) GetAward() []*UserAssets {
} }
//可接入任务推送 //可接入任务推送
type WTaskActivationsPush struct { type WTaskActivationsChangePush struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -531,8 +556,8 @@ type WTaskActivationsPush struct {
Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
} }
func (x *WTaskActivationsPush) Reset() { func (x *WTaskActivationsChangePush) Reset() {
*x = WTaskActivationsPush{} *x = WTaskActivationsChangePush{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_wtask_wtask_msg_proto_msgTypes[10] mi := &file_wtask_wtask_msg_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -540,13 +565,13 @@ func (x *WTaskActivationsPush) Reset() {
} }
} }
func (x *WTaskActivationsPush) String() string { func (x *WTaskActivationsChangePush) String() string {
return protoimpl.X.MessageStringOf(x) return protoimpl.X.MessageStringOf(x)
} }
func (*WTaskActivationsPush) ProtoMessage() {} func (*WTaskActivationsChangePush) ProtoMessage() {}
func (x *WTaskActivationsPush) ProtoReflect() protoreflect.Message { func (x *WTaskActivationsChangePush) ProtoReflect() protoreflect.Message {
mi := &file_wtask_wtask_msg_proto_msgTypes[10] mi := &file_wtask_wtask_msg_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -558,12 +583,12 @@ func (x *WTaskActivationsPush) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use WTaskActivationsPush.ProtoReflect.Descriptor instead. // Deprecated: Use WTaskActivationsChangePush.ProtoReflect.Descriptor instead.
func (*WTaskActivationsPush) Descriptor() ([]byte, []int) { func (*WTaskActivationsChangePush) Descriptor() ([]byte, []int) {
return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{10} return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{10}
} }
func (x *WTaskActivationsPush) GetActivations() []int32 { func (x *WTaskActivationsChangePush) GetActivations() []int32 {
if x != nil { if x != nil {
return x.Activations return x.Activations
} }
@ -571,16 +596,16 @@ func (x *WTaskActivationsPush) GetActivations() []int32 {
} }
//已接取任务 进度变化推送 //已接取任务 进度变化推送
type WTaskAccepttaskChangePush struct { type WTaskAcceptChangePush struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Accepttask []*DBWTaskItem `protobuf:"bytes,1,rep,name=accepttask,proto3" json:"accepttask"` //已接取任务列表 Accepts []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表
} }
func (x *WTaskAccepttaskChangePush) Reset() { func (x *WTaskAcceptChangePush) Reset() {
*x = WTaskAccepttaskChangePush{} *x = WTaskAcceptChangePush{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_wtask_wtask_msg_proto_msgTypes[11] mi := &file_wtask_wtask_msg_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -588,13 +613,13 @@ func (x *WTaskAccepttaskChangePush) Reset() {
} }
} }
func (x *WTaskAccepttaskChangePush) String() string { func (x *WTaskAcceptChangePush) String() string {
return protoimpl.X.MessageStringOf(x) return protoimpl.X.MessageStringOf(x)
} }
func (*WTaskAccepttaskChangePush) ProtoMessage() {} func (*WTaskAcceptChangePush) ProtoMessage() {}
func (x *WTaskAccepttaskChangePush) ProtoReflect() protoreflect.Message { func (x *WTaskAcceptChangePush) ProtoReflect() protoreflect.Message {
mi := &file_wtask_wtask_msg_proto_msgTypes[11] mi := &file_wtask_wtask_msg_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -606,70 +631,14 @@ func (x *WTaskAccepttaskChangePush) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use WTaskAccepttaskChangePush.ProtoReflect.Descriptor instead. // Deprecated: Use WTaskAcceptChangePush.ProtoReflect.Descriptor instead.
func (*WTaskAccepttaskChangePush) Descriptor() ([]byte, []int) { func (*WTaskAcceptChangePush) Descriptor() ([]byte, []int) {
return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{11} return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{11}
} }
func (x *WTaskAccepttaskChangePush) GetAccepttask() []*DBWTaskItem { func (x *WTaskAcceptChangePush) GetAccepts() []*DBWTaskItem {
if x != nil { if x != nil {
return x.Accepttask return x.Accepts
}
return nil
}
//任务自动完成 推送
type WTaskAutoFinshPush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Completes int32 `protobuf:"varint,1,opt,name=completes,proto3" json:"completes"` //可接取任务列表
Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
}
func (x *WTaskAutoFinshPush) Reset() {
*x = WTaskAutoFinshPush{}
if protoimpl.UnsafeEnabled {
mi := &file_wtask_wtask_msg_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *WTaskAutoFinshPush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*WTaskAutoFinshPush) ProtoMessage() {}
func (x *WTaskAutoFinshPush) ProtoReflect() protoreflect.Message {
mi := &file_wtask_wtask_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 WTaskAutoFinshPush.ProtoReflect.Descriptor instead.
func (*WTaskAutoFinshPush) Descriptor() ([]byte, []int) {
return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{12}
}
func (x *WTaskAutoFinshPush) GetCompletes() int32 {
if x != nil {
return x.Completes
}
return 0
}
func (x *WTaskAutoFinshPush) GetAward() []*UserAssets {
if x != nil {
return x.Award
} }
return nil return nil
} }
@ -683,59 +652,58 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 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, 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, 0x74, 0x6f, 0x22, 0x0e, 0x0a, 0x0c, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
0x65, 0x71, 0x22, 0x7d, 0x0a, 0x0d, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x69, 0x0a, 0x0d, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x65, 0x73, 0x70, 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, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61,
0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2c, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73,
0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x12,
0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03,
0x61, 0x73, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x22, 0x0a,
0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12,
0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69,
0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x64, 0x22, 0x4d, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74,
0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x33, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69,
0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74,
0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73,
0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53,
0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62,
0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62,
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62,
0x37, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61,
0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a,
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20,
0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49,
0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x17, 0x0a, 0x15, 0x57, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25,
0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
0x52, 0x65, 0x73, 0x70, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72,
0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61,
0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22,
0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66,
0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73,
0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x22, 0x38, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46,
0x69, 0x6f, 0x6e, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64,
0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61,
0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x49, 0x0a, 0x19, 0x57, 0x54, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65,
0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x3e,
0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2c, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x0a, 0x1a, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
0x74, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x6e, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b,
0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
0x74, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x55, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x75, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3f,
0x74, 0x6f, 0x46, 0x69, 0x6e, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61,
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70,
0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61,
0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x42,
0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -750,41 +718,37 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte {
return file_wtask_wtask_msg_proto_rawDescData return file_wtask_wtask_msg_proto_rawDescData
} }
var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13) var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
var file_wtask_wtask_msg_proto_goTypes = []interface{}{ var file_wtask_wtask_msg_proto_goTypes = []interface{}{
(*WTaskInfoReq)(nil), // 0: WTaskInfoReq (*WTaskInfoReq)(nil), // 0: WTaskInfoReq
(*WTaskInfoResp)(nil), // 1: WTaskInfoResp (*WTaskInfoResp)(nil), // 1: WTaskInfoResp
(*WTaskAcceptReq)(nil), // 2: WTaskAcceptReq (*WTaskAcceptReq)(nil), // 2: WTaskAcceptReq
(*WTaskAcceptResp)(nil), // 3: WTaskAcceptResp (*WTaskAcceptResp)(nil), // 3: WTaskAcceptResp
(*WTaskBattleStartReq)(nil), // 4: WTaskBattleStartReq (*WTaskBattleStartReq)(nil), // 4: WTaskBattleStartReq
(*WTaskBattleStartResp)(nil), // 5: WTaskBattleStartResp (*WTaskBattleStartResp)(nil), // 5: WTaskBattleStartResp
(*WTaskBattleFinishReq)(nil), // 6: WTaskBattleFinishReq (*WTaskBattleFinishReq)(nil), // 6: WTaskBattleFinishReq
(*WTaskBattleFinishResp)(nil), // 7: WTaskBattleFinishResp (*WTaskBattleFinishResp)(nil), // 7: WTaskBattleFinishResp
(*WTaskFinishReq)(nil), // 8: WTaskFinishReq (*WTaskFinishReq)(nil), // 8: WTaskFinishReq
(*WTaskFinishResp)(nil), // 9: WTaskFinishResp (*WTaskFinishResp)(nil), // 9: WTaskFinishResp
(*WTaskActivationsPush)(nil), // 10: WTaskActivationsPush (*WTaskActivationsChangePush)(nil), // 10: WTaskActivationsChangePush
(*WTaskAccepttaskChangePush)(nil), // 11: WTaskAccepttaskChangePush (*WTaskAcceptChangePush)(nil), // 11: WTaskAcceptChangePush
(*WTaskAutoFinshPush)(nil), // 12: WTaskAutoFinshPush (*BattleFormation)(nil), // 12: BattleFormation
(*DBWTaskItem)(nil), // 13: DBWTaskItem (*BattleInfo)(nil), // 13: BattleInfo
(*BattleFormation)(nil), // 14: BattleFormation (*BattleReport)(nil), // 14: BattleReport
(*BattleInfo)(nil), // 15: BattleInfo (*UserAssets)(nil), // 15: UserAssets
(*BattleReport)(nil), // 16: BattleReport (*DBWTaskItem)(nil), // 16: DBWTaskItem
(*UserAssets)(nil), // 17: UserAssets
} }
var file_wtask_wtask_msg_proto_depIdxs = []int32{ var file_wtask_wtask_msg_proto_depIdxs = []int32{
13, // 0: WTaskInfoResp.accepttask:type_name -> DBWTaskItem 12, // 0: WTaskBattleStartReq.battle:type_name -> BattleFormation
13, // 1: WTaskAcceptResp.task:type_name -> DBWTaskItem 13, // 1: WTaskBattleStartResp.info:type_name -> BattleInfo
14, // 2: WTaskBattleStartReq.battle:type_name -> BattleFormation 14, // 2: WTaskBattleFinishReq.report:type_name -> BattleReport
15, // 3: WTaskBattleStartResp.info:type_name -> BattleInfo 15, // 3: WTaskFinishResp.award:type_name -> UserAssets
16, // 4: WTaskBattleFinishReq.report:type_name -> BattleReport 16, // 4: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
17, // 5: WTaskFinishResp.award:type_name -> UserAssets 5, // [5:5] is the sub-list for method output_type
13, // 6: WTaskAccepttaskChangePush.accepttask:type_name -> DBWTaskItem 5, // [5:5] is the sub-list for method input_type
17, // 7: WTaskAutoFinshPush.award:type_name -> UserAssets 5, // [5:5] is the sub-list for extension type_name
8, // [8:8] is the sub-list for method output_type 5, // [5:5] is the sub-list for extension extendee
8, // [8:8] is the sub-list for method input_type 0, // [0:5] is the sub-list for field type_name
8, // [8:8] is the sub-list for extension type_name
8, // [8:8] is the sub-list for extension extendee
0, // [0:8] is the sub-list for field type_name
} }
func init() { file_wtask_wtask_msg_proto_init() } func init() { file_wtask_wtask_msg_proto_init() }
@ -917,7 +881,7 @@ func file_wtask_wtask_msg_proto_init() {
} }
} }
file_wtask_wtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { file_wtask_wtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WTaskActivationsPush); i { switch v := v.(*WTaskActivationsChangePush); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -929,19 +893,7 @@ func file_wtask_wtask_msg_proto_init() {
} }
} }
file_wtask_wtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { file_wtask_wtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WTaskAccepttaskChangePush); i { switch v := v.(*WTaskAcceptChangePush); 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[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WTaskAutoFinshPush); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -959,7 +911,7 @@ func file_wtask_wtask_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_wtask_wtask_msg_proto_rawDesc, RawDescriptor: file_wtask_wtask_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 13, NumMessages: 12,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

2
sys/configure/structs/Game.WorldTaskData.go
View File

@ -12,6 +12,7 @@ import "errors"
type GameWorldTaskData struct { type GameWorldTaskData struct {
Key int32 Key int32
Opencond string
Lock int32 Lock int32
Lockend int32 Lockend int32
Ontxe int32 Ontxe int32
@ -39,6 +40,7 @@ func (*GameWorldTaskData) GetTypeId() int32 {
func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; if _v.Opencond, _ok_ = _buf["opencond"].(string); !_ok_ { err = errors.New("opencond error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lockend"].(float64); !_ok_ { err = errors.New("lockend error"); return }; _v.Lockend = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lockend"].(float64); !_ok_ { err = errors.New("lockend error"); return }; _v.Lockend = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ontxe"].(float64); !_ok_ { err = errors.New("ontxe error"); return }; _v.Ontxe = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ontxe"].(float64); !_ok_ { err = errors.New("ontxe error"); return }; _v.Ontxe = int32(_tempNum_) }