掠夺运输次数校验

This commit is contained in:
meixiongfeng 2024-01-29 11:28:02 +08:00
parent 4ec2ce61ae
commit fe016596e3
14 changed files with 335 additions and 123 deletions

View File

@ -17,7 +17,7 @@
"n": 1 "n": 1
} }
], ],
"heroId": "85001", "heroId": "13001",
"main_text": { "main_text": {
"key": "enchantboss_boss_main_text_01", "key": "enchantboss_boss_main_text_01",
"text": "BOSS主界面描述" "text": "BOSS主界面描述"
@ -68,7 +68,7 @@
"n": 1 "n": 1
} }
], ],
"heroId": "85003", "heroId": "33003",
"main_text": { "main_text": {
"key": "enchantboss_boss_main_text_02", "key": "enchantboss_boss_main_text_02",
"text": "BOSS主界面描述" "text": "BOSS主界面描述"
@ -129,7 +129,7 @@
"n": 1 "n": 1
} }
], ],
"heroId": "85002", "heroId": "24002",
"main_text": { "main_text": {
"key": "enchantboss_boss_main_text_03", "key": "enchantboss_boss_main_text_03",
"text": "BOSS主界面描述" "text": "BOSS主界面描述"

View File

@ -25,7 +25,7 @@
"key": "debug_server_01", "key": "debug_server_01",
"text": "lw" "text": "lw"
}, },
"ips": "10.0.0.138:7891", "ips": "10.0.0.156:7891",
"debug": true, "debug": true,
"sid": "dfli" "sid": "dfli"
}, },

View File

@ -795,9 +795,11 @@
"n": 400 "n": 400
}, },
"plunder_pvp_college_time": 7, "plunder_pvp_college_time": 7,
"plunder_pvp_plunderum": 3,
"plunder_pvp_transportnum": 3,
"pvp_endtime": 3, "pvp_endtime": 3,
"pvp_maintenancetime": 2, "pvp_maintenancetime": 2,
"pvp_integraltool": "pvpintegral", "pvp_integraltool": "pvpintegral",
"sx_returnspeed": 0.5 "sx_returnspeed": 0.15
} }
] ]

View File

@ -4312,7 +4312,7 @@
"type": 1, "type": 1,
"ip": 10, "ip": 10,
"sd": 1, "sd": 1,
"handbook": true, "handbook": false,
"prefab": "35003", "prefab": "35003",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -5688,7 +5688,7 @@
"type": 1, "type": 1,
"ip": 4, "ip": 4,
"sd": 1, "sd": 1,
"handbook": true, "handbook": false,
"prefab": "45001", "prefab": "45001",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,

View File

@ -108,7 +108,6 @@
"Person/24004/24004_q.prefab" "Person/24004/24004_q.prefab"
], ],
"scene_effect": [ "scene_effect": [
"Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab",
"miwu" "miwu"
], ],
"scene_effectfilter": "", "scene_effectfilter": "",
@ -242,7 +241,6 @@
"Person/24004/24004_q.prefab" "Person/24004/24004_q.prefab"
], ],
"scene_effect": [ "scene_effect": [
"Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_02.prefab",
"miwu" "miwu"
], ],
"scene_effectfilter": "", "scene_effectfilter": "",
@ -8591,7 +8589,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -8678,7 +8682,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -8770,7 +8780,18 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
},
{
"a": "item",
"t": "24012102",
"n": 1
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -8865,7 +8886,18 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 150
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -8952,7 +8984,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -9039,7 +9077,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -9126,7 +9170,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "10000001",
"n": 5
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -9213,7 +9263,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -9305,7 +9361,18 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "item",
"t": "24012012",
"n": 1
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -9397,7 +9464,18 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "item",
"t": "24012013",
"n": 1
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -9489,7 +9567,18 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "item",
"t": "24012014",
"n": 1
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -10017,7 +10106,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -10109,7 +10204,18 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
},
{
"a": "item",
"t": "24012103",
"n": 1
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -10196,7 +10302,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -10283,7 +10395,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -10370,7 +10488,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -10457,7 +10581,13 @@
} }
], ],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [
{
"a": "item",
"t": "24011001",
"n": 50
}
],
"BattleReadyID": 0, "BattleReadyID": 0,
"FormatList": [], "FormatList": [],
"helphero": [], "helphero": [],
@ -40965,7 +41095,7 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"inherit": false, "inherit": false,
"battle_fail": false, "battle_fail": true,
"venturemodelspeed": 0, "venturemodelspeed": 0,
"venturemodelscale": 3, "venturemodelscale": 3,
"move_type": 1, "move_type": 1,

View File

@ -7698,5 +7698,75 @@
"y": 0, "y": 0,
"z": 0 "z": 0
} }
},
{
"id": "99998",
"preson": "99998",
"presonshow": "99998_exhibition",
"presonstory": "99998_story",
"presondraw": "",
"height": 30,
"weight": 1,
"ico": "tx_js_99998",
"fight": "tx_js_55007",
"img": "sbkp_js_99998",
"heroimg": "hbkp_js_99998",
"portrait": "zm_img_99998",
"bust": "bust_99998",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 16,
"z": 0
},
"boxSize": {
"x": 0,
"y": 0,
"z": 0
}
},
{
"id": "99999",
"preson": "99999",
"presonshow": "99999_exhibition",
"presonstory": "99999_story",
"presondraw": "",
"height": 30,
"weight": 1,
"ico": "tx_js_99999",
"fight": "tx_js_55007",
"img": "sbkp_js_99999",
"heroimg": "hbkp_js_99999",
"portrait": "zm_img_99999",
"bust": "bust_99999",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 16,
"z": 0
},
"boxSize": {
"x": 0,
"y": 0,
"z": 0
}
} }
] ]

View File

@ -3792,13 +3792,13 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.5, "hppro": 0.8,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 130, "speed": 140,
"modelsize": 1, "modelsize": 1,
"skillSequence": [] "skillSequence": []
}, },
@ -3813,8 +3813,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.5, "hppro": 0.6,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -3834,8 +3834,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.5, "hppro": 0.6,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -3855,8 +3855,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.5, "hppro": 0.6,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -3876,8 +3876,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.5, "hppro": 0.6,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -4002,8 +4002,8 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 1, "hppro": 2,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -4023,7 +4023,7 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.4, "hppro": 0.5,
"atkpro": 1, "atkpro": 1,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
@ -4044,7 +4044,7 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.4, "hppro": 0.5,
"atkpro": 1, "atkpro": 1,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
@ -4065,7 +4065,7 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.4, "hppro": 0.5,
"atkpro": 1, "atkpro": 1,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
@ -4086,7 +4086,7 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.4, "hppro": 0.5,
"atkpro": 1, "atkpro": 1,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
@ -4212,13 +4212,13 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.6, "hppro": 2.5,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 1,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 130, "speed": 125,
"modelsize": 1, "modelsize": 1,
"skillSequence": [] "skillSequence": []
}, },
@ -4233,13 +4233,13 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.6, "hppro": 2.5,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 1,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 135, "speed": 150,
"modelsize": 1, "modelsize": 1,
"skillSequence": [] "skillSequence": []
}, },
@ -4254,13 +4254,13 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 0.6, "hppro": 2.5,
"atkpro": 1, "atkpro": 3,
"defpro": 0.5, "defpro": 1,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 132, "speed": 120,
"modelsize": 1, "modelsize": 1,
"skillSequence": [] "skillSequence": []
}, },
@ -4318,12 +4318,12 @@
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 2, "hppro": 2,
"atkpro": 4, "atkpro": 3,
"defpro": 0.5, "defpro": 1,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 133, "speed": 130,
"modelsize": 1, "modelsize": 1,
"skillSequence": [] "skillSequence": []
}, },
@ -4339,12 +4339,12 @@
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 2, "hppro": 2,
"atkpro": 4, "atkpro": 3,
"defpro": 0.5, "defpro": 1,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 135, "speed": 140,
"modelsize": 1, "modelsize": 1,
"skillSequence": [] "skillSequence": []
}, },
@ -4360,8 +4360,8 @@
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 2, "hppro": 2,
"atkpro": 4, "atkpro": 3,
"defpro": 0.5, "defpro": 1,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -4381,7 +4381,7 @@
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 2, "hppro": 2,
"atkpro": 4, "atkpro": 3,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -4402,7 +4402,7 @@
"newskill": [], "newskill": [],
"lv": 60, "lv": 60,
"hppro": 2, "hppro": 2,
"atkpro": 4, "atkpro": 3,
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,

View File

@ -32268,7 +32268,7 @@
{ {
"Id": 234004212, "Id": 234004212,
"EmitPR": 1000, "EmitPR": 1000,
"From": 3, "From": 12,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,

View File

@ -11772,10 +11772,10 @@
}, },
"BuffType": 126, "BuffType": 126,
"EffectArgu": [ "EffectArgu": [
1,
6, 6,
10, 4,
14, 33
3
], ],
"BufParNum": 1, "BufParNum": 1,
"RelyCheckArgu": [], "RelyCheckArgu": [],
@ -13472,7 +13472,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_391000098", "key": "skill_skill_buff_Desc_391000098",
"text": "攻击时有30%概率眩晕敌人" "text": "受到攻击时有30%眩晕。"
}, },
"BuffType": 0, "BuffType": 0,
"EffectArgu": [], "EffectArgu": [],

View File

@ -12046,8 +12046,8 @@
}, },
"icon": "", "icon": "",
"When": 16, "When": 16,
"FromCheck": "Target=3,HasBuff=391000098", "FromCheck": "Target=1",
"TargetCheck": "Target=2", "TargetCheck": "Target=2,HasBuff=391000098",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",

View File

@ -81,6 +81,14 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PlunderChallen
} }
return return
} }
// 次数校验
if list.Count > this.module.ModuleTools.GetGlobalConf().PlunderPvpTransportnum {
errdata = &pb.ErrorData{ // 不能挑战了
Code: pb.ErrorCode_PlundeMaxTransportNum,
Title: pb.ErrorCode_PlundeMaxTransportNum.ToString(),
}
return
}
if battleConf, err = this.module.configure.getGamePlunderBattleById(conf.Battleid); err != nil { if battleConf, err = this.module.configure.getGamePlunderBattleById(conf.Battleid); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound, Code: pb.ErrorCode_ConfigNoFound,

View File

@ -474,16 +474,18 @@ const (
ErrorCode_TntegralDayMaxChallenge ErrorCode = 5301 // 当日挑战达上限 ErrorCode_TntegralDayMaxChallenge ErrorCode = 5301 // 当日挑战达上限
ErrorCode_TntegralRepeatedAchive ErrorCode = 5302 // 重复激活 ErrorCode_TntegralRepeatedAchive ErrorCode = 5302 // 重复激活
//plunder //plunder
ErrorCode_PlunderNotFoundShip ErrorCode = 5401 // pvp 没找到数据 ErrorCode_PlunderNotFoundShip ErrorCode = 5401 // pvp 没找到数据
ErrorCode_PlunderLineUnlock ErrorCode = 5402 // 队列没解锁 ErrorCode_PlunderLineUnlock ErrorCode = 5402 // 队列没解锁
ErrorCode_PlundeRepleteRecive ErrorCode = 5403 // 重复接取 ErrorCode_PlundeRepleteRecive ErrorCode = 5403 // 重复接取
ErrorCode_PlundeShipReach ErrorCode = 5404 //船已经达到不能被掠夺 ErrorCode_PlundeShipReach ErrorCode = 5404 //船已经达到不能被掠夺
ErrorCode_PlundeNormalShip ErrorCode = 5405 //普通船不能被掠夺 ErrorCode_PlundeNormalShip ErrorCode = 5405 //普通船不能被掠夺
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 //重复学习 ErrorCode_PlundeAlreadyLearn ErrorCode = 5409 //重复学习
ErrorCode_PlundeShipUnReach ErrorCode = 5410 // 船 未到达 ErrorCode_PlundeShipUnReach ErrorCode = 5410 // 船 未到达
ErrorCode_PlundeMaxTransportNum ErrorCode = 5411 // 到达每日最大运输次数了
ErrorCode_PlundeMaxPVPTransportNum ErrorCode = 5412 // 到达每日最大掠夺次数了
) )
// Enum value maps for ErrorCode. // Enum value maps for ErrorCode.
@ -903,6 +905,8 @@ var (
5408: "PlundeUnlock", 5408: "PlundeUnlock",
5409: "PlundeAlreadyLearn", 5409: "PlundeAlreadyLearn",
5410: "PlundeShipUnReach", 5410: "PlundeShipUnReach",
5411: "PlundeMaxTransportNum",
5412: "PlundeMaxPVPTransportNum",
} }
ErrorCode_value = map[string]int32{ ErrorCode_value = map[string]int32{
"Success": 0, "Success": 0,
@ -1319,6 +1323,8 @@ var (
"PlundeUnlock": 5408, "PlundeUnlock": 5408,
"PlundeAlreadyLearn": 5409, "PlundeAlreadyLearn": 5409,
"PlundeShipUnReach": 5410, "PlundeShipUnReach": 5410,
"PlundeMaxTransportNum": 5411,
"PlundeMaxPVPTransportNum": 5412,
} }
) )
@ -1353,7 +1359,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, 0x9b, 0x4d, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x6f, 0x2a, 0xd6, 0x4d, 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,
@ -1970,8 +1976,12 @@ var file_errorcode_proto_rawDesc = []byte{
0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17,
0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c,
0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64,
0x65, 0x53, 0x68, 0x69, 0x70, 0x55, 0x6e, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0xa2, 0x2a, 0x42, 0x65, 0x53, 0x68, 0x69, 0x70, 0x55, 0x6e, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0xa2, 0x2a, 0x12,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x1a, 0x0a, 0x15, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x4d, 0x61, 0x78, 0x54, 0x72, 0x61, 0x6e,
0x73, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x10, 0xa3, 0x2a, 0x12, 0x1d, 0x0a, 0x18, 0x50,
0x6c, 0x75, 0x6e, 0x64, 0x65, 0x4d, 0x61, 0x78, 0x50, 0x56, 0x50, 0x54, 0x72, 0x61, 0x6e, 0x73,
0x70, 0x6f, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x10, 0xa4, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

View File

@ -499,8 +499,7 @@ type IntegralRankListResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Ranks []*DBIntegralRank `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"` Ranks []*DBIntegralRank `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"` // repeated DBIntegralRank friends = 2;
Friends []*DBIntegralRank `protobuf:"bytes,2,rep,name=friends,proto3" json:"friends"`
} }
func (x *IntegralRankListResp) Reset() { func (x *IntegralRankListResp) Reset() {
@ -542,13 +541,6 @@ func (x *IntegralRankListResp) GetRanks() []*DBIntegralRank {
return nil return nil
} }
func (x *IntegralRankListResp) GetFriends() []*DBIntegralRank {
if x != nil {
return x.Friends
}
return nil
}
// 领取成就 // 领取成就
type IntegralGetAchieveReq struct { type IntegralGetAchieveReq struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -709,28 +701,25 @@ var file_integral_integral_msg_proto_rawDesc = []byte{
0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52,
0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61,
0x6e, 0x64, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75,
0x22, 0x68, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x22, 0x3d, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b,
0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b,
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x22,
0x29, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x27, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x63,
0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x68, 0x69, 0x65, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
0x6b, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x15, 0x49, 0x6e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xb5, 0x01, 0x0a, 0x16, 0x49, 0x6e, 0x74,
0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x52,
0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3e, 0x0a, 0x07, 0x61, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x18, 0x01,
0x02, 0x69, 0x64, 0x22, 0xb5, 0x01, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47,
0x47, 0x65, 0x74, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3e, 0x65, 0x74, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x41, 0x63,
0x0a, 0x07, 0x61, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x68, 0x69, 0x65, 0x76, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x61, 0x63, 0x68, 0x69,
0x24, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x63, 0x68, 0x65, 0x76, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03,
0x69, 0x65, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x61, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x12, 0x1f, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3a, 0x0a, 0x0c, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x45,
0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x3a, 0x0a, 0x0c, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
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, 0x42, 0x06, 0x5a, 0x04, 0x2e,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -779,14 +768,13 @@ var file_integral_integral_msg_proto_depIdxs = []int32{
14, // 7: IntegralGetRewardResp.data:type_name -> DBIntegralBoss 14, // 7: IntegralGetRewardResp.data:type_name -> DBIntegralBoss
18, // 8: IntegralGetRewardResp.award:type_name -> UserAtno 18, // 8: IntegralGetRewardResp.award:type_name -> UserAtno
19, // 9: IntegralRankListResp.ranks:type_name -> DBIntegralRank 19, // 9: IntegralRankListResp.ranks:type_name -> DBIntegralRank
19, // 10: IntegralRankListResp.friends:type_name -> DBIntegralRank 13, // 10: IntegralGetAchieveResp.achieve:type_name -> IntegralGetAchieveResp.AchieveEntry
13, // 11: IntegralGetAchieveResp.achieve:type_name -> IntegralGetAchieveResp.AchieveEntry 18, // 11: IntegralGetAchieveResp.award:type_name -> UserAtno
18, // 12: IntegralGetAchieveResp.award:type_name -> UserAtno 12, // [12:12] is the sub-list for method output_type
13, // [13:13] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type
13, // [13:13] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name
13, // [13:13] is the sub-list for extension type_name 12, // [12:12] is the sub-list for extension extendee
13, // [13:13] is the sub-list for extension extendee 0, // [0:12] is the sub-list for field type_name
0, // [0:13] is the sub-list for field type_name
} }
func init() { file_integral_integral_msg_proto_init() } func init() { file_integral_integral_msg_proto_init() }

View File

@ -284,6 +284,8 @@ type GameGlobalData struct {
PlunderPvpBattlereadyid int32 PlunderPvpBattlereadyid int32
PlunderPvpCollegeNum *Gameatn PlunderPvpCollegeNum *Gameatn
PlunderPvpCollegeTime int32 PlunderPvpCollegeTime int32
PlunderPvpPlunderum int32
PlunderPvpTransportnum int32
PvpEndtime int32 PvpEndtime int32
PvpMaintenancetime int32 PvpMaintenancetime int32
PvpIntegraltool string PvpIntegraltool string
@ -1103,6 +1105,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_battlereadyid"].(float64); !_ok_ { err = errors.New("plunder_pvp_battlereadyid error"); return }; _v.PlunderPvpBattlereadyid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_battlereadyid"].(float64); !_ok_ { err = errors.New("plunder_pvp_battlereadyid error"); return }; _v.PlunderPvpBattlereadyid = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["plunder_pvp_college_num"].(map[string]interface{}); !_ok_ { err = errors.New("plunder_pvp_college_num error"); return }; if _v.PlunderPvpCollegeNum, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["plunder_pvp_college_num"].(map[string]interface{}); !_ok_ { err = errors.New("plunder_pvp_college_num error"); return }; if _v.PlunderPvpCollegeNum, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_plunderum"].(float64); !_ok_ { err = errors.New("plunder_pvp_plunderum error"); return }; _v.PlunderPvpPlunderum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_transportnum"].(float64); !_ok_ { err = errors.New("plunder_pvp_transportnum error"); return }; _v.PlunderPvpTransportnum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_endtime"].(float64); !_ok_ { err = errors.New("pvp_endtime error"); return }; _v.PvpEndtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_endtime"].(float64); !_ok_ { err = errors.New("pvp_endtime error"); return }; _v.PvpEndtime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) }
{ var _ok_ bool; if _v.PvpIntegraltool, _ok_ = _buf["pvp_integraltool"].(string); !_ok_ { err = errors.New("pvp_integraltool error"); return } } { var _ok_ bool; if _v.PvpIntegraltool, _ok_ = _buf["pvp_integraltool"].(string); !_ok_ { err = errors.New("pvp_integraltool error"); return } }