Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
b52069d07b
@ -350,5 +350,25 @@
|
||||
"key": "item_coin_intr2_16",
|
||||
"text": "“多么精致的东西啊！人类居然把这么美丽的东西扔进垃圾桶里。“一位不愿透露姓名的巨怪说道。"
|
||||
}
|
||||
},
|
||||
{
|
||||
"key": "passcheck4exp",
|
||||
"keyint": 17,
|
||||
"name": {
|
||||
"key": "item_coin_name_17",
|
||||
"text": "月梦战令经验"
|
||||
},
|
||||
"color": 1,
|
||||
"effects": "",
|
||||
"access": [],
|
||||
"img": "wp_icon_10024",
|
||||
"intr": {
|
||||
"key": "item_coin_intr_17",
|
||||
"text": "用于提升月梦战令等级，激活战令奖励"
|
||||
},
|
||||
"intr2": {
|
||||
"key": "item_coin_intr2_17",
|
||||
"text": "用于提升月梦战令等级，激活战令奖励"
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -9,7 +9,12 @@
|
||||
"key": "passcheck_passcheck_task_text_1",
|
||||
"text": "消费100000金币"
|
||||
},
|
||||
"score": 10
|
||||
"score": 10,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
@ -21,7 +26,12 @@
|
||||
"key": "passcheck_passcheck_task_text_2",
|
||||
"text": "消费100钻石"
|
||||
},
|
||||
"score": 10
|
||||
"score": 10,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
@ -33,7 +43,12 @@
|
||||
"key": "passcheck_passcheck_task_text_3",
|
||||
"text": "当日消耗30点体力"
|
||||
},
|
||||
"score": 10
|
||||
"score": 10,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
@ -45,7 +60,12 @@
|
||||
"key": "passcheck_passcheck_task_text_4",
|
||||
"text": "使用好友助战守护者1次"
|
||||
},
|
||||
"score": 10
|
||||
"score": 10,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
@ -57,7 +77,12 @@
|
||||
"key": "passcheck_passcheck_task_text_5",
|
||||
"text": "进行1次普通招募"
|
||||
},
|
||||
"score": 10
|
||||
"score": 10,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
@ -69,7 +94,12 @@
|
||||
"key": "passcheck_passcheck_task_text_6",
|
||||
"text": "为任意守护者提升3级"
|
||||
},
|
||||
"score": 10
|
||||
"score": 10,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
@ -81,7 +111,12 @@
|
||||
"key": "passcheck_passcheck_task_text_7",
|
||||
"text": "强化任意装备成功3次"
|
||||
},
|
||||
"score": 10
|
||||
"score": 10,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
@ -93,7 +128,12 @@
|
||||
"key": "passcheck_passcheck_task_text_8",
|
||||
"text": "消费300000金币"
|
||||
},
|
||||
"score": 30
|
||||
"score": 30,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 30
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
@ -105,7 +145,12 @@
|
||||
"key": "passcheck_passcheck_task_text_9",
|
||||
"text": "消费300钻石"
|
||||
},
|
||||
"score": 30
|
||||
"score": 30,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 30
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
@ -117,7 +162,12 @@
|
||||
"key": "passcheck_passcheck_task_text_10",
|
||||
"text": "当日消耗100点体力"
|
||||
},
|
||||
"score": 30
|
||||
"score": 30,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 30
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
@ -129,7 +179,12 @@
|
||||
"key": "passcheck_passcheck_task_text_11",
|
||||
"text": "使用好友助战守护者3次"
|
||||
},
|
||||
"score": 30
|
||||
"score": 30,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 30
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
@ -141,7 +196,12 @@
|
||||
"key": "passcheck_passcheck_task_text_12",
|
||||
"text": "进行1次普通招募"
|
||||
},
|
||||
"score": 30
|
||||
"score": 30,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 30
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 13,
|
||||
@ -153,7 +213,12 @@
|
||||
"key": "passcheck_passcheck_task_text_13",
|
||||
"text": "为任意守护者提升10级"
|
||||
},
|
||||
"score": 30
|
||||
"score": 30,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 30
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 14,
|
||||
@ -165,7 +230,12 @@
|
||||
"key": "passcheck_passcheck_task_text_14",
|
||||
"text": "强化任意装备成功10次"
|
||||
},
|
||||
"score": 30
|
||||
"score": 30,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 30
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 15,
|
||||
@ -177,7 +247,12 @@
|
||||
"key": "passcheck_passcheck_task_text_15",
|
||||
"text": "消费2000000金币"
|
||||
},
|
||||
"score": 100
|
||||
"score": 100,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 100
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 16,
|
||||
@ -189,7 +264,12 @@
|
||||
"key": "passcheck_passcheck_task_text_16",
|
||||
"text": "消费1000钻石"
|
||||
},
|
||||
"score": 100
|
||||
"score": 100,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 100
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 17,
|
||||
@ -201,7 +281,12 @@
|
||||
"key": "passcheck_passcheck_task_text_17",
|
||||
"text": "当日消耗300点体力"
|
||||
},
|
||||
"score": 100
|
||||
"score": 100,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 100
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 18,
|
||||
@ -213,7 +298,12 @@
|
||||
"key": "passcheck_passcheck_task_text_18",
|
||||
"text": "使用好友助战守护者10次"
|
||||
},
|
||||
"score": 100
|
||||
"score": 100,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 100
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 19,
|
||||
@ -225,7 +315,12 @@
|
||||
"key": "passcheck_passcheck_task_text_19",
|
||||
"text": "进行10次普通招募"
|
||||
},
|
||||
"score": 100
|
||||
"score": 100,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 100
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 20,
|
||||
@ -237,7 +332,12 @@
|
||||
"key": "passcheck_passcheck_task_text_20",
|
||||
"text": "为任意守护者提升20级"
|
||||
},
|
||||
"score": 100
|
||||
"score": 100,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 100
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 21,
|
||||
@ -249,6 +349,11 @@
|
||||
"key": "passcheck_passcheck_task_text_21",
|
||||
"text": "强化任意装备成功20次"
|
||||
},
|
||||
"score": 100
|
||||
"score": 100,
|
||||
"show_atn": {
|
||||
"a": "attr",
|
||||
"t": "passcheck4exp",
|
||||
"n": 100
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -32,7 +32,7 @@
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": [
|
||||
14
|
||||
16
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -50,7 +50,7 @@
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": [
|
||||
14
|
||||
16
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -86,7 +86,7 @@
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": [
|
||||
14
|
||||
16
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@ -133,7 +133,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 100,
|
||||
"WeeklyPoint": 150,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -199,7 +199,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 200,
|
||||
"WeeklyPoint": 350,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -265,7 +265,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 500,
|
||||
"WeeklyPoint": 850,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -331,7 +331,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1000,
|
||||
"WeeklyPoint": 1850,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -474,7 +474,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 120,
|
||||
"WeeklyPoint": 160,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -540,7 +540,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 240,
|
||||
"WeeklyPoint": 400,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -606,7 +606,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 480,
|
||||
"WeeklyPoint": 880,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -672,7 +672,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 720,
|
||||
"WeeklyPoint": 1600,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -738,7 +738,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 960,
|
||||
"WeeklyPoint": 2560,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -804,7 +804,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1200,
|
||||
"WeeklyPoint": 3760,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -870,7 +870,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1600,
|
||||
"WeeklyPoint": 5360,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1013,7 +1013,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 150,
|
||||
"WeeklyPoint": 200,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1079,7 +1079,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 300,
|
||||
"WeeklyPoint": 500,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1145,7 +1145,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 600,
|
||||
"WeeklyPoint": 1100,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1211,7 +1211,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 900,
|
||||
"WeeklyPoint": 2000,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1277,7 +1277,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1200,
|
||||
"WeeklyPoint": 3200,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1343,7 +1343,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1500,
|
||||
"WeeklyPoint": 4700,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1409,7 +1409,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2000,
|
||||
"WeeklyPoint": 6700,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1552,7 +1552,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 180,
|
||||
"WeeklyPoint": 270,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1618,7 +1618,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 360,
|
||||
"WeeklyPoint": 630,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1684,7 +1684,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 540,
|
||||
"WeeklyPoint": 1170,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1750,7 +1750,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 720,
|
||||
"WeeklyPoint": 1890,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1816,7 +1816,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 900,
|
||||
"WeeklyPoint": 2790,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1882,7 +1882,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1080,
|
||||
"WeeklyPoint": 3870,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -1948,7 +1948,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1260,
|
||||
"WeeklyPoint": 5130,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2014,7 +2014,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1440,
|
||||
"WeeklyPoint": 6570,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2080,7 +2080,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1620,
|
||||
"WeeklyPoint": 8190,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2146,7 +2146,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1800,
|
||||
"WeeklyPoint": 9990,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2212,7 +2212,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2400,
|
||||
"WeeklyPoint": 12390,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2355,7 +2355,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 210,
|
||||
"WeeklyPoint": 315,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2421,7 +2421,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 420,
|
||||
"WeeklyPoint": 735,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2487,7 +2487,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 630,
|
||||
"WeeklyPoint": 1365,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2553,7 +2553,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 840,
|
||||
"WeeklyPoint": 2205,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2619,7 +2619,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1050,
|
||||
"WeeklyPoint": 3255,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2685,7 +2685,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1260,
|
||||
"WeeklyPoint": 4515,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2751,7 +2751,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1470,
|
||||
"WeeklyPoint": 5985,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2817,7 +2817,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1680,
|
||||
"WeeklyPoint": 7665,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2883,7 +2883,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1890,
|
||||
"WeeklyPoint": 9555,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -2949,7 +2949,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2100,
|
||||
"WeeklyPoint": 11655,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3015,7 +3015,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2800,
|
||||
"WeeklyPoint": 14455,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3158,7 +3158,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 240,
|
||||
"WeeklyPoint": 360,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3224,7 +3224,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 480,
|
||||
"WeeklyPoint": 840,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3290,7 +3290,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 720,
|
||||
"WeeklyPoint": 1560,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3356,7 +3356,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 960,
|
||||
"WeeklyPoint": 2520,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3422,7 +3422,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1200,
|
||||
"WeeklyPoint": 3720,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3488,7 +3488,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1440,
|
||||
"WeeklyPoint": 5160,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3554,7 +3554,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1680,
|
||||
"WeeklyPoint": 6840,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3620,7 +3620,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1920,
|
||||
"WeeklyPoint": 8760,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3686,7 +3686,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2160,
|
||||
"WeeklyPoint": 10920,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3752,7 +3752,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2400,
|
||||
"WeeklyPoint": 13320,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3818,7 +3818,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 3200,
|
||||
"WeeklyPoint": 16520,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -3961,7 +3961,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 270,
|
||||
"WeeklyPoint": 405,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4027,7 +4027,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 540,
|
||||
"WeeklyPoint": 945,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4093,7 +4093,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 810,
|
||||
"WeeklyPoint": 1755,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4159,7 +4159,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1080,
|
||||
"WeeklyPoint": 2835,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4225,7 +4225,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1350,
|
||||
"WeeklyPoint": 4185,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4291,7 +4291,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1620,
|
||||
"WeeklyPoint": 5805,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4357,7 +4357,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1890,
|
||||
"WeeklyPoint": 7695,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4423,7 +4423,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2160,
|
||||
"WeeklyPoint": 9855,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4489,7 +4489,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2430,
|
||||
"WeeklyPoint": 12285,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4555,7 +4555,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2700,
|
||||
"WeeklyPoint": 14985,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4621,7 +4621,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 3600,
|
||||
"WeeklyPoint": 18585,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4764,7 +4764,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 300,
|
||||
"WeeklyPoint": 450,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4830,7 +4830,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 600,
|
||||
"WeeklyPoint": 1050,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4896,7 +4896,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 900,
|
||||
"WeeklyPoint": 1950,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -4962,7 +4962,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1200,
|
||||
"WeeklyPoint": 3150,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -5028,7 +5028,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1500,
|
||||
"WeeklyPoint": 4650,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -5094,7 +5094,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 1800,
|
||||
"WeeklyPoint": 6450,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -5160,7 +5160,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2100,
|
||||
"WeeklyPoint": 8550,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -5226,7 +5226,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2400,
|
||||
"WeeklyPoint": 10950,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -5292,7 +5292,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 2700,
|
||||
"WeeklyPoint": 13650,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -5358,7 +5358,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 3000,
|
||||
"WeeklyPoint": 16650,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
@ -5424,7 +5424,7 @@
|
||||
],
|
||||
"FirstReward": [],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": 4000,
|
||||
"WeeklyPoint": 20650,
|
||||
"TalentItem": {
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
|
||||
@ -308,6 +308,16 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
|
||||
}
|
||||
}
|
||||
|
||||
if stone.Rooms.Complete { // 完成关卡 发放当前关奖励
|
||||
if conf := this.module.configure.GetStageConfByStageid(stone.StageID, stone.CurRoomIndes); conf != nil {
|
||||
if len(conf.FirstReward) > 0 {
|
||||
if errdata, reward = this.module.DispenseAtno(session, conf.FirstReward, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if errdata = this.module.ConsumeRes(session, eventConf.CostItem, true); errdata != nil { //真正的消耗
|
||||
return
|
||||
}
|
||||
|
||||
@ -17,6 +17,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR
|
||||
stone *pb.DBStonehenge
|
||||
update map[string]interface{}
|
||||
err error
|
||||
curintegral int32
|
||||
)
|
||||
update = make(map[string]interface{})
|
||||
if errdata = this.FinishCheck(session, req); errdata != nil {
|
||||
@ -32,6 +33,15 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR
|
||||
return
|
||||
}
|
||||
|
||||
// 发放积分 和奖励
|
||||
|
||||
if conf := this.module.configure.GetStageConfByStageid(stone.StageID, stone.CurRoomIndes); conf != nil {
|
||||
stone.Integral += conf.WeeklyPoint
|
||||
curintegral = conf.WeeklyPoint
|
||||
// if errdata, atno = this.module.DispenseAtno(session, conf.FirstReward, true); errdata != nil {
|
||||
// return
|
||||
// }
|
||||
}
|
||||
stone.StageID = 0
|
||||
update["stageID"] = stone.StageID
|
||||
stone.CurRoomIndes = 0
|
||||
@ -50,6 +60,9 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR
|
||||
update["addweight"] = stone.Addweight
|
||||
|
||||
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
|
||||
session.SendMsg(string(this.module.GetType()), "finish", &pb.StonehengeFinishResp{Data: stone})
|
||||
session.SendMsg(string(this.module.GetType()), "finish", &pb.StonehengeFinishResp{
|
||||
Data: stone,
|
||||
Curintegral: curintegral,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -85,6 +85,10 @@ func (this *apiComp) Story(session comm.IUserSession, req *pb.StonehengeStoryReq
|
||||
if n, err := strconv.Atoi(arr[2]); err == nil {
|
||||
stone.Rooms.Story = int32(n)
|
||||
}
|
||||
if n, err := strconv.Atoi(arr[0]); err == nil {
|
||||
newEvent = int32(n)
|
||||
stone.Rooms.Eventid[newEvent] = false
|
||||
}
|
||||
} else {
|
||||
for _, s := range event {
|
||||
arr := strings.Split(s, ",")
|
||||
@ -106,12 +110,13 @@ func (this *apiComp) Story(session comm.IUserSession, req *pb.StonehengeStoryReq
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.module.modelStonehenge.AddNewEvent([]int32{newEvent}, stone)
|
||||
update["rooms"] = stone.Rooms
|
||||
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
|
||||
session.SendMsg(string(this.module.GetType()), "story", &pb.StonehengeStoryResp{
|
||||
Story: stone.Rooms.Story,
|
||||
NewEvent: newEvent,
|
||||
Room: stone.Rooms,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@ type MCompConfigure struct {
|
||||
_groupType1 map[int64][]int32 //value cid
|
||||
// 小组类型为2
|
||||
_groupType2 map[int64][]int32 //value cid
|
||||
//Btype map[int32]int32
|
||||
Btype map[int32]int32
|
||||
Stype map[int64]int32 // subtype
|
||||
SNum map[int64]int32 // 小组产出数量
|
||||
|
||||
@ -84,13 +84,11 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com
|
||||
this._lotteryType2 = make(map[int32][]int32, 0)
|
||||
this._groupType1 = make(map[int64][]int32, 0)
|
||||
this._groupType2 = make(map[int64][]int32, 0)
|
||||
//this.Btype = make(map[int32]int32, 0)
|
||||
this.Btype = make(map[int32]int32, 0)
|
||||
this.Stype = make(map[int64]int32, 0)
|
||||
this.SNum = make(map[int64]int32, 0)
|
||||
configure.RegisterConfigure(game_lottery, cfg.NewGameLottery, this.LoadGroupData)
|
||||
|
||||
this.GetGroupDataByLottery(40001001, 0, 1)
|
||||
this.GetGroupDataByLottery(1001, 0, 1)
|
||||
return
|
||||
}
|
||||
|
||||
@ -104,20 +102,13 @@ func (this *MCompConfigure) LoadGroupData() {
|
||||
this._lotteryType2 = make(map[int32][]int32, 0)
|
||||
this._groupType1 = make(map[int64][]int32, 0)
|
||||
this._groupType2 = make(map[int64][]int32, 0)
|
||||
//this.Btype = make(map[int32]int32, 0)
|
||||
this.Btype = make(map[int32]int32, 0)
|
||||
this.Stype = make(map[int64]int32, 0)
|
||||
this.SNum = make(map[int64]int32, 0)
|
||||
|
||||
var itype int32
|
||||
for _, value := range configure.GetDataList() {
|
||||
key := int64(value.Lotteryid)<<31 + int64(value.Groupid)
|
||||
// key2 := int64(value.Lotteryid)<<31 + int64(value.Type)
|
||||
this._group[key] = append(this._group[key], value.Id)
|
||||
if value.Type == 0 {
|
||||
value.Type = itype
|
||||
} else {
|
||||
itype = value.Type
|
||||
}
|
||||
|
||||
// 数据安全校验
|
||||
if value.Min > value.Max {
|
||||
log.Errorf("value.Min:%d > value.Max :%d ", value.Min, value.Max)
|
||||
@ -132,20 +123,20 @@ func (this *MCompConfigure) LoadGroupData() {
|
||||
log.Errorf("value.Playerlvmin:%d > value.Playerlvmax :%d ", value.Playerlvmin, value.Playerlvmax)
|
||||
return
|
||||
}
|
||||
if _, ok := this.Btype[value.Lotteryid]; !ok {
|
||||
this.Btype[value.Lotteryid] = value.Type
|
||||
}
|
||||
|
||||
if _, ok := this.Stype[key]; !ok {
|
||||
this.Stype[key] = value.Subtype
|
||||
}
|
||||
if _, ok := this.SNum[key]; !ok {
|
||||
this.SNum[key] = value.Groupnum
|
||||
}
|
||||
|
||||
if value.Type == 1 || value.Type == 0 {
|
||||
if this.Btype[value.Lotteryid] == 1 {
|
||||
this._lotteryType1[value.Lotteryid] = append(this._lotteryType1[value.Lotteryid], value.Id)
|
||||
|
||||
}
|
||||
if value.Type == 2 || value.Type == 0 {
|
||||
} else if this.Btype[value.Lotteryid] == 2 {
|
||||
this._lotteryType2[value.Lotteryid] = append(this._lotteryType2[value.Lotteryid], value.Id)
|
||||
|
||||
}
|
||||
|
||||
if this.Stype[key] == 1 { // 小组ID为1
|
||||
@ -172,7 +163,7 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
|
||||
}
|
||||
}
|
||||
// 优先校验大组ID 的类型
|
||||
//if this.Btype[lotteryId] == 1 { // 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组
|
||||
if this.Btype[lotteryId] == 1 { // 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组
|
||||
var (
|
||||
szW []int32 // 权重数组
|
||||
szID []int32 // 小组ID 数组
|
||||
@ -222,7 +213,7 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
|
||||
N: _data.Itemid.N * count,
|
||||
})
|
||||
}
|
||||
|
||||
return
|
||||
} else if this.Stype[key] == 2 { // 该小组中的道具为概率掉落，每个道具都会随机一次是否会掉落（单位为千分比）
|
||||
var wt int32
|
||||
for _, v := range this._groupType2[key] {
|
||||
@ -240,24 +231,23 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
//}
|
||||
//if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
|
||||
} else if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
|
||||
// 每个小组id 都随机取一次
|
||||
var szGroupID []int32 // 获得的权重数组
|
||||
gourp1 := make([]*cfg.GameLotteryData, 0) // key 小组ID value 权重
|
||||
gourp := make([]*cfg.GameLotteryData, 0) // key 小组ID value 权重
|
||||
for _, v := range this._lotteryType2[lotteryId] {
|
||||
if _data := this.GetLotterConfById(v); _data != nil {
|
||||
if (_data.Playerlvmax == 0 || (_data.Playerlvmin <= lv && lv <= _data.Playerlvmax)) && (_data.VIPmax == 0 || (_data.VIPmin <= vipLv && vipLv <= _data.VIPmax)) { // 过滤等级等条件
|
||||
gourp1 = append(gourp1, _data)
|
||||
gourp = append(gourp, _data)
|
||||
}
|
||||
}
|
||||
}
|
||||
// 过滤 group
|
||||
var wt int32
|
||||
// 类型为2 可能会同时获得多个组id
|
||||
for _, v := range gourp1 {
|
||||
for _, v := range gourp {
|
||||
k := v.Groupid
|
||||
if v.Groupwt != 0 {
|
||||
wt = v.Groupwt
|
||||
@ -310,7 +300,7 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
|
||||
}
|
||||
}
|
||||
}
|
||||
//}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -642,6 +642,7 @@ type StonehengeFinishResp struct {
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Data *DBStonehenge `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
|
||||
Curintegral int32 `protobuf:"varint,2,opt,name=curintegral,proto3" json:"curintegral"`
|
||||
}
|
||||
|
||||
func (x *StonehengeFinishResp) Reset() {
|
||||
@ -683,6 +684,13 @@ func (x *StonehengeFinishResp) GetData() *DBStonehenge {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *StonehengeFinishResp) GetCurintegral() int32 {
|
||||
if x != nil {
|
||||
return x.Curintegral
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// 战斗事件
|
||||
type StonehengeBattleReq struct {
|
||||
state protoimpl.MessageState
|
||||
@ -1550,108 +1558,110 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
|
||||
0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52,
|
||||
0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x15, 0x0a,
|
||||
0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
|
||||
0x68, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
|
||||
0x68, 0x52, 0x65, 0x71, 0x22, 0x5b, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
|
||||
0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53,
|
||||
0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
|
||||
0x59, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74,
|
||||
0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64,
|
||||
0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x51, 0x0a, 0x14, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04,
|
||||
0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
|
||||
0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x52, 0x0a,
|
||||
0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x79,
|
||||
0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74,
|
||||
0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69,
|
||||
0x64, 0x22, 0x66, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53,
|
||||
0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x72,
|
||||
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1a,
|
||||
0x0a, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f,
|
||||
0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44,
|
||||
0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2e, 0x0a, 0x12, 0x53, 0x74, 0x6f,
|
||||
0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12,
|
||||
0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x22, 0x9c, 0x01, 0x0a, 0x13, 0x53, 0x74,
|
||||
0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12,
|
||||
0x20, 0x0a, 0x0b, 0x63, 0x75, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x6c, 0x22, 0x59, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e,
|
||||
0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74,
|
||||
0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x51, 0x0a, 0x14,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1f,
|
||||
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
|
||||
0x52, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f,
|
||||
0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65,
|
||||
0x6e, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e,
|
||||
0x74, 0x69, 0x64, 0x22, 0x66, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
|
||||
0x65, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
|
||||
0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79,
|
||||
0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04,
|
||||
0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f,
|
||||
0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2e, 0x0a, 0x12, 0x53,
|
||||
0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65,
|
||||
0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x22, 0x9c, 0x01, 0x0a, 0x13,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x12, 0x32, 0x0a,
|
||||
0x04, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73,
|
||||
0x70, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x04, 0x73,
|
||||
0x68, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x74, 0x6f, 0x6e,
|
||||
0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e,
|
||||
0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x70, 0x1a,
|
||||
0x37, 0x0a, 0x09, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x1b, 0x53, 0x74, 0x6f, 0x6e,
|
||||
0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61,
|
||||
0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x22, 0x82, 0x03, 0x0a, 0x1c,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61,
|
||||
0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04,
|
||||
0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65,
|
||||
0x12, 0x41, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x29, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74,
|
||||
0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e,
|
||||
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c,
|
||||
0x65, 0x6e, 0x74, 0x12, 0x59, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f,
|
||||
0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x53, 0x74,
|
||||
0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x6f,
|
||||
0x70, 0x1a, 0x37, 0x0a, 0x09, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x1b, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65,
|
||||
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e,
|
||||
0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e,
|
||||
0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x32,
|
||||
0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28,
|
||||
0x0e, 0x32, 0x14, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72,
|
||||
0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
|
||||
0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72,
|
||||
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a,
|
||||
0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
|
||||
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
|
||||
0x22, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f,
|
||||
0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x16, 0x53, 0x74, 0x6f,
|
||||
0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
|
||||
0x42, 0x6f, 0x6f, 0x6b, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x16, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72,
|
||||
0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
|
||||
0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65,
|
||||
0x22, 0x68, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f,
|
||||
0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62,
|
||||
0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70,
|
||||
0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
|
||||
0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
|
||||
0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x28, 0x0a, 0x16, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72,
|
||||
0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x02, 0x69, 0x64, 0x22, 0xdd, 0x01, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
|
||||
0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
|
||||
0x12, 0x4e, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
|
||||
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
|
||||
0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
|
||||
0x2e, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
|
||||
0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77,
|
||||
0x61, 0x72, 0x64, 0x1a, 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77,
|
||||
0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
|
||||
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x33,
|
||||
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64,
|
||||
0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x22, 0x82, 0x03,
|
||||
0x0a, 0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69,
|
||||
0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12,
|
||||
0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f,
|
||||
0x64, 0x65, 0x12, 0x41, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x29, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41,
|
||||
0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
|
||||
0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74,
|
||||
0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x59, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70,
|
||||
0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61,
|
||||
0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c,
|
||||
0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
|
||||
0x12, 0x32, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x04, 0x20,
|
||||
0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
|
||||
0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69,
|
||||
0x6c, 0x65, 0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
|
||||
0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
|
||||
0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
|
||||
0x38, 0x01, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
|
||||
0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x16, 0x53,
|
||||
0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66,
|
||||
0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
|
||||
0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x16,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77,
|
||||
0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61,
|
||||
0x67, 0x65, 0x22, 0x68, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
|
||||
0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74,
|
||||
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61,
|
||||
0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
|
||||
0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x28, 0x0a, 0x16,
|
||||
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77,
|
||||
0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xdd, 0x01, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65,
|
||||
0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
|
||||
0x69, 0x64, 0x12, 0x4e, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65,
|
||||
0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
|
||||
0x73, 0x70, 0x2e, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45,
|
||||
0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05,
|
||||
0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
||||
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c,
|
||||
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -18,6 +18,7 @@ type GamePassCheckTaskData struct {
|
||||
Pro int32
|
||||
Text string
|
||||
Score int32
|
||||
ShowAtn *Gameatn
|
||||
}
|
||||
|
||||
const TypeId_GamePassCheckTaskData = 1409433706
|
||||
@ -34,6 +35,7 @@ func (_v *GamePassCheckTaskData)Deserialize(_buf map[string]interface{}) (err er
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pro"].(float64); !_ok_ { err = errors.New("pro error"); return }; _v.Pro = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Text error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Text, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["show_atn"].(map[string]interface{}); !_ok_ { err = errors.New("show_atn error"); return }; if _v.ShowAtn, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user