Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
5bda101ab3
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1010,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -14,7 +14,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1020,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -23,7 +23,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1030,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -32,7 +32,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1040,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -41,7 +41,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1050,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -50,7 +50,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1060,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -59,7 +59,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1080,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -68,7 +68,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1090,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -77,7 +77,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1100,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -86,7 +86,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1110,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -95,7 +95,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1120,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -104,7 +104,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1130,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -113,7 +113,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1140,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -122,7 +122,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1150,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -131,7 +131,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1160,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -140,7 +140,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1170,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -149,7 +149,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1180,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -158,7 +158,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1190,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -167,7 +167,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1200,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -176,7 +176,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1210,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -185,7 +185,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1220,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -194,7 +194,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1230,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -203,7 +203,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1240,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -212,7 +212,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1250,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -221,7 +221,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1260,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -230,7 +230,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1270,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -239,7 +239,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1280,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -248,7 +248,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1290,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -257,7 +257,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1300,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -266,7 +266,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1310,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -275,7 +275,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1320,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
},
|
||||
{
|
||||
@ -284,7 +284,7 @@
|
||||
"lvstart": 1,
|
||||
"lvend": 999,
|
||||
"itemid": 1330,
|
||||
"itemwt": 100,
|
||||
"itemwt": 1000,
|
||||
"min": 0
|
||||
}
|
||||
]
|
||||
@ -10941,7 +10941,7 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
503
|
||||
109
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -10999,7 +10999,7 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
505
|
||||
701
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -29457,9 +29457,9 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_994",
|
||||
"text": "主角等级达到2级开启"
|
||||
"text": "主角等级达到1级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"type": 252,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
@ -29472,8 +29472,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"filter": [],
|
||||
"value": 1,
|
||||
"filter": [
|
||||
20364
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
@ -29573,9 +29575,9 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_998",
|
||||
"text": "主角等级达到2级开启"
|
||||
"text": "主角等级达到1级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"type": 252,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
@ -29588,8 +29590,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"filter": [],
|
||||
"value": 1,
|
||||
"filter": [
|
||||
20364
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
|
||||
@ -1467,5 +1467,12 @@
|
||||
"eq",
|
||||
"lte"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 252,
|
||||
"insert": 1,
|
||||
"filter": [
|
||||
"eq"
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -88,7 +88,7 @@
|
||||
"key": "chat_system_text_5",
|
||||
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力，将{1}强化至+13！"
|
||||
},
|
||||
"data": 13,
|
||||
"data": 14,
|
||||
"data2": 0,
|
||||
"week": [],
|
||||
"time_h": 0,
|
||||
@ -103,7 +103,7 @@
|
||||
"key": "chat_system_text_6",
|
||||
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力，将{1}强化至+14！"
|
||||
},
|
||||
"data": 14,
|
||||
"data": 15,
|
||||
"data2": 0,
|
||||
"week": [],
|
||||
"time_h": 0,
|
||||
@ -118,7 +118,7 @@
|
||||
"key": "chat_system_text_7",
|
||||
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力，将 {1} 强化至+15！"
|
||||
},
|
||||
"data": 15,
|
||||
"data": 16,
|
||||
"data2": 0,
|
||||
"week": [],
|
||||
"time_h": 0,
|
||||
|
||||
@ -467,12 +467,12 @@
|
||||
"color": 4,
|
||||
"effects": "",
|
||||
"access": [
|
||||
158
|
||||
10073
|
||||
],
|
||||
"img": "attr_sxmoney",
|
||||
"intr": {
|
||||
"key": "item_coin_intr_18",
|
||||
"text": "用于在三消玩法内消耗的货币"
|
||||
"text": "用于在巅峰之王指定商店内消耗的货币"
|
||||
},
|
||||
"describe": {
|
||||
"key": "",
|
||||
@ -494,12 +494,12 @@
|
||||
"color": 5,
|
||||
"effects": "",
|
||||
"access": [
|
||||
158
|
||||
10073
|
||||
],
|
||||
"img": "attr_sxintegral",
|
||||
"intr": {
|
||||
"key": "item_coin_intr_19",
|
||||
"text": "三消的积分道具，增加可以获得进度奖励"
|
||||
"text": "巅峰之王内的积分道具，增加可以获得进度奖励"
|
||||
},
|
||||
"describe": {
|
||||
"key": "",
|
||||
|
||||
@ -858,5 +858,15 @@
|
||||
},
|
||||
"data": "剧情组id",
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 87,
|
||||
"type": 1,
|
||||
"text": {
|
||||
"key": "GM_GM_text_133",
|
||||
"text": "获取某种类型所有道具（背包类型,数量）"
|
||||
},
|
||||
"data": "7,1",
|
||||
"prefix": "bingo:bagtype,{0}"
|
||||
}
|
||||
]
|
||||
@ -9633,6 +9633,92 @@
|
||||
"text": "传说中的守护者“埃雷特”,拥有不俗的战斗能力"
|
||||
}
|
||||
},
|
||||
{
|
||||
"hid": "83008",
|
||||
"name": {
|
||||
"key": "hero_main_name_83008",
|
||||
"text": "黑化小猴子"
|
||||
},
|
||||
"star": 3,
|
||||
"color": 2,
|
||||
"race": 4,
|
||||
"job": 3,
|
||||
"type": 2,
|
||||
"ip": 1,
|
||||
"sd": 1,
|
||||
"handbook": false,
|
||||
"prefab": "83008",
|
||||
"rotation": "0|0|0",
|
||||
"revolve": 0,
|
||||
"scale": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"icon": "51012",
|
||||
"vocal": "51012",
|
||||
"tujing": [
|
||||
107
|
||||
],
|
||||
"detailwindow": "effect_chezhan_daiji",
|
||||
"intr": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"events": "hero_51012",
|
||||
"cite": "",
|
||||
"effectstay": [],
|
||||
"hpspace": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"z": 0
|
||||
},
|
||||
"capskillrule": 101,
|
||||
"skill": 0,
|
||||
"skill1": 151012111,
|
||||
"skill2": 151012211,
|
||||
"skill3": 0,
|
||||
"skill4": 0,
|
||||
"skill5": 0,
|
||||
"skill6": 0,
|
||||
"txt": {
|
||||
"key": "atlas_83008",
|
||||
"text": ""
|
||||
},
|
||||
"enteranivalue": 0,
|
||||
"camerainterval": 0,
|
||||
"equiprcom": [
|
||||
1,
|
||||
2,
|
||||
10
|
||||
],
|
||||
"angle": 0,
|
||||
"deviation": 0,
|
||||
"show": 2,
|
||||
"herofrag": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "12025001",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"herofragnum": 6,
|
||||
"heroskillup": [
|
||||
"10000004"
|
||||
],
|
||||
"expitem": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000011",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"expitemnum": 7,
|
||||
"herointr": {
|
||||
"key": "hero_main_herointr_83008",
|
||||
"text": "传说中的守护者“黑化小猴子”,拥有不俗的战斗能力"
|
||||
}
|
||||
},
|
||||
{
|
||||
"hid": "84002",
|
||||
"name": {
|
||||
|
||||
@ -559,5 +559,22 @@
|
||||
"text": "立即前往"
|
||||
},
|
||||
"icon": "icon_zm"
|
||||
},
|
||||
{
|
||||
"id": 10073,
|
||||
"title": {
|
||||
"key": "itemlink_itemlink_title_34",
|
||||
"text": "巅峰之王获取"
|
||||
},
|
||||
"desc": {
|
||||
"key": "itemlink_itemlink_desc_34",
|
||||
"text": "赢得巅峰之王对战获取"
|
||||
},
|
||||
"jumpid": 10073,
|
||||
"btnTitle": {
|
||||
"key": "itemlink_itemlink_button_1",
|
||||
"text": "立即前往"
|
||||
},
|
||||
"icon": "icon_zm"
|
||||
}
|
||||
]
|
||||
@ -19746,7 +19746,9 @@
|
||||
"player",
|
||||
"sbkp_js_25002"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effect": [
|
||||
"shandian"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": false,
|
||||
"openlevel": 1,
|
||||
@ -19853,7 +19855,7 @@
|
||||
{
|
||||
"id": 1103014,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100311,
|
||||
"group_id": 1003101,
|
||||
"previous_group_id": [
|
||||
100310
|
||||
],
|
||||
@ -19865,10 +19867,405 @@
|
||||
"stage_param": 0,
|
||||
"inherit": false,
|
||||
"battle_fail": false,
|
||||
"venturemodelspeed": 0,
|
||||
"venturemodelscale": 0,
|
||||
"move_type": 0,
|
||||
"venturemodel": "",
|
||||
"bubbletalk": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [
|
||||
"shandian"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": false,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
"herocolor": 1,
|
||||
"heroimg": "",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"hide": false,
|
||||
"destroy": true,
|
||||
"progress": 1,
|
||||
"timelineplayer": false,
|
||||
"stroyshow": false,
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"maingroupIcon": "",
|
||||
"mainlineName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"title": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"exp": 0,
|
||||
"hero_exp": 400,
|
||||
"ps_consume": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "ps",
|
||||
"n": 9
|
||||
}
|
||||
],
|
||||
"ps_mg": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "ps",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"firstaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 8000
|
||||
},
|
||||
{
|
||||
"a": "equi",
|
||||
"t": "11615",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"lotteryward": 17111610,
|
||||
"commonaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 8000
|
||||
},
|
||||
{
|
||||
"a": "equi",
|
||||
"t": "11625",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"BattleReadyID": 10106002,
|
||||
"FormatList": [
|
||||
103071
|
||||
],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"star_type": [
|
||||
1,
|
||||
2,
|
||||
2
|
||||
],
|
||||
"star_value": [
|
||||
0,
|
||||
2,
|
||||
1
|
||||
],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103015,
|
||||
"chapterid": 11003,
|
||||
"group_id": 1003102,
|
||||
"previous_group_id": [
|
||||
100310
|
||||
],
|
||||
"previoustage": 0,
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 1,
|
||||
"stage_param": 0,
|
||||
"inherit": false,
|
||||
"battle_fail": false,
|
||||
"venturemodelspeed": 0,
|
||||
"venturemodelscale": 0,
|
||||
"move_type": 0,
|
||||
"venturemodel": "",
|
||||
"bubbletalk": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [
|
||||
"shandian"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": false,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
"herocolor": 1,
|
||||
"heroimg": "",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"hide": false,
|
||||
"destroy": true,
|
||||
"progress": 1,
|
||||
"timelineplayer": false,
|
||||
"stroyshow": false,
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"maingroupIcon": "",
|
||||
"mainlineName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"title": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"exp": 0,
|
||||
"hero_exp": 400,
|
||||
"ps_consume": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "ps",
|
||||
"n": 9
|
||||
}
|
||||
],
|
||||
"ps_mg": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "ps",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"firstaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 8000
|
||||
},
|
||||
{
|
||||
"a": "equi",
|
||||
"t": "11615",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"lotteryward": 17111610,
|
||||
"commonaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 8000
|
||||
},
|
||||
{
|
||||
"a": "equi",
|
||||
"t": "11625",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"BattleReadyID": 10106002,
|
||||
"FormatList": [
|
||||
103071
|
||||
],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"star_type": [
|
||||
1,
|
||||
2,
|
||||
2
|
||||
],
|
||||
"star_value": [
|
||||
0,
|
||||
2,
|
||||
1
|
||||
],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103016,
|
||||
"chapterid": 11003,
|
||||
"group_id": 1003103,
|
||||
"previous_group_id": [
|
||||
100310
|
||||
],
|
||||
"previoustage": 0,
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 1,
|
||||
"stage_param": 0,
|
||||
"inherit": false,
|
||||
"battle_fail": false,
|
||||
"venturemodelspeed": 0,
|
||||
"venturemodelscale": 0,
|
||||
"move_type": 0,
|
||||
"venturemodel": "",
|
||||
"bubbletalk": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [
|
||||
"shandian"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": false,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
"herocolor": 1,
|
||||
"heroimg": "",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"hide": false,
|
||||
"destroy": true,
|
||||
"progress": 1,
|
||||
"timelineplayer": false,
|
||||
"stroyshow": false,
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"maingroupIcon": "",
|
||||
"mainlineName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"title": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"exp": 0,
|
||||
"hero_exp": 400,
|
||||
"ps_consume": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "ps",
|
||||
"n": 9
|
||||
}
|
||||
],
|
||||
"ps_mg": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "ps",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"firstaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 8000
|
||||
},
|
||||
{
|
||||
"a": "equi",
|
||||
"t": "11615",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"lotteryward": 17111610,
|
||||
"commonaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 8000
|
||||
},
|
||||
{
|
||||
"a": "equi",
|
||||
"t": "11625",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"BattleReadyID": 10106002,
|
||||
"FormatList": [
|
||||
103071
|
||||
],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"star_type": [
|
||||
1,
|
||||
2,
|
||||
2
|
||||
],
|
||||
"star_value": [
|
||||
0,
|
||||
2,
|
||||
1
|
||||
],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103017,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100311,
|
||||
"previous_group_id": [
|
||||
1003103,
|
||||
1003102,
|
||||
1003101
|
||||
],
|
||||
"previoustage": 0,
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 1,
|
||||
"stage_param": 0,
|
||||
"inherit": false,
|
||||
"battle_fail": false,
|
||||
"venturemodelspeed": 12,
|
||||
"venturemodelscale": 4,
|
||||
"move_type": 0,
|
||||
"venturemodel": "Person/54016/54016_q.prefab",
|
||||
"venturemodel": "",
|
||||
"bubbletalk": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -19876,7 +20273,7 @@
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "效果8",
|
||||
"scene_effectfilter": "",
|
||||
"is_near": false,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
@ -19980,11 +20377,92 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103015,
|
||||
"id": 1103018,
|
||||
"chapterid": 11003,
|
||||
"group_id": 1003111,
|
||||
"previous_group_id": [
|
||||
100311
|
||||
],
|
||||
"previoustage": 0,
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 3,
|
||||
"stage_param": 0,
|
||||
"inherit": false,
|
||||
"battle_fail": false,
|
||||
"venturemodelspeed": 0,
|
||||
"venturemodelscale": 0,
|
||||
"move_type": 0,
|
||||
"venturemodel": "Person/54016/54016_q.prefab",
|
||||
"bubbletalk": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "效果8",
|
||||
"is_near": false,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
"herocolor": 1,
|
||||
"heroimg": "",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"hide": false,
|
||||
"destroy": true,
|
||||
"progress": 1,
|
||||
"timelineplayer": false,
|
||||
"stroyshow": false,
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"maingroupIcon": "",
|
||||
"mainlineName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"title": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"exp": 0,
|
||||
"hero_exp": 0,
|
||||
"ps_consume": [],
|
||||
"ps_mg": [],
|
||||
"firstaward": [],
|
||||
"lotteryward": 0,
|
||||
"commonaward": [],
|
||||
"BattleReadyID": 0,
|
||||
"FormatList": [],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [],
|
||||
"star_type": [],
|
||||
"star_value": [],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103019,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100312,
|
||||
"previous_group_id": [
|
||||
100311
|
||||
1003111
|
||||
],
|
||||
"previoustage": 0,
|
||||
"buried_type": 0,
|
||||
@ -20061,7 +20539,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103016,
|
||||
"id": 1103020,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100313,
|
||||
"previous_group_id": [
|
||||
@ -20190,7 +20668,7 @@
|
||||
"challengeward": 12003
|
||||
},
|
||||
{
|
||||
"id": 1103017,
|
||||
"id": 1103021,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100313,
|
||||
"previous_group_id": [
|
||||
@ -20319,7 +20797,7 @@
|
||||
"challengeward": 12003
|
||||
},
|
||||
{
|
||||
"id": 1103018,
|
||||
"id": 1103022,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100313,
|
||||
"previous_group_id": [
|
||||
@ -20448,7 +20926,7 @@
|
||||
"challengeward": 12003
|
||||
},
|
||||
{
|
||||
"id": 1103019,
|
||||
"id": 1103023,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100313,
|
||||
"previous_group_id": [
|
||||
@ -20577,7 +21055,7 @@
|
||||
"challengeward": 12003
|
||||
},
|
||||
{
|
||||
"id": 1103020,
|
||||
"id": 1103024,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100313,
|
||||
"previous_group_id": [
|
||||
@ -20706,7 +21184,7 @@
|
||||
"challengeward": 12003
|
||||
},
|
||||
{
|
||||
"id": 1103021,
|
||||
"id": 1103025,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100313,
|
||||
"previous_group_id": [
|
||||
@ -20835,7 +21313,7 @@
|
||||
"challengeward": 12003
|
||||
},
|
||||
{
|
||||
"id": 1103022,
|
||||
"id": 1103026,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100313,
|
||||
"previous_group_id": [
|
||||
@ -20964,7 +21442,7 @@
|
||||
"challengeward": 12003
|
||||
},
|
||||
{
|
||||
"id": 1103023,
|
||||
"id": 1103027,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100313,
|
||||
"previous_group_id": [
|
||||
@ -21093,7 +21571,7 @@
|
||||
"challengeward": 12003
|
||||
},
|
||||
{
|
||||
"id": 1103024,
|
||||
"id": 1103028,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100314,
|
||||
"previous_group_id": [
|
||||
@ -21222,7 +21700,7 @@
|
||||
"challengeward": 13003
|
||||
},
|
||||
{
|
||||
"id": 1103025,
|
||||
"id": 1103029,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100314,
|
||||
"previous_group_id": [
|
||||
@ -21351,7 +21829,7 @@
|
||||
"challengeward": 13003
|
||||
},
|
||||
{
|
||||
"id": 1103026,
|
||||
"id": 1103030,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100314,
|
||||
"previous_group_id": [
|
||||
@ -21480,7 +21958,7 @@
|
||||
"challengeward": 13003
|
||||
},
|
||||
{
|
||||
"id": 1103027,
|
||||
"id": 1103031,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100314,
|
||||
"previous_group_id": [
|
||||
@ -21609,7 +22087,7 @@
|
||||
"challengeward": 13003
|
||||
},
|
||||
{
|
||||
"id": 1103028,
|
||||
"id": 1103032,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100314,
|
||||
"previous_group_id": [
|
||||
@ -21738,7 +22216,7 @@
|
||||
"challengeward": 13003
|
||||
},
|
||||
{
|
||||
"id": 1103029,
|
||||
"id": 1103033,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100314,
|
||||
"previous_group_id": [
|
||||
@ -21867,7 +22345,7 @@
|
||||
"challengeward": 13003
|
||||
},
|
||||
{
|
||||
"id": 1103030,
|
||||
"id": 1103034,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100314,
|
||||
"previous_group_id": [
|
||||
@ -21996,7 +22474,7 @@
|
||||
"challengeward": 13003
|
||||
},
|
||||
{
|
||||
"id": 1103031,
|
||||
"id": 1103035,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100314,
|
||||
"previous_group_id": [
|
||||
@ -22125,7 +22603,7 @@
|
||||
"challengeward": 13003
|
||||
},
|
||||
{
|
||||
"id": 1103032,
|
||||
"id": 1103036,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100316,
|
||||
"previous_group_id": [
|
||||
@ -22206,7 +22684,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103033,
|
||||
"id": 1103037,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100317,
|
||||
"previous_group_id": [
|
||||
@ -22287,7 +22765,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103034,
|
||||
"id": 1103038,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100318,
|
||||
"previous_group_id": [
|
||||
@ -22416,7 +22894,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103035,
|
||||
"id": 1103039,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100319,
|
||||
"previous_group_id": [
|
||||
@ -22545,7 +23023,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103036,
|
||||
"id": 1103040,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100320,
|
||||
"previous_group_id": [
|
||||
@ -22626,7 +23104,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103037,
|
||||
"id": 1103041,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100321,
|
||||
"previous_group_id": [
|
||||
@ -22707,7 +23185,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103038,
|
||||
"id": 1103042,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100322,
|
||||
"previous_group_id": [
|
||||
@ -22788,7 +23266,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103039,
|
||||
"id": 1103043,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100323,
|
||||
"previous_group_id": [
|
||||
@ -22869,7 +23347,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103040,
|
||||
"id": 1103044,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100324,
|
||||
"previous_group_id": [
|
||||
@ -22950,7 +23428,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103041,
|
||||
"id": 1103045,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100325,
|
||||
"previous_group_id": [
|
||||
@ -23031,7 +23509,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103042,
|
||||
"id": 1103046,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100326,
|
||||
"previous_group_id": [
|
||||
@ -23112,7 +23590,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103043,
|
||||
"id": 1103047,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100327,
|
||||
"previous_group_id": [
|
||||
@ -23193,7 +23671,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103044,
|
||||
"id": 1103048,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100328,
|
||||
"previous_group_id": [
|
||||
@ -23274,7 +23752,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103045,
|
||||
"id": 1103049,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100329,
|
||||
"previous_group_id": [
|
||||
@ -23355,7 +23833,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103046,
|
||||
"id": 1103050,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100330,
|
||||
"previous_group_id": [
|
||||
@ -23436,7 +23914,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103047,
|
||||
"id": 1103051,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100331,
|
||||
"previous_group_id": [
|
||||
@ -23517,7 +23995,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103048,
|
||||
"id": 1103052,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100332,
|
||||
"previous_group_id": [
|
||||
@ -23598,7 +24076,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103049,
|
||||
"id": 1103053,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100333,
|
||||
"previous_group_id": [
|
||||
@ -23727,7 +24205,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103050,
|
||||
"id": 1103054,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100334,
|
||||
"previous_group_id": [
|
||||
@ -23808,7 +24286,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103051,
|
||||
"id": 1103055,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100335,
|
||||
"previous_group_id": [
|
||||
@ -23889,7 +24367,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103052,
|
||||
"id": 1103056,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100336,
|
||||
"previous_group_id": [
|
||||
@ -24018,7 +24496,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103053,
|
||||
"id": 1103057,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100337,
|
||||
"previous_group_id": [
|
||||
@ -24099,7 +24577,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103054,
|
||||
"id": 1103058,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100338,
|
||||
"previous_group_id": [
|
||||
@ -24180,7 +24658,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103055,
|
||||
"id": 1103059,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100339,
|
||||
"previous_group_id": [
|
||||
@ -24309,7 +24787,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103056,
|
||||
"id": 1103060,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100340,
|
||||
"previous_group_id": [
|
||||
@ -24390,7 +24868,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103057,
|
||||
"id": 1103061,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100341,
|
||||
"previous_group_id": [
|
||||
@ -24474,7 +24952,7 @@
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1103058,
|
||||
"id": 1103062,
|
||||
"chapterid": 11003,
|
||||
"group_id": 100342,
|
||||
"previous_group_id": [
|
||||
|
||||
@ -7524,6 +7524,41 @@
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "83008",
|
||||
"preson": "83008",
|
||||
"presonshow": "83008_exhibition",
|
||||
"presonstory": "83008_story",
|
||||
"presondraw": "",
|
||||
"height": 1,
|
||||
"weight": 1,
|
||||
"ico": "tx_js_83008",
|
||||
"fight": "tx_js_83008",
|
||||
"img": "sbkp_js_83008",
|
||||
"heroimg": "hbkp_js_83008",
|
||||
"portrait": "zm_img_83008",
|
||||
"bust": "bust_83008",
|
||||
"postxyz": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"rotation": {
|
||||
"x": 0,
|
||||
"y": 180,
|
||||
"z": 0
|
||||
},
|
||||
"boxPos": {
|
||||
"x": 0,
|
||||
"y": 0.5,
|
||||
"z": 0
|
||||
},
|
||||
"boxSize": {
|
||||
"x": 1,
|
||||
"y": 1,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "85001",
|
||||
"preson": "85001",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -178,11 +178,5 @@
|
||||
"open": true,
|
||||
"routrules": "~/worker",
|
||||
"describe": "积分boss"
|
||||
},
|
||||
{
|
||||
"msgid": "plunder",
|
||||
"open": false,
|
||||
"routrules": "~/worker",
|
||||
"describe": "掠夺"
|
||||
}
|
||||
]
|
||||
@ -25,25 +25,14 @@
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 30
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 20
|
||||
},
|
||||
"hidenum": 20,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -51,7 +40,7 @@
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 102,
|
||||
@ -79,25 +68,14 @@
|
||||
"n": 20
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 40
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 20
|
||||
},
|
||||
"hidenum": 20,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -105,7 +83,7 @@
|
||||
"n": 2
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 103,
|
||||
@ -133,25 +111,14 @@
|
||||
"n": 30
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 50
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 20
|
||||
},
|
||||
"hidenum": 20,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -159,7 +126,7 @@
|
||||
"n": 3
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 104,
|
||||
@ -187,25 +154,14 @@
|
||||
"n": 30
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 50
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 20
|
||||
},
|
||||
"hidenum": 20,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -213,7 +169,7 @@
|
||||
"n": 3
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 105,
|
||||
@ -241,25 +197,14 @@
|
||||
"n": 40
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 60
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 40
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 30
|
||||
},
|
||||
"hidenum": 30,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -267,7 +212,7 @@
|
||||
"n": 4
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 106,
|
||||
@ -295,25 +240,14 @@
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 70
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 30
|
||||
},
|
||||
"hidenum": 30,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -321,7 +255,7 @@
|
||||
"n": 5
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 107,
|
||||
@ -349,25 +283,14 @@
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 30
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 30
|
||||
},
|
||||
"hidenum": 30,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -375,7 +298,7 @@
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 108,
|
||||
@ -403,25 +326,14 @@
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 30
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 30
|
||||
},
|
||||
"hidenum": 30,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -429,7 +341,7 @@
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 109,
|
||||
@ -457,25 +369,14 @@
|
||||
"n": 20
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 40
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 40
|
||||
},
|
||||
"hidenum": 40,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -483,7 +384,7 @@
|
||||
"n": 2
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 110,
|
||||
@ -511,25 +412,14 @@
|
||||
"n": 30
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 50
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 40
|
||||
},
|
||||
"hidenum": 40,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -537,7 +427,7 @@
|
||||
"n": 3
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 111,
|
||||
@ -565,25 +455,14 @@
|
||||
"n": 40
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 60
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 40
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 40
|
||||
},
|
||||
"hidenum": 40,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -591,7 +470,7 @@
|
||||
"n": 4
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 112,
|
||||
@ -619,25 +498,14 @@
|
||||
"n": 40
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 60
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 40
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 40
|
||||
},
|
||||
"hidenum": 40,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -645,7 +513,7 @@
|
||||
"n": 4
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 113,
|
||||
@ -673,25 +541,14 @@
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 70
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 45
|
||||
},
|
||||
"hidenum": 45,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -699,7 +556,7 @@
|
||||
"n": 5
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 114,
|
||||
@ -727,25 +584,14 @@
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 30
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 45
|
||||
},
|
||||
"hidenum": 45,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -753,7 +599,7 @@
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 115,
|
||||
@ -781,25 +627,14 @@
|
||||
"n": 20
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 40
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 45
|
||||
},
|
||||
"hidenum": 45,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -807,7 +642,7 @@
|
||||
"n": 2
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 116,
|
||||
@ -835,25 +670,14 @@
|
||||
"n": 20
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 40
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 45
|
||||
},
|
||||
"hidenum": 45,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -861,7 +685,7 @@
|
||||
"n": 2
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 117,
|
||||
@ -889,25 +713,14 @@
|
||||
"n": 30
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 50
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 50
|
||||
},
|
||||
"hidenum": 50,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -915,7 +728,7 @@
|
||||
"n": 3
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 118,
|
||||
@ -943,25 +756,14 @@
|
||||
"n": 40
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 60
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 40
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 50
|
||||
},
|
||||
"hidenum": 50,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -969,7 +771,7 @@
|
||||
"n": 4
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 119,
|
||||
@ -997,25 +799,14 @@
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 70
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 50
|
||||
},
|
||||
"hidenum": 50,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -1023,7 +814,7 @@
|
||||
"n": 5
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
},
|
||||
{
|
||||
"id": 120,
|
||||
@ -1051,25 +842,14 @@
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"lostreward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 70
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"numitem": {
|
||||
"a": "attr",
|
||||
"t": "plunderexp",
|
||||
"n": 50
|
||||
},
|
||||
"hidenum": 50,
|
||||
"time": 15,
|
||||
"protecttime": 60,
|
||||
"time": 150,
|
||||
"exreward": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -1077,6 +857,6 @@
|
||||
"n": 5
|
||||
}
|
||||
],
|
||||
"extime": 10
|
||||
"extime": 100
|
||||
}
|
||||
]
|
||||
@ -5,7 +5,7 @@
|
||||
"key": "plunder_island_name_01",
|
||||
"text": "1号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy1",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -14,7 +14,7 @@
|
||||
"key": "plunder_island_name_02",
|
||||
"text": "2号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy2",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -23,7 +23,7 @@
|
||||
"key": "plunder_island_name_03",
|
||||
"text": "3号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy3",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -32,7 +32,7 @@
|
||||
"key": "plunder_island_name_04",
|
||||
"text": "4号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy4",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -41,7 +41,7 @@
|
||||
"key": "plunder_island_name_05",
|
||||
"text": "5号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy1",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -50,7 +50,7 @@
|
||||
"key": "plunder_island_name_06",
|
||||
"text": "6号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy2",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -59,7 +59,7 @@
|
||||
"key": "plunder_island_name_07",
|
||||
"text": "7号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy3",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -68,7 +68,7 @@
|
||||
"key": "plunder_island_name_08",
|
||||
"text": "8号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy4",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -77,7 +77,7 @@
|
||||
"key": "plunder_island_name_09",
|
||||
"text": "9号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy1",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -86,7 +86,7 @@
|
||||
"key": "plunder_island_name_10",
|
||||
"text": "10号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy2",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -95,7 +95,7 @@
|
||||
"key": "plunder_island_name_11",
|
||||
"text": "11号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy3",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -104,7 +104,7 @@
|
||||
"key": "plunder_island_name_12",
|
||||
"text": "12号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy4",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -113,7 +113,7 @@
|
||||
"key": "plunder_island_name_13",
|
||||
"text": "13号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy1",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -122,7 +122,7 @@
|
||||
"key": "plunder_island_name_14",
|
||||
"text": "14号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy2",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -131,7 +131,7 @@
|
||||
"key": "plunder_island_name_15",
|
||||
"text": "15号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy3",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -140,7 +140,7 @@
|
||||
"key": "plunder_island_name_16",
|
||||
"text": "16号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy4",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -149,7 +149,7 @@
|
||||
"key": "plunder_island_name_17",
|
||||
"text": "17号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy1",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -158,7 +158,7 @@
|
||||
"key": "plunder_island_name_18",
|
||||
"text": "18号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy2",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -167,7 +167,7 @@
|
||||
"key": "plunder_island_name_19",
|
||||
"text": "19号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy3",
|
||||
"ship_icon": []
|
||||
},
|
||||
{
|
||||
@ -176,7 +176,7 @@
|
||||
"key": "plunder_island_name_20",
|
||||
"text": "20号岛屿"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "ld_img_dy4",
|
||||
"ship_icon": []
|
||||
}
|
||||
]
|
||||
@ -9545,7 +9545,7 @@
|
||||
],
|
||||
"event": [
|
||||
1,
|
||||
503
|
||||
109
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -9621,7 +9621,7 @@
|
||||
],
|
||||
"event": [
|
||||
1,
|
||||
505
|
||||
701
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -10088,7 +10088,7 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"阿宝",
|
||||
"氛围npc-焊娇虎",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
@ -10241,7 +10241,7 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"功能入口-烹饪",
|
||||
"氛围npc-警长",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
|
||||
@ -5619,7 +5619,7 @@
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 2,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
"Type": 1,
|
||||
"Argu": [
|
||||
@ -5647,7 +5647,7 @@
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 2,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
"Type": 1,
|
||||
"Argu": [
|
||||
@ -5675,7 +5675,7 @@
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 2,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
"Type": 1,
|
||||
"Argu": [
|
||||
@ -7211,7 +7211,7 @@
|
||||
{
|
||||
"Id": 215005211,
|
||||
"EmitPR": 1000,
|
||||
"From": 1,
|
||||
"From": 3,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 10,
|
||||
@ -16800,7 +16800,7 @@
|
||||
{
|
||||
"Id": 224004211,
|
||||
"EmitPR": 1000,
|
||||
"From": 3,
|
||||
"From": 1,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 1,
|
||||
@ -74173,7 +74173,7 @@
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"Where": [],
|
||||
"Order": "Leader",
|
||||
"Order": "CaptainPriority=1",
|
||||
"Limit": 1,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
@ -74189,10 +74189,14 @@
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
"DpsRevisiType": 110,
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
"RevisiParams": [
|
||||
10,
|
||||
5,
|
||||
5000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 285001112,
|
||||
@ -74203,11 +74207,9 @@
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
"Type": 1,
|
||||
"Type": 24,
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
4000
|
||||
1000
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -74362,9 +74364,7 @@
|
||||
4,
|
||||
6000
|
||||
],
|
||||
"FollowSK": [
|
||||
285001512
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -74552,7 +74552,7 @@
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"Where": [],
|
||||
"Order": "Leader",
|
||||
"Order": "CaptainPriority=1",
|
||||
"Limit": 1,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
@ -74568,10 +74568,14 @@
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
"DpsRevisiType": 110,
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
"RevisiParams": [
|
||||
6,
|
||||
1,
|
||||
5000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 285002112,
|
||||
@ -74582,11 +74586,9 @@
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
"Type": 1,
|
||||
"Type": 24,
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
4000
|
||||
1000
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -74741,9 +74743,7 @@
|
||||
4,
|
||||
6000
|
||||
],
|
||||
"FollowSK": [
|
||||
285002512
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -74931,7 +74931,7 @@
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"Where": [],
|
||||
"Order": "Leader",
|
||||
"Order": "CaptainPriority=1",
|
||||
"Limit": 1,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
@ -74947,10 +74947,13 @@
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
"DpsRevisiType": 106,
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
"RevisiParams": [
|
||||
10,
|
||||
10
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 285003112,
|
||||
@ -74961,11 +74964,9 @@
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 1,
|
||||
"TriggerAnim": "",
|
||||
"Type": 1,
|
||||
"Type": 24,
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
4000
|
||||
1000
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -75120,9 +75121,7 @@
|
||||
4,
|
||||
6000
|
||||
],
|
||||
"FollowSK": [
|
||||
285003512
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -75130,7 +75129,7 @@
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": [
|
||||
391000123,
|
||||
391000127,
|
||||
50
|
||||
]
|
||||
},
|
||||
|
||||
@ -12299,7 +12299,7 @@
|
||||
"passSkill": [],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_124004211_1",
|
||||
"text": "为自身施加2回合[color=#37d8a9]攻击提升[/color]效果，之后立即获得回合"
|
||||
"text": "为友方施加2回合[color=#37d8a9]攻击提升[/color]效果，之后立即获得回合。"
|
||||
},
|
||||
"buffid": [
|
||||
390001001
|
||||
@ -24515,11 +24515,9 @@
|
||||
"passSkill": [],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_155002211_1",
|
||||
"text": "（被动）当有队友死亡或自身血量首次低于30%时为自身附加2回合[color=#37d8a9]香蕉在哪[/color]。"
|
||||
"text": "（被动）当有队友死亡或自身血量首次低于30%时自身进入狂暴化。"
|
||||
},
|
||||
"buffid": [
|
||||
390001448
|
||||
],
|
||||
"buffid": [],
|
||||
"map": ""
|
||||
},
|
||||
{
|
||||
@ -61138,7 +61136,7 @@
|
||||
"passSkill": [],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_185001211_1",
|
||||
"text": "场上每死亡1名敌方自身攻击提升增加10%"
|
||||
"text": "场上每死亡1名敌方自身伤害提升10%"
|
||||
},
|
||||
"buffid": [],
|
||||
"map": ""
|
||||
@ -61338,7 +61336,7 @@
|
||||
"passSkill": [],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_185002211_1",
|
||||
"text": "场上每死亡1名敌方自身攻击提升增加10%"
|
||||
"text": "场上每死亡1名敌方自身伤害提升10%"
|
||||
},
|
||||
"buffid": [],
|
||||
"map": ""
|
||||
@ -61538,7 +61536,7 @@
|
||||
"passSkill": [],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_185003211_1",
|
||||
"text": "场上每死亡1名敌方自身攻击提升增加10%"
|
||||
"text": "场上每死亡1名敌方自身伤害提升10%"
|
||||
},
|
||||
"buffid": [],
|
||||
"map": ""
|
||||
|
||||
@ -58,6 +58,7 @@
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3,
|
||||
15,
|
||||
11
|
||||
],
|
||||
"AddEffect": false,
|
||||
@ -97,6 +98,7 @@
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3,
|
||||
17,
|
||||
11
|
||||
],
|
||||
"AddEffect": false,
|
||||
@ -1466,6 +1468,7 @@
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3,
|
||||
18,
|
||||
11
|
||||
],
|
||||
"AddEffect": false,
|
||||
@ -1664,7 +1667,8 @@
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
0,
|
||||
3
|
||||
3,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -2341,7 +2345,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -2379,7 +2384,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -2607,7 +2613,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -2645,7 +2652,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -2873,7 +2881,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -3063,7 +3072,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -3101,7 +3111,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -3139,7 +3150,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -4668,7 +4680,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -5455,7 +5468,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -5493,7 +5507,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -6024,7 +6039,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -6062,7 +6078,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
15
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -6749,7 +6766,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
8
|
||||
8,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -9845,7 +9863,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -10114,7 +10133,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -10303,7 +10323,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -10992,7 +11013,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -11030,7 +11052,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -11106,7 +11129,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -11184,7 +11208,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
17
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -11222,7 +11247,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -11562,7 +11588,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -11602,7 +11629,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -12057,7 +12085,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -12091,7 +12120,7 @@
|
||||
1,
|
||||
3
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"BufParNum": 3,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
@ -12167,7 +12196,7 @@
|
||||
0,
|
||||
50
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"BufParNum": 3,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
@ -13485,11 +13514,12 @@
|
||||
"EffectArgu": [
|
||||
400
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"BufParNum": 3,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -13903,7 +13933,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -14017,7 +14048,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": true,
|
||||
@ -14055,7 +14087,8 @@
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": [
|
||||
3
|
||||
3,
|
||||
16
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
@ -14460,16 +14493,15 @@
|
||||
"Id": 391000115,
|
||||
"Name": {
|
||||
"key": "skill_skill_buff_Name_391000115",
|
||||
"text": "攻击提升"
|
||||
"text": "伤害提升"
|
||||
},
|
||||
"Desc": {
|
||||
"key": "skill_skill_buff_Desc_391000115",
|
||||
"text": "场上每死亡1名敌方自身攻击提升增加10%"
|
||||
"text": "场上每死亡1名敌方自身伤害提升10%"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"BuffType": 147,
|
||||
"EffectArgu": [
|
||||
2,
|
||||
22,
|
||||
100
|
||||
],
|
||||
"BufParNum": 1,
|
||||
@ -14505,8 +14537,13 @@
|
||||
"key": "skill_skill_buff_Desc_391000116",
|
||||
"text": "每回合开始前造成以自身最大生命值为一定比例的伤害，受到净化以及增益效果时,将被消除一层。被【】引爆后，将以当前层数的效果保留，且无法再被消除。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 151,
|
||||
"EffectArgu": [
|
||||
1,
|
||||
2,
|
||||
500,
|
||||
285001511
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14514,7 +14551,7 @@
|
||||
13
|
||||
],
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
"RemoveType": true,
|
||||
"Priority": 0,
|
||||
"NotOverlay": 0,
|
||||
"OverlayTimes": 99,
|
||||
@ -14540,8 +14577,11 @@
|
||||
"key": "skill_skill_buff_Desc_391000117",
|
||||
"text": "受到单段伤害提升，受到多段伤害的后续伤害降低90%。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 150,
|
||||
"EffectArgu": [
|
||||
1000,
|
||||
-900
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14610,8 +14650,10 @@
|
||||
"key": "skill_skill_buff_Desc_391000119",
|
||||
"text": "破防"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 148,
|
||||
"EffectArgu": [
|
||||
1000
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14645,8 +14687,10 @@
|
||||
"key": "skill_skill_buff_Desc_391000120",
|
||||
"text": "防御提升失效"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 146,
|
||||
"EffectArgu": [
|
||||
15
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14680,8 +14724,10 @@
|
||||
"key": "skill_skill_buff_Desc_391000121",
|
||||
"text": " 减伤效果失效"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 144,
|
||||
"EffectArgu": [
|
||||
16
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14715,10 +14761,9 @@
|
||||
"key": "skill_skill_buff_Desc_391000122",
|
||||
"text": "承受一定伤害获得回合"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"BuffType": 149,
|
||||
"EffectArgu": [
|
||||
100000,
|
||||
285001614
|
||||
100000
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
@ -14753,8 +14798,12 @@
|
||||
"key": "skill_skill_buff_Desc_391000123",
|
||||
"text": "林荫"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 153,
|
||||
"EffectArgu": [
|
||||
2,
|
||||
500,
|
||||
285002511
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14821,10 +14870,12 @@
|
||||
},
|
||||
"Desc": {
|
||||
"key": "skill_skill_buff_Desc_391000125",
|
||||
"text": "速度提升 减伤效果失效"
|
||||
"text": "速度提升失效"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 145,
|
||||
"EffectArgu": [
|
||||
17
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14858,8 +14909,11 @@
|
||||
"key": "skill_skill_buff_Desc_391000127",
|
||||
"text": "寒冷"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 152,
|
||||
"EffectArgu": [
|
||||
500,
|
||||
285003511
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14928,8 +14982,10 @@
|
||||
"key": "skill_skill_buff_Desc_391000129",
|
||||
"text": "治疗效果失效"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 143,
|
||||
"EffectArgu": [
|
||||
18
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -14963,8 +15019,11 @@
|
||||
"key": "skill_skill_buff_Desc_391000130",
|
||||
"text": "受到多段伤害提升，受到的后续伤害增加50%。"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 150,
|
||||
"EffectArgu": [
|
||||
0,
|
||||
500
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
|
||||
@ -399,6 +399,17 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "store",
|
||||
"subId": "15",
|
||||
"currencyField": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "storebuypopup",
|
||||
"subId": "",
|
||||
@ -2872,12 +2883,12 @@
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumeexp",
|
||||
"n": 1
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 1
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -2888,12 +2899,12 @@
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumeexp",
|
||||
"n": 1
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 1
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -2904,12 +2915,12 @@
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumeexp",
|
||||
"n": 1
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 1
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -2920,12 +2931,12 @@
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumeexp",
|
||||
"n": 1
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 1
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -751,7 +751,7 @@
|
||||
"bossmodel": 0,
|
||||
"boss_skill": 0,
|
||||
"boss": [
|
||||
301040
|
||||
301043
|
||||
],
|
||||
"ps_consume": [
|
||||
{
|
||||
@ -820,7 +820,7 @@
|
||||
"bossmodel": 0,
|
||||
"boss_skill": 0,
|
||||
"boss": [
|
||||
301040
|
||||
301046
|
||||
],
|
||||
"ps_consume": [
|
||||
{
|
||||
@ -1589,7 +1589,7 @@
|
||||
"bossmodel": 0,
|
||||
"boss_skill": 0,
|
||||
"boss": [
|
||||
302040
|
||||
302043
|
||||
],
|
||||
"ps_consume": [
|
||||
{
|
||||
@ -1658,7 +1658,7 @@
|
||||
"bossmodel": 0,
|
||||
"boss_skill": 0,
|
||||
"boss": [
|
||||
302040
|
||||
302046
|
||||
],
|
||||
"ps_consume": [
|
||||
{
|
||||
@ -2427,7 +2427,7 @@
|
||||
"bossmodel": 0,
|
||||
"boss_skill": 0,
|
||||
"boss": [
|
||||
303040
|
||||
303043
|
||||
],
|
||||
"ps_consume": [
|
||||
{
|
||||
@ -2496,7 +2496,7 @@
|
||||
"bossmodel": 0,
|
||||
"boss_skill": 0,
|
||||
"boss": [
|
||||
303040
|
||||
303046
|
||||
],
|
||||
"ps_consume": [
|
||||
{
|
||||
|
||||
@ -508,7 +508,7 @@
|
||||
{
|
||||
"id": 504,
|
||||
"FormatList": [
|
||||
700011
|
||||
700038
|
||||
],
|
||||
"BattleReadyID": 126,
|
||||
"EventList": [],
|
||||
@ -552,5 +552,21 @@
|
||||
"carexe": 500,
|
||||
"reward": 0,
|
||||
"exreward": []
|
||||
},
|
||||
{
|
||||
"id": 701,
|
||||
"FormatList": [
|
||||
101041
|
||||
],
|
||||
"BattleReadyID": 126,
|
||||
"EventList": [],
|
||||
"playexp": {
|
||||
"a": "attr",
|
||||
"t": "exp",
|
||||
"n": 5
|
||||
},
|
||||
"carexe": 500,
|
||||
"reward": 0,
|
||||
"exreward": []
|
||||
}
|
||||
]
|
||||
@ -801,12 +801,7 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if rst.Expitem == nil {
|
||||
rst.Expitem = make(map[string]int32)
|
||||
}
|
||||
if rst.Herofrag == nil {
|
||||
rst.Herofrag = make(map[string]int32)
|
||||
}
|
||||
|
||||
bChange := false
|
||||
// 转碎片处理
|
||||
for i := 0; int32(i) < count; i++ {
|
||||
@ -938,7 +933,8 @@ func (this *ModelHero) CheckDrawCardRes(session comm.IUserSession, drawConf *cfg
|
||||
// 模拟获得英雄 (bImitate : true 表示模拟获得 并不发英雄)
|
||||
func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bImitate bool) (addres [][]*cfg.Gameatn, add []*pb.DBHero, err error) {
|
||||
var (
|
||||
szCard map[string]int32
|
||||
szCard map[string]int32
|
||||
bChange bool
|
||||
)
|
||||
szCard = make(map[string]int32)
|
||||
heros := make([]*pb.DBHero, 0)
|
||||
@ -951,12 +947,7 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if rst.Expitem == nil {
|
||||
rst.Expitem = make(map[string]int32)
|
||||
}
|
||||
if rst.Herofrag == nil {
|
||||
rst.Herofrag = make(map[string]int32)
|
||||
}
|
||||
|
||||
if err = this.GetList(uid, &heros); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
}
|
||||
@ -1012,9 +1003,11 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
|
||||
if v, ok := rst.Herofrag[hero.HeroID]; !ok {
|
||||
rst.Herofrag[hero.HeroID] = 1
|
||||
bAdd = true
|
||||
bChange = true
|
||||
} else if heroCfg.Herofragnum > v {
|
||||
rst.Herofrag[hero.HeroID] += 1
|
||||
bAdd = true
|
||||
bChange = true
|
||||
}
|
||||
}
|
||||
if bAdd {
|
||||
@ -1039,10 +1032,12 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
|
||||
if heroCfg.Expitemnum > v {
|
||||
rst.Expitem[hero.HeroID] += 1
|
||||
bAdd = true
|
||||
bChange = true
|
||||
}
|
||||
} else {
|
||||
rst.Expitem[hero.HeroID] = 1
|
||||
bAdd = true
|
||||
bChange = true
|
||||
}
|
||||
}
|
||||
if bAdd {
|
||||
@ -1050,7 +1045,12 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
|
||||
}
|
||||
addres = append(addres, res)
|
||||
}
|
||||
|
||||
if !bImitate && bChange {
|
||||
this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
|
||||
"herofrag": rst.Herofrag,
|
||||
"expitem": rst.Expitem,
|
||||
})
|
||||
}
|
||||
if !bImitate { // 获得三消卡片资源数据
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
|
||||
|
||||
@ -38,7 +38,8 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PlunderChallen
|
||||
}
|
||||
return
|
||||
}
|
||||
if len(list.Source) > int(req.Index) { // 数组长度校验
|
||||
|
||||
if len(list.Source) < int(req.Index) { // 数组长度校验
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
@ -46,6 +47,18 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PlunderChallen
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
for k := range list.Setout {
|
||||
if req.Index == int32(k) {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
Message: fmt.Sprintf("list.Setout %d,", req.Pos),
|
||||
}
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// 配置校验
|
||||
if conf, err = this.module.configure.getGamePlunderDataById(list.Source[req.Index]); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
@ -73,6 +86,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PlunderChallen
|
||||
if errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "challenge", &pb.PlunderChallengeResp{
|
||||
Info: &pb.BattleInfo{Id: record.Id, Title: record.Title, Rulesid: battleConf.BattleReadyID, Btype: record.Btype, Ptype: record.Ptype, RedCompId: record.RedCompId, Redflist: record.Redflist, BlueCompId: record.BlueCompId, Buleflist: record.Buleflist, Tasks: record.Tasks},
|
||||
})
|
||||
|
||||
@ -37,7 +37,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
|
||||
land *pb.DBPlunderLand // 岛屿数据
|
||||
shipData *pb.ShipData // 船
|
||||
users []string
|
||||
update map[string]interface{} //
|
||||
)
|
||||
update = make(map[string]interface{})
|
||||
changExp = make(map[string]int32, 0)
|
||||
if errdata = this.ChallengeOverCheck(session, req); errdata != nil {
|
||||
return // 参数校验失败直接返回
|
||||
@ -49,7 +51,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
|
||||
}
|
||||
return
|
||||
}
|
||||
if len(list.Source) > int(req.Index) { // 数组长度校验
|
||||
if len(list.Source) < int(req.Index) { // 数组长度校验
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
@ -97,22 +99,29 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
|
||||
for _, v := range land.Uinfo {
|
||||
users = append(users, v.Uid)
|
||||
}
|
||||
_id := primitive.NilObjectID.Hex()
|
||||
_id := primitive.NewObjectID().Hex()
|
||||
// 创建一条船的信息
|
||||
shipData = &pb.ShipData{
|
||||
Uid: session.GetUserId(),
|
||||
Line: &pb.PlunderLine{
|
||||
Itype: 0,
|
||||
Etime: configure.Now().Unix() + int64(conf.Extime),
|
||||
Cid: conf.Id,
|
||||
Oid: _id,
|
||||
Closetime: 0,
|
||||
Itype: req.Itype,
|
||||
Etime: configure.Now().Unix() + int64(conf.Extime),
|
||||
Cid: conf.Id,
|
||||
Oid: _id,
|
||||
},
|
||||
Status: 0,
|
||||
Cd: 0,
|
||||
Client: false,
|
||||
Defend: req.Report.Info.Buleflist,
|
||||
}
|
||||
list.Count++
|
||||
update["count"] = list.Count
|
||||
list.Line[req.Index].Oid = _id
|
||||
update["line"] = list.Line
|
||||
list.Setout = append(list.Setout, req.Index)
|
||||
update["setout"] = list.Setout
|
||||
|
||||
this.module.modelPlunder.changePlunderData(session.GetUserId(), update)
|
||||
// 此处需要redis 锁
|
||||
land.Ship[_id] = shipData // 一条新船
|
||||
|
||||
@ -152,7 +161,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "challengeover", &pb.PlunderChallengeOverResp{
|
||||
Line: []*pb.PlunderLine{},
|
||||
Line: list.Line,
|
||||
Ship: map[string]*pb.ShipData{},
|
||||
Atno: atno,
|
||||
Heroexp: changExp,
|
||||
|
||||
@ -72,7 +72,11 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC
|
||||
}); errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
land.Ship[req.Oid].Status = 1
|
||||
// 修改状态
|
||||
this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{
|
||||
"ship": land.Ship,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "challenge", &pb.ArenaChallengeResp{Info: &pb.BattleInfo{
|
||||
Id: record.Id,
|
||||
Title: record.Title,
|
||||
|
||||
@ -3,6 +3,8 @@ package plunder
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/configure"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
// 参数校验
|
||||
@ -19,9 +21,12 @@ func (this *apiComp) PvpChallengeOverCheck(session comm.IUserSession, req *pb.Pl
|
||||
// /挑战
|
||||
func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.PlunderPvpChallengeOverReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
err error
|
||||
land *pb.DBPlunderLand // 岛屿数据
|
||||
list *pb.DBPlunder
|
||||
err error
|
||||
land *pb.DBPlunderLand // 岛屿数据
|
||||
list *pb.DBPlunder
|
||||
iswin bool
|
||||
conf *cfg.GamePlunderData
|
||||
users []string
|
||||
)
|
||||
if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil {
|
||||
return
|
||||
@ -42,7 +47,9 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
for _, v := range land.Uinfo {
|
||||
users = append(users, v.Uid)
|
||||
}
|
||||
// 校验oid
|
||||
if _, ok := land.Ship[req.Oid]; !ok {
|
||||
errdata = &pb.ErrorData{
|
||||
@ -51,7 +58,40 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder
|
||||
}
|
||||
return
|
||||
}
|
||||
if errdata, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
|
||||
return
|
||||
}
|
||||
// 配置校验
|
||||
if conf, err = this.module.configure.getGamePlunderDataById(land.Ship[req.Oid].Line.Cid); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if !iswin {
|
||||
land.Ship[req.Oid].Cd = configure.Now().Unix() + int64(conf.Protecttime)
|
||||
land.Ship[req.Oid].Status = 2
|
||||
this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{
|
||||
"ship": land.Ship,
|
||||
})
|
||||
// 通知大家
|
||||
this.module.SendMsgToUsers(string(this.module.GetType()), "change", &pb.PlunderChangePush{
|
||||
Ship: land.Ship,
|
||||
}, users...)
|
||||
return
|
||||
}
|
||||
land.Ship[req.Oid].Status = 3
|
||||
// 修改状态
|
||||
this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{
|
||||
"ship": land.Ship,
|
||||
})
|
||||
// 通知大家
|
||||
this.module.SendMsgToUsers(string(this.module.GetType()), "change", &pb.PlunderChangePush{
|
||||
Ship: land.Ship,
|
||||
}, users...)
|
||||
session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{
|
||||
Atno: []*pb.UserAtno{},
|
||||
})
|
||||
|
||||
73
modules/plunder/api_reach.go
Normal file
73
modules/plunder/api_reach.go
Normal file
@ -0,0 +1,73 @@
|
||||
package plunder
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
// 参数校验
|
||||
func (this *apiComp) ReachCheck(session comm.IUserSession, req *pb.PlunderReachReq) (errdata *pb.ErrorData) {
|
||||
if len(req.Oid) == 0 {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 船准备出发
|
||||
func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
err error
|
||||
list *pb.DBPlunder
|
||||
land *pb.DBPlunderLand // 岛屿数据
|
||||
)
|
||||
|
||||
if errdata = this.ReachCheck(session, req); errdata != nil {
|
||||
return // 参数校验失败直接返回
|
||||
}
|
||||
|
||||
if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
for _, oid := range req.Oid {
|
||||
if _, ok := land.Ship[oid]; !ok {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
} else {
|
||||
for _, v := range list.Line {
|
||||
if v.Oid == oid {
|
||||
v.Oid = ""
|
||||
}
|
||||
}
|
||||
delete(land.Ship, oid)
|
||||
}
|
||||
}
|
||||
|
||||
this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{
|
||||
"line": list.Line,
|
||||
})
|
||||
this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{
|
||||
"ship": land.Ship,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "reach", &pb.PlunderReachResp{
|
||||
Line: list.Line,
|
||||
Ship: land.Ship,
|
||||
})
|
||||
return
|
||||
}
|
||||
@ -69,7 +69,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand
|
||||
if limtSocre < 0 {
|
||||
limtSocre = 0
|
||||
}
|
||||
cur, err := this.DB.Find(core.SqlTable(comm.TableUser), bson.M{"gold": bson.M{"$gte": limtSocre}}, options.Find().SetSkip(int64(0)).SetLimit(int64(30)))
|
||||
cur, err := this.DB.Find(core.SqlTable(comm.TableUser), bson.M{"gold": bson.M{"$gte": limtSocre}, "name": bson.M{"$ne": ""}}, options.Find().SetSkip(int64(0)).SetLimit(int64(30)))
|
||||
for cur.Next(context.TODO()) {
|
||||
tmp := &pb.DBUser{}
|
||||
if err = cur.Decode(tmp); err == nil {
|
||||
@ -95,7 +95,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand
|
||||
if users, err = this.module.ModuleUser.GetUsers(curUids); err == nil {
|
||||
for _, v := range users {
|
||||
uInfos = append(uInfos, comm.GetUserBaseInfo(v))
|
||||
if len(land.Uinfo) > 20 {
|
||||
if len(uInfos) >= 20 {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,9 +44,9 @@ func (this *modelPlunder) getPlunderData(uid string) (info *pb.DBPlunder, err er
|
||||
}
|
||||
|
||||
for i := 0; i < 3; i++ { // 队列固定三条
|
||||
info.Line = append(info.Line, &pb.PlunderLine{})
|
||||
info.Line = append(info.Line, &pb.TransportLine{})
|
||||
}
|
||||
info.Line = append(info.Line, &pb.PlunderLine{
|
||||
info.Line = append(info.Line, &pb.TransportLine{
|
||||
Closetime: -1, // 需要手动解锁
|
||||
})
|
||||
// 刷新货物信息
|
||||
|
||||
@ -26,16 +26,16 @@ type DBPlunder struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //
|
||||
Landid string `protobuf:"bytes,3,opt,name=landid,proto3" json:"landid"` //掠夺岛 oid
|
||||
Line []*PlunderLine `protobuf:"bytes,4,rep,name=line,proto3" json:"line"` // 运输队列
|
||||
Count int32 `protobuf:"varint,5,opt,name=count,proto3" json:"count"` // 运输次数
|
||||
Source []int32 `protobuf:"varint,6,rep,packed,name=source,proto3" json:"source"` // 货源列表
|
||||
Setout []int32 `protobuf:"varint,7,rep,packed,name=setout,proto3" json:"setout"` // 已经出发的列表
|
||||
Refresh int32 `protobuf:"varint,8,opt,name=refresh,proto3" json:"refresh"` // 刷新次数
|
||||
Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用
|
||||
Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分
|
||||
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"` //
|
||||
Landid string `protobuf:"bytes,3,opt,name=landid,proto3" json:"landid"` //掠夺岛 oid
|
||||
Line []*TransportLine `protobuf:"bytes,4,rep,name=line,proto3" json:"line"` // 运输队列
|
||||
Count int32 `protobuf:"varint,5,opt,name=count,proto3" json:"count"` // 运输次数
|
||||
Source []int32 `protobuf:"varint,6,rep,packed,name=source,proto3" json:"source"` // 货源列表
|
||||
Setout []int32 `protobuf:"varint,7,rep,packed,name=setout,proto3" json:"setout"` // 已经出发的列表
|
||||
Refresh int32 `protobuf:"varint,8,opt,name=refresh,proto3" json:"refresh"` // 刷新次数
|
||||
Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用
|
||||
Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分
|
||||
}
|
||||
|
||||
func (x *DBPlunder) Reset() {
|
||||
@ -91,7 +91,7 @@ func (x *DBPlunder) GetLandid() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBPlunder) GetLine() []*PlunderLine {
|
||||
func (x *DBPlunder) GetLine() []*TransportLine {
|
||||
if x != nil {
|
||||
return x.Line
|
||||
}
|
||||
@ -140,23 +140,77 @@ func (x *DBPlunder) GetScore() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
type TransportLine struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` // 唯一id
|
||||
Closetime int64 `protobuf:"varint,2,opt,name=closetime,proto3" json:"closetime"` // 格子关闭时间 -1 关闭 0 开启
|
||||
}
|
||||
|
||||
func (x *TransportLine) Reset() {
|
||||
*x = TransportLine{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[1]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *TransportLine) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*TransportLine) ProtoMessage() {}
|
||||
|
||||
func (x *TransportLine) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[1]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use TransportLine.ProtoReflect.Descriptor instead.
|
||||
func (*TransportLine) Descriptor() ([]byte, []int) {
|
||||
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{1}
|
||||
}
|
||||
|
||||
func (x *TransportLine) GetOid() string {
|
||||
if x != nil {
|
||||
return x.Oid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *TransportLine) GetClosetime() int64 {
|
||||
if x != nil {
|
||||
return x.Closetime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// 自己的船
|
||||
type PlunderLine struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Itype int32 `protobuf:"varint,1,opt,name=itype,proto3" json:"itype"` // 运输品质
|
||||
Etime int64 `protobuf:"varint,2,opt,name=etime,proto3" json:"etime"` // 到达时间
|
||||
Cid int32 `protobuf:"varint,3,opt,name=cid,proto3" json:"cid"` // 货物配置id
|
||||
Oid string `protobuf:"bytes,4,opt,name=oid,proto3" json:"oid"` // 唯一id
|
||||
Closetime int64 `protobuf:"varint,5,opt,name=closetime,proto3" json:"closetime"` // 格子关闭时间 -1 关闭 0 开启
|
||||
Itype int32 `protobuf:"varint,1,opt,name=itype,proto3" json:"itype"` // 运输品质
|
||||
Etime int64 `protobuf:"varint,2,opt,name=etime,proto3" json:"etime"` // 到达时间
|
||||
Cid int32 `protobuf:"varint,3,opt,name=cid,proto3" json:"cid"` // 货物配置id
|
||||
Oid string `protobuf:"bytes,4,opt,name=oid,proto3" json:"oid"` // 唯一id
|
||||
}
|
||||
|
||||
func (x *PlunderLine) Reset() {
|
||||
*x = PlunderLine{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[1]
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[2]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -169,7 +223,7 @@ func (x *PlunderLine) String() string {
|
||||
func (*PlunderLine) ProtoMessage() {}
|
||||
|
||||
func (x *PlunderLine) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[1]
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[2]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -182,7 +236,7 @@ func (x *PlunderLine) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use PlunderLine.ProtoReflect.Descriptor instead.
|
||||
func (*PlunderLine) Descriptor() ([]byte, []int) {
|
||||
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{1}
|
||||
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{2}
|
||||
}
|
||||
|
||||
func (x *PlunderLine) GetItype() int32 {
|
||||
@ -213,13 +267,6 @@ func (x *PlunderLine) GetOid() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *PlunderLine) GetClosetime() int64 {
|
||||
if x != nil {
|
||||
return x.Closetime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// 船信息
|
||||
type ShipData struct {
|
||||
state protoimpl.MessageState
|
||||
@ -238,7 +285,7 @@ type ShipData struct {
|
||||
func (x *ShipData) Reset() {
|
||||
*x = ShipData{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[2]
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[3]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -251,7 +298,7 @@ func (x *ShipData) String() string {
|
||||
func (*ShipData) ProtoMessage() {}
|
||||
|
||||
func (x *ShipData) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[2]
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[3]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -264,7 +311,7 @@ func (x *ShipData) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use ShipData.ProtoReflect.Descriptor instead.
|
||||
func (*ShipData) Descriptor() ([]byte, []int) {
|
||||
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{2}
|
||||
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{3}
|
||||
}
|
||||
|
||||
func (x *ShipData) GetUid() string {
|
||||
@ -324,7 +371,7 @@ type DBPlunderLand struct {
|
||||
func (x *DBPlunderLand) Reset() {
|
||||
*x = DBPlunderLand{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[3]
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[4]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -337,7 +384,7 @@ func (x *DBPlunderLand) String() string {
|
||||
func (*DBPlunderLand) ProtoMessage() {}
|
||||
|
||||
func (x *DBPlunderLand) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[3]
|
||||
mi := &file_plunder_plunder_db_proto_msgTypes[4]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -350,7 +397,7 @@ func (x *DBPlunderLand) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBPlunderLand.ProtoReflect.Descriptor instead.
|
||||
func (*DBPlunderLand) Descriptor() ([]byte, []int) {
|
||||
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{3}
|
||||
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{4}
|
||||
}
|
||||
|
||||
func (x *DBPlunderLand) GetId() string {
|
||||
@ -387,60 +434,63 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{
|
||||
0x0a, 0x18, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x2f, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65,
|
||||
0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x61, 0x74, 0x74,
|
||||
0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf3,
|
||||
0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf5,
|
||||
0x01, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
|
||||
0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x04,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69,
|
||||
0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e,
|
||||
0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06,
|
||||
0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x74, 0x6f, 0x75, 0x74,
|
||||
0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x74, 0x6f, 0x75, 0x74, 0x12, 0x18,
|
||||
0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d,
|
||||
0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
|
||||
0x63, 0x6f, 0x72, 0x65, 0x22, 0x7b, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c,
|
||||
0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12,
|
||||
0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69,
|
||||
0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
|
||||
0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d,
|
||||
0x65, 0x22, 0xa6, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
|
||||
0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c,
|
||||
0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69,
|
||||
0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c,
|
||||
0x69, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65,
|
||||
0x6e, 0x74, 0x12, 0x26, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
|
||||
0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, 0xa1, 0x02, 0x0a, 0x0d, 0x44,
|
||||
0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2f, 0x0a, 0x05,
|
||||
0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42,
|
||||
0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, 0x55, 0x69, 0x6e, 0x66,
|
||||
0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a,
|
||||
0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42,
|
||||
0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, 0x53, 0x68, 0x69, 0x70,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65,
|
||||
0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d,
|
||||
0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
|
||||
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
|
||||
0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68,
|
||||
0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c,
|
||||
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44,
|
||||
0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06,
|
||||
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x04,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
|
||||
0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f,
|
||||
0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
|
||||
0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05,
|
||||
0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x74, 0x6f,
|
||||
0x75, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x74, 0x6f, 0x75, 0x74,
|
||||
0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74,
|
||||
0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70,
|
||||
0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f,
|
||||
0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c,
|
||||
0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x5d, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64,
|
||||
0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0xa6, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44,
|
||||
0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e,
|
||||
0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
|
||||
0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
|
||||
0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52,
|
||||
0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e,
|
||||
0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74,
|
||||
0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22,
|
||||
0xa1, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e,
|
||||
0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
|
||||
0x64, 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64,
|
||||
0x2e, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e,
|
||||
0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64,
|
||||
0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
|
||||
0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45,
|
||||
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
|
||||
0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
|
||||
0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
|
||||
0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -455,25 +505,26 @@ func file_plunder_plunder_db_proto_rawDescGZIP() []byte {
|
||||
return file_plunder_plunder_db_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
|
||||
var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
|
||||
var file_plunder_plunder_db_proto_goTypes = []interface{}{
|
||||
(*DBPlunder)(nil), // 0: DBPlunder
|
||||
(*PlunderLine)(nil), // 1: PlunderLine
|
||||
(*ShipData)(nil), // 2: ShipData
|
||||
(*DBPlunderLand)(nil), // 3: DBPlunderLand
|
||||
nil, // 4: DBPlunderLand.UinfoEntry
|
||||
nil, // 5: DBPlunderLand.ShipEntry
|
||||
(*DBBattleFormt)(nil), // 6: DBBattleFormt
|
||||
(*BaseUserInfo)(nil), // 7: BaseUserInfo
|
||||
(*TransportLine)(nil), // 1: TransportLine
|
||||
(*PlunderLine)(nil), // 2: PlunderLine
|
||||
(*ShipData)(nil), // 3: ShipData
|
||||
(*DBPlunderLand)(nil), // 4: DBPlunderLand
|
||||
nil, // 5: DBPlunderLand.UinfoEntry
|
||||
nil, // 6: DBPlunderLand.ShipEntry
|
||||
(*DBBattleFormt)(nil), // 7: DBBattleFormt
|
||||
(*BaseUserInfo)(nil), // 8: BaseUserInfo
|
||||
}
|
||||
var file_plunder_plunder_db_proto_depIdxs = []int32{
|
||||
1, // 0: DBPlunder.line:type_name -> PlunderLine
|
||||
1, // 1: ShipData.line:type_name -> PlunderLine
|
||||
6, // 2: ShipData.defend:type_name -> DBBattleFormt
|
||||
4, // 3: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry
|
||||
5, // 4: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry
|
||||
7, // 5: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo
|
||||
2, // 6: DBPlunderLand.ShipEntry.value:type_name -> ShipData
|
||||
1, // 0: DBPlunder.line:type_name -> TransportLine
|
||||
2, // 1: ShipData.line:type_name -> PlunderLine
|
||||
7, // 2: ShipData.defend:type_name -> DBBattleFormt
|
||||
5, // 3: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry
|
||||
6, // 4: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry
|
||||
8, // 5: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo
|
||||
3, // 6: DBPlunderLand.ShipEntry.value:type_name -> ShipData
|
||||
7, // [7:7] is the sub-list for method output_type
|
||||
7, // [7:7] is the sub-list for method input_type
|
||||
7, // [7:7] is the sub-list for extension type_name
|
||||
@ -502,7 +553,7 @@ func file_plunder_plunder_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_plunder_plunder_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*PlunderLine); i {
|
||||
switch v := v.(*TransportLine); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -514,7 +565,7 @@ func file_plunder_plunder_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_plunder_plunder_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*ShipData); i {
|
||||
switch v := v.(*PlunderLine); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -526,6 +577,18 @@ func file_plunder_plunder_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_plunder_plunder_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*ShipData); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_plunder_plunder_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBPlunderLand); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -544,7 +607,7 @@ func file_plunder_plunder_db_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_plunder_plunder_db_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 6,
|
||||
NumMessages: 7,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
@ -404,7 +404,7 @@ type PlunderChallengeOverResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Line []*PlunderLine `protobuf:"bytes,1,rep,name=line,proto3" json:"line"` // 运输队列
|
||||
Line []*TransportLine `protobuf:"bytes,1,rep,name=line,proto3" json:"line"` // 运输队列
|
||||
Ship map[string]*ShipData `protobuf:"bytes,2,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 运输的船 key 唯一id
|
||||
Atno []*UserAtno `protobuf:"bytes,3,rep,name=atno,proto3" json:"atno"` // 奖励
|
||||
Heroexp map[string]int32 `protobuf:"bytes,4,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验
|
||||
@ -442,7 +442,7 @@ func (*PlunderChallengeOverResp) Descriptor() ([]byte, []int) {
|
||||
return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{7}
|
||||
}
|
||||
|
||||
func (x *PlunderChallengeOverResp) GetLine() []*PlunderLine {
|
||||
func (x *PlunderChallengeOverResp) GetLine() []*TransportLine {
|
||||
if x != nil {
|
||||
return x.Line
|
||||
}
|
||||
@ -737,7 +737,7 @@ type PlunderReachResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Line []*PlunderLine `protobuf:"bytes,1,rep,name=line,proto3" json:"line"` // 运输队列
|
||||
Line []*TransportLine `protobuf:"bytes,1,rep,name=line,proto3" json:"line"` // 运输队列
|
||||
Ship map[string]*ShipData `protobuf:"bytes,2,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 运输的船 key 唯一id
|
||||
}
|
||||
|
||||
@ -773,7 +773,7 @@ func (*PlunderReachResp) Descriptor() ([]byte, []int) {
|
||||
return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{13}
|
||||
}
|
||||
|
||||
func (x *PlunderReachResp) GetLine() []*PlunderLine {
|
||||
func (x *PlunderReachResp) GetLine() []*TransportLine {
|
||||
if x != nil {
|
||||
return x.Line
|
||||
}
|
||||
@ -970,82 +970,83 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{
|
||||
0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12,
|
||||
0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06,
|
||||
0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xd6, 0x02, 0x0a, 0x18, 0x50, 0x6c, 0x75, 0x6e, 0x64,
|
||||
0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xd8, 0x02, 0x0a, 0x18, 0x50, 0x6c, 0x75, 0x6e, 0x64,
|
||||
0x65, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52,
|
||||
0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x37, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20,
|
||||
0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61,
|
||||
0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53,
|
||||
0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1d,
|
||||
0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
|
||||
0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x12, 0x40, 0x0a,
|
||||
0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26,
|
||||
0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
|
||||
0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78,
|
||||
0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a,
|
||||
0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
|
||||
0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
|
||||
0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
|
||||
0x54, 0x0a, 0x16, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x76, 0x70, 0x43, 0x68, 0x61,
|
||||
0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
|
||||
0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4c, 0x0a, 0x17, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
|
||||
0x50, 0x76, 0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f,
|
||||
0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
|
||||
0x6e, 0x66, 0x6f, 0x22, 0x55, 0x0a, 0x1a, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x76,
|
||||
0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65,
|
||||
0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
|
||||
0x6f, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f,
|
||||
0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3c, 0x0a, 0x1b, 0x50, 0x6c,
|
||||
0x75, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x76, 0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
|
||||
0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e,
|
||||
0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
|
||||
0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x23, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e,
|
||||
0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0xa9, 0x01,
|
||||
0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04,
|
||||
0x6c, 0x69, 0x6e, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63,
|
||||
0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
|
||||
0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x13, 0x50, 0x6c, 0x75,
|
||||
0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71,
|
||||
0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6f,
|
||||
0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c,
|
||||
0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x33, 0x0a, 0x04, 0x73,
|
||||
0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x50, 0x6c, 0x75, 0x6e,
|
||||
0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70,
|
||||
0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e,
|
||||
0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x37, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18,
|
||||
0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43,
|
||||
0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
|
||||
0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70,
|
||||
0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
|
||||
0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x12,
|
||||
0x40, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x26, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
|
||||
0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f,
|
||||
0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78,
|
||||
0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||
0x01, 0x22, 0x54, 0x0a, 0x16, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x76, 0x70, 0x43,
|
||||
0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x28, 0x0a,
|
||||
0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
|
||||
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
|
||||
0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4c, 0x0a, 0x17, 0x50, 0x6c, 0x75, 0x6e, 0x64,
|
||||
0x65, 0x72, 0x50, 0x76, 0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x03, 0x6f, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x55, 0x0a, 0x1a, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
|
||||
0x50, 0x76, 0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72,
|
||||
0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
|
||||
0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3c, 0x0a, 0x1b,
|
||||
0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x76, 0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
|
||||
0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61,
|
||||
0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
|
||||
0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x23, 0x0a, 0x0f, 0x50, 0x6c,
|
||||
0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22,
|
||||
0xab, 0x01, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69,
|
||||
0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70,
|
||||
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
|
||||
0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69,
|
||||
0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61,
|
||||
0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a,
|
||||
0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61,
|
||||
0x67, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64,
|
||||
0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||
0x33, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e,
|
||||
0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67,
|
||||
0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04,
|
||||
0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72,
|
||||
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75,
|
||||
0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30,
|
||||
0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50,
|
||||
0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
|
||||
0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70,
|
||||
0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
|
||||
0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09,
|
||||
0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
|
||||
0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, 0x0a, 0x04, 0x73, 0x68,
|
||||
0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64,
|
||||
0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x53, 0x68, 0x69,
|
||||
0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09,
|
||||
0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69,
|
||||
0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
|
||||
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -1089,7 +1090,7 @@ var file_plunder_plunder_msg_proto_goTypes = []interface{}{
|
||||
(*BattleFormation)(nil), // 24: BattleFormation
|
||||
(*BattleInfo)(nil), // 25: BattleInfo
|
||||
(*BattleReport)(nil), // 26: BattleReport
|
||||
(*PlunderLine)(nil), // 27: PlunderLine
|
||||
(*TransportLine)(nil), // 27: TransportLine
|
||||
(*UserAtno)(nil), // 28: UserAtno
|
||||
(*ShipData)(nil), // 29: ShipData
|
||||
}
|
||||
@ -1099,7 +1100,7 @@ var file_plunder_plunder_msg_proto_depIdxs = []int32{
|
||||
24, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation
|
||||
25, // 3: PlunderChallengeResp.info:type_name -> BattleInfo
|
||||
26, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport
|
||||
27, // 5: PlunderChallengeOverResp.line:type_name -> PlunderLine
|
||||
27, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine
|
||||
17, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry
|
||||
28, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno
|
||||
18, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry
|
||||
@ -1107,7 +1108,7 @@ var file_plunder_plunder_msg_proto_depIdxs = []int32{
|
||||
25, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo
|
||||
26, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport
|
||||
28, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno
|
||||
27, // 13: PlunderReachResp.line:type_name -> PlunderLine
|
||||
27, // 13: PlunderReachResp.line:type_name -> TransportLine
|
||||
19, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry
|
||||
20, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry
|
||||
21, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry
|
||||
|
||||
@ -24,4 +24,8 @@ const (
|
||||
GameBuffEffectType_CanRollDeBuff = 12
|
||||
GameBuffEffectType_EnchantBossBuff = 13
|
||||
GameBuffEffectType_Overall = 14
|
||||
GameBuffEffectType_Def = 15
|
||||
GameBuffEffectType_DmgDown = 16
|
||||
GameBuffEffectType_SpdUp = 17
|
||||
GameBuffEffectType_Heal = 18
|
||||
)
|
||||
|
||||
@ -137,4 +137,11 @@ const (
|
||||
GameBuffType_GLOBAL_DISABLE_DAMRE = 144
|
||||
GameBuffType_GLOBAL_DISABLE_ADD_SPEED = 145
|
||||
GameBuffType_GLOBAL_DISABLE_ADD_DEF = 146
|
||||
GameBuffType_ADJUST_DMG_BY_DEATH_NUM = 147
|
||||
GameBuffType_DEFENSE_BREAK = 148
|
||||
GameBuffType_BE_DMG_TOTAL_NEW_ROUND = 149
|
||||
GameBuffType_MODIFY_MULTI_DMG = 150
|
||||
GameBuffType_BROIL = 151
|
||||
GameBuffType_FRIGID = 152
|
||||
GameBuffType_SHADE = 153
|
||||
)
|
||||
|
||||
@ -19,9 +19,9 @@ type GamePlunderData struct {
|
||||
Weight int32
|
||||
Battleid int32
|
||||
Keepreward []*Gameatn
|
||||
Lostreward []*Gameatn
|
||||
Numitem *Gameatn
|
||||
Hidenum int32
|
||||
Protecttime int32
|
||||
Time int32
|
||||
Exreward []*Gameatn
|
||||
Extime int32
|
||||
@ -55,22 +55,9 @@ func (_v *GamePlunderData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["lostreward"].([]interface{}); !_ok_ { err = errors.New("lostreward error"); return }
|
||||
|
||||
_v.Lostreward = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ *Gameatn
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
_v.Lostreward = append(_v.Lostreward, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["numitem"].(map[string]interface{}); !_ok_ { err = errors.New("numitem error"); return }; if _v.Numitem, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hidenum"].(float64); !_ok_ { err = errors.New("hidenum error"); return }; _v.Hidenum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["protecttime"].(float64); !_ok_ { err = errors.New("protecttime error"); return }; _v.Protecttime = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user