From 4953b4e5453afb7e2ba058cd33127348dac237a2 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Thu, 17 Nov 2022 20:32:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E7=BA=BF=E5=89=A7=E6=83=85=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_linestorymaintask.json | 80 ++- bin/json/game_linestorytimeline.json | 8 + bin/json/game_worldtask.json | 616 ++++-------------- modules/linestory/model_linestory.go | 21 +- modules/linestory/module.go | 48 +- modules/sociaty/module.go | 17 +- modules/worldtask/api_battlestart.go | 6 +- modules/worldtask/api_finish.go | 25 +- modules/worldtask/model_worldtask.go | 2 +- modules/worldtask/module.go | 27 +- pb/errorcode.pb.go | 225 +++---- .../structs/Game.LinestoryMainTaskData.go | 10 +- .../structs/Game.LinestoryTimeLineData.go | 2 + 13 files changed, 430 insertions(+), 657 deletions(-) diff --git a/bin/json/game_linestorymaintask.json b/bin/json/game_linestorymaintask.json index 2773db391..dbc2e50cd 100644 --- a/bin/json/game_linestorymaintask.json +++ b/bin/json/game_linestorymaintask.json @@ -1,120 +1,180 @@ [ { "id": 20001, - "group": 10001, "subTask": 0, + "nodeIndex": 0, + "order": "1", + "group": 10001, "name": { "key": "SubplotMainTask_20001", "text": "让阿宝变强1" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强1" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20002, - "group": 10001, "subTask": 20001, + "nodeIndex": 1, + "order": "2", + "group": 10001, "name": { "key": "SubplotMainTask_20002", "text": "让阿宝变强2" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强2" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20003, + "subTask": 20001, + "nodeIndex": 1, + "order": "3", "group": 10001, - "subTask": 20002, "name": { "key": "SubplotMainTask_20003", "text": "让阿宝变强3" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强3" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20004, - "group": 10001, "subTask": 20003, + "nodeIndex": 2, + "order": "4", + "group": 10001, "name": { "key": "SubplotMainTask_20004", "text": "让阿宝变强4" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强4" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20005, + "subTask": 20002, + "nodeIndex": 2, + "order": "5", "group": 10001, - "subTask": 20004, "name": { "key": "SubplotMainTask_20005", "text": "让阿宝变强5" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强5" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20006, - "group": 10001, "subTask": 20005, + "nodeIndex": 3, + "order": "6", + "group": 10001, "name": { "key": "SubplotMainTask_20006", "text": "让阿宝变强6" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强6" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20007, - "group": 10001, "subTask": 20006, + "nodeIndex": 4, + "order": "7", + "group": 10001, "name": { "key": "SubplotMainTask_20007", "text": "让阿宝变强7" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强7" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20008, - "group": 10001, "subTask": 20007, + "nodeIndex": 5, + "order": "8", + "group": 10001, "name": { "key": "SubplotMainTask_20008", "text": "让阿宝变强8" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强8" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20009, - "group": 10001, "subTask": 20008, + "nodeIndex": 6, + "order": "9", + "group": 10001, "name": { "key": "SubplotMainTask_20009", "text": "让阿宝变强9" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强9" + }, "img": "", "ending": 0, "resetto": [] }, { "id": 20010, - "group": 10001, "subTask": 20009, + "nodeIndex": 7, + "order": "10", + "group": 10001, "name": { "key": "SubplotMainTask_20010", "text": "让阿宝变强10" }, + "describe": { + "key": "SubplotMainTask_10001", + "text": "让阿宝变强10" + }, "img": "", "ending": 1, "resetto": [] diff --git a/bin/json/game_linestorytimeline.json b/bin/json/game_linestorytimeline.json index 9217cc998..33ce6cf80 100644 --- a/bin/json/game_linestorytimeline.json +++ b/bin/json/game_linestorytimeline.json @@ -1,6 +1,7 @@ [ { "group": 10001, + "order": "1", "nodeIndex": 0, "cond": [], "name": { @@ -23,6 +24,7 @@ }, { "group": 10002, + "order": "2", "nodeIndex": 1, "cond": [ 10001 @@ -47,6 +49,7 @@ }, { "group": 10003, + "order": "3", "nodeIndex": 1, "cond": [ 10001 @@ -71,6 +74,7 @@ }, { "group": 10004, + "order": "4", "nodeIndex": 2, "cond": [ 10003 @@ -95,6 +99,7 @@ }, { "group": 10005, + "order": "5", "nodeIndex": 2, "cond": [ 10003 @@ -119,6 +124,7 @@ }, { "group": 10006, + "order": "6", "nodeIndex": 3, "cond": [ 10005 @@ -143,6 +149,7 @@ }, { "group": 10007, + "order": "7", "nodeIndex": 4, "cond": [ 10006 @@ -167,6 +174,7 @@ }, { "group": 10008, + "order": "8", "nodeIndex": 5, "cond": [ 10007 diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 36e69a8b6..1ce883390 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -19,7 +19,7 @@ 100001 ], "completetask": 0, - "auto_accept": 1, + "auto_accept": 0, "overtips": 1, "reword": [ { @@ -33,8 +33,8 @@ "n": 1 } ], - "day": "night", - "weather": 2 + "day": "", + "weather": 0 }, { "key": 10101, @@ -191,13 +191,7 @@ "completetask": 118, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -223,15 +217,9 @@ "completetask": 174, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", - "weather": 2 + "reword": [], + "day": "", + "weather": 0 }, { "key": 10107, @@ -255,15 +243,9 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", - "weather": 2 + "reword": [], + "day": "", + "weather": 0 }, { "key": 10108, @@ -287,14 +269,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "", "weather": 0 }, { @@ -319,14 +295,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "", "weather": 0 }, { @@ -351,14 +321,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "", "weather": 0 }, { @@ -383,14 +347,8 @@ "completetask": 175, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "", "weather": 0 }, { @@ -415,14 +373,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "", "weather": 0 }, { @@ -447,14 +399,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "", "weather": 0 }, { @@ -479,14 +425,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "", "weather": 0 }, { @@ -501,7 +441,7 @@ "task_display": "新剧情文本10115", "npc": [ "scenes_boundary_02night", - "阿宝组件名", + "阿宝夜晚组件名", "153" ], "getafter_event": [ @@ -511,15 +451,9 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "night", - "weather": 0 + "weather": 2 }, { "key": 10116, @@ -543,13 +477,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "night", "weather": 0 }, @@ -575,14 +503,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "day", "weather": 0 }, { @@ -607,14 +529,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "day", "weather": 0 }, { @@ -639,14 +555,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "day", "weather": 0 }, { @@ -671,14 +581,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "day", "weather": 0 }, { @@ -703,14 +607,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "day", "weather": 0 }, { @@ -735,14 +633,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "night", + "reword": [], + "day": "day", "weather": 0 }, { @@ -767,14 +659,8 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], - "day": "", + "reword": [], + "day": "day", "weather": 0 }, { @@ -789,8 +675,8 @@ "task_display": "新剧情文本10124", "npc": [ "WuGuanScene", - "阿宝组件名", - "624" + "武馆阿宝", + "137" ], "getafter_event": [ 2, @@ -799,13 +685,7 @@ "completetask": 176, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -821,8 +701,8 @@ "task_display": "新剧情文本10125", "npc": [ "WuGuanScene", - "阿宝组件名", - "625" + "武馆阿宝", + "137" ], "getafter_event": [ 2, @@ -831,13 +711,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -853,8 +727,8 @@ "task_display": "新剧情文本10126", "npc": [ "WuGuanScene", - "阿宝组件名", - "626" + "武馆阿宝", + "137" ], "getafter_event": [ 2, @@ -863,13 +737,7 @@ "completetask": 177, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -885,8 +753,8 @@ "task_display": "新剧情文本10127", "npc": [ "WuGuanScene", - "阿宝组件名", - "627" + "武馆阿宝", + "137" ], "getafter_event": [ 2, @@ -895,13 +763,7 @@ "completetask": 178, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -917,8 +779,8 @@ "task_display": "新剧情文本10128", "npc": [ "WuGuanScene", - "阿宝组件名", - "628" + "武馆阿宝", + "137" ], "getafter_event": [ 2, @@ -927,13 +789,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -949,8 +805,8 @@ "task_display": "新剧情文本10129", "npc": [ "WuGuanScene", - "阿宝组件名", - "629" + "武馆阿宝", + "137" ], "getafter_event": [ 2, @@ -959,13 +815,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -981,8 +831,8 @@ "task_display": "新剧情文本10130", "npc": [ "WuGuanScene", - "阿宝组件名", - "630" + "武馆阿宝", + "137" ], "getafter_event": [ 2, @@ -991,13 +841,7 @@ "completetask": 158, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1023,13 +867,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1055,13 +893,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1087,13 +919,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1119,13 +945,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1151,13 +971,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1183,13 +997,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1215,13 +1023,7 @@ "completetask": 179, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1247,13 +1049,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1279,13 +1075,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1311,13 +1101,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1343,13 +1127,7 @@ "completetask": 180, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1375,13 +1153,7 @@ "completetask": 181, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1407,13 +1179,7 @@ "completetask": 182, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1439,13 +1205,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1471,13 +1231,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1503,13 +1257,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1535,13 +1283,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1567,13 +1309,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1599,13 +1335,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1631,13 +1361,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1663,13 +1387,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1694,13 +1412,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1725,13 +1437,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1756,13 +1462,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1787,13 +1487,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1818,13 +1512,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1849,13 +1537,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1880,13 +1562,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1911,13 +1587,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1942,13 +1612,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -1973,13 +1637,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -2004,13 +1662,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -2035,13 +1687,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -2066,13 +1712,7 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, @@ -2097,23 +1737,17 @@ "completetask": 0, "auto_accept": 1, "overtips": 1, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 100 - } - ], + "reword": [], "day": "", "weather": 0 }, { "key": 20001, "lock": 1, - "ontxe": 0, + "ontxe": 10165, "id_after": 20002, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10100", "task_display": "新剧情文本10100", @@ -2150,7 +1784,7 @@ "ontxe": 20001, "id_after": 20003, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10101", "task_display": "新剧情文本10101", @@ -2182,7 +1816,7 @@ "ontxe": 20002, "id_after": 20004, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10102", "task_display": "新剧情文本10102", @@ -2195,7 +1829,7 @@ 2, 100003 ], - "completetask": 171, + "completetask": 176, "auto_accept": 1, "overtips": 1, "reword": [ @@ -2214,7 +1848,7 @@ "ontxe": 20003, "id_after": 20005, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10103", "task_display": "新剧情文本10103", @@ -2246,7 +1880,7 @@ "ontxe": 20004, "id_after": 20006, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10104", "task_display": "新剧情文本10104", @@ -2283,7 +1917,7 @@ "ontxe": 20005, "id_after": 20007, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10105", "task_display": "新剧情文本10105", @@ -2315,7 +1949,7 @@ "ontxe": 20006, "id_after": 20008, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10106", "task_display": "新剧情文本10106", @@ -2328,7 +1962,7 @@ 2, 100007 ], - "completetask": 174, + "completetask": 175, "auto_accept": 1, "overtips": 1, "reword": [ @@ -2347,7 +1981,7 @@ "ontxe": 20007, "id_after": 20009, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10107", "task_display": "新剧情文本10107", @@ -2379,7 +2013,7 @@ "ontxe": 20008, "id_after": 20010, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10108", "task_display": "新剧情文本10108", @@ -2411,7 +2045,7 @@ "ontxe": 20009, "id_after": 20011, "group": 10001, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10109", "task_display": "新剧情文本10109", @@ -2440,10 +2074,10 @@ { "key": 20011, "lock": 1, - "ontxe": 0, + "ontxe": 20010, "id_after": 20012, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10100", "task_display": "新剧情文本10100", @@ -2480,7 +2114,7 @@ "ontxe": 20011, "id_after": 20013, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10101", "task_display": "新剧情文本10101", @@ -2512,7 +2146,7 @@ "ontxe": 20012, "id_after": 20014, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10102", "task_display": "新剧情文本10102", @@ -2544,7 +2178,7 @@ "ontxe": 20013, "id_after": 20015, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10103", "task_display": "新剧情文本10103", @@ -2576,7 +2210,7 @@ "ontxe": 20014, "id_after": 20016, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10104", "task_display": "新剧情文本10104", @@ -2613,7 +2247,7 @@ "ontxe": 20015, "id_after": 20017, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10105", "task_display": "新剧情文本10105", @@ -2626,7 +2260,7 @@ 2, 100006 ], - "completetask": 118, + "completetask": 172, "auto_accept": 1, "overtips": 1, "reword": [ @@ -2645,7 +2279,7 @@ "ontxe": 20016, "id_after": 20018, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10106", "task_display": "新剧情文本10106", @@ -2677,7 +2311,7 @@ "ontxe": 20017, "id_after": 20019, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10107", "task_display": "新剧情文本10107", @@ -2709,7 +2343,7 @@ "ontxe": 20018, "id_after": 20020, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10108", "task_display": "新剧情文本10108", @@ -2741,7 +2375,7 @@ "ontxe": 20019, "id_after": 20100, "group": 10002, - "des": 2, + "des": 3, "icon": "", "task_name": "新剧情10109", "task_display": "新剧情文本10109", @@ -2770,7 +2404,7 @@ { "key": 20100, "lock": 1, - "ontxe": 0, + "ontxe": 20020, "id_after": 20101, "group": 1, "des": 2, @@ -2787,7 +2421,7 @@ 200001 ], "completetask": 0, - "auto_accept": 1, + "auto_accept": 0, "overtips": 1, "reword": [ { diff --git a/modules/linestory/model_linestory.go b/modules/linestory/model_linestory.go index 470f4c1b3..ecd7dffeb 100644 --- a/modules/linestory/model_linestory.go +++ b/modules/linestory/model_linestory.go @@ -6,6 +6,7 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/utils" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" @@ -52,6 +53,24 @@ func (this *ModelLinestory) getChapters(uid string) map[int32]*pb.TaskChapter { return ls.TaskChapter } +// 校验前置任务是否完成 +// true完成 false未完成 +func (this *ModelLinestory) isPreFinished(finishTasks []int32, taskId int32) bool { + maintaskConf, ok := this.moduleLinestory.confMaintask.GetDataMap()[taskId] + if !ok { + return false + } + if maintaskConf.SubTask == 0 { + return true + } + + if _, ok := utils.Findx(finishTasks, maintaskConf.SubTask); ok { + return true + } + + return false +} + // 获取玩家支线剧情-主线任务 func (this *ModelLinestory) getMaintasks(uid string, groupId int32) (list []*pb.TaskMain) { // 调用世界任务接口groupId & taskId @@ -86,7 +105,7 @@ func (this *ModelLinestory) receive(uid string, groupId int32) (err error) { if v.Receive == 1 { v.Receive = 2 update := map[string]interface{}{ - "receive": v.Receive, + "taskChapter": ls.TaskChapter, } return this.Change(uid, update) } else { diff --git a/modules/linestory/module.go b/modules/linestory/module.go index d5b551d35..3a69c4df8 100644 --- a/modules/linestory/module.go +++ b/modules/linestory/module.go @@ -55,17 +55,47 @@ func (this *ModuleLinestory) Start() (err error) { return } +// 检查真实结局路径是否完成 +func (this *ModuleLinestory) isOverRealline(finishTasks []int32) bool { + //真实结局节点ID + var realEndingTaskId int32 + for _, v := range this.confMaintask.GetDataList() { + if v.Ending == 1 { + realEndingTaskId = v.Id + break + } + } + log.Debugln(realEndingTaskId) + // 存在真实结局节点 + if _, ok := utils.Findx(finishTasks, realEndingTaskId); ok { + return true + } + return false +} + // 世界任务完成通知 func (this *ModuleLinestory) TaskFinishNotify(uid string, taskId, groupId int32) error { ls := this.modelLinestory.getLinestory(uid) log.Debug("支线剧情任务", log.Fields{"uid": uid, "groupId": groupId, "taskId": taskId}) + + // 校验groupId 或taskId是否合法 + if _, ok := this.confTimeline.GetDataMap()[groupId]; !ok { + this.Debug("非支线剧情任务", log.Fields{"uid": uid, "groupId": groupId, "taskId": taskId}) + return comm.NewCustomError(pb.ErrorCode_ReqParameterError) + } + if _, ok := this.confMaintask.GetDataMap()[taskId]; !ok { + this.Debug("非支线剧情任务", log.Fields{"uid": uid, "groupId": groupId, "taskId": taskId}) + return comm.NewCustomError(pb.ErrorCode_ReqParameterError) + } + var isUpdate bool if chapter, ok := ls.TaskChapter[groupId]; ok { + if !this.modelLinestory.isPreFinished(chapter.TaskIds, taskId) { + return comm.NewCustomError(pb.ErrorCode_LinestoryPreNoComplete) + } if _, ok := utils.Findx(chapter.TaskIds, taskId); !ok { chapter.TaskIds = append(chapter.TaskIds, taskId) - taskIds := this.configure.converArr(groupId) - // 校验当前组下的任务是否全部完成 - if utils.ForContainer(taskIds, chapter.TaskIds) { + if this.isOverRealline(chapter.TaskIds) { //说明组里的所有任务完成 chapter.Receive = 1 chapter.Status = 1 @@ -75,7 +105,7 @@ func (this *ModuleLinestory) TaskFinishNotify(uid string, taskId, groupId int32) if conf, ok := this.confMaintask.GetDataMap()[taskId]; ok { if conf.Group == groupId { if len(conf.Resetto) > 0 { - var newTaskList []int32 + newTaskList := []int32{} for _, v := range conf.Resetto { newTaskList = utils.Deletex(chapter.TaskIds, v) } @@ -86,16 +116,6 @@ func (this *ModuleLinestory) TaskFinishNotify(uid string, taskId, groupId int32) isUpdate = true } } else { - // 校验groupId 或taskId是否合法 - if _, ok := this.confTimeline.GetDataMap()[groupId]; !ok { - this.Debug("非支线剧情任务", log.Fields{"uid": uid, "groupId": groupId, "taskId": taskId}) - return comm.NewCustomError(pb.ErrorCode_ReqParameterError) - } - if _, ok := this.confMaintask.GetDataMap()[taskId]; !ok { - this.Debug("非支线剧情任务", log.Fields{"uid": uid, "groupId": groupId, "taskId": taskId}) - return comm.NewCustomError(pb.ErrorCode_ReqParameterError) - } - tg := &pb.TaskChapter{} // 设置完成的任务 tg.TaskIds = append(tg.TaskIds, taskId) diff --git a/modules/sociaty/module.go b/modules/sociaty/module.go index 8cbe7d194..c8883588c 100644 --- a/modules/sociaty/module.go +++ b/modules/sociaty/module.go @@ -62,11 +62,20 @@ func (this *Sociaty) Start() (err error) { this.globalConf = this.configure.GetGlobalConf() if this.globalConf == nil { err = errors.New("global config not found") + return + } + if this.sociatyActivityConf, err = this.configure.getSociatyActivityCfg(); err != nil { + return err + } + if this.sociatyTaskConf, err = this.configure.getSociatyTaskCfg(); err != nil { + return err + } + if this.rtaskCondConf, err = this.configure.getRtaskCondiCfg(); err != nil { + return err + } + if this.sociatySignConf, err = this.configure.getSociatySignCfg(); err != nil { + return err } - this.sociatyActivityConf, err = this.configure.getSociatyActivityCfg() - this.sociatyTaskConf, err = this.configure.getSociatyTaskCfg() - this.rtaskCondConf, err = this.configure.getRtaskCondiCfg() - this.sociatySignConf, err = this.configure.getSociatySignCfg() return } diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go index adca6d478..5824e5726 100644 --- a/modules/worldtask/api_battlestart.go +++ b/modules/worldtask/api_battlestart.go @@ -10,7 +10,7 @@ import ( // 战斗开始 func (this *apiComp) BattlestartCheck(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (code pb.ErrorCode) { - if req.BattleConfId == 0 || req.Battle != nil { + if req.BattleConfId == 0 || req.Battle == nil { this.module.Error("世界任务战斗开始参数错误", log.Fields{"uid": session.GetUserId(), "params": req}) code = pb.ErrorCode_ReqParameterError } @@ -21,11 +21,11 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success { return } - + uid := session.GetUserId() battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId) if err != nil || battleConf == nil { code = pb.ErrorCode_ConfigNoFound - log.Errorf("world_battle %v no found", req.BattleConfId) + log.Error("战斗配置未找到", log.Fields{"uid": uid, "battleConfId": req.BattleConfId}) return } diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index d1851c065..336e2a0d8 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -60,11 +60,13 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe userTask.Uid = uid } - // 前置任务ID - if !this.module.modelWorldtask.IsPreFinished(userTask, curTaskConf) { - this.module.Debug("前置任务未完成", log.Fields{"uid": uid, "preTaskId": curTaskConf.Ontxe, "taskId": curTaskConf.Key}) - code = pb.ErrorCode_WorldtaskLastUnFinished - return + // 前置任务ID 只有世界任务才校验前置 + if curTaskConf.Des == 2 { + if !this.module.modelWorldtask.IsPreFinished(userTask, curTaskConf) { + this.module.Debug("前置任务未完成", log.Fields{"uid": uid, "preTaskId": curTaskConf.Ontxe, "taskId": curTaskConf.Key}) + code = pb.ErrorCode_WorldtaskLastUnFinished + return + } } //判断任务是否已完成 @@ -78,6 +80,9 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe var nextTaskId int32 finishCall := func() { + defer func() { + this.module.Debug("世界任务完成", log.Fields{"uid": uid, "params": req}) + }() nextTaskId = curTaskConf.IdAfter // 完成任务 if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil { @@ -109,10 +114,12 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } // 任务完成推送 - if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{ - NextTaskId: nextTaskId, - }); err != nil { - code = pb.ErrorCode_SystemError + if curTaskConf.Des == 2 { + if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{ + NextTaskId: nextTaskId, + }); err != nil { + code = pb.ErrorCode_SystemError + } } return diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index e0056befa..d7a884d63 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -96,7 +96,7 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta 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.Error("任务完成通知", log.Fields{"uid": task.Uid, "groupId": groupId, "taskId": taskId, "err": err.Error()}) + log.Error("世界任务完成通知支线剧情任务", log.Fields{"uid": task.Uid, "groupId": groupId, "taskId": taskId, "err": err.Error()}) } } } diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 159efe0ab..6c206c1ee 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -56,7 +56,7 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e finishedTaskIds := make(map[int32]int32) //达成的任务条件 for _, c := range this.worldtaskConf.GetDataList() { - if c.Completetask == condId && c.Completetask != 0 { + if c.Completetask != 0 && c.Completetask == condId { finishedTaskIds[c.Group] = c.Key } } @@ -66,6 +66,8 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e return nil } + log.Debug("世界任务完成通知-查找到世界任务", log.Fields{"uid": uid, "condId": condId, "params": finishedTaskIds}) + //下一个任务ID var nextTaskId int32 // 获取用户信息 @@ -83,23 +85,24 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e if userTask.Uid != "" { //查找任务ID根据condId 可能会找出不同的任务 - for k, id := range finishedTaskIds { - logFields := log.Fields{"uid": uid, "group": k, "taskId": id, "condId": condId} + for groupId, taskId := range finishedTaskIds { + logFields := log.Fields{"uid": uid, "group": groupId, "taskId": taskId, "condId": condId} // 判断任务是否已完成 - if this.modelWorldtask.isFinished(id, userTask.TaskList) { - this.Debug("任务已完成", logFields) + if this.modelWorldtask.isFinished(taskId, userTask.TaskList) { + this.Debug("世界任务已完成", logFields) continue } - taskConf, err := this.configure.getWorldtaskById(id) + taskConf, err := this.configure.getWorldtaskById(taskId) if err != nil { return err } if taskConf != nil { - if !this.modelWorldtask.IsPreFinished(userTask, taskConf) { - this.Debug("世界任务前置任务未完成", logFields) - continue + if taskConf.Des == 2 { //只有世界任务才校验前置 + if !this.modelWorldtask.IsPreFinished(userTask, taskConf) { + this.Debug("世界任务前置任务未完成", logFields) + continue + } } - nextTaskId = taskConf.IdAfter // 判断玩家等级要求 @@ -111,7 +114,7 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e } //完成任务 - if err := this.modelWorldtask.finishTask(k, id, userTask); err != nil { + if err := this.modelWorldtask.finishTask(groupId, taskId, userTask); err != nil { logFields["err"] = err.Error() this.Error("世界任务完成", logFields) return err @@ -124,7 +127,7 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e this.Error("资源发放", logFields) } - if nextTaskId != 0 { + if nextTaskId != 0 && taskConf.Des == 2 { if err := session.SendMsg(string(this.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{ NextTaskId: nextTaskId, }); err != nil { diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index ba2353600..84193011b 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -186,6 +186,7 @@ const ( ErrorCode_LinestoryNoReceive ErrorCode = 2602 //章节奖励不能领取 ErrorCode_LinestoryTaskDisabledEnter ErrorCode = 2603 //禁止进入 ErrorCode_LinestoryChapterNoOpen ErrorCode = 2604 //章节未开启 + ErrorCode_LinestoryPreNoComplete ErrorCode = 2605 //前置任务未完成 // hunting ErrorCode_HuntingLvErr ErrorCode = 2701 // 关卡难度不匹配 ErrorCode_HuntingBoosType ErrorCode = 2702 // BOSS 类型不对 @@ -422,6 +423,7 @@ var ( 2602: "LinestoryNoReceive", 2603: "LinestoryTaskDisabledEnter", 2604: "LinestoryChapterNoOpen", + 2605: "LinestoryPreNoComplete", 2701: "HuntingLvErr", 2702: "HuntingBoosType", 2703: "HuntingBuyMaxCount", @@ -642,6 +644,7 @@ var ( "LinestoryNoReceive": 2602, "LinestoryTaskDisabledEnter": 2603, "LinestoryChapterNoOpen": 2604, + "LinestoryPreNoComplete": 2605, "HuntingLvErr": 2701, "HuntingBoosType": 2702, "HuntingBuyMaxCount": 2703, @@ -747,7 +750,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, 0xf0, 0x26, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0x8d, 0x27, 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, @@ -951,115 +954,117 @@ var file_errorcode_proto_rawDesc = []byte{ 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, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, - 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 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, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, - 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, - 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, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, - 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, 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, 0x0f, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 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, + 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, + 0x65, 0x10, 0xad, 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, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, + 0x62, 0x65, 0x72, 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, 0x16, + 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, + 0x6d, 0x73, 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 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, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 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, 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, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 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.LinestoryMainTaskData.go b/sys/configure/structs/Game.LinestoryMainTaskData.go index e18cc30ca..d9cbd1990 100644 --- a/sys/configure/structs/Game.LinestoryMainTaskData.go +++ b/sys/configure/structs/Game.LinestoryMainTaskData.go @@ -12,9 +12,12 @@ import "errors" type GameLinestoryMainTaskData struct { Id int32 - Group int32 SubTask int32 + NodeIndex int32 + Order string + Group int32 Name string + Describe string Img string Ending int32 Resetto []int32 @@ -28,9 +31,12 @@ func (*GameLinestoryMainTaskData) GetTypeId() int32 { func (_v *GameLinestoryMainTaskData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subTask"].(float64); !_ok_ { err = errors.New("subTask error"); return }; _v.SubTask = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nodeIndex"].(float64); !_ok_ { err = errors.New("nodeIndex error"); return }; _v.NodeIndex = int32(_tempNum_) } + { var _ok_ bool; if _v.Order, _ok_ = _buf["order"].(string); !_ok_ { err = errors.New("order error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ending"].(float64); !_ok_ { err = errors.New("ending error"); return }; _v.Ending = int32(_tempNum_) } { diff --git a/sys/configure/structs/Game.LinestoryTimeLineData.go b/sys/configure/structs/Game.LinestoryTimeLineData.go index 1d90940cf..f79bfe64e 100644 --- a/sys/configure/structs/Game.LinestoryTimeLineData.go +++ b/sys/configure/structs/Game.LinestoryTimeLineData.go @@ -12,6 +12,7 @@ import "errors" type GameLinestoryTimeLineData struct { Group int32 + Order string NodeIndex int32 Cond []int32 Name string @@ -27,6 +28,7 @@ func (*GameLinestoryTimeLineData) GetTypeId() int32 { func (_v *GameLinestoryTimeLineData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } + { var _ok_ bool; if _v.Order, _ok_ = _buf["order"].(string); !_ok_ { err = errors.New("order error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nodeIndex"].(float64); !_ok_ { err = errors.New("nodeIndex error"); return }; _v.NodeIndex = int32(_tempNum_) } { var _arr_ []interface{}