This commit is contained in:
liwei1dao 2024-01-23 18:25:47 +08:00
commit 22db9c7978
32 changed files with 4230 additions and 1160 deletions

View File

@ -8,6 +8,14 @@
"key": "arena_active_reward_name_1", "key": "arena_active_reward_name_1",
"text": "黑铁" "text": "黑铁"
}, },
"ex_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 10
}
],
"score_return": 0,
"win_reward": [ "win_reward": [
{ {
"a": "attr", "a": "attr",
@ -27,6 +35,14 @@
"key": "arena_active_reward_name_2", "key": "arena_active_reward_name_2",
"text": "青铜" "text": "青铜"
}, },
"ex_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 10
}
],
"score_return": 0,
"win_reward": [ "win_reward": [
{ {
"a": "attr", "a": "attr",
@ -46,6 +62,14 @@
"key": "arena_active_reward_name_3", "key": "arena_active_reward_name_3",
"text": "白银" "text": "白银"
}, },
"ex_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 10
}
],
"score_return": 800,
"win_reward": [ "win_reward": [
{ {
"a": "attr", "a": "attr",
@ -65,6 +89,14 @@
"key": "arena_active_reward_name_4", "key": "arena_active_reward_name_4",
"text": "黄金" "text": "黄金"
}, },
"ex_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 10
}
],
"score_return": 1300,
"win_reward": [ "win_reward": [
{ {
"a": "attr", "a": "attr",
@ -84,6 +116,14 @@
"key": "arena_active_reward_name_5", "key": "arena_active_reward_name_5",
"text": "铂金" "text": "铂金"
}, },
"ex_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 10
}
],
"score_return": 1600,
"win_reward": [ "win_reward": [
{ {
"a": "attr", "a": "attr",
@ -103,6 +143,14 @@
"key": "arena_active_reward_name_6", "key": "arena_active_reward_name_6",
"text": "钻石" "text": "钻石"
}, },
"ex_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 10
}
],
"score_return": 2200,
"win_reward": [ "win_reward": [
{ {
"a": "attr", "a": "attr",
@ -122,6 +170,14 @@
"key": "arena_active_reward_name_7", "key": "arena_active_reward_name_7",
"text": "大师" "text": "大师"
}, },
"ex_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 10
}
],
"score_return": 2800,
"win_reward": [ "win_reward": [
{ {
"a": "attr", "a": "attr",
@ -141,6 +197,14 @@
"key": "arena_active_reward_name_8", "key": "arena_active_reward_name_8",
"text": "王者" "text": "王者"
}, },
"ex_reward": [
{
"a": "attr",
"t": "arenacoin",
"n": 10
}
],
"score_return": 3700,
"win_reward": [ "win_reward": [
{ {
"a": "attr", "a": "attr",

View File

@ -1,6 +1,7 @@
[ [
{ {
"id": 1, "id": 1,
"name": 1,
"rank_low": 1, "rank_low": 1,
"rank_up": 1, "rank_up": 1,
"rank_display": { "rank_display": {
@ -27,6 +28,7 @@
}, },
{ {
"id": 2, "id": 2,
"name": 1,
"rank_low": 2, "rank_low": 2,
"rank_up": 2, "rank_up": 2,
"rank_display": { "rank_display": {
@ -53,6 +55,7 @@
}, },
{ {
"id": 3, "id": 3,
"name": 1,
"rank_low": 3, "rank_low": 3,
"rank_up": 3, "rank_up": 3,
"rank_display": { "rank_display": {
@ -79,6 +82,7 @@
}, },
{ {
"id": 4, "id": 4,
"name": 1,
"rank_low": 4, "rank_low": 4,
"rank_up": 10, "rank_up": 10,
"rank_display": { "rank_display": {
@ -105,6 +109,7 @@
}, },
{ {
"id": 5, "id": 5,
"name": 1,
"rank_low": 11, "rank_low": 11,
"rank_up": 20, "rank_up": 20,
"rank_display": { "rank_display": {
@ -126,6 +131,7 @@
}, },
{ {
"id": 6, "id": 6,
"name": 1,
"rank_low": 21, "rank_low": 21,
"rank_up": 50, "rank_up": 50,
"rank_display": { "rank_display": {
@ -147,6 +153,7 @@
}, },
{ {
"id": 7, "id": 7,
"name": 1,
"rank_low": 51, "rank_low": 51,
"rank_up": 100, "rank_up": 100,
"rank_display": { "rank_display": {
@ -168,6 +175,7 @@
}, },
{ {
"id": 8, "id": 8,
"name": 1,
"rank_low": 101, "rank_low": 101,
"rank_up": 200, "rank_up": 200,
"rank_display": { "rank_display": {
@ -189,6 +197,7 @@
}, },
{ {
"id": 9, "id": 9,
"name": 1,
"rank_low": 201, "rank_low": 201,
"rank_up": 500, "rank_up": 500,
"rank_display": { "rank_display": {
@ -210,6 +219,7 @@
}, },
{ {
"id": 10, "id": 10,
"name": 1,
"rank_low": 501, "rank_low": 501,
"rank_up": 1000, "rank_up": 1000,
"rank_display": { "rank_display": {
@ -231,6 +241,7 @@
}, },
{ {
"id": 11, "id": 11,
"name": 1,
"rank_low": 1001, "rank_low": 1001,
"rank_up": 2000, "rank_up": 2000,
"rank_display": { "rank_display": {
@ -252,6 +263,7 @@
}, },
{ {
"id": 12, "id": 12,
"name": 1,
"rank_low": 2001, "rank_low": 2001,
"rank_up": 9999, "rank_up": 9999,
"rank_display": { "rank_display": {

View File

@ -3674,5 +3674,250 @@
"BlueAssistTeam": 0, "BlueAssistTeam": 0,
"CanFriendHelp": true, "CanFriendHelp": true,
"Numrounds": 0 "Numrounds": 0
},
{
"id": 10103101,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 1031,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 101612,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 0
},
{
"id": 10103102,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 1031,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 101622,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 0
},
{
"id": 10103103,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 1031,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 101632,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 0
},
{
"id": 10103104,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 1031,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 101642,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 0
},
{
"id": 10103105,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 1031,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 101652,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 0
},
{
"id": 10103106,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 1031,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 101662,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 0
},
{
"id": 10103107,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 1031,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 101672,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 0
} }
] ]

File diff suppressed because it is too large Load Diff

View File

@ -791,16 +791,6 @@
}, },
{ {
"id": 80, "id": 80,
"type": 4,
"text": {
"key": "GM_GM_text_120",
"text": "积分BOSS"
},
"data": "11081",
"prefix": ""
},
{
"id": 81,
"type": 2, "type": 2,
"text": { "text": {
"key": "GM_GM_text_127", "key": "GM_GM_text_127",
@ -810,7 +800,7 @@
"prefix": "bingo:sociatybooslv,{0}" "prefix": "bingo:sociatybooslv,{0}"
}, },
{ {
"id": 82, "id": 81,
"type": 2, "type": 2,
"text": { "text": {
"key": "GM_GM_text_128", "key": "GM_GM_text_128",
@ -820,7 +810,7 @@
"prefix": "bingo:create,{0}" "prefix": "bingo:create,{0}"
}, },
{ {
"id": 83, "id": 82,
"type": 2, "type": 2,
"text": { "text": {
"key": "GM_GM_text_129", "key": "GM_GM_text_129",
@ -830,7 +820,7 @@
"prefix": "bingo:mainline,{0}" "prefix": "bingo:mainline,{0}"
}, },
{ {
"id": 84, "id": 83,
"type": 2, "type": 2,
"text": { "text": {
"key": "GM_GM_text_130", "key": "GM_GM_text_130",
@ -840,7 +830,7 @@
"prefix": "" "prefix": ""
}, },
{ {
"id": 85, "id": 84,
"type": 2, "type": 2,
"text": { "text": {
"key": "GM_GM_text_131", "key": "GM_GM_text_131",
@ -850,7 +840,7 @@
"prefix": "bingo:moonlv,{0}" "prefix": "bingo:moonlv,{0}"
}, },
{ {
"id": 86, "id": 85,
"type": 2, "type": 2,
"text": { "text": {
"key": "GM_GM_text_132", "key": "GM_GM_text_132",
@ -860,7 +850,7 @@
"prefix": "" "prefix": ""
}, },
{ {
"id": 87, "id": 86,
"type": 1, "type": 1,
"text": { "text": {
"key": "GM_GM_text_133", "key": "GM_GM_text_133",
@ -868,5 +858,15 @@
}, },
"data": "7,1", "data": "7,1",
"prefix": "bingo:bagtype,{0}" "prefix": "bingo:bagtype,{0}"
},
{
"id": 87,
"type": 4,
"text": {
"key": "GM_GM_text_120",
"text": "积分BOSS"
},
"data": "11081",
"prefix": ""
} }
] ]

View File

@ -39925,7 +39925,7 @@
"progress": 0, "progress": 0,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401000,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -40006,7 +40006,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401010,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -40074,8 +40074,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_261",
"text": "" "text": "呃呃呃,好冷啊……!!"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -40087,7 +40087,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401020,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -40155,8 +40155,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_262",
"text": "" "text": "吼吼吼——"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -40168,7 +40168,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401050,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -40236,8 +40236,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_263",
"text": "" "text": "哦,我的奥丁神啊!!"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -40249,7 +40249,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401060,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -40317,8 +40317,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_264",
"text": "" "text": "小嗝嗝,快来帮忙。"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -40330,7 +40330,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401070,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -40446,8 +40446,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_265",
"text": "" "text": "好端端的,龙群怎么会感染瘟疫?"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -40459,8 +40459,8 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401090,
"afterstoryid": 0, "afterstoryid": 401100,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -40704,8 +40704,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_266",
"text": "" "text": "事关博克岛生存,必须谨慎处理。"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -40717,7 +40717,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401110,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -40962,8 +40962,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_268",
"text": "" "text": "别打了,大家都冷静一下!"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -40975,7 +40975,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401120,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -41045,8 +41045,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_269",
"text": "" "text": "这不是你的错,小嗝嗝。"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -41058,8 +41058,8 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401140,
"afterstoryid": 0, "afterstoryid": 401150,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -41174,8 +41174,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_270",
"text": "" "text": "终于又回到了这里。"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -41187,7 +41187,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401160,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -41255,8 +41255,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_271",
"text": "" "text": "希卡普,我的儿子!!"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -41268,7 +41268,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401170,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -41349,7 +41349,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401180,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -41420,8 +41420,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_273",
"text": "" "text": "以爱回应忠诚,以荣誉回应英勇。"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -41433,7 +41433,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401190,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -41507,8 +41507,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_274",
"text": "" "text": "是奥拉夫暴风雪!!"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -41520,7 +41520,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401200,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -41604,7 +41604,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401210,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -41691,8 +41691,8 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401220,
"afterstoryid": 0, "afterstoryid": 401230,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -41807,8 +41807,8 @@
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
"key": "", "key": "main_stage_bubbletext_277",
"text": "" "text": "怎么办怎么办,暴风雪来了!"
}, },
"animation": [], "animation": [],
"prewarbubbletext": { "prewarbubbletext": {
@ -41820,7 +41820,7 @@
"progress": 1, "progress": 1,
"timelineplayer": false, "timelineplayer": false,
"stroyshow": false, "stroyshow": false,
"frontstoryid": 0, "frontstoryid": 401250,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,363 @@
[
{
"id": 1001,
"itype": 1,
"name": {
"key": "plunder_plunder_develop_name_01",
"text": "初级航海术"
},
"open": [],
"last": [],
"icon": "jn_24004_1",
"place": 0,
"type": 101,
"buffID": 1,
"txt": {
"key": "plunder_plunder_develop_txt_01",
"text": "货船免费刷新次数+1"
}
},
{
"id": 1002,
"itype": 1,
"name": {
"key": "plunder_plunder_develop_name_02",
"text": "初级航海术"
},
"open": [],
"last": [
1001
],
"icon": "jn_24004_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_02",
"text": "全队攻击增加3%"
}
},
{
"id": 1003,
"itype": 1,
"name": {
"key": "plunder_plunder_develop_name_03",
"text": "初级航海术"
},
"open": [],
"last": [
1001
],
"icon": "jn_24004_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_03",
"text": "全队防御增加3%"
}
},
{
"id": 1004,
"itype": 1,
"name": {
"key": "plunder_plunder_develop_name_04",
"text": "初级航海术"
},
"open": [],
"last": [
1002
],
"icon": "jn_24004_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_04",
"text": "全队生命增加3%"
}
},
{
"id": 1005,
"itype": 1,
"name": {
"key": "plunder_plunder_develop_name_05",
"text": "初级航海术"
},
"open": [],
"last": [
1003
],
"icon": "jn_24004_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_05",
"text": "全队速度增加3%"
}
},
{
"id": 1006,
"itype": 1,
"name": {
"key": "plunder_plunder_develop_name_06",
"text": "初级航海术"
},
"open": [],
"last": [
1004,
1005
],
"icon": "jn_24004_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_06",
"text": "全队暴击率增加3%"
}
},
{
"id": 1007,
"itype": 2,
"name": {
"key": "plunder_plunder_develop_name_07",
"text": "中级航海术"
},
"open": [],
"last": [
1006
],
"icon": "jn_43003_1",
"place": 0,
"type": 101,
"buffID": 1,
"txt": {
"key": "plunder_plunder_develop_txt_07",
"text": "货船免费刷新次数+1"
}
},
{
"id": 1008,
"itype": 2,
"name": {
"key": "plunder_plunder_develop_name_08",
"text": "中级航海术"
},
"open": [],
"last": [
1007
],
"icon": "jn_43003_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_08",
"text": "全队攻击增加6%"
}
},
{
"id": 1009,
"itype": 2,
"name": {
"key": "plunder_plunder_develop_name_09",
"text": "中级航海术"
},
"open": [],
"last": [
1007
],
"icon": "jn_43003_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_09",
"text": "全队防御增加6%"
}
},
{
"id": 1010,
"itype": 2,
"name": {
"key": "plunder_plunder_develop_name_10",
"text": "中级航海术"
},
"open": [],
"last": [
1008
],
"icon": "jn_43003_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_10",
"text": "全队生命增加6%"
}
},
{
"id": 1011,
"itype": 2,
"name": {
"key": "plunder_plunder_develop_name_11",
"text": "中级航海术"
},
"open": [],
"last": [
1009
],
"icon": "jn_43003_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_11",
"text": "全队速度增加6%"
}
},
{
"id": 1012,
"itype": 2,
"name": {
"key": "plunder_plunder_develop_name_12",
"text": "中级航海术"
},
"open": [],
"last": [
1010,
1011
],
"icon": "jn_43003_1",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_12",
"text": "全队暴击率增加6%"
}
},
{
"id": 1013,
"itype": 3,
"name": {
"key": "plunder_plunder_develop_name_13",
"text": "高级航海术"
},
"open": [],
"last": [
1012
],
"icon": "jn_35005_2",
"place": 0,
"type": 101,
"buffID": 1,
"txt": {
"key": "plunder_plunder_develop_txt_13",
"text": "货船免费刷新次数+1"
}
},
{
"id": 1014,
"itype": 3,
"name": {
"key": "plunder_plunder_develop_name_14",
"text": "高级航海术"
},
"open": [],
"last": [
1013
],
"icon": "jn_35005_2",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_14",
"text": "全队攻击增加9%"
}
},
{
"id": 1015,
"itype": 3,
"name": {
"key": "plunder_plunder_develop_name_15",
"text": "高级航海术"
},
"open": [],
"last": [
1013
],
"icon": "jn_35005_2",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_15",
"text": "全队防御增加9%"
}
},
{
"id": 1016,
"itype": 3,
"name": {
"key": "plunder_plunder_develop_name_16",
"text": "高级航海术"
},
"open": [],
"last": [
1014
],
"icon": "jn_35005_2",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_16",
"text": "全队生命增加3%"
}
},
{
"id": 1017,
"itype": 3,
"name": {
"key": "plunder_plunder_develop_name_17",
"text": "高级航海术"
},
"open": [],
"last": [
1015
],
"icon": "jn_35005_2",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_17",
"text": "全队速度增加9%"
}
},
{
"id": 1018,
"itype": 3,
"name": {
"key": "plunder_plunder_develop_name_18",
"text": "高级航海术"
},
"open": [],
"last": [
1016,
1018
],
"icon": "jn_35005_2",
"place": 0,
"type": 1,
"buffID": 300,
"txt": {
"key": "plunder_plunder_develop_txt_18",
"text": "全队暴击伤害增加10%"
}
}
]

View File

@ -24832,7 +24832,8 @@
255007211, 255007211,
255007212, 255007212,
255007213, 255007213,
255007315 255007315,
255007319
] ]
}, },
"passSkill": [], "passSkill": [],

View File

@ -451,7 +451,7 @@ const (
TableAssist = "assist" TableAssist = "assist"
TablePlunder = "plunder" // 掠夺 TablePlunder = "plunder" // 掠夺
TablePlunderLand = "plunderland" // 掠夺岛 TablePlunderLand = "plunderland" // 掠夺岛
TablePlunderRecord = "plunderrecord" // 掠夺岛记录
///工会远征 ///工会远征
TableExpedition = "expedition" TableExpedition = "expedition"
) )

View File

@ -221,6 +221,8 @@ type (
PsConvertExp(ps int32) (res *cfg.Gameatn) PsConvertExp(ps int32) (res *cfg.Gameatn)
CleanUserConsumeMoney(session IUserSession) (err error) CleanUserConsumeMoney(session IUserSession) (err error)
// 增加隐藏分
AddUserHidenum(session IUserSession, score int32) (err error)
} }
//武器模块 //武器模块
IEquipment interface { IEquipment interface {

View File

@ -57,13 +57,7 @@ func (this *ModelHero) calFigthValue(hero *pb.DBHero) (addValue int32, err error
skillStar *cfg.GameFightingSkillStarData skillStar *cfg.GameFightingSkillStarData
) )
tmpHero = new(pb.DBHero) tmpHero = new(pb.DBHero)
//tmpHero = this.copyPoint(hero)
*tmpHero = *hero // 克隆一个对象 *tmpHero = *hero // 克隆一个对象
// tmpHero.Property = make(map[int32]int32)
// tmpHero.AddProperty = make(map[int32]int32)
// tmpHero.JuexProperty = make(map[int32]int32)
// tmpHero.HoroscopeProperty = make(map[int32]int32)
// tmpHero.TalentProperty = make(map[int32]int32)
tmpHero.Property = this.cloneTags(hero.Property) tmpHero.Property = this.cloneTags(hero.Property)
tmpHero.AddProperty = this.cloneTags(hero.AddProperty) tmpHero.AddProperty = this.cloneTags(hero.AddProperty)
tmpHero.JuexProperty = this.cloneTags(hero.JuexProperty) tmpHero.JuexProperty = this.cloneTags(hero.JuexProperty)
@ -460,9 +454,11 @@ func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DB
func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[int32]int32, skills []*pb.SkillData) { func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[int32]int32, skills []*pb.SkillData) {
hero.AddProperty = data hero.AddProperty = data
this.calFigthValue(hero)
if err := this.ChangeList(uid, hero.Id, map[string]interface{}{ if err := this.ChangeList(uid, hero.Id, map[string]interface{}{
"addProperty": data, "addProperty": data,
"equipSkill": skills, "equipSkill": skills,
"fightvalue": hero.Fightvalue,
}); err != nil { }); err != nil {
this.module.Errorf("mergeAddProperty err %v", err) this.module.Errorf("mergeAddProperty err %v", err)
} }

View File

@ -221,6 +221,24 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
Atno: atno, Atno: atno,
Heroexp: changExp, Heroexp: changExp,
}) })
// 运输记录
var info []*pb.PlunderRecordData
info = append(info, &pb.PlunderRecordData{
Itype: 1, // 1 出发
P1: session.GetUserId(),
P2: "",
Cid: list.Source[req.Index],
Ctime: configure.Now().Unix(),
})
info = append(info, &pb.PlunderRecordData{
Itype: 3, // 3 到达
P1: session.GetUserId(),
P2: "",
Cid: list.Source[req.Index],
Ctime: configure.Now().Unix() + int64(conf.Extime),
})
err = this.module.modelRecord.AddRecordData(land.Id, info)
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PlunderChallengeOverReq", atno) this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PlunderChallengeOverReq", atno)
}) })

View File

@ -0,0 +1,67 @@
package plunder
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
func (this *apiComp) DevelopCheck(session comm.IUserSession, req *pb.PlunderDevelopReq) (errdata *pb.ErrorData) {
return
}
// 获取基本信息
func (this *apiComp) Develop(session comm.IUserSession, req *pb.PlunderDevelopReq) (errdata *pb.ErrorData) {
var (
err error
list *pb.DBPlunder
update map[string]interface{}
conf *cfg.GamePlunderDevelopData
)
if errdata = this.DevelopCheck(session, req); errdata != nil {
return
}
update = make(map[string]interface{})
if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
return
}
if conf, err = this.module.configure.getPlunderDevelopById(req.Cid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return
}
if _, ok := list.Develop[conf.Itype]; ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_PlundeAlreadyLearn,
Title: pb.ErrorCode_PlundeAlreadyLearn.ToString(),
}
return
}
// 校验前置任务
for _, v := range conf.Last {
if _, ok := list.Develop[v]; !ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_PlundeAlreadyLearn,
Title: pb.ErrorCode_PlundeAlreadyLearn.ToString(),
}
return
}
}
list.Develop[conf.Itype] = 1
update["develop"] = list.Develop
this.module.modelPlunder.changePlunderData(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "develop", &pb.PlunderDevelopResp{
Develop: list.Develop,
})
return
}

View File

@ -30,7 +30,10 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder
users []string users []string
lock *redis.RedisMutex lock *redis.RedisMutex
changeShip map[string]*pb.ShipData // 数据变化通知 changeShip map[string]*pb.ShipData // 数据变化通知
atno []*pb.UserAtno // 打赢奖励
info []*pb.PlunderRecordData // 运输记录
) )
if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil { if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil {
return return
} }
@ -96,21 +99,53 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder
session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{
Atno: []*pb.UserAtno{}, Atno: []*pb.UserAtno{},
}) })
info = append(info, &pb.PlunderRecordData{
Itype: 2, // 2 被战败
P1: session.GetUserId(),
P2: land.Ship[req.Oid].Uid,
Cid: land.Ship[req.Oid].Line.Cid,
Ctime: configure.Now().Unix(),
})
err = this.module.modelRecord.AddRecordData(land.Id, info)
return return
} }
land.Ship[req.Oid].Status = 3 land.Ship[req.Oid].Status = 3
if errdata, atno = this.module.DispenseAtno(session, conf.Keepreward, true); errdata != nil {
return
}
if conf.Numitem.N > 0 {
atno = append(atno, &pb.UserAtno{
A: conf.Numitem.A,
T: conf.Numitem.T,
N: conf.Numitem.N,
})
list.Score += conf.Numitem.N
}
// 修改状态 // 修改状态
changeShip[req.Oid] = land.Ship[req.Oid] changeShip[req.Oid] = land.Ship[req.Oid]
this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{ this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{
"ship": land.Ship, "ship": land.Ship,
}) })
this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{
"score": list.Score,
})
// 通知大家 // 通知大家
this.module.SendMsgToUsers(string(this.module.GetType()), "change", &pb.PlunderChangePush{ this.module.SendMsgToUsers(string(this.module.GetType()), "change", &pb.PlunderChangePush{
Ship: changeShip, Ship: changeShip,
}, users...) }, users...)
session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{
Atno: []*pb.UserAtno{}, Atno: atno,
}) })
info = append(info, &pb.PlunderRecordData{
Itype: 4, // 4 掠夺成功
P1: session.GetUserId(),
P2: land.Ship[req.Oid].Uid,
Cid: land.Ship[req.Oid].Line.Cid,
Ctime: configure.Now().Unix(),
})
err = this.module.modelRecord.AddRecordData(land.Id, info)
return return
} }

View File

@ -4,6 +4,8 @@ import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/sys/redis" "go_dreamfactory/lego/sys/redis"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
) )
// 参数校验 // 参数校验
@ -17,7 +19,7 @@ func (this *apiComp) ReachCheck(session comm.IUserSession, req *pb.PlunderReachR
return return
} }
// 船准备出发 // 船到达 领奖
func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (errdata *pb.ErrorData) { func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (errdata *pb.ErrorData) {
var ( var (
err error err error
@ -25,6 +27,12 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (
land *pb.DBPlunderLand // 岛屿数据 land *pb.DBPlunderLand // 岛屿数据
//changeShip map[string]*pb.ShipData // 变化的信息 //changeShip map[string]*pb.ShipData // 变化的信息
lock *redis.RedisMutex lock *redis.RedisMutex
bPlunder bool // 到达检测 是否被掠夺
cid int32
conf *cfg.GamePlunderData
res []*cfg.Gameatn // 奖励
bExReward bool // 是否是高级运输
atno []*pb.UserAtno
) )
//changeShip = make(map[string]*pb.ShipData, 0) //changeShip = make(map[string]*pb.ShipData, 0)
if errdata = this.ReachCheck(session, req); errdata != nil { if errdata = this.ReachCheck(session, req); errdata != nil {
@ -62,17 +70,61 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (
} }
return return
} else { } else {
if land.Ship[oid].Line.Etime >= configure.Now().Unix() { // 还没到时间 船没到达
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
return
}
if land.Ship[oid].Line.Itype != 0 {
bExReward = true
if land.Ship[oid].Status == 3 { // 高级船
bPlunder = true
}
}
for _, v := range list.Line { for _, v := range list.Line {
if v.Oid == oid { if v.Oid == oid {
v.Oid = "" v.Oid = ""
} }
} }
cid = land.Ship[oid].Line.Cid
delete(land.Ship, oid) delete(land.Ship, oid)
} }
} }
// 配置校验
if conf, err = this.module.configure.getGamePlunderDataById(cid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if !bExReward { // 普通奖励
res = append(res, conf.Keepreward...)
list.Score += conf.Numitem.N
} else {
res = append(res, conf.Exreward...) // 高级奖励
}
if !bPlunder { // 掠夺成功
res = append(res, conf.Keepreward...)
}
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
return
}
if bExReward {
if conf.Numitem.N > 0 {
atno = append(atno, &pb.UserAtno{
A: conf.Numitem.A,
T: conf.Numitem.T,
N: conf.Numitem.N,
})
}
}
this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{ this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{
"line": list.Line, "line": list.Line,
"score": list.Score,
}) })
this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{ this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{
"ship": land.Ship, "ship": land.Ship,
@ -80,6 +132,7 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (
session.SendMsg(string(this.module.GetType()), "reach", &pb.PlunderReachResp{ session.SendMsg(string(this.module.GetType()), "reach", &pb.PlunderReachResp{
Line: list.Line, Line: list.Line,
Ship: land.Ship, Ship: land.Ship,
Atno: atno,
}) })
return return
} }

View File

@ -10,6 +10,7 @@ import (
const ( const (
game_plunder = "game_plunder.json" game_plunder = "game_plunder.json"
game_plunderbattle = "game_plunderbattle.json" game_plunderbattle = "game_plunderbattle.json"
game_plunderdevelop = "game_plunderdevelop.json"
) )
type configureComp struct { type configureComp struct {
@ -24,6 +25,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadMultiConfigure(map[string]interface{}{ err = this.LoadMultiConfigure(map[string]interface{}{
game_plunder: cfg.NewGamePlunder, game_plunder: cfg.NewGamePlunder,
game_plunderbattle: cfg.NewGamePlunderBattle, game_plunderbattle: cfg.NewGamePlunderBattle,
game_plunderdevelop: cfg.NewGamePlunderDevelop,
}) })
return return
} }
@ -75,3 +77,19 @@ func (this *configureComp) getGameMonkeyRewardData(chapterid int32) (result []*c
return return
} }
// 获取航海术相关
func (this *configureComp) getPlunderDevelopById(id int32) (result *cfg.GamePlunderDevelopData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_plunderdevelop); err == nil {
if configure, ok := v.(*cfg.GamePlunderDevelop); ok {
if result = configure.Get(id); result != nil {
return
}
}
}
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_plunderdevelop, id)
return
}

View File

@ -71,7 +71,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand
} }
uids = append(uids, uid) // 优先加入自己 uids = append(uids, uid) // 优先加入自己
uInfos = append(uInfos, comm.GetUserBaseInfo(user)) uInfos = append(uInfos, comm.GetUserBaseInfo(user))
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))) cur, err := this.DB.Find(core.SqlTable(comm.TableUser), bson.M{"plunder": bson.M{"$gte": limtSocre}, "name": bson.M{"$ne": ""}}, options.Find().SetSkip(int64(0)).SetLimit(int64(30)))
for cur.Next(context.TODO()) { for cur.Next(context.TODO()) {
tmp := &pb.DBUser{} tmp := &pb.DBUser{}
if err = cur.Decode(tmp); err == nil { if err = cur.Decode(tmp); err == nil {
@ -104,7 +104,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand
land.Uinfo[int32(sz[k])] = v land.Uinfo[int32(sz[k])] = v
} }
err = this.AddList(comm.RDS_EMPTY, land.Id, land) err = this.AddList(comm.RDS_EMPTY, land.Id, land)
this.module.modelRecord.getPlunderRecordData(land.Id) // 创建一条记录数据
return return
} }

View File

@ -42,6 +42,7 @@ func (this *modelPlunder) getPlunderData(uid string) (info *pb.DBPlunder, err er
Id: primitive.NewObjectID().Hex(), Id: primitive.NewObjectID().Hex(),
Uid: uid, Uid: uid,
Ctime: configure.Now().Unix(), Ctime: configure.Now().Unix(),
Develop: make(map[int32]int32),
} }
for i := 0; i < 3; i++ { // 队列固定三条 for i := 0; i < 3; i++ { // 队列固定三条
@ -135,7 +136,7 @@ func (this *modelPlunder) queryPlunderInfos(uids []string, landid string) (data
results = make([]*pb.DBPlunder, 0) results = make([]*pb.DBPlunder, 0)
mp = make(map[string]struct{}) mp = make(map[string]struct{})
if _, err = this.Gets(uids, &results); err != nil { if _, err = this.GetByUids(uids, &results); err != nil {
this.module.Errorln(err) this.module.Errorln(err)
return return
} }

View File

@ -0,0 +1,45 @@
package plunder
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
)
type modelRecord struct {
modules.MCompModel
module *Plunder
}
func (this *modelRecord) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompModel.Init(service, module, comp, options)
this.TableName = comm.TablePlunderRecord
this.module = module.(*Plunder)
return
}
func (this *modelRecord) getPlunderRecordData(id string) (info *pb.DBPlunderRecord, err error) {
info = &pb.DBPlunderRecord{}
if err = this.Get(id, info); err == mgo.MongodbNil {
info.Id = id
err = this.Add(id, info)
return
}
return
}
func (this *modelRecord) changePlunderRecordData(id string, update map[string]interface{}) (err error) {
err = this.Change(id, update)
return
}
// 新增一条记录
func (this *modelRecord) AddRecordData(id string, info []*pb.PlunderRecordData) (err error) {
if record, err := this.getPlunderRecordData(id); err == nil {
record.Data = append(record.Data, info...)
err = this.changePlunderRecordData(id, map[string]interface{}{"data": record.Data})
}
return
}

View File

@ -23,6 +23,7 @@ type Plunder struct {
modelPlunder *modelPlunder modelPlunder *modelPlunder
modelLand *modelLand modelLand *modelLand
battle comm.IBattle battle comm.IBattle
modelRecord *modelRecord
} }
// 模块名 // 模块名
@ -56,6 +57,7 @@ func (this *Plunder) OnInstallComp() {
this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
this.modelPlunder = this.RegisterComp(new(modelPlunder)).(*modelPlunder) this.modelPlunder = this.RegisterComp(new(modelPlunder)).(*modelPlunder)
this.modelLand = this.RegisterComp(new(modelLand)).(*modelLand) this.modelLand = this.RegisterComp(new(modelLand)).(*modelLand)
this.modelRecord = this.RegisterComp(new(modelRecord)).(*modelRecord)
} }
func (this *Plunder) CreatePlunderLand(uid string) (land *pb.DBPlunderLand, err error) { func (this *Plunder) CreatePlunderLand(uid string) (land *pb.DBPlunderLand, err error) {

View File

@ -0,0 +1,26 @@
package plunder
import "sort"
//根据value排序
type Pair struct {
Key string
Value int
}
type PairList []Pair
func (p PairList) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
func (p PairList) Len() int { return len(p) }
func (p PairList) Less(i, j int) bool { return p[i].Value < p[j].Value }
func sortMap(m map[string]int) PairList {
p := make(PairList, len(m))
i := 0
for k, v := range m {
p[i] = Pair{k, v}
i++
}
sort.Sort(p)
return p
}

View File

@ -45,6 +45,9 @@ func (this *ModelUser) Init(service core.IService, module core.IModule, comp cor
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "merchantmoney", Value: bsonx.Int32(1)}}, Keys: bsonx.Doc{{Key: "merchantmoney", Value: bsonx.Int32(1)}},
}) })
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "plunder", Value: bsonx.Int32(1)}},
})
return return
} }
@ -420,3 +423,36 @@ func (this *ModelUser) CleanUserConsumeMoney(session comm.IUserSession) (err err
} }
return return
} }
func (this *ModelUser) AddUserHidenum(uid string, score int32) (err error) {
var (
user *pb.DBUser
)
user = &pb.DBUser{}
if this.module.IsCross() {
var model *db.DBModel
if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
this.module.Errorln(err)
} else {
if err = model.Get(uid, user); err != nil {
this.module.Errorf("uid:%s err:%v", uid, err)
}
if err = model.Change(uid, map[string]interface{}{
"plunder": user.Plunder + score,
}); err != nil {
this.module.Errorf("uid:%s err:%v", uid, err)
}
}
} else {
if err = this.Get(uid, user); err != nil {
this.module.Errorf("uid:%s err:%v", uid, err)
}
if err = this.Change(uid, map[string]interface{}{
"plunder": user.Plunder + score,
}); err != nil {
this.module.Errorf("uid:%s err:%v", uid, err)
}
}
return
}

View File

@ -1476,3 +1476,6 @@ func (this *User) PsConvertExp(ps int32) (res *cfg.Gameatn) {
func (this *User) CleanUserConsumeMoney(session comm.IUserSession) (err error) { func (this *User) CleanUserConsumeMoney(session comm.IUserSession) (err error) {
return this.modelUser.CleanUserConsumeMoney(session) return this.modelUser.CleanUserConsumeMoney(session)
} }
func (this *User) AddUserHidenum(session comm.IUserSession, score int32) (err error) {
return this.modelUser.AddUserHidenum(session.GetUserId(), score)
}

View File

@ -480,6 +480,7 @@ const (
ErrorCode_PlundeShipCDIng ErrorCode = 5406 //掠夺cd中 ErrorCode_PlundeShipCDIng ErrorCode = 5406 //掠夺cd中
ErrorCode_PlundeShipRunning ErrorCode = 5407 //运输中 ErrorCode_PlundeShipRunning ErrorCode = 5407 //运输中
ErrorCode_PlundeUnlock ErrorCode = 5408 //已解锁 ErrorCode_PlundeUnlock ErrorCode = 5408 //已解锁
ErrorCode_PlundeAlreadyLearn ErrorCode = 5409 //重复学习
) )
// Enum value maps for ErrorCode. // Enum value maps for ErrorCode.
@ -895,6 +896,7 @@ var (
5406: "PlundeShipCDIng", 5406: "PlundeShipCDIng",
5407: "PlundeShipRunning", 5407: "PlundeShipRunning",
5408: "PlundeUnlock", 5408: "PlundeUnlock",
5409: "PlundeAlreadyLearn",
} }
ErrorCode_value = map[string]int32{ ErrorCode_value = map[string]int32{
"Success": 0, "Success": 0,
@ -1307,6 +1309,7 @@ var (
"PlundeShipCDIng": 5406, "PlundeShipCDIng": 5406,
"PlundeShipRunning": 5407, "PlundeShipRunning": 5407,
"PlundeUnlock": 5408, "PlundeUnlock": 5408,
"PlundeAlreadyLearn": 5409,
} }
) )
@ -1341,7 +1344,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
var file_errorcode_proto_rawDesc = []byte{ var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2a, 0xb4, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x6f, 0x2a, 0xcd, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@ -1952,8 +1955,10 @@ var file_errorcode_proto_rawDesc = []byte{
0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a, 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a,
0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69,
0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55,
0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1,
0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
} }
var ( var (

View File

@ -37,6 +37,8 @@ type DBPlunder struct {
Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用 Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用
Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分 Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分
Etime int64 `protobuf:"varint,11,opt,name=etime,proto3" json:"etime"` // 结束时间 Etime int64 `protobuf:"varint,11,opt,name=etime,proto3" json:"etime"` // 结束时间
Plunderexp int32 `protobuf:"varint,12,opt,name=plunderexp,proto3" json:"plunderexp"` // 积分 排行用
Develop map[int32]int32 `protobuf:"bytes,13,rep,name=develop,proto3" json:"develop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 海航术
} }
func (x *DBPlunder) Reset() { func (x *DBPlunder) Reset() {
@ -148,6 +150,20 @@ func (x *DBPlunder) GetEtime() int64 {
return 0 return 0
} }
func (x *DBPlunder) GetPlunderexp() int32 {
if x != nil {
return x.Plunderexp
}
return 0
}
func (x *DBPlunder) GetDevelop() map[int32]int32 {
if x != nil {
return x.Develop
}
return nil
}
type TransportLine struct { type TransportLine struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -373,6 +389,7 @@ type DBPlunderLand struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uinfo map[int32]*BaseUserInfo `protobuf:"bytes,2,rep,name=uinfo,proto3" json:"uinfo" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 成员信息 key 岛位置 Uinfo map[int32]*BaseUserInfo `protobuf:"bytes,2,rep,name=uinfo,proto3" json:"uinfo" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 成员信息 key 岛位置
Ship map[string]*ShipData `protobuf:"bytes,3,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 运输的船 key 唯一id Ship map[string]*ShipData `protobuf:"bytes,3,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 运输的船 key 唯一id
//map<string,socre> score= 4;// 排行榜积分用
Etime int64 `protobuf:"varint,4,opt,name=etime,proto3" json:"etime"` // 结束时间 Etime int64 `protobuf:"varint,4,opt,name=etime,proto3" json:"etime"` // 结束时间
} }
@ -436,6 +453,141 @@ func (x *DBPlunderLand) GetEtime() int64 {
return 0 return 0
} }
type PlunderRecordData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Itype int32 `protobuf:"varint,1,opt,name=itype,proto3" json:"itype"` //
P1 string `protobuf:"bytes,2,opt,name=p1,proto3" json:"p1"` // 玩家1
P2 string `protobuf:"bytes,3,opt,name=p2,proto3" json:"p2"`
Cid int32 `protobuf:"varint,4,opt,name=cid,proto3" json:"cid"` // 配置表id
Ctime int64 `protobuf:"varint,5,opt,name=ctime,proto3" json:"ctime"` //记录时间
}
func (x *PlunderRecordData) Reset() {
*x = PlunderRecordData{}
if protoimpl.UnsafeEnabled {
mi := &file_plunder_plunder_db_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *PlunderRecordData) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*PlunderRecordData) ProtoMessage() {}
func (x *PlunderRecordData) ProtoReflect() protoreflect.Message {
mi := &file_plunder_plunder_db_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use PlunderRecordData.ProtoReflect.Descriptor instead.
func (*PlunderRecordData) Descriptor() ([]byte, []int) {
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{5}
}
func (x *PlunderRecordData) GetItype() int32 {
if x != nil {
return x.Itype
}
return 0
}
func (x *PlunderRecordData) GetP1() string {
if x != nil {
return x.P1
}
return ""
}
func (x *PlunderRecordData) GetP2() string {
if x != nil {
return x.P2
}
return ""
}
func (x *PlunderRecordData) GetCid() int32 {
if x != nil {
return x.Cid
}
return 0
}
func (x *PlunderRecordData) GetCtime() int64 {
if x != nil {
return x.Ctime
}
return 0
}
// 掠夺记录
type DBPlunderRecord struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Data []*PlunderRecordData `protobuf:"bytes,2,rep,name=data,proto3" json:"data"` // 记录详情
}
func (x *DBPlunderRecord) Reset() {
*x = DBPlunderRecord{}
if protoimpl.UnsafeEnabled {
mi := &file_plunder_plunder_db_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBPlunderRecord) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBPlunderRecord) ProtoMessage() {}
func (x *DBPlunderRecord) ProtoReflect() protoreflect.Message {
mi := &file_plunder_plunder_db_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DBPlunderRecord.ProtoReflect.Descriptor instead.
func (*DBPlunderRecord) Descriptor() ([]byte, []int) {
return file_plunder_plunder_db_proto_rawDescGZIP(), []int{6}
}
func (x *DBPlunderRecord) GetId() string {
if x != nil {
return x.Id
}
return ""
}
func (x *DBPlunderRecord) GetData() []*PlunderRecordData {
if x != nil {
return x.Data
}
return nil
}
var File_plunder_plunder_db_proto protoreflect.FileDescriptor var File_plunder_plunder_db_proto protoreflect.FileDescriptor
var file_plunder_plunder_db_proto_rawDesc = []byte{ var file_plunder_plunder_db_proto_rawDesc = []byte{
@ -443,7 +595,7 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{
0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x62, 0x61, 0x74, 0x74, 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x62, 0x61, 0x74, 0x74,
0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x22, 0x8b, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x74, 0x6f, 0x22, 0x9a, 0x03, 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, 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, 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, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
@ -460,47 +612,67 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{
0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 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, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74,
0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
0x22, 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x78, 0x70, 0x18, 0x0c,
0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x78, 0x70,
0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x31, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x18, 0x0d, 0x20, 0x03, 0x28,
0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65,
0x65, 0x22, 0x5d, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x65, 0x76, 0x65,
0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x6c, 0x6f, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e,
0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x63, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65,
0x22, 0xac, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f,
0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18,
0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65,
0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x22, 0x5d, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12,
0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x63,
0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a,
0x74, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22,
0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0xac, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03,
0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20,
0xa1, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50,
0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65,
0x64, 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x05,
0x2e, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x65,
0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, 0xa1,
0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e,
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66,
0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12,
0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e,
0x74, 0x6f, 0x33, 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, 0x22, 0x71, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63,
0x6f, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a,
0x02, 0x70, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x31, 0x12, 0x0e, 0x0a,
0x02, 0x70, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x32, 0x12, 0x10, 0x0a,
0x03, 0x63, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12,
0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x49, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64,
0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -515,31 +687,36 @@ func file_plunder_plunder_db_proto_rawDescGZIP() []byte {
return file_plunder_plunder_db_proto_rawDescData return file_plunder_plunder_db_proto_rawDescData
} }
var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
var file_plunder_plunder_db_proto_goTypes = []interface{}{ var file_plunder_plunder_db_proto_goTypes = []interface{}{
(*DBPlunder)(nil), // 0: DBPlunder (*DBPlunder)(nil), // 0: DBPlunder
(*TransportLine)(nil), // 1: TransportLine (*TransportLine)(nil), // 1: TransportLine
(*PlunderLine)(nil), // 2: PlunderLine (*PlunderLine)(nil), // 2: PlunderLine
(*ShipData)(nil), // 3: ShipData (*ShipData)(nil), // 3: ShipData
(*DBPlunderLand)(nil), // 4: DBPlunderLand (*DBPlunderLand)(nil), // 4: DBPlunderLand
nil, // 5: DBPlunderLand.UinfoEntry (*PlunderRecordData)(nil), // 5: PlunderRecordData
nil, // 6: DBPlunderLand.ShipEntry (*DBPlunderRecord)(nil), // 6: DBPlunderRecord
(*DBPlayerBattleFormt)(nil), // 7: DBPlayerBattleFormt nil, // 7: DBPlunder.DevelopEntry
(*BaseUserInfo)(nil), // 8: BaseUserInfo nil, // 8: DBPlunderLand.UinfoEntry
nil, // 9: DBPlunderLand.ShipEntry
(*DBPlayerBattleFormt)(nil), // 10: DBPlayerBattleFormt
(*BaseUserInfo)(nil), // 11: BaseUserInfo
} }
var file_plunder_plunder_db_proto_depIdxs = []int32{ var file_plunder_plunder_db_proto_depIdxs = []int32{
1, // 0: DBPlunder.line:type_name -> TransportLine 1, // 0: DBPlunder.line:type_name -> TransportLine
2, // 1: ShipData.line:type_name -> PlunderLine 7, // 1: DBPlunder.develop:type_name -> DBPlunder.DevelopEntry
7, // 2: ShipData.defend:type_name -> DBPlayerBattleFormt 2, // 2: ShipData.line:type_name -> PlunderLine
5, // 3: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry 10, // 3: ShipData.defend:type_name -> DBPlayerBattleFormt
6, // 4: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry 8, // 4: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry
8, // 5: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo 9, // 5: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry
3, // 6: DBPlunderLand.ShipEntry.value:type_name -> ShipData 5, // 6: DBPlunderRecord.data:type_name -> PlunderRecordData
7, // [7:7] is the sub-list for method output_type 11, // 7: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo
7, // [7:7] is the sub-list for method input_type 3, // 8: DBPlunderLand.ShipEntry.value:type_name -> ShipData
7, // [7:7] is the sub-list for extension type_name 9, // [9:9] is the sub-list for method output_type
7, // [7:7] is the sub-list for extension extendee 9, // [9:9] is the sub-list for method input_type
0, // [0:7] is the sub-list for field type_name 9, // [9:9] is the sub-list for extension type_name
9, // [9:9] is the sub-list for extension extendee
0, // [0:9] is the sub-list for field type_name
} }
func init() { file_plunder_plunder_db_proto_init() } func init() { file_plunder_plunder_db_proto_init() }
@ -610,6 +787,30 @@ func file_plunder_plunder_db_proto_init() {
return nil return nil
} }
} }
file_plunder_plunder_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*PlunderRecordData); 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[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBPlunderRecord); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
} }
type x struct{} type x struct{}
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
@ -617,7 +818,7 @@ func file_plunder_plunder_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_plunder_plunder_db_proto_rawDesc, RawDescriptor: file_plunder_plunder_db_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 7, NumMessages: 10,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

View File

@ -739,6 +739,7 @@ type PlunderReachResp struct {
Line []*TransportLine `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 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"` // 奖励
} }
func (x *PlunderReachResp) Reset() { func (x *PlunderReachResp) Reset() {
@ -787,6 +788,13 @@ func (x *PlunderReachResp) GetShip() map[string]*ShipData {
return nil return nil
} }
func (x *PlunderReachResp) GetAtno() []*UserAtno {
if x != nil {
return x.Atno
}
return nil
}
// 修改状态 // 修改状态
type PlunderClientTagReq struct { type PlunderClientTagReq struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -1025,6 +1033,185 @@ func (x *PlunderUnlockResp) GetLine() []*TransportLine {
return nil return nil
} }
type PlunderDevelopReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Cid int32 `protobuf:"varint,1,opt,name=cid,proto3" json:"cid"` //
}
func (x *PlunderDevelopReq) Reset() {
*x = PlunderDevelopReq{}
if protoimpl.UnsafeEnabled {
mi := &file_plunder_plunder_msg_proto_msgTypes[19]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *PlunderDevelopReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*PlunderDevelopReq) ProtoMessage() {}
func (x *PlunderDevelopReq) ProtoReflect() protoreflect.Message {
mi := &file_plunder_plunder_msg_proto_msgTypes[19]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use PlunderDevelopReq.ProtoReflect.Descriptor instead.
func (*PlunderDevelopReq) Descriptor() ([]byte, []int) {
return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{19}
}
func (x *PlunderDevelopReq) GetCid() int32 {
if x != nil {
return x.Cid
}
return 0
}
type PlunderDevelopResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Develop map[int32]int32 `protobuf:"bytes,1,rep,name=develop,proto3" json:"develop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 海航术
}
func (x *PlunderDevelopResp) Reset() {
*x = PlunderDevelopResp{}
if protoimpl.UnsafeEnabled {
mi := &file_plunder_plunder_msg_proto_msgTypes[20]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *PlunderDevelopResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*PlunderDevelopResp) ProtoMessage() {}
func (x *PlunderDevelopResp) ProtoReflect() protoreflect.Message {
mi := &file_plunder_plunder_msg_proto_msgTypes[20]
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 PlunderDevelopResp.ProtoReflect.Descriptor instead.
func (*PlunderDevelopResp) Descriptor() ([]byte, []int) {
return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{20}
}
func (x *PlunderDevelopResp) GetDevelop() map[int32]int32 {
if x != nil {
return x.Develop
}
return nil
}
type PlunderRecordReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *PlunderRecordReq) Reset() {
*x = PlunderRecordReq{}
if protoimpl.UnsafeEnabled {
mi := &file_plunder_plunder_msg_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *PlunderRecordReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*PlunderRecordReq) ProtoMessage() {}
func (x *PlunderRecordReq) ProtoReflect() protoreflect.Message {
mi := &file_plunder_plunder_msg_proto_msgTypes[21]
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 PlunderRecordReq.ProtoReflect.Descriptor instead.
func (*PlunderRecordReq) Descriptor() ([]byte, []int) {
return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{21}
}
type PlunderRecordResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Info *DBPlunderRecord `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` // 航海要事
}
func (x *PlunderRecordResp) Reset() {
*x = PlunderRecordResp{}
if protoimpl.UnsafeEnabled {
mi := &file_plunder_plunder_msg_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *PlunderRecordResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*PlunderRecordResp) ProtoMessage() {}
func (x *PlunderRecordResp) ProtoReflect() protoreflect.Message {
mi := &file_plunder_plunder_msg_proto_msgTypes[22]
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 PlunderRecordResp.ProtoReflect.Descriptor instead.
func (*PlunderRecordResp) Descriptor() ([]byte, []int) {
return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{22}
}
func (x *PlunderRecordResp) GetInfo() *DBPlunderRecord {
if x != nil {
return x.Info
}
return nil
}
var File_plunder_plunder_msg_proto protoreflect.FileDescriptor var File_plunder_plunder_msg_proto protoreflect.FileDescriptor
var file_plunder_plunder_msg_proto_rawDesc = []byte{ var file_plunder_plunder_msg_proto_rawDesc = []byte{
@ -1109,45 +1296,63 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{
0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x23, 0x0a, 0x0f, 0x50, 0x6c, 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, 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, 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, 0xca, 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, 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, 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, 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, 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, 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, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e,
0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74,
0x67, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x13,
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, 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, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x33,
0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x50,
0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73,
0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61,
0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, 0x0a,
0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, 0x6c,
0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e,
0x3a, 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a,
0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x37, 0x0a, 0x11, 0x50, 0x6c, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f,
0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e,
0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x01,
0x74, 0x6f, 0x33, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x37, 0x0a, 0x11, 0x50, 0x6c, 0x75,
0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 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, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76,
0x65, 0x6c, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x50, 0x6c,
0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70,
0x12, 0x3a, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x20, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76, 0x65, 0x6c,
0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x1a, 0x3a, 0x0a, 0x0c,
0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x12, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e,
0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x11,
0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73,
0x70, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x10, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72,
0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -1162,7 +1367,7 @@ func file_plunder_plunder_msg_proto_rawDescGZIP() []byte {
return file_plunder_plunder_msg_proto_rawDescData return file_plunder_plunder_msg_proto_rawDescData
} }
var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 24) var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29)
var file_plunder_plunder_msg_proto_goTypes = []interface{}{ var file_plunder_plunder_msg_proto_goTypes = []interface{}{
(*PlunderGetListReq)(nil), // 0: PlunderGetListReq (*PlunderGetListReq)(nil), // 0: PlunderGetListReq
(*PlunderGetListResp)(nil), // 1: PlunderGetListResp (*PlunderGetListResp)(nil), // 1: PlunderGetListResp
@ -1183,48 +1388,57 @@ var file_plunder_plunder_msg_proto_goTypes = []interface{}{
(*PlunderChangePush)(nil), // 16: PlunderChangePush (*PlunderChangePush)(nil), // 16: PlunderChangePush
(*PlunderUnlockReq)(nil), // 17: PlunderUnlockReq (*PlunderUnlockReq)(nil), // 17: PlunderUnlockReq
(*PlunderUnlockResp)(nil), // 18: PlunderUnlockResp (*PlunderUnlockResp)(nil), // 18: PlunderUnlockResp
nil, // 19: PlunderChallengeOverResp.ShipEntry (*PlunderDevelopReq)(nil), // 19: PlunderDevelopReq
nil, // 20: PlunderChallengeOverResp.HeroexpEntry (*PlunderDevelopResp)(nil), // 20: PlunderDevelopResp
nil, // 21: PlunderReachResp.ShipEntry (*PlunderRecordReq)(nil), // 21: PlunderRecordReq
nil, // 22: PlunderClientTagResp.ShipEntry (*PlunderRecordResp)(nil), // 22: PlunderRecordResp
nil, // 23: PlunderChangePush.ShipEntry nil, // 23: PlunderChallengeOverResp.ShipEntry
(*DBPlunder)(nil), // 24: DBPlunder nil, // 24: PlunderChallengeOverResp.HeroexpEntry
(*DBPlunderLand)(nil), // 25: DBPlunderLand nil, // 25: PlunderReachResp.ShipEntry
(*BattleFormation)(nil), // 26: BattleFormation nil, // 26: PlunderClientTagResp.ShipEntry
(*BattleInfo)(nil), // 27: BattleInfo nil, // 27: PlunderChangePush.ShipEntry
(*BattleReport)(nil), // 28: BattleReport nil, // 28: PlunderDevelopResp.DevelopEntry
(*TransportLine)(nil), // 29: TransportLine (*DBPlunder)(nil), // 29: DBPlunder
(*UserAtno)(nil), // 30: UserAtno (*DBPlunderLand)(nil), // 30: DBPlunderLand
(*ShipData)(nil), // 31: ShipData (*BattleFormation)(nil), // 31: BattleFormation
(*BattleInfo)(nil), // 32: BattleInfo
(*BattleReport)(nil), // 33: BattleReport
(*TransportLine)(nil), // 34: TransportLine
(*UserAtno)(nil), // 35: UserAtno
(*DBPlunderRecord)(nil), // 36: DBPlunderRecord
(*ShipData)(nil), // 37: ShipData
} }
var file_plunder_plunder_msg_proto_depIdxs = []int32{ var file_plunder_plunder_msg_proto_depIdxs = []int32{
24, // 0: PlunderGetListResp.list:type_name -> DBPlunder 29, // 0: PlunderGetListResp.list:type_name -> DBPlunder
25, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand 30, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand
26, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation 31, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation
27, // 3: PlunderChallengeResp.info:type_name -> BattleInfo 32, // 3: PlunderChallengeResp.info:type_name -> BattleInfo
28, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport 33, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport
29, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine 34, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine
19, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry 23, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry
30, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno 35, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno
20, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry 24, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry
26, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation 31, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation
27, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo 32, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo
28, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport 33, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport
30, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno 35, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno
29, // 13: PlunderReachResp.line:type_name -> TransportLine 34, // 13: PlunderReachResp.line:type_name -> TransportLine
21, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry 25, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry
22, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry 35, // 15: PlunderReachResp.atno:type_name -> UserAtno
23, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry 26, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry
29, // 17: PlunderUnlockResp.line:type_name -> TransportLine 27, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry
31, // 18: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData 34, // 18: PlunderUnlockResp.line:type_name -> TransportLine
31, // 19: PlunderReachResp.ShipEntry.value:type_name -> ShipData 28, // 19: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry
31, // 20: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData 36, // 20: PlunderRecordResp.info:type_name -> DBPlunderRecord
31, // 21: PlunderChangePush.ShipEntry.value:type_name -> ShipData 37, // 21: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData
22, // [22:22] is the sub-list for method output_type 37, // 22: PlunderReachResp.ShipEntry.value:type_name -> ShipData
22, // [22:22] is the sub-list for method input_type 37, // 23: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData
22, // [22:22] is the sub-list for extension type_name 37, // 24: PlunderChangePush.ShipEntry.value:type_name -> ShipData
22, // [22:22] is the sub-list for extension extendee 25, // [25:25] is the sub-list for method output_type
0, // [0:22] is the sub-list for field type_name 25, // [25:25] is the sub-list for method input_type
25, // [25:25] is the sub-list for extension type_name
25, // [25:25] is the sub-list for extension extendee
0, // [0:25] is the sub-list for field type_name
} }
func init() { file_plunder_plunder_msg_proto_init() } func init() { file_plunder_plunder_msg_proto_init() }
@ -1464,6 +1678,54 @@ func file_plunder_plunder_msg_proto_init() {
return nil return nil
} }
} }
file_plunder_plunder_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*PlunderDevelopReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_plunder_plunder_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*PlunderDevelopResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_plunder_plunder_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*PlunderRecordReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_plunder_plunder_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*PlunderRecordResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
} }
type x struct{} type x struct{}
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
@ -1471,7 +1733,7 @@ func file_plunder_plunder_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_plunder_plunder_msg_proto_rawDesc, RawDescriptor: file_plunder_plunder_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 24, NumMessages: 29,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

View File

@ -16,6 +16,8 @@ type GameArenaActiveRewardData struct {
ScoreUp int32 ScoreUp int32
HumanNum int32 HumanNum int32
Name string Name string
ExReward []*Gameatn
ScoreReturn int32
WinReward []*Gameatn WinReward []*Gameatn
Png string Png string
KValue float32 KValue float32
@ -33,6 +35,21 @@ func (_v *GameArenaActiveRewardData)Deserialize(_buf map[string]interface{}) (er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_up"].(float64); !_ok_ { err = errors.New("score_up error"); return }; _v.ScoreUp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_up"].(float64); !_ok_ { err = errors.New("score_up error"); return }; _v.ScoreUp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["human_num"].(float64); !_ok_ { err = errors.New("human_num error"); return }; _v.HumanNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["human_num"].(float64); !_ok_ { err = errors.New("human_num error"); return }; _v.HumanNum = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ex_reward"].([]interface{}); !_ok_ { err = errors.New("ex_reward error"); return }
_v.ExReward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.ExReward = append(_v.ExReward, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_return"].(float64); !_ok_ { err = errors.New("score_return error"); return }; _v.ScoreReturn = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

View File

@ -12,6 +12,7 @@ import "errors"
type GameArenaRankRewardData struct { type GameArenaRankRewardData struct {
Id int32 Id int32
Name int32
RankLow int32 RankLow int32
RankUp int32 RankUp int32
RankDisplay string RankDisplay string
@ -26,6 +27,7 @@ func (*GameArenaRankRewardData) GetTypeId() int32 {
func (_v *GameArenaRankRewardData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameArenaRankRewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["name"].(float64); !_ok_ { err = errors.New("name error"); return }; _v.Name = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["rank_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RankDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RankDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["rank_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RankDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RankDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GamePlunderDevelop struct {
_dataMap map[int32]*GamePlunderDevelopData
_dataList []*GamePlunderDevelopData
}
func NewGamePlunderDevelop(_buf []map[string]interface{}) (*GamePlunderDevelop, error) {
_dataList := make([]*GamePlunderDevelopData, 0, len(_buf))
dataMap := make(map[int32]*GamePlunderDevelopData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamePlunderDevelopData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GamePlunderDevelop{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamePlunderDevelop) GetDataMap() map[int32]*GamePlunderDevelopData {
return table._dataMap
}
func (table *GamePlunderDevelop) GetDataList() []*GamePlunderDevelopData {
return table._dataList
}
func (table *GamePlunderDevelop) Get(key int32) *GamePlunderDevelopData {
return table._dataMap[key]
}

View File

@ -0,0 +1,79 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GamePlunderDevelopData struct {
Id int32
Itype int32
Name string
Open []int32
Last []int32
Icon string
Place int32
Type int32
BuffID int32
Txt string
}
const TypeId_GamePlunderDevelopData = -2120757465
func (*GamePlunderDevelopData) GetTypeId() int32 {
return -2120757465
}
func (_v *GamePlunderDevelopData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itype"].(float64); !_ok_ { err = errors.New("itype error"); return }; _v.Itype = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["open"].([]interface{}); !_ok_ { err = errors.New("open error"); return }
_v.Open = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Open = append(_v.Open, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["last"].([]interface{}); !_ok_ { err = errors.New("last error"); return }
_v.Last = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Last = append(_v.Last, _list_v_)
}
}
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["place"].(float64); !_ok_ { err = errors.New("place error"); return }; _v.Place = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buffID"].(float64); !_ok_ { err = errors.New("buffID error"); return }; _v.BuffID = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
func DeserializeGamePlunderDevelopData(_buf map[string]interface{}) (*GamePlunderDevelopData, error) {
v := &GamePlunderDevelopData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -346,6 +346,7 @@ type Tables struct {
FightingSkill *GameFightingSkill FightingSkill *GameFightingSkill
FightingSkillStar *GameFightingSkillStar FightingSkillStar *GameFightingSkillStar
ExpeditionBoss *GameExpeditionBoss ExpeditionBoss *GameExpeditionBoss
PlunderDevelop *GamePlunderDevelop
} }
func NewTables(loader JsonLoader) (*Tables, error) { func NewTables(loader JsonLoader) (*Tables, error) {
@ -2363,5 +2364,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.ExpeditionBoss, err = NewGameExpeditionBoss(buf) ; err != nil { if tables.ExpeditionBoss, err = NewGameExpeditionBoss(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_plunderdevelop") ; err != nil {
return nil, err
}
if tables.PlunderDevelop, err = NewGamePlunderDevelop(buf) ; err != nil {
return nil, err
}
return tables, nil return tables, nil
} }