From bdf05951c8822d37dda0f6ab324f4e440f0a200f Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 15 Nov 2022 19:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_worldbattle.json | 14 +- bin/json/game_worldtask.json | 454 +++++++++--------- modules/worldtask/api_finish.go | 1 + modules/worldtask/model_worldtask.go | 14 +- modules/worldtask/module.go | 9 + pb/errorcode.pb.go | 244 +++++----- sys/configure/structs/Game.WorldBattleData.go | 51 +- sys/configure/structs/Game.WorldTaskData.go | 34 +- 8 files changed, 396 insertions(+), 425 deletions(-) diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index d11f56962..f844192f9 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -4,11 +4,13 @@ "FormatList": [ 700011 ], - "captainId": "250011", - "buff": [], - "battlestory": [], - "teammate": [], - "numberofteam": 0, - "battleteam": [] + "DefaultHero": 700011, + "SelectableHero": [], + "LockSlots": [ + 3, + 4 + ], + "AssistTeam": 101011, + "EventList": [] } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index f3fb3a6be..c0360a819 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -12,7 +12,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "600" + "150" ], "getafter_event": [ 2, @@ -33,13 +33,8 @@ "n": 1 } ], - "day": [ - "day|night" - ], - "weather": [ - 2, - 1 - ] + "day": "night", + "weather": 2 }, { "key": 10101, @@ -54,7 +49,7 @@ "npc": [ "scenes_ boundary_02", "邦尼兔组件名", - "601" + "150" ], "getafter_event": [ 2, @@ -70,8 +65,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10102, @@ -86,7 +81,7 @@ "npc": [ "dreamwork_restaurant_01", "波比组件名", - "602" + "140" ], "getafter_event": [ 2, @@ -102,8 +97,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10103, @@ -118,7 +113,7 @@ "npc": [ "dreamwork_restaurant_01", "阿宝组件名", - "603" + "140" ], "getafter_event": [ 2, @@ -134,8 +129,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10104, @@ -150,7 +145,7 @@ "npc": [ "dreamwork_restaurant_01", "波比组件名", - "604" + "140" ], "getafter_event": [ 2, @@ -171,8 +166,8 @@ "n": 10 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10105, @@ -187,7 +182,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "605" + "150" ], "getafter_event": [ 2, @@ -203,8 +198,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10106, @@ -219,7 +214,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "606" + "150" ], "getafter_event": [ 2, @@ -235,8 +230,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10107, @@ -251,7 +246,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "607" + "150" ], "getafter_event": [ 2, @@ -267,8 +262,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10108, @@ -283,7 +278,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "608" + "150" ], "getafter_event": [ 2, @@ -299,8 +294,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10109, @@ -315,7 +310,7 @@ "npc": [ "scenes_ boundary_02", "戈伯组件名", - "609" + "153" ], "getafter_event": [ 2, @@ -331,8 +326,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10110, @@ -347,7 +342,7 @@ "npc": [ "SmithyScene", "戈伯铁匠铺组件名", - "610" + "139" ], "getafter_event": [ 2, @@ -363,8 +358,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10111, @@ -379,7 +374,7 @@ "npc": [ "scenes_ boundary_02", "阿宝右屏组件名", - "611" + "153" ], "getafter_event": [ 2, @@ -395,8 +390,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10112, @@ -411,7 +406,7 @@ "npc": [ "scenes_ boundary_02", "瓜哥组件名", - "612" + "153" ], "getafter_event": [ 2, @@ -427,8 +422,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10113, @@ -443,7 +438,7 @@ "npc": [ "test_library", "贫嘴驴组件名", - "613" + "146" ], "getafter_event": [ 2, @@ -459,8 +454,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10114, @@ -475,7 +470,7 @@ "npc": [ "test_library", "贫嘴驴组件名", - "614" + "146" ], "getafter_event": [ 2, @@ -491,8 +486,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10115, @@ -507,7 +502,7 @@ "npc": [ "scenes_boundary_02night", "阿宝组件名", - "615" + "153" ], "getafter_event": [ 2, @@ -523,8 +518,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10116, @@ -539,7 +534,7 @@ "npc": [ "scenes_boundary_02night", "阿宝组件名", - "616" + "150" ], "getafter_event": [ 2, @@ -555,8 +550,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10117, @@ -571,7 +566,7 @@ "npc": [ "scenes_ boundary_02", "瓜哥组件名", - "617" + "150" ], "getafter_event": [ 2, @@ -587,8 +582,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10118, @@ -603,7 +598,7 @@ "npc": [ "scenes_ boundary_02", "瓜哥组件名", - "618" + "150" ], "getafter_event": [ 2, @@ -619,8 +614,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10119, @@ -635,7 +630,7 @@ "npc": [ "scenes_ boundary_02", "阿宝维京区", - "619" + "151" ], "getafter_event": [ 2, @@ -651,8 +646,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10120, @@ -667,7 +662,7 @@ "npc": [ "scenes_ boundary_02", "阿宝维京区", - "620" + "151" ], "getafter_event": [ 2, @@ -683,8 +678,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10121, @@ -699,7 +694,7 @@ "npc": [ "scenes_ boundary_02", "阿宝维京区", - "621" + "151" ], "getafter_event": [ 2, @@ -715,8 +710,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10122, @@ -731,7 +726,7 @@ "npc": [ "scenes_ boundary_02", "阿宝维京区", - "622" + "151" ], "getafter_event": [ 2, @@ -747,8 +742,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10123, @@ -763,7 +758,7 @@ "npc": [ "scenes_ boundary_02", "阿宝维京区", - "623" + "151" ], "getafter_event": [ 2, @@ -779,8 +774,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10124, @@ -811,8 +806,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10125, @@ -843,8 +838,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10126, @@ -875,8 +870,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10127, @@ -907,8 +902,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10128, @@ -939,8 +934,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10129, @@ -971,8 +966,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10130, @@ -1003,8 +998,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10131, @@ -1019,7 +1014,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "631" + "151" ], "getafter_event": [ 2, @@ -1035,8 +1030,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10132, @@ -1051,7 +1046,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "632" + "151" ], "getafter_event": [ 2, @@ -1067,8 +1062,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10133, @@ -1083,7 +1078,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "633" + "151" ], "getafter_event": [ 2, @@ -1099,8 +1094,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10134, @@ -1115,7 +1110,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "634" + "151" ], "getafter_event": [ 2, @@ -1131,8 +1126,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10135, @@ -1147,7 +1142,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "635" + "151" ], "getafter_event": [ 2, @@ -1163,8 +1158,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10136, @@ -1179,7 +1174,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "636" + "152" ], "getafter_event": [ 2, @@ -1195,8 +1190,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10137, @@ -1211,7 +1206,7 @@ "npc": [ "WuGuanScene", "阿宝组件名", - "637" + "137" ], "getafter_event": [ 2, @@ -1227,8 +1222,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10138, @@ -1243,7 +1238,7 @@ "npc": [ "WuGuanScene", "阿宝组件名", - "638" + "137" ], "getafter_event": [ 2, @@ -1259,8 +1254,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10139, @@ -1275,7 +1270,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "639" + "152" ], "getafter_event": [ 2, @@ -1291,8 +1286,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10140, @@ -1307,7 +1302,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "640" + "152" ], "getafter_event": [ 2, @@ -1323,8 +1318,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10141, @@ -1339,7 +1334,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "641" + "152" ], "getafter_event": [ 2, @@ -1355,8 +1350,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10142, @@ -1371,7 +1366,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "642" + "152" ], "getafter_event": [ 2, @@ -1387,8 +1382,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10143, @@ -1403,7 +1398,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "643" + "152" ], "getafter_event": [ 2, @@ -1419,8 +1414,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10144, @@ -1435,7 +1430,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "644" + "152" ], "getafter_event": [ 2, @@ -1451,8 +1446,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10145, @@ -1467,7 +1462,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "645" + "152" ], "getafter_event": [ 2, @@ -1483,8 +1478,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10146, @@ -1499,7 +1494,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "646" + "150" ], "getafter_event": [ 2, @@ -1515,8 +1510,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10147, @@ -1531,7 +1526,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "647" + "150" ], "getafter_event": [ 2, @@ -1547,8 +1542,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10148, @@ -1563,7 +1558,7 @@ "npc": [ "scenes_ boundary_02", "阿宝组件名", - "648" + "150" ], "getafter_event": [ 2, @@ -1579,8 +1574,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10149, @@ -1594,7 +1589,8 @@ "task_display": "新剧情文本10149", "npc": [ "scenes_ boundary_02", - "波比组件名" + "波比组件名", + "150" ], "getafter_event": [ 2, @@ -1610,8 +1606,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10150, @@ -1625,7 +1621,8 @@ "task_display": "新剧情文本10150", "npc": [ "scenes_ boundary_02", - "波比组件名" + "波比组件名", + "150" ], "getafter_event": [ 2, @@ -1641,8 +1638,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10151, @@ -1656,7 +1653,8 @@ "task_display": "新剧情文本10151", "npc": [ "scenes_ boundary_02", - "杰克组件名" + "杰克组件名", + "150" ], "getafter_event": [ 2, @@ -1672,8 +1670,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10152, @@ -1703,8 +1701,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10153, @@ -1734,8 +1732,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10154, @@ -1765,8 +1763,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10155, @@ -1796,8 +1794,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10156, @@ -1827,8 +1825,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10157, @@ -1858,8 +1856,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10158, @@ -1889,8 +1887,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10159, @@ -1920,8 +1918,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10160, @@ -1951,8 +1949,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10161, @@ -1982,8 +1980,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10162, @@ -2013,8 +2011,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10163, @@ -2044,8 +2042,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10164, @@ -2075,14 +2073,14 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 10165, "lock": 1, "ontxe": 10164, - "id_after": 10166, + "id_after": 0, "group": 1, "des": 2, "icon": "", @@ -2106,8 +2104,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20001, @@ -2143,13 +2141,8 @@ "n": 1 } ], - "day": [ - "day|night" - ], - "weather": [ - 2, - 1 - ] + "day": "night", + "weather": 2 }, { "key": 20002, @@ -2180,8 +2173,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20003, @@ -2212,8 +2205,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20004, @@ -2244,8 +2237,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20005, @@ -2281,8 +2274,8 @@ "n": 10 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20006, @@ -2313,8 +2306,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20007, @@ -2345,8 +2338,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20008, @@ -2377,8 +2370,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20009, @@ -2409,8 +2402,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20010, @@ -2441,8 +2434,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20011, @@ -2478,13 +2471,8 @@ "n": 1 } ], - "day": [ - "day|night" - ], - "weather": [ - 2, - 1 - ] + "day": "night", + "weather": 2 }, { "key": 20012, @@ -2515,8 +2503,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20013, @@ -2547,8 +2535,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20014, @@ -2579,8 +2567,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20015, @@ -2616,8 +2604,8 @@ "n": 10 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20016, @@ -2648,8 +2636,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20017, @@ -2680,8 +2668,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20018, @@ -2712,8 +2700,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20019, @@ -2744,8 +2732,8 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 }, { "key": 20020, @@ -2776,7 +2764,7 @@ "n": 100 } ], - "day": [], - "weather": [] + "day": "", + "weather": 0 } ] \ No newline at end of file diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 27ce56b2a..9c0b965fb 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -60,6 +60,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe // 前置任务ID if !this.module.modelWorldtask.IsPreFinished(userTask, curTaskConf) { + this.module.Warnf("前置任务未完成 uid:%v preTaskId:%v taskId:", uid, curTaskConf.Ontxe, curTaskConf.Key) code = pb.ErrorCode_WorldtaskLastUnFinished return } diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index 171d87540..ebf2535e6 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -4,6 +4,7 @@ import ( "errors" "go_dreamfactory/comm" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" @@ -86,5 +87,16 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta update["taskList"] = task.TaskList update["lastTaskIds"] = task.LastTaskIds - return this.Change(task.Uid, update) + if err := this.Change(task.Uid, update); err != nil { + return err + } + + if module, err := this.service.GetModule(comm.ModuleLinestory); err == nil { + if iLinestory, ok := module.(comm.ILinestory); ok { + if err := iLinestory.TaskFinishNotify(task.Uid, taskId, groupId); err != nil { + log.Errorf("任务完成通知失败 groupId:%v taskId:%v err:%v", groupId, taskId, err) + } + } + } + return nil } diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 93b219217..dbf86ea85 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -129,6 +129,15 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e return nil } +// 获取我的世界任务 +func (this *Worldtask) GetMyWorldtask(uid string) *pb.DBWorldtask { + wt, err := this.modelWorldtask.getWorldtask(uid) + if err != nil { + log.Errorf("GetMyWorldtask err:%v", err) + } + return wt +} + // bingo世界任务跳跃 支持回退 func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId int32) error { uid := session.GetUserId() diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 2b0799b5c..b39da82c3 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -20,6 +20,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// go:generate stringer -type ErrorCode -linecomment type ErrorCode int32 const ( @@ -182,9 +183,9 @@ const ( ErrorCode_MoonfantasyNotEnoughbattles ErrorCode = 2407 // boos 挑战次数不足 ErrorCode_BattleNoFoundRecord ErrorCode = 2501 // 未找到记录 ErrorCode_LinestoryTaskFinished ErrorCode = 2601 //任务已完成 - ErrorCode_LinestorySubTaskFinished ErrorCode = 2602 //子任务已完成 + ErrorCode_LinestoryNoReceive ErrorCode = 2602 //章节奖励不能领取 ErrorCode_LinestoryTaskDisabledEnter ErrorCode = 2603 //禁止进入 - ErrorCode_LinestoryPreTaskNoFinished ErrorCode = 2604 //前置任务未完成 + ErrorCode_LinestoryChapterNoOpen ErrorCode = 2604 //章节未开启 // hunting ErrorCode_HuntingLvErr ErrorCode = 2701 // 关卡难度不匹配 ErrorCode_HuntingBoosType ErrorCode = 2702 // BOSS 类型不对 @@ -267,7 +268,7 @@ const ( ErrorCode_WorldtaskNoComplete ErrorCode = 3804 //任务条件未完成 ErrorCode_WorldtaskFinihed ErrorCode = 3805 //任务已完成 ErrorCode_WorldtaskLastUnFinished ErrorCode = 3806 //上个任务未完成 - //academy + // academy ErrorCode_AcademyTaskNoCompleteTask ErrorCode = 3901 //未完成任务 ) @@ -418,9 +419,9 @@ var ( 2407: "MoonfantasyNotEnoughbattles", 2501: "BattleNoFoundRecord", 2601: "LinestoryTaskFinished", - 2602: "LinestorySubTaskFinished", + 2602: "LinestoryNoReceive", 2603: "LinestoryTaskDisabledEnter", - 2604: "LinestoryPreTaskNoFinished", + 2604: "LinestoryChapterNoOpen", 2701: "HuntingLvErr", 2702: "HuntingBoosType", 2703: "HuntingBuyMaxCount", @@ -638,9 +639,9 @@ var ( "MoonfantasyNotEnoughbattles": 2407, "BattleNoFoundRecord": 2501, "LinestoryTaskFinished": 2601, - "LinestorySubTaskFinished": 2602, + "LinestoryNoReceive": 2602, "LinestoryTaskDisabledEnter": 2603, - "LinestoryPreTaskNoFinished": 2604, + "LinestoryChapterNoOpen": 2604, "HuntingLvErr": 2701, "HuntingBoosType": 2702, "HuntingBuyMaxCount": 2703, @@ -746,7 +747,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xf1, 0x26, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xe7, 0x26, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -945,120 +946,119 @@ var file_errorcode_proto_rawDesc = []byte{ 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, - 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x53, 0x75, 0x62, - 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xaa, 0x14, 0x12, - 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, - 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, - 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, - 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xac, - 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, - 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, - 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, - 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, - 0x90, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, - 0x4c, 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, - 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, - 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, - 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12, 0x11, 0x0a, - 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, - 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, - 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x11, 0x0a, - 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0xbb, 0x17, - 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, - 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, - 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, - 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, - 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, - 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x10, 0xba, 0xea, 0x01, 0x12, 0x16, 0x0a, - 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, - 0x65, 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, - 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, - 0x10, 0xbd, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, - 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, - 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, - 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, - 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, - 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, - 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, - 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, - 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, 0x65, 0x6c, 0x10, 0xc8, 0xea, 0x01, - 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, - 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, 0x0a, - 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, - 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, - 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, - 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, - 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, - 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, 0x01, - 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, - 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, - 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, - 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, - 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, - 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, - 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, - 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, - 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, - 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, - 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, - 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, - 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, - 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, - 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, - 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, - 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, - 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, - 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, - 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, - 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, - 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, - 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, - 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, - 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, - 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x14, 0x0a, - 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, - 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, - 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, - 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, - 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, - 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, - 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, - 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, - 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, - 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, - 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, - 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, + 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, + 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, + 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, + 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, + 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, + 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, + 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, + 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, + 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, + 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, + 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, + 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x13, + 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, + 0x10, 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, + 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, + 0x10, 0xba, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, + 0x70, 0x6c, 0x79, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, + 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, + 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x13, + 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x10, + 0xba, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, + 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, + 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, + 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, + 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, + 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, + 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, + 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, + 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, + 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, + 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, + 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, 0x01, 0x12, 0x17, 0x0a, + 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, + 0x65, 0x6c, 0x10, 0xc8, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, 0x0a, + 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, + 0xca, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, + 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, 0x01, + 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, + 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, 0x0a, + 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, + 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xcf, + 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, + 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, + 0x65, 0x64, 0x10, 0xd1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, + 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, + 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, + 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, + 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, + 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, + 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, + 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, + 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, + 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, + 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, + 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, + 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, + 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, + 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, + 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, + 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, + 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, + 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, + 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, + 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, + 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, + 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, + 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, + 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, + 0x10, 0xf6, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, + 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, + 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, + 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, + 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, + 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, + 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, + 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, + 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go index a5b4ab575..3b5c89f30 100644 --- a/sys/configure/structs/Game.WorldBattleData.go +++ b/sys/configure/structs/Game.WorldBattleData.go @@ -13,12 +13,11 @@ import "errors" type GameWorldBattleData struct { Id int32 FormatList []int32 - CaptainId string - Buff []int32 - Battlestory []int32 - Teammate []int32 - Numberofteam int32 - Battleteam []int32 + DefaultHero int32 + SelectableHero []string + LockSlots []int32 + AssistTeam int32 + EventList []int32 } const TypeId_GameWorldBattleData = 1096332216 @@ -43,61 +42,47 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro } } - { var _ok_ bool; if _v.CaptainId, _ok_ = _buf["captainId"].(string); !_ok_ { err = errors.New("captainId error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["buff"].([]interface{}); !_ok_ { err = errors.New("buff error"); return } + if _arr_, _ok_ = _buf["SelectableHero"].([]interface{}); !_ok_ { err = errors.New("SelectableHero error"); return } - _v.Buff = make([]int32, 0, len(_arr_)) + _v.SelectableHero = make([]string, 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.Buff = append(_v.Buff, _list_v_) + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.SelectableHero = append(_v.SelectableHero, _list_v_) } } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["battlestory"].([]interface{}); !_ok_ { err = errors.New("battlestory error"); return } + if _arr_, _ok_ = _buf["LockSlots"].([]interface{}); !_ok_ { err = errors.New("LockSlots error"); return } - _v.Battlestory = make([]int32, 0, len(_arr_)) + _v.LockSlots = 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.Battlestory = append(_v.Battlestory, _list_v_) + _v.LockSlots = append(_v.LockSlots, _list_v_) } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AssistTeam"].(float64); !_ok_ { err = errors.New("AssistTeam error"); return }; _v.AssistTeam = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["teammate"].([]interface{}); !_ok_ { err = errors.New("teammate error"); return } + if _arr_, _ok_ = _buf["EventList"].([]interface{}); !_ok_ { err = errors.New("EventList error"); return } - _v.Teammate = make([]int32, 0, len(_arr_)) + _v.EventList = 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.Teammate = append(_v.Teammate, _list_v_) - } - } - - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["numberofteam"].(float64); !_ok_ { err = errors.New("numberofteam error"); return }; _v.Numberofteam = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["battleteam"].([]interface{}); !_ok_ { err = errors.New("battleteam error"); return } - - _v.Battleteam = 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.Battleteam = append(_v.Battleteam, _list_v_) + _v.EventList = append(_v.EventList, _list_v_) } } diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index de79b13f6..30ab22698 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -26,8 +26,8 @@ type GameWorldTaskData struct { AutoAccept int32 Overtips int32 Reword []*Gameatn - Day []string - Weather []int32 + Day string + Weather int32 } const TypeId_GameWorldTaskData = -1059668091 @@ -91,34 +91,8 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["day"].([]interface{}); !_ok_ { err = errors.New("day error"); return } - - _v.Day = make([]string, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } - _v.Day = append(_v.Day, _list_v_) - } - } - - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["weather"].([]interface{}); !_ok_ { err = errors.New("weather error"); return } - - _v.Weather = 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.Weather = append(_v.Weather, _list_v_) - } - } - + { var _ok_ bool; if _v.Day, _ok_ = _buf["day"].(string); !_ok_ { err = errors.New("day error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weather"].(float64); !_ok_ { err = errors.New("weather error"); return }; _v.Weather = int32(_tempNum_) } return }