diff --git a/bin/json/game_gourmet.json b/bin/json/game_gourmet.json index 6dd598d28..2d393d017 100644 --- a/bin/json/game_gourmet.json +++ b/bin/json/game_gourmet.json @@ -50,14 +50,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 1 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 1 } ], @@ -119,14 +119,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 2 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 2 } ], @@ -188,14 +188,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 3 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 3 } ], @@ -257,14 +257,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 4 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 4 } ], @@ -326,14 +326,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 5 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 5 } ], @@ -395,14 +395,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 6 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 6 } ], @@ -464,14 +464,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 7 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 7 } ], @@ -533,14 +533,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 8 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 8 } ], @@ -602,14 +602,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 1 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 1 } ], @@ -671,14 +671,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 2 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 2 } ], @@ -740,14 +740,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 3 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 3 } ], @@ -809,14 +809,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 4 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 4 } ], @@ -878,14 +878,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 5 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 5 } ], @@ -947,14 +947,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 6 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 6 } ], @@ -1016,14 +1016,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 7 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 7 } ], @@ -1085,14 +1085,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 8 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 8 } ], @@ -1154,14 +1154,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 1 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 1 } ], @@ -1223,14 +1223,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 2 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 2 } ], @@ -1292,14 +1292,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 3 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 3 } ], @@ -1361,14 +1361,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 4 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 4 } ], @@ -1430,14 +1430,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 5 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 5 } ], @@ -1499,14 +1499,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 6 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 6 } ], @@ -1568,14 +1568,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 7 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 7 } ], @@ -1637,14 +1637,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 8 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 8 } ], @@ -1706,14 +1706,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 1 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 1 } ], @@ -1775,14 +1775,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 2 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 2 } ], @@ -1844,14 +1844,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 3 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 3 } ], @@ -1913,14 +1913,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 4 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 4 } ], @@ -1982,14 +1982,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 5 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 5 } ], @@ -2051,14 +2051,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 6 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 6 } ], @@ -2120,14 +2120,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 7 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 7 } ], @@ -2189,14 +2189,14 @@ "delicious_consume": [ { "a": "item", - "t": "10002", + "t": "110001", "n": 8 } ], "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 8 } ], @@ -2243,7 +2243,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 1 } ], @@ -2290,7 +2290,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 2 } ], @@ -2337,7 +2337,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 3 } ], @@ -2384,7 +2384,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 4 } ], @@ -2431,7 +2431,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 5 } ], @@ -2478,7 +2478,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 6 } ], @@ -2525,7 +2525,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 7 } ], @@ -2572,7 +2572,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 8 } ], @@ -2619,7 +2619,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 9 } ], @@ -2666,7 +2666,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 10 } ], @@ -2713,7 +2713,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 11 } ], @@ -2760,7 +2760,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 12 } ], @@ -2807,7 +2807,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 13 } ], @@ -2854,7 +2854,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 14 } ], @@ -2901,7 +2901,7 @@ "skill_consume": [ { "a": "item", - "t": "10002", + "t": "110002", "n": 15 } ], diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index db365482d..067b1fe55 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -6422,7 +6422,7 @@ { "hid": "11021", "name": { - "key": "hero_55007", + "key": "hero_55008", "text": "莫甘娜巨怪" }, "star": 5, @@ -6452,10 +6452,10 @@ "y": 0, "z": 0 }, - "skill": 111021011, - "skill1": 111021111, - "skill2": 111021211, - "skill3": 111021311, + "skill": 155006011, + "skill1": 155006111, + "skill2": 155006211, + "skill3": 155006311, "txt": { "key": "atlas_11021", "text": "" diff --git a/bin/json/game_herolevelgrow.json b/bin/json/game_herolevelgrow.json index a89590ce8..f1e7cefac 100644 --- a/bin/json/game_herolevelgrow.json +++ b/bin/json/game_herolevelgrow.json @@ -1588,5 +1588,20 @@ "atkgrow": 1300, "defgrow": 1250, "speedgrow": 0 + }, + { + "id": "11021", + "hp": 0, + "atk": 0, + "def": 0, + "speed": 170, + "cri": 50, + "cridam": 1500, + "effhit": 0, + "effre": 200, + "hpgrow": 1900, + "atkgrow": 1700, + "defgrow": 1700, + "speedgrow": 0 } ] \ No newline at end of file diff --git a/bin/json/game_libraryhero.json b/bin/json/game_libraryhero.json index 1ef07733e..fe61a635e 100644 --- a/bin/json/game_libraryhero.json +++ b/bin/json/game_libraryhero.json @@ -1066,8 +1066,7 @@ "star": 3, "history": [ "430051", - "430052", - "430053" + "430052" ], "favorlv": [ 1, diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json index ebb8d5204..ec4f70e0a 100644 --- a/bin/json/game_mail.json +++ b/bin/json/game_mail.json @@ -158,5 +158,25 @@ "text": "系统" }, "duration": 720 + }, + { + "id": "VipLvReward", + "title": { + "key": "MailTitle_VipLvReward", + "text": "商会等级奖励" + }, + "recipient": { + "key": "MailRecipient_VipLvReward", + "text": "亲爱的{0}：" + }, + "content": { + "key": "MailContent_VipLvReward", + "text": "我们已根据您在商会的职位发放每日分红，请查收" + }, + "sender": { + "key": "MailSender_VipLvReward", + "text": "商会管理员" + }, + "duration": 720 } ] \ No newline at end of file diff --git a/bin/json/game_vip.json b/bin/json/game_vip.json index 8a1ca90df..5c17542b6 100644 --- a/bin/json/game_vip.json +++ b/bin/json/game_vip.json @@ -6,7 +6,7 @@ "key": "vipname1", "text": "特邀会员" }, - "vip_lv_png": "icon_vip_dj00", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj00", "original_priceprice": { "a": "attr", @@ -38,7 +38,7 @@ } ], "vip_privilege": [ - 1 + 20101 ] }, { @@ -48,7 +48,7 @@ "key": "vipname2", "text": "高级会员" }, - "vip_lv_png": "icon_vip_dj01", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj01", "original_priceprice": { "a": "attr", @@ -80,8 +80,8 @@ } ], "vip_privilege": [ - 1, - 2 + 20102, + 20201 ] }, { @@ -91,7 +91,7 @@ "key": "vipname3", "text": "资深会员" }, - "vip_lv_png": "icon_vip_dj02", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj02", "original_priceprice": { "a": "attr", @@ -123,9 +123,8 @@ } ], "vip_privilege": [ - 1, - 2, - 3 + 20103, + 20202 ] }, { @@ -135,7 +134,7 @@ "key": "vipname4", "text": "理事" }, - "vip_lv_png": "icon_vip_dj03", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj03", "original_priceprice": { "a": "attr", @@ -167,10 +166,9 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20104, + 20203, + 20701 ] }, { @@ -180,7 +178,7 @@ "key": "vipname5", "text": "高级理事" }, - "vip_lv_png": "icon_vip_dj04", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj04", "original_priceprice": { "a": "attr", @@ -212,10 +210,9 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20105, + 20204, + 20702 ] }, { @@ -225,7 +222,7 @@ "key": "vipname6", "text": "理事长" }, - "vip_lv_png": "icon_vip_dj05", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj05", "original_priceprice": { "a": "attr", @@ -257,10 +254,9 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20106, + 20205, + 20703 ] }, { @@ -270,7 +266,7 @@ "key": "vipname7", "text": "监事" }, - "vip_lv_png": "icon_vip_dj06", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj06", "original_priceprice": { "a": "attr", @@ -302,10 +298,12 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20107, + 20206, + 20704, + 20801, + 20901, + 21001 ] }, { @@ -315,7 +313,7 @@ "key": "vipname8", "text": "高级监事" }, - "vip_lv_png": "icon_vip_dj07", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj07", "original_priceprice": { "a": "attr", @@ -347,10 +345,12 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20108, + 20207, + 20705, + 20802, + 20902, + 21002 ] }, { @@ -360,7 +360,7 @@ "key": "vipname9", "text": "监事长" }, - "vip_lv_png": "icon_vip_dj08", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj08", "original_priceprice": { "a": "attr", @@ -392,10 +392,12 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20109, + 20208, + 20706, + 20803, + 20903, + 21003 ] }, { @@ -405,7 +407,7 @@ "key": "vipname10", "text": "荣誉副会长" }, - "vip_lv_png": "icon_vip_dj09", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj09", "original_priceprice": { "a": "attr", @@ -437,10 +439,14 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20110, + 20209, + 20707, + 20804, + 20904, + 21004, + 20401, + 20501 ] }, { @@ -450,7 +456,7 @@ "key": "vipname11", "text": "执行副会长" }, - "vip_lv_png": "icon_vip_dj10", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj10", "original_priceprice": { "a": "attr", @@ -482,10 +488,14 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20111, + 20210, + 20708, + 20805, + 20905, + 21005, + 20402, + 20502 ] }, { @@ -495,7 +505,7 @@ "key": "vipname12", "text": "常务副会长" }, - "vip_lv_png": "icon_vip_dj11", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj11", "original_priceprice": { "a": "attr", @@ -527,10 +537,14 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20112, + 20211, + 20709, + 20806, + 20906, + 21006, + 20403, + 20503 ] }, { @@ -540,7 +554,7 @@ "key": "vipname13", "text": "秘书长" }, - "vip_lv_png": "icon_vip_dj12", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj12", "original_priceprice": { "a": "attr", @@ -572,10 +586,14 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20113, + 20212, + 20710, + 20807, + 20907, + 21007, + 20404, + 20504 ] }, { @@ -585,7 +603,7 @@ "key": "vipname14", "text": "执行会长" }, - "vip_lv_png": "icon_vip_dj13", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj13", "original_priceprice": { "a": "attr", @@ -617,10 +635,14 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20114, + 20213, + 20711, + 20808, + 20908, + 21008, + 20405, + 20505 ] }, { @@ -630,7 +652,7 @@ "key": "vipname15", "text": "商会主席" }, - "vip_lv_png": "icon_vip_dj14", + "vip_lv_png": "wp_icon_bydw02", "vip_lv_gift_png": "icon_vip_dj14", "original_priceprice": { "a": "attr", @@ -662,10 +684,14 @@ } ], "vip_privilege": [ - 1, - 2, - 3, - 4 + 20115, + 20214, + 20712, + 20809, + 20909, + 21009, + 20406, + 20506 ] } ] \ No newline at end of file diff --git a/comm/const.go b/comm/const.go index 471e5822c..16072e859 100644 --- a/comm/const.go +++ b/comm/const.go @@ -653,14 +653,14 @@ const ( // 特权类型 const ( - PrivilegeType1 = iota + 1 //每日获得 - PrivilegeType2 //金币商店每日免费刷新次数 - PrivilegeType3 //维京远征每日可购买挑战次数 - PrivilegeType4 //狩猎每日可购买挑战次数 - PrivilegeType5 //竞技场每日可购买挑战次数 - PrivilegeType6 //梦境每日可购买挑战次数 - PrivilegeType7 //巨怪商队背包容量 - PrivilegeType8 //美食馆每日最大制作时间 - PrivilegeType9 //武馆每日最大练功时间 - PrivilegeType10 //铁匠铺每日最大锻造时间 + PrivilegeType1 int32 = iota + 1 //每日获得 + PrivilegeType2 //金币商店每日免费刷新次数 + PrivilegeType3 //维京远征每日可购买挑战次数 + PrivilegeType4 //狩猎每日可购买挑战次数 + PrivilegeType5 //竞技场每日可购买挑战次数 + PrivilegeType6 //梦境每日可购买挑战次数 + PrivilegeType7 //巨怪商队背包容量 + PrivilegeType8 //美食馆每日最大制作时间 + PrivilegeType9 //武馆每日最大练功时间 + PrivilegeType10 //铁匠铺每日最大锻造时间 ) diff --git a/comm/imodule.go b/comm/imodule.go index 63d636a6e..fabdb5fcb 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -290,6 +290,8 @@ type ( AddVipData(session IUserSession, oldVip, newVip int32) // 查询所有特权 key 对应comm.PrivilegeType1类型 CheckAllPrivilege(session IUserSession) map[int32]*pb.PrivilegeList + // 通过特权类型获取特权对应的增加数量 + GetCountByPrivilegeId(uid string, pId int32) (count int32) } //武馆 IMartialhall interface { diff --git a/modules/gourmet/module.go b/modules/gourmet/module.go index 86418be02..96459e2da 100644 --- a/modules/gourmet/module.go +++ b/modules/gourmet/module.go @@ -70,15 +70,11 @@ func (this *Gourmet) Reddot(session comm.IUserSession, rid ...comm.ReddotType) ( } func (this *Gourmet) CheckPoint20(uid string) bool { - cfgCom := this.configure.GetGlobalConf() // 获取总的下单时长 - if cfgCom == nil { - return false - } _gourmet, err := this.modelGourmet.getGourmetList(uid) if err != nil { return false } - if cfgCom.Gourmet < _gourmet.OrderCostTime { // 大于总时长是不允许的 + if _gourmet.OrderCostTime > 0 { return false } return true diff --git a/modules/hunting/api_buy.go b/modules/hunting/api_buy.go index 24f4706d2..0951c91e9 100644 --- a/modules/hunting/api_buy.go +++ b/modules/hunting/api_buy.go @@ -21,12 +21,13 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HuntingBuyReq) func (this *apiComp) Buy(session comm.IUserSession, req *pb.HuntingBuyReq) (code pb.ErrorCode, data proto.Message) { var ( - curByCount int32 - costRes *cfg.Gameatn // 门票atn 类型 只取T - mapData map[string]interface{} - szCostRes []*cfg.Gameatn // 购买累计消耗 - curCount int32 // 当前门票数量 - addCount int32 //获得数量 + curByCount int32 + costRes *cfg.Gameatn // 门票atn 类型 只取T + mapData map[string]interface{} + szCostRes []*cfg.Gameatn // 购买累计消耗 + curCount int32 // 当前门票数量 + addCount int32 //获得数量 + PrivilegeBuyCount int32 // 特权购买次数 ) mapData = make(map[string]interface{}, 0) code = this.BuyCheck(session, req) @@ -48,8 +49,10 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HuntingBuyReq) (code } else { curByCount = list.BuyCount } + + PrivilegeBuyCount = this.module.ModulePrivilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType4) curByCount += req.Count // 当前需要购买的数量 - if this.configure.GetMaxBuyChallengeCount() < curByCount { + if this.configure.GetMaxBuyChallengeCount()+PrivilegeBuyCount < curByCount { code = pb.ErrorCode_HuntingBuyMaxCount return } @@ -88,8 +91,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HuntingBuyReq) (code list.RecoveryTime = 0 } addCount += req.Count - if amount+addCount > conf.VikingNum { - code = pb.ErrorCode_VikingBuyMaxCount + if amount+addCount > conf.HuntingNum { + code = pb.ErrorCode_HuntingBuyMaxCount return } mapData["recoveryTime"] = list.RecoveryTime @@ -97,8 +100,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HuntingBuyReq) (code for i := list.BuyCount + 1; i <= curByCount; i++ { _cfg := this.configure.GetBuyChallengeCount(i) if _cfg == nil { - code = pb.ErrorCode_HuntingBuyMaxCount - return + // 取最后一条 + _cfg = this.configure.GetLastBuyChallenge() } szCostRes = append(szCostRes, _cfg.Need...) } diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go index 27092fadf..cd959e961 100644 --- a/modules/hunting/api_challenge.go +++ b/modules/hunting/api_challenge.go @@ -44,10 +44,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen code = pb.ErrorCode_HuntingNoChallengeCount return } - // if hunting.ChallengeCount > this.module.configure.GetGlobalConf().HuntingNum+hunting.BuyCount { - // code = pb.ErrorCode_HuntingMaxChallengeCount - // return - // } + cfgData := this.module.configure.GetHuntingBossConfigData(req.BossType, req.Difficulty) if cfgData == nil { code = pb.ErrorCode_ConfigNoFound diff --git a/modules/hunting/api_getlist.go b/modules/hunting/api_getlist.go index b7b4b733d..394709ff5 100644 --- a/modules/hunting/api_getlist.go +++ b/modules/hunting/api_getlist.go @@ -2,11 +2,14 @@ package hunting import ( "go_dreamfactory/comm" + "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" + "strconv" + "go.mongodb.org/mongo-driver/bson/primitive" "google.golang.org/protobuf/proto" ) @@ -28,7 +31,38 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe } list, err := this.module.modelHunting.getHuntingList(session.GetUserId()) - if err != nil { + if mgo.MongodbNil == err { + result := &pb.DBHunting{ + Id: primitive.NewObjectID().Hex(), + Uid: session.GetUserId(), + Boss: make(map[int32]int32), + BossTime: make(map[string]int32), + } + _cfg := this.module.configure.GetHuntingBossTypeConfigData() + for k := range _cfg { + result.Boss[k] = 0 + str := strconv.Itoa(int(k)) + "_1" + result.BossTime[str] = 0 + } + + this.module.modelHunting.Add(session.GetUserId(), result) + conf := this.module.configure.GetGlobalConf() + if conf == nil { + code = pb.ErrorCode_ConfigNoFound + return + } + iCont := conf.EnchantbossInitial + atn := conf.EnchantbossCos + if iCont > 0 { + + this.module.DispenseRes(session, []*cfg.Gameatn{&cfg.Gameatn{ + A: atn.A, + T: atn.T, + N: iCont, + }}, true) + } + } else if err != nil { + code = pb.ErrorCode_DBError return } diff --git a/modules/hunting/comp_configure.go b/modules/hunting/comp_configure.go index 052b03479..b389266d8 100644 --- a/modules/hunting/comp_configure.go +++ b/modules/hunting/comp_configure.go @@ -110,3 +110,17 @@ func (this *configureComp) GetMaxBuyChallengeCount() int32 { return 0 } + +// 获取最后一条数据 +func (this *configureComp) GetLastBuyChallenge() (data *cfg.GameHuntingChallengeData) { + if v, err := this.GetConfigure(game_challenge); err == nil { + if configure, ok := v.(*cfg.GameHuntingChallenge); ok && len(configure.GetDataList()) > 0 { + data = configure.GetDataList()[len(configure.GetDataList())-1] + return + } + } else { + log.Errorf("get game_challenge conf err:%v", err) + } + + return +} diff --git a/modules/hunting/model_hunting.go b/modules/hunting/model_hunting.go index e4ff20e75..b25d35e93 100644 --- a/modules/hunting/model_hunting.go +++ b/modules/hunting/model_hunting.go @@ -6,9 +6,7 @@ import ( "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/modules" "go_dreamfactory/pb" - "strconv" - "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/x/bsonx" ) @@ -35,27 +33,11 @@ func (this *modelHunting) modifyHuntingDataByObjId(uid string, data map[string]i // 获取列表信息 func (this *modelHunting) getHuntingList(uid string) (result *pb.DBHunting, err error) { - result = &pb.DBHunting{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Boss: make(map[int32]int32), - BossTime: make(map[string]int32), - } + result = &pb.DBHunting{} if err = this.Get(uid, result); err != nil && mgo.MongodbNil != err { - return } - if mgo.MongodbNil == err { - if len(result.Boss) == 0 { - _cfg := this.module.configure.GetHuntingBossTypeConfigData() - for k := range _cfg { - result.Boss[k] = 0 - str := strconv.Itoa(int(k)) + "_1" - result.BossTime[str] = 0 - } - } - this.Add(uid, result) - } + err = nil return result, err } diff --git a/modules/privilege/configure.go b/modules/privilege/configure.go index 1c3925791..9ffd4d210 100644 --- a/modules/privilege/configure.go +++ b/modules/privilege/configure.go @@ -3,8 +3,11 @@ package privilege import ( "fmt" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" + "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" + "sync" ) const ( @@ -15,7 +18,9 @@ const ( ///背包配置管理组件 type configureComp struct { modules.MCompConfigure - module *Privilege + module *Privilege + hlock sync.RWMutex + _privilegeMap map[int32]map[int32]int32 } //组件初始化接口 @@ -24,6 +29,25 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp this.module = module.(*Privilege) this.LoadConfigure(game_privilegecard, cfg.NewGamePrivilegeCard) this.LoadConfigure(game_privilege, cfg.NewGamePrivilege) + this._privilegeMap = make(map[int32]map[int32]int32, 0) + configure.RegisterConfigure(game_privilege, cfg.NewGamePrivilege, func() { + if v, err := this.GetConfigure(game_privilege); err == nil { + if configure, ok := v.(*cfg.GamePrivilege); ok { + this.hlock.Lock() + defer this.hlock.Unlock() + for k, v := range configure.GetDataMap() { + if v1, ok := this._privilegeMap[v.PrivilegeType]; ok { + v1[k] = v.PrivilegeParameter + } else { + this._privilegeMap[v.PrivilegeType] = make(map[int32]int32) + } + } + return + } + } + log.Errorf("get game_pagoda conf err:%v", err) + return + }) return } @@ -59,3 +83,11 @@ func (this *configureComp) GetPrivilegeData(id int32) (result *cfg.GamePrivilege this.module.Errorf("GetPrivilegeData err, id:%d", id) return nil } + +func (this *configureComp) GetPrivilegeByType(iType int32) (result map[int32]int32) { + result = make(map[int32]int32) + if v, ok := this._privilegeMap[iType]; ok { + result = v + } + return result +} diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 41152e5a3..3e66edb1d 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -401,3 +401,18 @@ func (this *Privilege) SendDailyPrivilegeMail(session comm.IUserSession, cId []i this.mail.SendMailByCid(session, comm.VipDaily, res) } } +func (this *Privilege) GetCountByPrivilegeId(uid string, pId int32) (count int32) { + vip, err := this.modelVip.getVipList(uid) + if err != nil { + return + } + if v, ok := vip.Privilege[pId]; ok { + data := this.configure.GetPrivilegeByType(pId) + for _, v1 := range v.PrivilegeID { + if c, ok1 := data[v1]; ok1 { + count += c + } + } + } + return +} diff --git a/modules/viking/api_buy.go b/modules/viking/api_buy.go index 560b8653f..0e591d915 100644 --- a/modules/viking/api_buy.go +++ b/modules/viking/api_buy.go @@ -69,7 +69,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.VikingBuyReq) (code if list.RecoveryTime+int64(conf.VikingExpeditionRecoveryTime*60) <= configure.Now().Unix() { curCount++ list.RecoveryTime += int64(conf.VikingExpeditionRecoveryTime * 60) - if curCount >= conf.HuntingNum { + if curCount >= conf.VikingNum { list.RecoveryTime = 0 break } diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go index 3237ecc07..765cfed0c 100644 --- a/modules/viking/api_getlist.go +++ b/modules/viking/api_getlist.go @@ -63,7 +63,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq if list.RecoveryTime+int64(conf.VikingExpeditionRecoveryTime*60) <= configure.Now().Unix() { curCount++ list.RecoveryTime += int64(conf.VikingExpeditionRecoveryTime * 60) - if curCount >= conf.HuntingNum { + if curCount >= conf.VikingNum { list.RecoveryTime = 0 break } diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go index 2b7a6f648..02104d29e 100644 --- a/pb/battle_db.pb.go +++ b/pb/battle_db.pb.go @@ -267,6 +267,7 @@ type BattleRole struct { EquipSkill []*SkillData `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"normalSkill"` //普通技能 Property map[string]int32 `protobuf:"bytes,12,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关 Ishelp bool `protobuf:"varint,13,opt,name=ishelp,proto3" json:"ishelp"` //是否是助战英雄 + Isboos bool `protobuf:"varint,14,opt,name=isboos,proto3" json:"isboos"` //是否是boos } func (x *BattleRole) Reset() { @@ -392,6 +393,13 @@ func (x *BattleRole) GetIshelp() bool { return false } +func (x *BattleRole) GetIsboos() bool { + if x != nil { + return x.Isboos + } + return false +} + //战斗阵型信息 type DBBattleFormt struct { state protoimpl.MessageState @@ -605,7 +613,7 @@ var File_battle_battle_db_proto protoreflect.FileDescriptor var file_battle_battle_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd2, 0x03, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xea, 0x03, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, @@ -630,68 +638,69 @@ var file_battle_battle_db_proto_rawDesc = []byte{ 0x19, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x1a, 0x3b, 0x0a, 0x0d, - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9e, 0x01, 0x0a, 0x0d, 0x44, 0x42, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, - 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, - 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, - 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x25, 0x0a, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, - 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x2b, 0x0a, - 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x0a, - 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xa7, 0x03, 0x0a, 0x0e, 0x44, - 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, - 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, - 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, - 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, - 0x23, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, - 0x2e, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, - 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, - 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, - 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, - 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, - 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, 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, 0x12, 0x2f, 0x0a, 0x0b, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, - 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, - 0x52, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, - 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, - 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, - 0x73, 0x75, 0x6c, 0x74, 0x2a, 0x39, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, - 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, - 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, - 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x2a, - 0xa6, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, - 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, - 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, - 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, - 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, - 0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, - 0x12, 0x0b, 0x0a, 0x07, 0x61, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a, - 0x0c, 0x68, 0x65, 0x72, 0x6f, 0x74, 0x65, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12, - 0x0a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65, - 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x10, 0x0b, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, - 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, - 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, - 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x12, 0x16, 0x0a, 0x06, + 0x69, 0x73, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, + 0x62, 0x6f, 0x6f, 0x73, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0x9e, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, + 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, + 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x25, + 0x0a, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x07, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x2b, 0x0a, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, + 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, + 0x61, 0x6d, 0x22, 0xa7, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, + 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, + 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, + 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, + 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, + 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, + 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, + 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, + 0x6d, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, + 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, + 0x69, 0x73, 0x74, 0x18, 0x0a, 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, 0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, + 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2a, 0x39, 0x0a, 0x0a, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, + 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, + 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, 0x07, + 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x2a, 0xa6, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, + 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, + 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, + 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, + 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, + 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, + 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x61, 0x63, 0x61, 0x64, + 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a, 0x0c, 0x68, 0x65, 0x72, 0x6f, 0x74, 0x65, 0x61, + 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12, 0x0a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x62, 0x61, + 0x74, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x10, 0x0b, + 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, + 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, + 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, + 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, + 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go index 81d043b86..09010e6d1 100644 --- a/pb/battle_msg.pb.go +++ b/pb/battle_msg.pb.go @@ -452,13 +452,14 @@ type BattleInfo struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //战斗id Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title"` //战斗标题 - Btype BattleType `protobuf:"varint,3,opt,name=btype,proto3,enum=BattleType" json:"btype"` //战斗类型 - Ptype PlayType `protobuf:"varint,4,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` //玩法类型 - RedCompId string `protobuf:"bytes,5,opt,name=redCompId,proto3" json:"redCompId"` //红方阵营id - Redflist []*DBBattleFormt `protobuf:"bytes,6,rep,name=redflist,proto3" json:"redflist"` //红方阵型列表 - BlueCompId string `protobuf:"bytes,7,opt,name=blueCompId,proto3" json:"blueCompId"` //蓝方阵营id - Buleflist []*DBBattleFormt `protobuf:"bytes,8,rep,name=buleflist,proto3" json:"buleflist"` //红方阵型列表 - Tasks []int32 `protobuf:"varint,9,rep,packed,name=tasks,proto3" json:"tasks"` //任务列表 + Scene string `protobuf:"bytes,3,opt,name=scene,proto3" json:"scene"` //战斗场景 + Btype BattleType `protobuf:"varint,4,opt,name=btype,proto3,enum=BattleType" json:"btype"` //战斗类型 + Ptype PlayType `protobuf:"varint,5,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` //玩法类型 + RedCompId string `protobuf:"bytes,6,opt,name=redCompId,proto3" json:"redCompId"` //红方阵营id + Redflist []*DBBattleFormt `protobuf:"bytes,7,rep,name=redflist,proto3" json:"redflist"` //红方阵型列表 + BlueCompId string `protobuf:"bytes,8,opt,name=blueCompId,proto3" json:"blueCompId"` //蓝方阵营id + Buleflist []*DBBattleFormt `protobuf:"bytes,9,rep,name=buleflist,proto3" json:"buleflist"` //红方阵型列表 + Tasks []int32 `protobuf:"varint,10,rep,packed,name=tasks,proto3" json:"tasks"` //任务列表 } func (x *BattleInfo) Reset() { @@ -507,6 +508,13 @@ func (x *BattleInfo) GetTitle() string { return "" } +func (x *BattleInfo) GetScene() string { + if x != nil { + return x.Scene + } + return "" +} + func (x *BattleInfo) GetBtype() BattleType { if x != nil { return x.Btype @@ -860,51 +868,53 @@ var file_battle_battle_msg_proto_rawDesc = []byte{ 0x52, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2d, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, - 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xa4, 0x02, 0x0a, 0x0a, 0x42, + 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xba, 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, 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, - 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, - 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, - 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, - 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, - 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, - 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, - 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, - 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 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, 0x12, 0x14, 0x0a, 0x05, 0x74, - 0x61, 0x73, 0x6b, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, - 0x73, 0x22, 0x3b, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x12, 0x18, - 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xb5, - 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 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, 0x66, 0x6f, - 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x05, - 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22, - 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, - 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63, - 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, - 0x73, 0x6b, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, - 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, - 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, - 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x14, 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x73, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, + 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, + 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, + 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, + 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, + 0x69, 0x73, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, + 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, + 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, + 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, + 0x18, 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, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3b, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x43, 0x6d, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x22, 0xb5, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x65, 0x70, 0x6f, 0x72, 0x74, 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, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, + 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, + 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, + 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, + 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x66, 0x0a, 0x10, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, + 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, + 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var (