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

伤害系数计算

Browse Source
This commit is contained in:
meixiongfeng 2023-12-26 17:00:06 +08:00
parent a0df4f8b39
commit 724044c2cc
21 changed files with 3583 additions and 982 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
bin/json/game_battleready.json
View File

@ -3474,5 +3474,75 @@
"BlueAssistTeam": 0, "BlueAssistTeam": 0,
"CanFriendHelp": 0, "CanFriendHelp": 0,
"Numrounds": 0 "Numrounds": 0
},
{
"id": 11804001,
"PlayType": 21,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_dragon_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 301,
"disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 60
},
{
"id": 11804002,
"PlayType": 21,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_dragon_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 302,
"disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 60
} }
] ]

242
bin/json/game_battlescore.json
View File

@ -482,5 +482,247 @@
"rank_up": -1, "rank_up": -1,
"grade": "", "grade": "",
"score": 24 "score": 24
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "c-"
},
"rank_low": 0,
"rank_up": 249999,
"grade": "gh_img_c0",
"score": 1
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "c"
},
"rank_low": 250000,
"rank_up": 319999,
"grade": "gh_img_c",
"score": 2
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "c+"
},
"rank_low": 320000,
"rank_up": 399999,
"grade": "gh_img_c1",
"score": 3
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "b"
},
"rank_low": 400000,
"rank_up": 499999,
"grade": "gh_img_b",
"score": 4
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "b+"
},
"rank_low": 500000,
"rank_up": 599999,
"grade": "gh_img_b1",
"score": 5
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "a"
},
"rank_low": 600000,
"rank_up": 699999,
"grade": "gh_img_a",
"score": 6
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "a+"
},
"rank_low": 700000,
"rank_up": 999999,
"grade": "gh_img_a1",
"score": 7
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "s"
},
"rank_low": 1000000,
"rank_up": 1199999,
"grade": "gh_img_s",
"score": 8
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "ss"
},
"rank_low": 1200000,
"rank_up": 1599999,
"grade": "gh_img_ss",
"score": 9
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "sss"
},
"rank_low": 1600000,
"rank_up": 1999999,
"grade": "gh_img_sss",
"score": 10
},
{
"id": 301,
"score_name": {
"key": "Integralboss_boss_name_1",
"text": "sss+"
},
"rank_low": 2000000,
"rank_up": -1,
"grade": "gh_img_sss1",
"score": 11
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "c-"
},
"rank_low": 0,
"rank_up": 249999,
"grade": "gh_img_c0",
"score": 12
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "c"
},
"rank_low": 250000,
"rank_up": 319999,
"grade": "gh_img_c",
"score": 13
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "c+"
},
"rank_low": 320000,
"rank_up": 399999,
"grade": "gh_img_c1",
"score": 14
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "b"
},
"rank_low": 400000,
"rank_up": 499999,
"grade": "gh_img_b",
"score": 15
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "b+"
},
"rank_low": 500000,
"rank_up": 599999,
"grade": "gh_img_b1",
"score": 16
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "a"
},
"rank_low": 600000,
"rank_up": 699999,
"grade": "gh_img_a",
"score": 17
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "a+"
},
"rank_low": 700000,
"rank_up": 999999,
"grade": "gh_img_a1",
"score": 18
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "s"
},
"rank_low": 1000000,
"rank_up": 1199999,
"grade": "gh_img_s",
"score": 19
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "ss"
},
"rank_low": 1200000,
"rank_up": 1599999,
"grade": "gh_img_ss",
"score": 20
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "sss"
},
"rank_low": 1600000,
"rank_up": 1999999,
"grade": "gh_img_sss",
"score": 21
},
{
"id": 302,
"score_name": {
"key": "Integralboss_boss_name_7",
"text": "sss+"
},
"rank_low": 2000000,
"rank_up": -1,
"grade": "gh_img_sss1",
"score": 22
} }
] ]

33
bin/json/game_buriedcondi.json
View File

@ -980,7 +980,7 @@
}, },
"value": 4, "value": 4,
"filter": [ "filter": [
16004001 24012016
], ],
"filter2": [ "filter2": [
"道具ID", "道具ID",
@ -15343,6 +15343,37 @@
], ],
"filter2": [] "filter2": []
}, },
{
"id": 11001010,
"rtype": 1,
"ctype": 1,
"notify": [
"achieve"
],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1121",
"text": "冒险之旅第一章成就解锁"
},
"type": 61,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"Npc_event_type": 0,
"NPC": 0,
"tipstxt": {
"key": "",
"text": ""
},
"value": 1,
"filter": [
1101017
],
"filter2": []
},
{ {
"id": 11002001, "id": 11002001,
"rtype": 1, "rtype": 1,

48
bin/json/game_caravancity.json
View File

@ -210,8 +210,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 103, "id": 103,
@ -334,8 +334,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 104, "id": 104,
@ -461,8 +461,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 105, "id": 105,
@ -587,8 +587,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 106, "id": 106,
@ -714,8 +714,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 107, "id": 107,
@ -840,8 +840,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 108, "id": 108,
@ -966,8 +966,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 109, "id": 109,
@ -1092,8 +1092,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 110, "id": 110,
@ -1218,8 +1218,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 111, "id": 111,
@ -1345,8 +1345,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 112, "id": 112,
@ -1471,8 +1471,8 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
}, },
{ {
"id": 113, "id": 113,
@ -1597,7 +1597,7 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"weitalk": 11005, "weitalk": 11005,
"cityeventpro": 0, "cityeventpro": 10000,
"cityevent": 0 "cityevent": 1
} }
] ]

8
bin/json/game_guide.json
View File

@ -1696,7 +1696,7 @@
"startPar": "", "startPar": "",
"parameter": "", "parameter": "",
"interface": "", "interface": "",
"condition": "worldtask_accept_20112", "condition": "FinishLevel_1101017",
"followtj": "", "followtj": "",
"followguide": 1000902, "followguide": 1000902,
"finger": [ "finger": [
@ -1960,7 +1960,7 @@
"x": 0, "x": 0,
"y": 0 "y": 0
}, },
"fingerTime": 0.5, "fingerTime": 1.5,
"objSize": { "objSize": {
"x": 0, "x": 0,
"y": 0 "y": 0
@ -2341,7 +2341,7 @@
"x": 0, "x": 0,
"y": 0 "y": 0
}, },
"fingerTime": 0, "fingerTime": 1.5,
"objSize": { "objSize": {
"x": 0, "x": 0,
"y": 0 "y": 0
@ -2372,7 +2372,7 @@
"startPar": "", "startPar": "",
"parameter": "", "parameter": "",
"interface": "", "interface": "",
"condition": "FinishLevel_1101018", "condition": "funcopen_Traindragon",
"followtj": "", "followtj": "",
"followguide": 1001102, "followguide": 1001102,
"finger": [ "finger": [

711
bin/json/game_hero.json
View File

File diff suppressed because it is too large Load Diff

91
bin/json/game_integralboss.json
View File

@ -5,18 +5,18 @@
"difficulty": 1, "difficulty": 1,
"itype": 1, "itype": 1,
"difficultytext": "简单", "difficultytext": "简单",
"coefficient": "1", "coefficient": 1,
"unlock": 101, "unlock": 101,
"unlockval": 0, "unlockval": 0,
"name": { "name": {
"key": "vikingexpedition_boss_name_1", "key": "Integralboss_boss_name_1",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "vikingexpedition_bossskill_introduce_1", "key": "Integralboss_bossskill_introduce_1",
"text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。" "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。"
}, },
"BattleReadyID": 10500001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "attr",
@ -36,9 +36,8 @@
], ],
"drop": 10001001, "drop": 10001001,
"heroexp": 10, "heroexp": 10,
"scene": "bossfight_spinymandrilla_02", "spine": "bossShow_bingshuangtaitan",
"bossmodel": 11009, "HeroId": 11009,
"boss_skill": [],
"boss": [ "boss": [
1420003 1420003
], ],
@ -50,18 +49,18 @@
"difficulty": 2, "difficulty": 2,
"itype": 1, "itype": 1,
"difficultytext": "普通", "difficultytext": "普通",
"coefficient": "1.2", "coefficient": 1.2,
"unlock": 102, "unlock": 102,
"unlockval": 1000, "unlockval": 1000,
"name": { "name": {
"key": "vikingexpedition_boss_name_2", "key": "Integralboss_boss_name_2",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "vikingexpedition_bossskill_introduce_2", "key": "Integralboss_bossskill_introduce_2",
"text": "冰霜泰坦巨人从极寒之地而来，没有什么比它更寒冷了。" "text": "冰霜泰坦巨人从极寒之地而来，没有什么比它更寒冷了。"
}, },
"BattleReadyID": 10500001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "attr",
@ -76,9 +75,8 @@
], ],
"drop": 10001002, "drop": 10001002,
"heroexp": 10, "heroexp": 10,
"scene": "bossfight_spinymandrilla_02", "spine": "bossShow_bingshuangtaitan",
"bossmodel": 11009, "HeroId": 11009,
"boss_skill": [],
"boss": [ "boss": [
1420006 1420006
], ],
@ -90,18 +88,18 @@
"difficulty": 3, "difficulty": 3,
"itype": 1, "itype": 1,
"difficultytext": "困难", "difficultytext": "困难",
"coefficient": "1.4", "coefficient": 1.4,
"unlock": 102, "unlock": 102,
"unlockval": 2000, "unlockval": 2000,
"name": { "name": {
"key": "vikingexpedition_boss_name_3", "key": "Integralboss_boss_name_3",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "vikingexpedition_bossskill_introduce_3", "key": "Integralboss_bossskill_introduce_3",
"text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神。" "text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神。"
}, },
"BattleReadyID": 10500001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "attr",
@ -121,9 +119,8 @@
], ],
"drop": 10001003, "drop": 10001003,
"heroexp": 10, "heroexp": 10,
"scene": "bossfight_spinymandrilla_02", "spine": "bossShow_bingshuangtaitan",
"bossmodel": 11009, "HeroId": 11009,
"boss_skill": [],
"boss": [ "boss": [
1420009 1420009
], ],
@ -135,18 +132,18 @@
"difficulty": 4, "difficulty": 4,
"itype": 1, "itype": 1,
"difficultytext": "精英", "difficultytext": "精英",
"coefficient": "1.6", "coefficient": 1.6,
"unlock": 102, "unlock": 102,
"unlockval": 3000, "unlockval": 3000,
"name": { "name": {
"key": "vikingexpedition_boss_name_4", "key": "Integralboss_boss_name_4",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "vikingexpedition_bossskill_introduce_4", "key": "Integralboss_bossskill_introduce_4",
"text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。" "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。"
}, },
"BattleReadyID": 10500001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "attr",
@ -161,9 +158,8 @@
], ],
"drop": 10001004, "drop": 10001004,
"heroexp": 10, "heroexp": 10,
"scene": "bossfight_spinymandrilla_02", "spine": "bossShow_bingshuangtaitan",
"bossmodel": 11009, "HeroId": 11009,
"boss_skill": [],
"boss": [ "boss": [
1420012 1420012
], ],
@ -175,18 +171,18 @@
"difficulty": 5, "difficulty": 5,
"itype": 1, "itype": 1,
"difficultytext": "地狱", "difficultytext": "地狱",
"coefficient": "1.8", "coefficient": 1.8,
"unlock": 102, "unlock": 102,
"unlockval": 4000, "unlockval": 4000,
"name": { "name": {
"key": "vikingexpedition_boss_name_5", "key": "Integralboss_boss_name_5",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "vikingexpedition_bossskill_introduce_5", "key": "Integralboss_bossskill_introduce_5",
"text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。" "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。"
}, },
"BattleReadyID": 10500001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "attr",
@ -206,9 +202,8 @@
], ],
"drop": 10001005, "drop": 10001005,
"heroexp": 10, "heroexp": 10,
"scene": "bossfight_spinymandrilla_02", "spine": "bossShow_bingshuangtaitan",
"bossmodel": 11009, "HeroId": 11009,
"boss_skill": [],
"boss": [ "boss": [
1420015 1420015
], ],
@ -220,18 +215,18 @@
"difficulty": 6, "difficulty": 6,
"itype": 1, "itype": 1,
"difficultytext": "噩梦", "difficultytext": "噩梦",
"coefficient": "2", "coefficient": 2,
"unlock": 102, "unlock": 102,
"unlockval": 5000, "unlockval": 5000,
"name": { "name": {
"key": "vikingexpedition_boss_name_6", "key": "Integralboss_boss_name_6",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "vikingexpedition_bossskill_introduce_6", "key": "Integralboss_bossskill_introduce_6",
"text": "梦境回廊，产出经验材料" "text": "梦境回廊，产出经验材料"
}, },
"BattleReadyID": 10500001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "attr",
@ -246,9 +241,8 @@
], ],
"drop": 10001006, "drop": 10001006,
"heroexp": 10, "heroexp": 10,
"scene": "bossfight_spinymandrilla_02", "spine": "bossShow_bingshuangtaitan",
"bossmodel": 11009, "HeroId": 11009,
"boss_skill": [],
"boss": [ "boss": [
1420018 1420018
], ],
@ -260,18 +254,18 @@
"difficulty": 1, "difficulty": 1,
"itype": 2, "itype": 2,
"difficultytext": "", "difficultytext": "",
"coefficient": "", "coefficient": 1,
"unlock": 101, "unlock": 101,
"unlockval": 0, "unlockval": 0,
"name": { "name": {
"key": "vikingexpedition_boss_name_7", "key": "Integralboss_boss_name_7",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "vikingexpedition_bossskill_introduce_7", "key": "Integralboss_bossskill_introduce_7",
"text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。" "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。"
}, },
"BattleReadyID": 10500001, "BattleReadyID": 11804002,
"firstprize": [ "firstprize": [
{ {
"a": "attr", "a": "attr",
@ -286,9 +280,8 @@
], ],
"drop": 10001006, "drop": 10001006,
"heroexp": 10, "heroexp": 10,
"scene": "bossfight_spinymandrilla_02", "spine": "bossShow_bingshuangtaitan",
"bossmodel": 11009, "HeroId": 11009,
"boss_skill": [],
"boss": [ "boss": [
1420021 1420021
], ],

455
bin/json/game_integralreward.json
View File

@ -3,7 +3,7 @@
"id": 1, "id": 1,
"hdid": 10001, "hdid": 10001,
"type": 1, "type": 1,
"val": 10000, "Val": 10000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -26,7 +26,7 @@
"id": 2, "id": 2,
"hdid": 10001, "hdid": 10001,
"type": 1, "type": 1,
"val": 20000, "Val": 20000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -44,7 +44,7 @@
"id": 3, "id": 3,
"hdid": 10001, "hdid": 10001,
"type": 1, "type": 1,
"val": 50000, "Val": 50000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -67,7 +67,7 @@
"id": 4, "id": 4,
"hdid": 10001, "hdid": 10001,
"type": 1, "type": 1,
"val": 100000, "Val": 100000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -85,7 +85,7 @@
"id": 5, "id": 5,
"hdid": 10001, "hdid": 10001,
"type": 1, "type": 1,
"val": 150000, "Val": 150000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -107,8 +107,8 @@
{ {
"id": 6, "id": 6,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 1,
"val": 100000, "Val": 100000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -130,8 +130,8 @@
{ {
"id": 7, "id": 7,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 1,
"val": 200000, "Val": 200000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -148,8 +148,8 @@
{ {
"id": 8, "id": 8,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 1,
"val": 500000, "Val": 500000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -171,8 +171,8 @@
{ {
"id": 9, "id": 9,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 1,
"val": 1000000, "Val": 1000000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -189,8 +189,8 @@
{ {
"id": 10, "id": 10,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 1,
"val": 1200000, "Val": 1200000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -212,8 +212,8 @@
{ {
"id": 11, "id": 11,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 1,
"val": 1500000, "Val": 1002000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -231,7 +231,7 @@
"id": 12, "id": 12,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 2,
"val": 1800000, "Val": 10000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -249,7 +249,7 @@
"id": 13, "id": 13,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 2,
"val": 2100000, "Val": 20000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -267,7 +267,7 @@
"id": 14, "id": 14,
"hdid": 10001, "hdid": 10001,
"type": 2, "type": 2,
"val": 2400000, "Val": 50000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -283,9 +283,9 @@
}, },
{ {
"id": 15, "id": 15,
"hdid": 20001, "hdid": 10001,
"type": 1, "type": 2,
"val": 10000, "Val": 100000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -306,9 +306,9 @@
}, },
{ {
"id": 16, "id": 16,
"hdid": 20001, "hdid": 10001,
"type": 1, "type": 2,
"val": 20000, "Val": 150000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -324,9 +324,9 @@
}, },
{ {
"id": 17, "id": 17,
"hdid": 20001, "hdid": 10001,
"type": 1, "type": 2,
"val": 50000, "Val": 174000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -347,9 +347,9 @@
}, },
{ {
"id": 18, "id": 18,
"hdid": 20001, "hdid": 10001,
"type": 1, "type": 2,
"val": 100000, "Val": 210000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -365,9 +365,9 @@
}, },
{ {
"id": 19, "id": 19,
"hdid": 20001, "hdid": 10001,
"type": 1, "type": 2,
"val": 150000, "Val": 246000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -388,14 +388,14 @@
}, },
{ {
"id": 20, "id": 20,
"hdid": 20001, "hdid": 10001,
"type": 2, "type": 2,
"val": 100000, "Val": 282000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 50 "n": 100
}, },
{ {
"a": "item", "a": "item",
@ -412,13 +412,13 @@
{ {
"id": 21, "id": 21,
"hdid": 20001, "hdid": 20001,
"type": 2, "type": 1,
"val": 200000, "Val": 10000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 50 "n": 100
}, },
{ {
"a": "item", "a": "item",
@ -430,8 +430,8 @@
{ {
"id": 22, "id": 22,
"hdid": 20001, "hdid": 20001,
"type": 2, "type": 1,
"val": 500000, "Val": 20000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -442,19 +442,14 @@
"a": "item", "a": "item",
"t": "13000003", "t": "13000003",
"n": 5 "n": 5
},
{
"a": "item",
"t": "13000007",
"n": 1
} }
] ]
}, },
{ {
"id": 23, "id": 23,
"hdid": 20001, "hdid": 20001,
"type": 2, "type": 1,
"val": 1000000, "Val": 50000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -471,8 +466,67 @@
{ {
"id": 24, "id": 24,
"hdid": 20001, "hdid": 20001,
"type": 2, "type": 1,
"val": 1200000, "Val": 100000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 25,
"hdid": 20001,
"type": 1,
"Val": 150000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "item",
"t": "13000003",
"n": 5
},
{
"a": "item",
"t": "13000007",
"n": 1
}
]
},
{
"id": 26,
"hdid": 20001,
"type": 1,
"Val": 100000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 27,
"hdid": 20001,
"type": 1,
"Val": 200000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",
@ -491,65 +545,252 @@
} }
] ]
}, },
{
"id": 25,
"hdid": 20001,
"type": 2,
"val": 1500000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 26,
"hdid": 20001,
"type": 2,
"val": 1800000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 27,
"hdid": 20001,
"type": 2,
"val": 2100000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{ {
"id": 28, "id": 28,
"hdid": 20001, "hdid": 20001,
"type": 1,
"Val": 500000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 29,
"hdid": 20001,
"type": 1,
"Val": 1000000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
},
{
"a": "item",
"t": "13000007",
"n": 1
}
]
},
{
"id": 30,
"hdid": 20001,
"type": 1,
"Val": 1200000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
},
{
"a": "item",
"t": "13000007",
"n": 1
}
]
},
{
"id": 31,
"hdid": 20001,
"type": 1,
"Val": 1002000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 36,
"hdid": 20001,
"type": 2, "type": 2,
"val": 2400000, "Val": 10000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "item",
"t": "13000003",
"n": 5
},
{
"a": "item",
"t": "13000007",
"n": 1
}
]
},
{
"id": 37,
"hdid": 20001,
"type": 2,
"Val": 20000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 38,
"hdid": 20001,
"type": 2,
"Val": 50000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
},
{
"a": "item",
"t": "13000007",
"n": 1
}
]
},
{
"id": 39,
"hdid": 20001,
"type": 2,
"Val": 100000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 40,
"hdid": 20001,
"type": 2,
"Val": 150000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
},
{
"a": "item",
"t": "13000007",
"n": 1
}
]
},
{
"id": 41,
"hdid": 20001,
"type": 2,
"Val": 174000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 42,
"hdid": 20001,
"type": 2,
"Val": 210000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 43,
"hdid": 20001,
"type": 2,
"Val": 246000,
"prize": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "item",
"t": "13000003",
"n": 5
}
]
},
{
"id": 44,
"hdid": 20001,
"type": 2,
"Val": 282000,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",

2
bin/json/game_item.json
View File

@ -8506,7 +8506,7 @@
"decompose_deplete": [], "decompose_deplete": [],
"decompose_get": [], "decompose_get": [],
"access": [ "access": [
126 167
], ],
"use_skip": 1001, "use_skip": 1001,
"upper_limit": 0, "upper_limit": 0,

2
bin/json/game_mainchapter.json
View File

@ -10,7 +10,7 @@
"key": "mainchapter_main_chapter_describe_1", "key": "mainchapter_main_chapter_describe_1",
"text": "探索博克岛，完成拼图。每一块拼图完成都有神秘奖励！拼图集齐后可以获得亚丝翠！" "text": "探索博克岛，完成拼图。每一块拼图完成都有神秘奖励！拼图集齐后可以获得亚丝翠！"
}, },
"achunlock": 11001001, "achunlock": 11001010,
"shopname": { "shopname": {
"key": "mainchapter_main_chapter_shopname_1", "key": "mainchapter_main_chapter_shopname_1",
"text": "特色商店" "text": "特色商店"

2512
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

6
bin/json/game_msgdistrib.json
View File

@ -172,5 +172,11 @@
"open": true, "open": true,
"routrules": "~/worker", "routrules": "~/worker",
"describe": "捉虫子" "describe": "捉虫子"
},
{
"msgid": "integral",
"open": true,
"routrules": "~/worker",
"describe": "积分boss"
} }
] ]

4
bin/json/game_opencond.json
View File

@ -2890,7 +2890,7 @@
"main": [ "main": [
{ {
"key": 2, "key": 2,
"param": 1101016 "param": 1101017
} }
], ],
"wkqbx": 2, "wkqbx": 2,
@ -3198,7 +3198,7 @@
"main": [ "main": [
{ {
"key": 2, "key": 2,
"param": 1101017 "param": 1101018
} }
], ],
"wkqbx": 0, "wkqbx": 0,

2
bin/json/game_worldtask.json
View File

@ -1154,7 +1154,7 @@
"taskend_removeitem": [], "taskend_removeitem": [],
"auto_accept": 2, "auto_accept": 2,
"tasktips": 0, "tasktips": 0,
"deliver_task": 2, "deliver_task": 0,
"deliver_task_npc": 35002, "deliver_task_npc": 35002,
"lock_add": 0, "lock_add": 0,
"finish": [], "finish": [],

4
modules/integral/api_challenge.go
View File

@ -76,7 +76,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle
Redflist: record.Redflist, Redflist: record.Redflist,
BlueCompId: record.BlueCompId, BlueCompId: record.BlueCompId,
Buleflist: record.Buleflist, Buleflist: record.Buleflist,
Tasks: record.Tasks}, Tasks: record.Tasks,
Params: []float32{cfgData.Coefficient}, // 伤害系数
},
Nandu: req.Nandu, Nandu: req.Nandu,
}) })

19
modules/integral/api_challengeover.go
View File

@ -23,8 +23,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
var ( var (
update map[string]interface{} update map[string]interface{}
res []*cfg.Gameatn res []*cfg.Gameatn
first bool // 是否是首通 first bool // 是否是首通
line []*pb.LineUp // 阵容数据
harm int32
) )
harm = req.Report.Harm
update = make(map[string]interface{}, 0) update = make(map[string]interface{}, 0)
if errdata = this.ChallengeOverCheck(session, req); errdata != nil { if errdata = this.ChallengeOverCheck(session, req); errdata != nil {
return // 参数校验失败直接返回 return // 参数校验失败直接返回
@ -40,7 +43,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
} }
if _, ok := list.Score[req.Nandu]; !ok { if _, ok := list.Score[req.Nandu]; !ok {
list.Score[req.Nandu] = req.Score list.Score[req.Nandu] = harm
update["score"] = list.Score update["score"] = list.Score
first = true first = true
} }
@ -72,23 +75,23 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
list.Count++ list.Count++
update["count"] = list.Count update["count"] = list.Count
// 更新积分数据 // 更新积分数据
if list.Score[req.Nandu] < req.Score { if list.Score[req.Nandu] < harm {
list.Score[req.Nandu] = req.Score list.Score[req.Nandu] = harm
update["score"] = list.Score update["score"] = list.Score
} }
if list.Maxscore < req.Score { // 更新最大积分数据 if list.Maxscore < harm { // 更新最大积分数据
list.Maxscore = req.Score list.Maxscore = harm
update["maxscore"] = list.Maxscore update["maxscore"] = list.Maxscore
} }
list.Totalscore += req.Score list.Totalscore += harm
update["totalscore"] = list.Totalscore update["totalscore"] = list.Totalscore
if first { if first {
for _, v := range cfgData.Firstprize { // 发放通关随机奖励 for _, v := range cfgData.Firstprize { // 发放通关随机奖励
res = append(res, v) res = append(res, v)
} }
} }
var line []*pb.LineUp
for _, v := range req.Report.Info.Redflist[0].Team { for _, v := range req.Report.Info.Redflist[0].Team {
line = append(line, &pb.LineUp{ line = append(line, &pb.LineUp{
Cid: v.HeroID, Cid: v.HeroID,

25
modules/integral/api_rank.go
View File

@ -16,7 +16,9 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.IntegralRankLis
var ( var (
uids []string uids []string
ranks []*pb.DBIntegralBoss ranks []*pb.DBIntegralBoss
franks []*pb.DBIntegralBoss
players []*pb.DBIntegralRank players []*pb.DBIntegralRank
friends []*pb.DBIntegralRank
err error err error
) )
@ -51,8 +53,29 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.IntegralRankLis
Line: v.Line[req.Nandu], Line: v.Line[req.Nandu],
} }
} }
// 获取好友
fids := this.module.ModuleFriend.GetFriendList(session.GetUserId())
if franks, err = this.module.modelIntegral.queryPlayers(fids); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
friends = make([]*pb.DBIntegralRank, len(franks))
for i, v := range franks {
friends[i] = &pb.DBIntegralRank{
Id: v.Uid,
Uinfo: v.Uinfo,
Nandu: v.Nandu,
Score: v.Score[req.Nandu],
Line: v.Line[req.Nandu],
}
}
session.SendMsg(string(this.module.GetType()), "rank", &pb.IntegralRankListResp{ session.SendMsg(string(this.module.GetType()), "rank", &pb.IntegralRankListResp{
Ranks: players, Ranks: players,
Friends: friends,
}) })
return return
} }

219
pb/battle_msg.pb.go
View File

@ -836,6 +836,7 @@ type BattleInfo struct {
BlueCompId string `protobuf:"bytes,8,opt,name=blueCompId,proto3" json:"blueCompId"` //蓝方阵营id BlueCompId string `protobuf:"bytes,8,opt,name=blueCompId,proto3" json:"blueCompId"` //蓝方阵营id
Buleflist []*DBBattleFormt `protobuf:"bytes,9,rep,name=buleflist,proto3" json:"buleflist"` //红方阵型列表 Buleflist []*DBBattleFormt `protobuf:"bytes,9,rep,name=buleflist,proto3" json:"buleflist"` //红方阵型列表
Tasks []int32 `protobuf:"varint,10,rep,packed,name=tasks,proto3" json:"tasks"` //任务列表 Tasks []int32 `protobuf:"varint,10,rep,packed,name=tasks,proto3" json:"tasks"` //任务列表
Params []float32 `protobuf:"fixed32,11,rep,packed,name=params,proto3" json:"params"` //需要代入战斗中的参数列表
} }
func (x *BattleInfo) Reset() { func (x *BattleInfo) Reset() {
@ -940,6 +941,13 @@ func (x *BattleInfo) GetTasks() []int32 {
return nil return nil
} }
func (x *BattleInfo) GetParams() []float32 {
if x != nil {
return x.Params
}
return nil
}
type BattleCmd struct { type BattleCmd struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -2061,7 +2069,7 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d,
0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66,
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xbe, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xd6, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75,
@ -2081,111 +2089,112 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74,
0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05, 0x52, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05, 0x52,
0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x51, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73,
0x43, 0x6d, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x02, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x51,
0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63,
0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d,
0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02,
0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xc8, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x76,
0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0xc8, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f,
0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18,
0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12,
0x65, 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e, 0x63,
0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x05, 0x20, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06, 0x6f,
0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61,
0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x12,
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18,
0x65, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74,
0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01,
0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75,
0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12,
0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68,
0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x61, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01,
0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x6c, 0x69,
0x6c, 0x69, 0x76, 0x65, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22, 0x66, 0x0a, 0x10,
0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72,
0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01,
0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61,
0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04,
0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68,
0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2e, 0x0a, 0x10, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63,
0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65,
0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65,
0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74,
0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74,
0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20,
0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74,
0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42,
0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65,
0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01,
0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74,
0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74,
0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18,
0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e,
0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08,
0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48,
0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75,
0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18,
0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74,
0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64,
0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65,
0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64,
0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
0x65, 0x71, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74,
0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
0x52, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64,
0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09,
0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70,
0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e,
0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69,
0x0a, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x42, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53,
0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66,
0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05,
0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65,
0x6e, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
0x74, 0x6f, 0x33, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61,
0x64, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64,
0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01,
0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52,
0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18,
0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65,
0x52, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

83
pb/integral_msg.pb.go
View File

@ -223,7 +223,6 @@ type IntegralChallengeOverReq struct {
Nandu int32 `protobuf:"varint,1,opt,name=nandu,proto3" json:"nandu"` // boos 难度 Nandu int32 `protobuf:"varint,1,opt,name=nandu,proto3" json:"nandu"` // boos 难度
Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报 Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报
Score int32 `protobuf:"varint,3,opt,name=score,proto3" json:"score"` //获得积分 或伤害
} }
func (x *IntegralChallengeOverReq) Reset() { func (x *IntegralChallengeOverReq) Reset() {
@ -272,13 +271,6 @@ func (x *IntegralChallengeOverReq) GetReport() *BattleReport {
return nil return nil
} }
func (x *IntegralChallengeOverReq) GetScore() int32 {
if x != nil {
return x.Score
}
return 0
}
// 客户端通知服务器打赢了 // 客户端通知服务器打赢了
type IntegralChallengeOverResp struct { type IntegralChallengeOverResp struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -436,8 +428,7 @@ type IntegralRankListReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Nandu int32 `protobuf:"varint,1,opt,name=nandu,proto3" json:"nandu"` // 难度 Nandu int32 `protobuf:"varint,1,opt,name=nandu,proto3" json:"nandu"` // 难度
Bfriend bool `protobuf:"varint,2,opt,name=bfriend,proto3" json:"bfriend"` // 是否好友榜
} }
func (x *IntegralRankListReq) Reset() { func (x *IntegralRankListReq) Reset() {
@ -479,19 +470,13 @@ func (x *IntegralRankListReq) GetNandu() int32 {
return 0 return 0
} }
func (x *IntegralRankListReq) GetBfriend() bool {
if x != nil {
return x.Bfriend
}
return false
}
type IntegralRankListResp struct { type IntegralRankListResp struct {
state protoimpl.MessageState state protoimpl.MessageState
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"`
Friends []*DBIntegralRank `protobuf:"bytes,2,rep,name=friends,proto3" json:"friends"`
} }
func (x *IntegralRankListResp) Reset() { func (x *IntegralRankListResp) Reset() {
@ -533,6 +518,13 @@ func (x *IntegralRankListResp) GetRanks() []*DBIntegralRank {
return nil return nil
} }
func (x *IntegralRankListResp) GetFriends() []*DBIntegralRank {
if x != nil {
return x.Friends
}
return nil
}
var File_integral_integral_msg_proto protoreflect.FileDescriptor var File_integral_integral_msg_proto protoreflect.FileDescriptor
var file_integral_integral_msg_proto_rawDesc = []byte{ var file_integral_integral_msg_proto_rawDesc = []byte{
@ -557,36 +549,36 @@ var file_integral_integral_msg_proto_rawDesc = []byte{
0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x6d, 0x0a, 0x18, 0x49, 0x6e, 0x74, 0x65, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x57, 0x0a, 0x18, 0x49, 0x6e, 0x74, 0x65,
0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20, 0x72, 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, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65,
0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x74, 0x22, 0x40, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61,
0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x40, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23,
0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44,
0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64,
0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x61, 0x74, 0x61, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47,
0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70,
0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x65, 0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74,
0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61,
0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74,
0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12,
0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x22, 0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b,
0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x45, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75,
0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x68, 0x0a,
0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61,
0x6e, 0x64, 0x75, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02,
0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x62, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3d, 0x0a,
0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 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, 0x73, 0x18, 0x01, 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, 0x67, 0x72, 0x61, 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, 0x42, 0x06, 0x5a, 0x04, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12, 0x29, 0x0a, 0x07,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x07,
0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -629,11 +621,12 @@ var file_integral_integral_msg_proto_depIdxs = []int32{
10, // 5: IntegralGetRewardResp.data:type_name -> DBIntegralBoss 10, // 5: IntegralGetRewardResp.data:type_name -> DBIntegralBoss
14, // 6: IntegralGetRewardResp.award:type_name -> UserAtno 14, // 6: IntegralGetRewardResp.award:type_name -> UserAtno
15, // 7: IntegralRankListResp.ranks:type_name -> DBIntegralRank 15, // 7: IntegralRankListResp.ranks:type_name -> DBIntegralRank
8, // [8:8] is the sub-list for method output_type 15, // 8: IntegralRankListResp.friends:type_name -> DBIntegralRank
8, // [8:8] is the sub-list for method input_type 9, // [9:9] is the sub-list for method output_type
8, // [8:8] is the sub-list for extension type_name 9, // [9:9] is the sub-list for method input_type
8, // [8:8] is the sub-list for extension extendee 9, // [9:9] is the sub-list for extension type_name
0, // [0:8] is the sub-list for field 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_integral_integral_msg_proto_init() } func init() { file_integral_integral_msg_proto_init() }

27
sys/configure/structs/Game.IntegralBossData.go
View File

@ -16,7 +16,7 @@ type GameIntegralBossData struct {
Difficulty int32 Difficulty int32
Itype int32 Itype int32
Difficultytext string Difficultytext string
Coefficient string Coefficient float32
Unlock int32 Unlock int32
Unlockval int32 Unlockval int32
Name string Name string
@ -25,9 +25,8 @@ type GameIntegralBossData struct {
Firstprize []*Gameatn Firstprize []*Gameatn
Drop int32 Drop int32
Heroexp int32 Heroexp int32
Scene string Spine string
Bossmodel int32 HeroId int32
BossSkill []int32
Boss []int32 Boss []int32
BossIcon string BossIcon string
} }
@ -44,7 +43,7 @@ func (_v *GameIntegralBossData)Deserialize(_buf map[string]interface{}) (err err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = 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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["itype"].(float64); !_ok_ { err = errors.New("itype error"); return }; _v.Itype = int32(_tempNum_) }
{ var _ok_ bool; if _v.Difficultytext, _ok_ = _buf["difficultytext"].(string); !_ok_ { err = errors.New("difficultytext error"); return } } { var _ok_ bool; if _v.Difficultytext, _ok_ = _buf["difficultytext"].(string); !_ok_ { err = errors.New("difficultytext error"); return } }
{ var _ok_ bool; if _v.Coefficient, _ok_ = _buf["coefficient"].(string); !_ok_ { err = errors.New("coefficient error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["coefficient"].(float64); !_ok_ { err = errors.New("coefficient error"); return }; _v.Coefficient = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlockval"].(float64); !_ok_ { err = errors.New("unlockval error"); return }; _v.Unlockval = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlockval"].(float64); !_ok_ { err = errors.New("unlockval error"); return }; _v.Unlockval = 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 } } }
@ -66,22 +65,8 @@ func (_v *GameIntegralBossData)Deserialize(_buf map[string]interface{}) (err err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) }
{ var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } } { var _ok_ bool; if _v.Spine, _ok_ = _buf["spine"].(string); !_ok_ { err = errors.New("spine error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HeroId"].(float64); !_ok_ { err = errors.New("HeroId error"); return }; _v.HeroId = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["boss_skill"].([]interface{}); !_ok_ { err = errors.New("boss_skill error"); return }
_v.BossSkill = 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.BossSkill = append(_v.BossSkill, _list_v_)
}
}
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

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

@ -28,7 +28,7 @@ func (_v *GameIntegralRewardData)Deserialize(_buf map[string]interface{}) (err e
{ 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["hdid"].(float64); !_ok_ { err = errors.New("hdid error"); return }; _v.Hdid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hdid"].(float64); !_ok_ { err = errors.New("hdid error"); return }; _v.Hdid = 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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["val"].(float64); !_ok_ { err = errors.New("val error"); return }; _v.Val = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Val"].(float64); !_ok_ { err = errors.New("Val error"); return }; _v.Val = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool