diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index e793543b5..b1e22c0b7 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -1105,5 +1105,185 @@
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
+ },
+ {
+ "id": 201,
+ "PlayType": 0,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "HideAlienSpace": 0,
+ "ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [
+ 109
+ ],
+ "ScoreGroupID": 0,
+ "disableAiCamera": 0,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 720014,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "AssistTeam": 0,
+ "CanFriendHelp": 0,
+ "Numrounds": 0
+ },
+ {
+ "id": 202,
+ "PlayType": 0,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "HideAlienSpace": 0,
+ "ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [
+ 110
+ ],
+ "ScoreGroupID": 0,
+ "disableAiCamera": 0,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 720014,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "AssistTeam": 0,
+ "CanFriendHelp": 0,
+ "Numrounds": 0
+ },
+ {
+ "id": 203,
+ "PlayType": 0,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "HideAlienSpace": 0,
+ "ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [
+ 111
+ ],
+ "ScoreGroupID": 0,
+ "disableAiCamera": 0,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 0,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "AssistTeam": 0,
+ "CanFriendHelp": 0,
+ "Numrounds": 0
+ },
+ {
+ "id": 204,
+ "PlayType": 0,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "HideAlienSpace": 0,
+ "ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [
+ 112
+ ],
+ "ScoreGroupID": 0,
+ "disableAiCamera": 0,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 0,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "AssistTeam": 0,
+ "CanFriendHelp": 0,
+ "Numrounds": 0
+ },
+ {
+ "id": 205,
+ "PlayType": 0,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "HideAlienSpace": 0,
+ "ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [
+ 113
+ ],
+ "ScoreGroupID": 0,
+ "disableAiCamera": 0,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 0,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "AssistTeam": 0,
+ "CanFriendHelp": 0,
+ "Numrounds": 0
+ },
+ {
+ "id": 206,
+ "PlayType": 0,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "HideAlienSpace": 0,
+ "ShowBuff": 0,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [
+ 109
+ ],
+ "ScoreGroupID": 0,
+ "disableAiCamera": 0,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 720017,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "AssistTeam": 0,
+ "CanFriendHelp": 0,
+ "Numrounds": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 59e97e2af..06f015ecb 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -26884,5 +26884,549 @@
"value": 0,
"filter": [],
"filter2": []
+ },
+ {
+ "id": 22215001,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_966",
+ "text": "12100001首次触发剧情"
+ },
+ "type": 215,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 12100001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22215002,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_967",
+ "text": "12100002首次触发剧情"
+ },
+ "type": 215,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 12100002
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22215003,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_968",
+ "text": "12100003首次触发剧情"
+ },
+ "type": 215,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 12100003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22215004,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_969",
+ "text": "12100004首次触发剧情"
+ },
+ "type": 215,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 12100004
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22215005,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_970",
+ "text": "12100005首次触发剧情"
+ },
+ "type": 215,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 12100005
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22215006,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_971",
+ "text": "12100006首次触发剧情"
+ },
+ "type": 215,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 12100006
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216001,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_972",
+ "text": "全阵容职业1通关石阵5"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 1,
+ 10015
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216002,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_973",
+ "text": "全阵容职业1通关石阵6"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 1,
+ 10016
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216003,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_974",
+ "text": "全阵容职业1通关石阵7"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 1,
+ 10017
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216004,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_975",
+ "text": "全阵容职业1通关石阵8"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 1,
+ 10018
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216005,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_976",
+ "text": "全阵容职业2通关石阵5"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 2,
+ 10015
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216006,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_977",
+ "text": "全阵容职业2通关石阵6"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 2,
+ 10016
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216007,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_978",
+ "text": "全阵容职业2通关石阵7"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 2,
+ 10017
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216008,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_979",
+ "text": "全阵容职业2通关石阵8"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 2,
+ 10018
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216009,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_980",
+ "text": "全阵容职业3通关石阵5"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 3,
+ 10015
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216010,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_981",
+ "text": "全阵容职业3通关石阵6"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 3,
+ 10016
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216011,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_982",
+ "text": "全阵容职业3通关石阵7"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 3,
+ 10017
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216012,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_983",
+ "text": "全阵容职业3通关石阵8"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 3,
+ 10018
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216013,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_984",
+ "text": "全阵容职业4通关石阵5"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 4,
+ 10015
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216014,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_985",
+ "text": "全阵容职业4通关石阵6"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 4,
+ 10016
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216015,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_986",
+ "text": "全阵容职业4通关石阵7"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 4,
+ 10017
+ ],
+ "filter2": []
+ },
+ {
+ "id": 22216016,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_987",
+ "text": "全阵容职业4通关石阵8"
+ },
+ "type": 216,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "NPC": 0,
+ "value": 1,
+ "filter": [
+ 4,
+ 10018
+ ],
+ "filter2": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json
index 87edf1775..175f61c07 100644
--- a/bin/json/game_coin.json
+++ b/bin/json/game_coin.json
@@ -16,7 +16,11 @@
"key": "item_coin_intr_1",
"text": "可以用来购买各种道具的基础货币。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_1",
+ "text": ""
+ },
+ "dialogue": {
"key": "item_coin_intr2_1",
"text": ""
}
@@ -38,7 +42,11 @@
"key": "item_coin_intr_2",
"text": "珍贵的高级货币，可以用来购买各种稀有道具。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_2",
+ "text": ""
+ },
+ "dialogue": {
"key": "item_coin_intr2_2",
"text": ""
}
@@ -60,7 +68,11 @@
"key": "item_coin_intr_3",
"text": "历代月中人传承者的经验值，可用于提升自己的等级。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_3",
+ "text": "”不提示自己，怎么能与其他守护者并肩战斗呢？“"
+ },
+ "dialogue": {
"key": "item_coin_intr2_3",
"text": "”不提示自己，怎么能与其他守护者并肩战斗呢？“"
}
@@ -82,7 +94,11 @@
"key": "item_coin_intr_4",
"text": "好友赠送的背包，朋友怎么会忍心让你风餐露宿呢？带上这个承载着友情的背包，找友情商店兑换心仪的物品吧。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_4",
+ "text": "”朋友的背包，背到现在还没烂。它早已成为我生命的另一半。看在它这么贵重的份上，老板，多给我一点吧。“"
+ },
+ "dialogue": {
"key": "item_coin_intr2_4",
"text": "”朋友的背包，背到现在还没烂。它早已成为我生命的另一半。看在它这么贵重的份上，老板，多给我一点吧。“"
}
@@ -104,7 +120,11 @@
"key": "item_coin_intr_5",
"text": "去往其他地方的守护者遗留的经验值，可用于提升守护者的等级。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_5",
+ "text": "”有些人来过又离开了，但他们总会留下点什么。“"
+ },
+ "dialogue": {
"key": "item_coin_intr2_5",
"text": "”有些人来过又离开了，但他们总会留下点什么。“"
}
@@ -126,7 +146,11 @@
"key": "item_coin_intr_6",
"text": "俱乐部专属的经验值，可以用于提升俱乐部等级。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_6",
+ "text": "”俱乐部会员可以任意翻阅这些日记，上面记载了许多冒险的故事，以及我们是怎么把产业做大做强的。“沃尔夫说道。"
+ },
+ "dialogue": {
"key": "item_coin_intr2_6",
"text": "”俱乐部会员可以任意翻阅这些日记，上面记载了许多冒险的故事，以及我们是怎么把产业做大做强的。“沃尔夫说道。"
}
@@ -148,7 +172,11 @@
"key": "item_coin_intr_7",
"text": "通过俱乐部任务获取，代表情绪值。印章达到一定数量，俱乐部成员可以领取对应的奖励。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_7",
+ "text": "”这里活跃的人太多，以至于有时候印章都不够用了。“戴安狐说道。"
+ },
+ "dialogue": {
"key": "item_coin_intr2_7",
"text": "”这里活跃的人太多，以至于有时候印章都不够用了。“戴安狐说道。"
}
@@ -170,7 +198,11 @@
"key": "item_coin_intr_8",
"text": "俱乐部会员专属的卡，可以用来在俱乐部商店兑换各种道具。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_8",
+ "text": "“这是一张尊贵的卡，象征着身份，象征着不凡。”"
+ },
+ "dialogue": {
"key": "item_coin_intr2_8",
"text": "“这是一张尊贵的卡，象征着身份，象征着不凡。”"
}
@@ -194,7 +226,11 @@
"key": "item_coin_intr_9",
"text": "点亮星图的必要道具，可以通过升级获得。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_9",
+ "text": "“给黑夜带去黎明，只是小小的一盏灯。”"
+ },
+ "dialogue": {
"key": "item_coin_intr2_9",
"text": "“给黑夜带去黎明，只是小小的一盏灯。”"
}
@@ -216,7 +252,11 @@
"key": "item_coin_intr_10",
"text": "商会地位的象征，积累一定数量可以提升商会等级。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_10",
+ "text": "“商会的艰辛与不易都浓缩在这小小的徽章之中。“"
+ },
+ "dialogue": {
"key": "item_coin_intr2_10",
"text": "“商会的艰辛与不易都浓缩在这小小的徽章之中。“"
}
@@ -238,7 +278,11 @@
"key": "item_coin_intr_11",
"text": "竞技比赛强者才能获得的钱币，可以在竞技商店兑换多种奖励。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_11",
+ "text": "“强者的证明！实力的象征！胜利的嘉奖！好了好了，快去把它花掉吧。”"
+ },
+ "dialogue": {
"key": "item_coin_intr2_11",
"text": "“强者的证明！实力的象征！胜利的嘉奖！好了好了，快去把它花掉吧。”"
}
@@ -260,7 +304,11 @@
"key": "item_coin_intr_12",
"text": "挑战关卡必备。没有体力做不成任何事。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_12",
+ "text": ""
+ },
+ "dialogue": {
"key": "item_coin_intr2_12",
"text": ""
}
@@ -280,7 +328,11 @@
"key": "item_coin_intr_13",
"text": "历代守护者的战斗经验值，可用于提升守护者的等级。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_13",
+ "text": "“先辈们的宝贵经验！可以学到很多东西，还可以读到很多小故事。”"
+ },
+ "dialogue": {
"key": "item_coin_intr2_13",
"text": "“先辈们的宝贵经验！可以学到很多东西，还可以读到很多小故事。”"
}
@@ -302,7 +354,11 @@
"key": "item_coin_intr_14",
"text": "重复抽取同一个守护者7次以上才能获得的宝贝，可用于守护者商店。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_14",
+ "text": "“你的运气实在非凡，这个宝贝送给你。”"
+ },
+ "dialogue": {
"key": "item_coin_intr2_14",
"text": "“你的运气实在非凡，这个宝贝送给你。”"
}
@@ -324,7 +380,11 @@
"key": "item_coin_intr_15",
"text": "用于在巨怪商队内进行消费的货币。巨怪们并不会使用常规意义的黄金宝石之类的货币，反倒是小型又量产的人类工艺品更受他们青睐。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_15",
+ "text": "“多么精致的东西啊！人类居然把这么美丽的东西扔进垃圾桶里。“一位不愿透露姓名的巨怪说道。"
+ },
+ "dialogue": {
"key": "item_coin_intr2_15",
"text": "“多么精致的东西啊！人类居然把这么美丽的东西扔进垃圾桶里。“一位不愿透露姓名的巨怪说道。"
}
@@ -346,7 +406,11 @@
"key": "item_coin_intr_16",
"text": "用于在巨怪商队内进行消费的货币。巨怪们并不会使用常规意义的黄金宝石之类的货币，反倒是小型又量产的人类工艺品更受他们青睐。"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_16",
+ "text": "“多么精致的东西啊！人类居然把这么美丽的东西扔进垃圾桶里。“一位不愿透露姓名的巨怪说道。"
+ },
+ "dialogue": {
"key": "item_coin_intr2_16",
"text": "“多么精致的东西啊！人类居然把这么美丽的东西扔进垃圾桶里。“一位不愿透露姓名的巨怪说道。"
}
@@ -366,7 +430,11 @@
"key": "item_coin_intr_17",
"text": "用于提升月梦战令等级，激活战令奖励"
},
- "intr2": {
+ "describe": {
+ "key": "item_coin_intr2_17",
+ "text": "用于提升月梦战令等级，激活战令奖励"
+ },
+ "dialogue": {
"key": "item_coin_intr2_17",
"text": "用于提升月梦战令等级，激活战令奖励"
}
diff --git a/bin/json/game_fightglobalevent.json b/bin/json/game_fightglobalevent.json
index 1be7526dc..725e66feb 100644
--- a/bin/json/game_fightglobalevent.json
+++ b/bin/json/game_fightglobalevent.json
@@ -585,5 +585,111 @@
"AddCon": [],
"Execution": 0,
"Args": []
+ },
+ {
+ "Id": 109,
+ "Count": 1,
+ "LoopTime": 0,
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "When": 20,
+ "FromCheck": "Side=1,HeroID=44004",
+ "TargetCheck": "",
+ "MainSkillCheck": "",
+ "AfterSkillCheck": "",
+ "BuffCheck": "",
+ "FightEndCheck": "",
+ "AddCon": [],
+ "Execution": 2,
+ "Args": [
+ "6000010"
+ ]
+ },
+ {
+ "Id": 110,
+ "Count": 1,
+ "LoopTime": 0,
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "When": 20,
+ "FromCheck": "Side=2,HeroID=24004",
+ "TargetCheck": "",
+ "MainSkillCheck": "",
+ "AfterSkillCheck": "",
+ "BuffCheck": "",
+ "FightEndCheck": "",
+ "AddCon": [],
+ "Execution": 2,
+ "Args": [
+ "6000020"
+ ]
+ },
+ {
+ "Id": 111,
+ "Count": 1,
+ "LoopTime": 0,
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "When": 20,
+ "FromCheck": "Side=1,HeroID=24004",
+ "TargetCheck": "",
+ "MainSkillCheck": "",
+ "AfterSkillCheck": "",
+ "BuffCheck": "",
+ "FightEndCheck": "",
+ "AddCon": [],
+ "Execution": 2,
+ "Args": [
+ "6000030",
+ "3"
+ ]
+ },
+ {
+ "Id": 112,
+ "Count": 1,
+ "LoopTime": 0,
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "When": 3,
+ "FromCheck": "Side=2,HeroID=33002",
+ "TargetCheck": "",
+ "MainSkillCheck": "",
+ "AfterSkillCheck": "",
+ "BuffCheck": "",
+ "FightEndCheck": "",
+ "AddCon": [],
+ "Execution": 2,
+ "Args": [
+ "6000040"
+ ]
+ },
+ {
+ "Id": 113,
+ "Count": 1,
+ "LoopTime": 0,
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "When": 25,
+ "FromCheck": "",
+ "TargetCheck": "",
+ "MainSkillCheck": "",
+ "AfterSkillCheck": "",
+ "BuffCheck": "",
+ "FightEndCheck": "",
+ "AddCon": [],
+ "Execution": 2,
+ "Args": [
+ "6000050"
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index be8160179..271ec77f7 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -391,7 +391,11 @@
"DrawCard_supplement10": 1000002,
"CGPloatTxt": [
"First_plot1",
- "First_plot2"
+ "First_plot2",
+ "First_plot3",
+ "First_plot4",
+ "First_plot5",
+ "First_plot6"
],
"VIP_DaysSent": 7,
"MonthlyCard_DaysSent": 30,
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 7df0f29b4..d10b79d4c 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -109,7 +109,7 @@
"z": 0
},
"capskillrule": 101,
- "skill": 0,
+ "skill": 113002011,
"skill1": 113002111,
"skill2": 113002211,
"skill3": 113002311,
@@ -1737,7 +1737,7 @@
"z": 0
},
"capskillrule": 101,
- "skill": 124004011,
+ "skill": 0,
"skill1": 124004111,
"skill2": 124004211,
"skill3": 124004311,
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index d30b2387e..415109583 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -680,9 +680,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10038
],
- "use_skip": 107,
+ "use_skip": 10038,
"upper_limit": 999,
"img": "wp_icon_10020",
"intr": {
@@ -727,9 +727,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10038
],
- "use_skip": 107,
+ "use_skip": 10038,
"upper_limit": 999,
"img": "wp_icon_10021",
"intr": {
@@ -774,9 +774,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10038
],
- "use_skip": 107,
+ "use_skip": 10038,
"upper_limit": 999,
"img": "wp_icon_10022",
"intr": {
@@ -821,9 +821,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10038
],
- "use_skip": 107,
+ "use_skip": 10038,
"upper_limit": 999,
"img": "wp_icon_10024",
"intr": {
@@ -868,9 +868,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10038
],
- "use_skip": 107,
+ "use_skip": 10038,
"upper_limit": 999,
"img": "wp_icon_10020",
"intr": {
@@ -915,9 +915,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10038
],
- "use_skip": 107,
+ "use_skip": 10038,
"upper_limit": 999,
"img": "wp_icon_10021",
"intr": {
@@ -962,9 +962,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10038
],
- "use_skip": 107,
+ "use_skip": 10038,
"upper_limit": 999,
"img": "wp_icon_10022",
"intr": {
@@ -1009,9 +1009,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10038
],
- "use_skip": 107,
+ "use_skip": 10038,
"upper_limit": 999,
"img": "wp_icon_10024",
"intr": {
@@ -1056,9 +1056,9 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [
- 123
+ 10036
],
- "use_skip": 107,
+ "use_skip": 10036,
"upper_limit": 999,
"img": "wp_icon_10023",
"intr": {
@@ -15372,7 +15372,7 @@
"img": "item_18000004",
"intr": {
"key": "item_item_intr_329",
- "text": "竞技场挑战券，是进入竞技场的凭证。"
+ "text": "竞技场挑战券每144分钟恢复一张，是进入竞技场的凭证。"
},
"describe": {
"key": "item_item_describe_329",
diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json
index 99415727d..69cc044a8 100644
--- a/bin/json/game_itemlink.json
+++ b/bin/json/game_itemlink.json
@@ -440,5 +440,73 @@
"text": "立即前往"
},
"icon": "ty_qp_sl"
+ },
+ {
+ "id": 10036,
+ "title": {
+ "key": "itemlink_itemlink_title_27",
+ "text": "前往圣桃招募"
+ },
+ "desc": {
+ "key": "itemlink_itemlink_desc_27",
+ "text": "通过招募可以获得守护者"
+ },
+ "jumpid": 10036,
+ "btnTitle": {
+ "key": "itemlink_itemlink_button_1",
+ "text": "立即前往"
+ },
+ "icon": "icon_zm"
+ },
+ {
+ "id": 10037,
+ "title": {
+ "key": "itemlink_itemlink_title_28",
+ "text": "前往限定招募"
+ },
+ "desc": {
+ "key": "itemlink_itemlink_desc_28",
+ "text": "限时开启的招募活动"
+ },
+ "jumpid": 10037,
+ "btnTitle": {
+ "key": "itemlink_itemlink_button_1",
+ "text": "立即前往"
+ },
+ "icon": "icon_zm"
+ },
+ {
+ "id": 10038,
+ "title": {
+ "key": "itemlink_itemlink_title_29",
+ "text": "前往阵营招募"
+ },
+ "desc": {
+ "key": "itemlink_itemlink_desc_29",
+ "text": "分阵营的招募卡池"
+ },
+ "jumpid": 10038,
+ "btnTitle": {
+ "key": "itemlink_itemlink_button_1",
+ "text": "立即前往"
+ },
+ "icon": "icon_zm"
+ },
+ {
+ "id": 10039,
+ "title": {
+ "key": "itemlink_itemlink_title_30",
+ "text": "前往许愿招募"
+ },
+ "desc": {
+ "key": "itemlink_itemlink_desc_30",
+ "text": "攒材料兑换指定英雄"
+ },
+ "jumpid": 10039,
+ "btnTitle": {
+ "key": "itemlink_itemlink_button_1",
+ "text": "立即前往"
+ },
+ "icon": "icon_zm"
}
]
\ No newline at end of file
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index fea7010f4..11397359e 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -137,7 +137,7 @@
"n": 6000
}
],
- "BattleReadyID": 138,
+ "BattleReadyID": 204,
"FormatList": [
101011
],
@@ -184,7 +184,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_zd",
"bubbletext": {
- "key": "main_stage_bubbletext_2",
+ "key": "",
"text": ""
},
"animation": [],
@@ -240,7 +240,7 @@
"n": 6000
}
],
- "BattleReadyID": 118,
+ "BattleReadyID": 206,
"FormatList": [
101021
],
@@ -289,7 +289,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_zd",
"bubbletext": {
- "key": "main_stage_bubbletext_3",
+ "key": "",
"text": ""
},
"animation": [],
@@ -345,7 +345,7 @@
"n": 6000
}
],
- "BattleReadyID": 118,
+ "BattleReadyID": 206,
"FormatList": [
101031
],
@@ -455,7 +455,7 @@
"n": 6000
}
],
- "BattleReadyID": 118,
+ "BattleReadyID": 206,
"FormatList": [
101041
],
@@ -631,7 +631,7 @@
"n": 6000
}
],
- "BattleReadyID": 136,
+ "BattleReadyID": 206,
"FormatList": [
101051
],
@@ -740,7 +740,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_sq",
"bubbletext": {
- "key": "main_stage_bubbletext_8",
+ "key": "",
"text": ""
},
"animation": [],
@@ -808,7 +808,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_sq",
"bubbletext": {
- "key": "main_stage_bubbletext_9",
+ "key": "",
"text": ""
},
"animation": [],
@@ -876,7 +876,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_sq",
"bubbletext": {
- "key": "main_stage_bubbletext_10",
+ "key": "",
"text": ""
},
"animation": [],
@@ -936,7 +936,7 @@
"EditorStage": 0,
"venturemodel": "",
"bubbletalk": {
- "key": "main_stage_bubbletext_1",
+ "key": "main_stage_bubbletalk_1",
"text": "嘿嘿，看我找到了什么！「猛犸象牙」！但这东西吃不了，不过拿来做一把大斧似乎不错。"
},
"venturetype": 1,
@@ -1000,7 +1000,7 @@
"EditorStage": 0,
"venturemodel": "",
"bubbletalk": {
- "key": "main_stage_bubbletext_2",
+ "key": "main_stage_bubbletalk_2",
"text": "「猫头熊的皮」，运气真不错 ，不过要怎么吃呢？"
},
"venturetype": 1,
@@ -1064,7 +1064,7 @@
"EditorStage": 0,
"venturemodel": "",
"bubbletalk": {
- "key": "main_stage_bubbletext_3",
+ "key": "main_stage_bubbletalk_3",
"text": "「鳄犬的尾巴」？这可是难得的美味！竟然在这里捡到了。"
},
"venturetype": 1,
@@ -1351,7 +1351,7 @@
"herocolor": 0,
"heroimg": "zxgq_qp_icon_sq",
"bubbletext": {
- "key": "main_stage_bubbletext_16",
+ "key": "",
"text": ""
},
"animation": [],
@@ -1424,7 +1424,7 @@
"herocolor": 0,
"heroimg": "zxgq_qp_icon_sq",
"bubbletext": {
- "key": "main_stage_bubbletext_17",
+ "key": "",
"text": ""
},
"animation": [],
@@ -1621,7 +1621,7 @@
"n": 6000
}
],
- "BattleReadyID": 122,
+ "BattleReadyID": 205,
"FormatList": [
101081
],
@@ -1670,7 +1670,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
- "key": "main_stage_bubbletext_20",
+ "key": "",
"text": ""
},
"animation": [],
@@ -4608,7 +4608,7 @@
"chapterid": 11001,
"group_id": 100127,
"previous_group_id": [
- 100126
+ 100125
],
"previoustage": 0,
"Episodetype": 7,
@@ -4676,7 +4676,8 @@
"chapterid": 11001,
"group_id": 100128,
"previous_group_id": [
- 100127
+ 100127,
+ 100126
],
"previoustage": 0,
"Episodetype": 7,
@@ -4874,10 +4875,10 @@
"chapterid": 11001,
"group_id": 100131,
"previous_group_id": [
- 100130
+ 100129
],
"previoustage": 0,
- "Episodetype": 5,
+ "Episodetype": 7,
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
@@ -4942,7 +4943,7 @@
"chapterid": 11001,
"group_id": 100132,
"previous_group_id": [
- 100131
+ 100129
],
"previoustage": 0,
"Episodetype": 7,
@@ -5010,7 +5011,7 @@
"chapterid": 11001,
"group_id": 100133,
"previous_group_id": [
- 100132
+ 100129
],
"previoustage": 0,
"Episodetype": 5,
@@ -5072,7 +5073,7 @@
"chapterid": 11001,
"group_id": 100134,
"previous_group_id": [
- 100133
+ 100129
],
"previoustage": 0,
"Episodetype": 4,
@@ -5182,7 +5183,7 @@
"chapterid": 11001,
"group_id": 100134,
"previous_group_id": [
- 100133
+ 100129
],
"previoustage": 1100150,
"Episodetype": 4,
@@ -5292,7 +5293,7 @@
"chapterid": 11001,
"group_id": 100134,
"previous_group_id": [
- 100133
+ 100129
],
"previoustage": 1100151,
"Episodetype": 4,
@@ -5402,7 +5403,7 @@
"chapterid": 11001,
"group_id": 100134,
"previous_group_id": [
- 100133
+ 100129
],
"previoustage": 1100152,
"Episodetype": 4,
@@ -5512,7 +5513,7 @@
"chapterid": 11001,
"group_id": 100134,
"previous_group_id": [
- 100133
+ 100129
],
"previoustage": 1100153,
"Episodetype": 4,
@@ -5622,7 +5623,7 @@
"chapterid": 11001,
"group_id": 100134,
"previous_group_id": [
- 100133
+ 100129
],
"previoustage": 1100154,
"Episodetype": 4,
@@ -5732,7 +5733,7 @@
"chapterid": 11001,
"group_id": 100134,
"previous_group_id": [
- 100133
+ 100129
],
"previoustage": 1100155,
"Episodetype": 4,
@@ -5910,7 +5911,7 @@
"chapterid": 11001,
"group_id": 100136,
"previous_group_id": [
- 100135
+ 100134
],
"previoustage": 0,
"Episodetype": 7,
@@ -5978,7 +5979,7 @@
"chapterid": 11001,
"group_id": 100137,
"previous_group_id": [
- 100136
+ 100134
],
"previoustage": 0,
"Episodetype": 7,
@@ -6046,7 +6047,9 @@
"chapterid": 11001,
"group_id": 100138,
"previous_group_id": [
- 100137
+ 100137,
+ 100136,
+ 100135
],
"previoustage": 0,
"Episodetype": 7,
@@ -6114,7 +6117,7 @@
"chapterid": 11001,
"group_id": 100139,
"previous_group_id": [
- 100138
+ 100134
],
"previoustage": 0,
"Episodetype": 7,
@@ -6182,7 +6185,7 @@
"chapterid": 11001,
"group_id": 100140,
"previous_group_id": [
- 100139
+ 100134
],
"previoustage": 0,
"Episodetype": 7,
@@ -6250,7 +6253,7 @@
"chapterid": 11001,
"group_id": 100141,
"previous_group_id": [
- 100140
+ 100134
],
"previoustage": 0,
"Episodetype": 7,
@@ -6318,7 +6321,9 @@
"chapterid": 11001,
"group_id": 100142,
"previous_group_id": [
- 100141
+ 100141,
+ 100140,
+ 100139
],
"previoustage": 0,
"Episodetype": 7,
@@ -6386,7 +6391,7 @@
"chapterid": 11001,
"group_id": 100143,
"previous_group_id": [
- 100142
+ 100134
],
"previoustage": 0,
"Episodetype": 7,
@@ -6454,7 +6459,7 @@
"chapterid": 11001,
"group_id": 100144,
"previous_group_id": [
- 100143
+ 100134
],
"previoustage": 0,
"Episodetype": 7,
@@ -6522,7 +6527,7 @@
"chapterid": 11001,
"group_id": 100145,
"previous_group_id": [
- 100144
+ 100134
],
"previoustage": 0,
"Episodetype": 7,
@@ -6590,7 +6595,9 @@
"chapterid": 11001,
"group_id": 100146,
"previous_group_id": [
- 100145
+ 100145,
+ 100143,
+ 100144
],
"previoustage": 0,
"Episodetype": 7,
@@ -6658,7 +6665,9 @@
"chapterid": 11001,
"group_id": 100147,
"previous_group_id": [
- 100146
+ 100146,
+ 100142,
+ 100138
],
"previoustage": 0,
"Episodetype": 1,
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 2ffc60bfb..ea1c38025 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -16,7 +16,7 @@
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": 73,
+ "speed": 95,
"modelsize": 1
},
{
@@ -36,7 +36,7 @@
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": 73,
+ "speed": 100,
"modelsize": 1
},
{
@@ -65,7 +65,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 45003,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@@ -232410,7 +232410,7 @@
"equip": [],
"newskill": [],
"lv": 1,
- "hppro": 0.1,
+ "hppro": 0.6,
"atkpro": 0.2,
"defpro": 0.1,
"skill1": 1,
@@ -232430,7 +232430,7 @@
"equip": [],
"newskill": [],
"lv": 1,
- "hppro": 0.1,
+ "hppro": 0.6,
"atkpro": 0.2,
"defpro": 0.1,
"skill1": 1,
@@ -232450,7 +232450,7 @@
"equip": [],
"newskill": [],
"lv": 1,
- "hppro": 0.1,
+ "hppro": 0.6,
"atkpro": 0.2,
"defpro": 0.1,
"skill1": 1,
@@ -232470,7 +232470,7 @@
"equip": [],
"newskill": [],
"lv": 1,
- "hppro": 0.1,
+ "hppro": 0.6,
"atkpro": 0.2,
"defpro": 0.1,
"skill1": 1,
@@ -232490,7 +232490,7 @@
"equip": [],
"newskill": [],
"lv": 1,
- "hppro": 0.2,
+ "hppro": 0.6,
"atkpro": 0.2,
"defpro": 0.1,
"skill1": 1,
@@ -232570,13 +232570,13 @@
"equip": [],
"newskill": [],
"lv": 1,
- "hppro": 0.3,
- "atkpro": 0.5,
+ "hppro": 0.6,
+ "atkpro": 2,
"defpro": 0.1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": 80,
+ "speed": 95,
"modelsize": 1
},
{
@@ -232705,7 +232705,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 51052,
+ "heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@@ -232725,7 +232725,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@@ -232745,7 +232745,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51052,
"star": 3,
"equip": [],
"newskill": [],
@@ -232805,13 +232805,13 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 35001,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.6,
- "atkpro": 0.5,
+ "atkpro": 0.3,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
@@ -232825,13 +232825,13 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 24005,
"star": 3,
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.6,
- "atkpro": 0.5,
+ "atkpro": 0.3,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
@@ -232845,13 +232845,13 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 14005,
"star": 3,
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.6,
- "atkpro": 0.5,
+ "atkpro": 0.3,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
@@ -232865,13 +232865,13 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 44006,
"star": 3,
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.5,
- "atkpro": 0.5,
+ "atkpro": 0.3,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
@@ -232891,7 +232891,7 @@
"newskill": [],
"lv": 3,
"hppro": 0.6,
- "atkpro": 0.5,
+ "atkpro": 0.3,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
@@ -238149,7 +238149,7 @@
"star": 3,
"equip": [],
"newskill": [],
- "lv": 10,
+ "lv": 1,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
@@ -238165,18 +238165,18 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 44004,
"star": 3,
"equip": [],
"newskill": [],
- "lv": 10,
+ "lv": 1,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": 80,
+ "speed": 90,
"modelsize": 1
},
{
@@ -238189,7 +238189,7 @@
"star": 3,
"equip": [],
"newskill": [],
- "lv": 10,
+ "lv": 1,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
@@ -238209,7 +238209,7 @@
"star": 3,
"equip": [],
"newskill": [],
- "lv": 10,
+ "lv": 1,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
@@ -238229,7 +238229,7 @@
"star": 3,
"equip": [],
"newskill": [],
- "lv": 10,
+ "lv": 1,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
@@ -238241,7 +238241,7 @@
},
{
"Id": 720015,
- "pos": 3,
+ "pos": 1,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
@@ -238249,7 +238249,47 @@
"star": 4,
"equip": [],
"newskill": [],
- "lv": 10,
+ "lv": 1,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 80,
+ "modelsize": 1
+ },
+ {
+ "Id": 720016,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": 0,
+ "bossHpCnt": 0,
+ "heroid": 35001,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 80,
+ "modelsize": 1
+ },
+ {
+ "Id": 720017,
+ "pos": 4,
+ "captainId": 0,
+ "IsBoss": 0,
+ "bossHpCnt": 0,
+ "heroid": 35001,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
diff --git a/bin/json/game_skillproperty.json b/bin/json/game_skillproperty.json
new file mode 100644
index 000000000..18970a013
--- /dev/null
+++ b/bin/json/game_skillproperty.json
@@ -0,0 +1,1245 @@
+[
+ {
+ "ProType": 0,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 1,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 1,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 2,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 1,
+ "MaxValue": 0,
+ "BaseTerms": 37,
+ "ExtraTerms": 45,
+ "PerTerms": 21,
+ "FixTerms": 29
+ },
+ {
+ "ProType": 3,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 4,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 38,
+ "ExtraTerms": 46,
+ "PerTerms": 22,
+ "FixTerms": 30
+ },
+ {
+ "ProType": 5,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 39,
+ "ExtraTerms": 47,
+ "PerTerms": 23,
+ "FixTerms": 31
+ },
+ {
+ "ProType": 6,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 40,
+ "ExtraTerms": 48,
+ "PerTerms": 87,
+ "FixTerms": 88
+ },
+ {
+ "ProType": 7,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 1000,
+ "BaseTerms": 41,
+ "ExtraTerms": 49,
+ "PerTerms": 90,
+ "FixTerms": 91
+ },
+ {
+ "ProType": 8,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 42,
+ "ExtraTerms": 50,
+ "PerTerms": 93,
+ "FixTerms": 94
+ },
+ {
+ "ProType": 9,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 1000,
+ "BaseTerms": 43,
+ "ExtraTerms": 51,
+ "PerTerms": 96,
+ "FixTerms": 97
+ },
+ {
+ "ProType": 10,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 200,
+ "MaxValue": 1000,
+ "BaseTerms": 44,
+ "ExtraTerms": 52,
+ "PerTerms": 28,
+ "FixTerms": 36
+ },
+ {
+ "ProType": 11,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 1000,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 12,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 1000,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 13,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 14,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 15,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 16,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 17,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 18,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 19,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 20,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 21,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 22,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 23,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 24,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 25,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 26,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 27,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 28,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 29,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 30,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 31,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 32,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 33,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 34,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 35,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 36,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 37,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 53,
+ "ExtraTerms": 0,
+ "PerTerms": 54,
+ "FixTerms": 55
+ },
+ {
+ "ProType": 38,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 56,
+ "ExtraTerms": 0,
+ "PerTerms": 57,
+ "FixTerms": 58
+ },
+ {
+ "ProType": 39,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 59,
+ "ExtraTerms": 0,
+ "PerTerms": 60,
+ "FixTerms": 61
+ },
+ {
+ "ProType": 40,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 62,
+ "ExtraTerms": 0,
+ "PerTerms": 63,
+ "FixTerms": 64
+ },
+ {
+ "ProType": 41,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 65,
+ "ExtraTerms": 0,
+ "PerTerms": 66,
+ "FixTerms": 67
+ },
+ {
+ "ProType": 42,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 68,
+ "ExtraTerms": 0,
+ "PerTerms": 69,
+ "FixTerms": 70
+ },
+ {
+ "ProType": 43,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 71,
+ "ExtraTerms": 0,
+ "PerTerms": 72,
+ "FixTerms": 73
+ },
+ {
+ "ProType": 44,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 74,
+ "ExtraTerms": 0,
+ "PerTerms": 75,
+ "FixTerms": 76
+ },
+ {
+ "ProType": 45,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 77,
+ "ExtraTerms": 0,
+ "PerTerms": 78,
+ "FixTerms": 79
+ },
+ {
+ "ProType": 46,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 80,
+ "ExtraTerms": 0,
+ "PerTerms": 81,
+ "FixTerms": 82
+ },
+ {
+ "ProType": 47,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 83,
+ "ExtraTerms": 0,
+ "PerTerms": 84,
+ "FixTerms": 85
+ },
+ {
+ "ProType": 48,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 86,
+ "ExtraTerms": 0,
+ "PerTerms": 87,
+ "FixTerms": 88
+ },
+ {
+ "ProType": 49,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 89,
+ "ExtraTerms": 0,
+ "PerTerms": 90,
+ "FixTerms": 91
+ },
+ {
+ "ProType": 50,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 92,
+ "ExtraTerms": 0,
+ "PerTerms": 93,
+ "FixTerms": 94
+ },
+ {
+ "ProType": 51,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 95,
+ "ExtraTerms": 0,
+ "PerTerms": 96,
+ "FixTerms": 97
+ },
+ {
+ "ProType": 52,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 98,
+ "ExtraTerms": 0,
+ "PerTerms": 99,
+ "FixTerms": 100
+ },
+ {
+ "ProType": 53,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 54,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 55,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 56,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 57,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 58,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 59,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 60,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 61,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 62,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 63,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 64,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 65,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 66,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 67,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 68,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 69,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 70,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 71,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 72,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 73,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 74,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 75,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 76,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 77,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 78,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 79,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 80,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 81,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 82,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 83,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 84,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 85,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 86,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 87,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 88,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 89,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 90,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 91,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 92,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 93,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 94,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 95,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 96,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 97,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 98,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 99,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 100,
+ "ProLevel": 1,
+ "LimitValue": 0,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 101,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 102,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 103,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 104,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 105,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 107,
+ "ExtraTerms": 108,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 106,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 107,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 108,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 109,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 110,
+ "ProLevel": 2,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 1,
+ "ExtraTerms": 0,
+ "PerTerms": 111,
+ "FixTerms": 112
+ },
+ {
+ "ProType": 111,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ },
+ {
+ "ProType": 112,
+ "ProLevel": 1,
+ "LimitValue": 1,
+ "MinValue": 0,
+ "MaxValue": 0,
+ "BaseTerms": 0,
+ "ExtraTerms": 0,
+ "PerTerms": 0,
+ "FixTerms": 0
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_stoneprivilege.json b/bin/json/game_stoneprivilege.json
index f745148ae..3e211893e 100644
--- a/bin/json/game_stoneprivilege.json
+++ b/bin/json/game_stoneprivilege.json
@@ -68,5 +68,15 @@
"Value1": 0,
"Value2": 0,
"Value3": 0
+ },
+ {
+ "PrivilegeId": 8,
+ "Desc": {
+ "key": "stonehenge_privilege_Desc_8",
+ "text": "每次进入关卡时，都会获得30个宝螺贝"
+ },
+ "Value1": 10000036,
+ "Value2": 30,
+ "Value3": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_stonestage.json b/bin/json/game_stonestage.json
index 7e123abde..b01f0c4ca 100644
--- a/bin/json/game_stonestage.json
+++ b/bin/json/game_stonestage.json
@@ -73,7 +73,7 @@
"t": "10000037",
"n": 5
},
- "ReferenceLevel": 0,
+ "ReferenceLevel": 20,
"StageValue": 0
},
{
@@ -414,7 +414,7 @@
"t": "10000037",
"n": 5
},
- "ReferenceLevel": 0,
+ "ReferenceLevel": 30,
"StageValue": 0
},
{
@@ -953,7 +953,7 @@
"t": "10000037",
"n": 6
},
- "ReferenceLevel": 0,
+ "ReferenceLevel": 40,
"StageValue": 0
},
{
@@ -1492,7 +1492,7 @@
"t": "10000037",
"n": 18
},
- "ReferenceLevel": 0,
+ "ReferenceLevel": 50,
"StageValue": 0
},
{
@@ -2295,7 +2295,7 @@
"t": "10000037",
"n": 24
},
- "ReferenceLevel": 0,
+ "ReferenceLevel": 60,
"StageValue": 0
},
{
@@ -3098,7 +3098,7 @@
"t": "10000037",
"n": 24
},
- "ReferenceLevel": 0,
+ "ReferenceLevel": 60,
"StageValue": 0
},
{
@@ -3901,7 +3901,7 @@
"t": "10000037",
"n": 27
},
- "ReferenceLevel": 0,
+ "ReferenceLevel": 60,
"StageValue": 0
},
{
@@ -4704,7 +4704,7 @@
"t": "10000037",
"n": 27
},
- "ReferenceLevel": 0,
+ "ReferenceLevel": 60,
"StageValue": 0
},
{
diff --git a/bin/json/game_stonetalent.json b/bin/json/game_stonetalent.json
index bb0cfa6c3..f6cfb67ac 100644
--- a/bin/json/game_stonetalent.json
+++ b/bin/json/game_stonetalent.json
@@ -9,29 +9,29 @@
{
"a": "attr",
"t": "diamond",
- "n": 50
+ "n": 100
}
],
"PrivilegeId": 0,
"AttributeDesc": {
"key": "stonehenge_talenttree_AttributeDesc_1",
- "text": "全局生命提升{0},全局攻击提升{1}"
+ "text": "在巨石迷阵中，全体卡牌攻击提升100，生命提升1500"
},
"Attribute": [
{
- "a": "hp",
- "n": 75
+ "a": "Atk",
+ "n": 100
},
{
- "a": "atk",
- "n": 100
+ "a": "Hp",
+ "n": 1500
}
]
},
{
"Id": 2,
"NodeType": 1,
- "NodeIcon": "mj_icon_life",
+ "NodeIcon": "mj_icon_attack",
"listIndex": 1,
"Front": [
1
@@ -40,25 +40,25 @@
{
"a": "attr",
"t": "diamond",
- "n": 51
+ "n": 50
}
],
"PrivilegeId": 0,
"AttributeDesc": {
"key": "stonehenge_talenttree_AttributeDesc_2",
- "text": "全局生命提升{0}"
+ "text": "在巨石迷阵中，全体卡牌攻击提升50"
},
"Attribute": [
{
- "a": "hp",
- "n": 150
+ "a": "Atk",
+ "n": 50
}
]
},
{
"Id": 3,
"NodeType": 1,
- "NodeIcon": "mj_icon_life",
+ "NodeIcon": "mj_icon_attack",
"listIndex": 1,
"Front": [
1
@@ -67,18 +67,18 @@
{
"a": "attr",
"t": "diamond",
- "n": 52
+ "n": 50
}
],
"PrivilegeId": 0,
"AttributeDesc": {
"key": "stonehenge_talenttree_AttributeDesc_3",
- "text": "全局生命提升{0}"
+ "text": "在巨石迷阵中，全体卡牌生命提升750"
},
"Attribute": [
{
- "a": "hp",
- "n": 225
+ "a": "Hp",
+ "n": 750
}
]
},
@@ -95,24 +95,19 @@
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 200
}
],
- "PrivilegeId": 1,
+ "PrivilegeId": 4,
"AttributeDesc": {
- "key": "stonehenge_talenttree_AttributeDesc_4",
- "text": "全局攻击提升{0}"
+ "key": "",
+ "text": ""
},
- "Attribute": [
- {
- "a": "atk",
- "n": 20
- }
- ]
+ "Attribute": []
},
{
"Id": 5,
- "NodeType": 2,
+ "NodeType": 1,
"NodeIcon": "mj_icon_attack",
"listIndex": 2,
"Front": [
@@ -122,18 +117,18 @@
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 100
}
],
- "PrivilegeId": 2,
+ "PrivilegeId": 0,
"AttributeDesc": {
"key": "stonehenge_talenttree_AttributeDesc_5",
- "text": "全局攻击提升{0}"
+ "text": "在巨石迷阵中，全体卡牌攻击提升50"
},
"Attribute": [
{
- "a": "atk",
- "n": 40
+ "a": "Atk",
+ "n": 50
}
]
},
@@ -143,79 +138,74 @@
"NodeIcon": "mj_icon_attack",
"listIndex": 2,
"Front": [
- 5
+ 4
],
"CostItem": [
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 100
}
],
"PrivilegeId": 0,
"AttributeDesc": {
"key": "stonehenge_talenttree_AttributeDesc_6",
- "text": "全局攻击提升{0}"
+ "text": "在巨石迷阵中，全体卡牌生命提升750"
},
"Attribute": [
{
- "a": "atk",
- "n": 60
+ "a": "Hp",
+ "n": 750
}
]
},
{
"Id": 7,
- "NodeType": 1,
+ "NodeType": 2,
"NodeIcon": "mj_icon_attack",
"listIndex": 2,
"Front": [
- 5
+ 5,
+ 6
],
"CostItem": [
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 300
}
],
- "PrivilegeId": 0,
+ "PrivilegeId": 7,
"AttributeDesc": {
- "key": "stonehenge_talenttree_AttributeDesc_7",
- "text": "全局生命提升{0}"
+ "key": "",
+ "text": ""
},
- "Attribute": [
- {
- "a": "hp",
- "n": 200
- }
- ]
+ "Attribute": []
},
{
"Id": 8,
- "NodeType": 2,
+ "NodeType": 1,
"NodeIcon": "mj_icon_attack",
- "listIndex": 2,
+ "listIndex": 3,
"Front": [
- 6,
7
],
"CostItem": [
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 150
}
],
- "PrivilegeId": 3,
+ "PrivilegeId": 0,
"AttributeDesc": {
"key": "stonehenge_talenttree_AttributeDesc_8",
- "text": "全局生命提升{0}"
+ "text": "在巨石迷阵中，全体卡牌攻击提升60"
},
"Attribute": [
{
- "a": "hp",
- "n": 600
+ "a": "Atk",
+ "n": 60
}
]
},
@@ -225,86 +215,55 @@
"NodeIcon": "mj_icon_attack",
"listIndex": 3,
"Front": [
- 8
+ 7
],
"CostItem": [
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 150
}
],
"PrivilegeId": 0,
"AttributeDesc": {
"key": "stonehenge_talenttree_AttributeDesc_9",
- "text": "全局生命提升{0}"
+ "text": "在巨石迷阵中，全体卡牌生命提升900"
},
"Attribute": [
{
- "a": "hp",
- "n": 300
+ "a": "Hp",
+ "n": 900
}
]
},
{
"Id": 10,
- "NodeType": 1,
- "NodeIcon": "mj_icon_attack",
- "listIndex": 3,
- "Front": [
- 8
- ],
- "CostItem": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 54
- }
- ],
- "PrivilegeId": 0,
- "AttributeDesc": {
- "key": "stonehenge_talenttree_AttributeDesc_10",
- "text": "全局生命提升{0}"
- },
- "Attribute": [
- {
- "a": "hp",
- "n": 300
- }
- ]
- },
- {
- "Id": 11,
- "NodeType": 1,
+ "NodeType": 2,
"NodeIcon": "mj_icon_attack",
"listIndex": 3,
"Front": [
+ 8,
9
],
"CostItem": [
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 400
}
],
- "PrivilegeId": 0,
+ "PrivilegeId": 1,
"AttributeDesc": {
- "key": "stonehenge_talenttree_AttributeDesc_11",
- "text": "全局生命提升{0}"
+ "key": "stonehenge_talenttree_AttributeDesc_10",
+ "text": "在巨石迷阵中，遇到商人，商人将额外提供复活功能（每次遇到商人仅可复活1个角色）"
},
- "Attribute": [
- {
- "a": "hp",
- "n": 300
- }
- ]
+ "Attribute": []
},
{
- "Id": 12,
+ "Id": 11,
"NodeType": 1,
"NodeIcon": "mj_icon_attack",
- "listIndex": 3,
+ "listIndex": 4,
"Front": [
10
],
@@ -312,18 +271,45 @@
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 200
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_11",
+ "text": "在巨石迷阵中，全体卡牌攻击提升60"
+ },
+ "Attribute": [
+ {
+ "a": "Atk",
+ "n": 60
+ }
+ ]
+ },
+ {
+ "Id": 12,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 4,
+ "Front": [
+ 10
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
}
],
"PrivilegeId": 0,
"AttributeDesc": {
"key": "stonehenge_talenttree_AttributeDesc_12",
- "text": "全局生命提升{0}"
+ "text": "在巨石迷阵中，全体卡牌生命提升900"
},
"Attribute": [
{
- "a": "hp",
- "n": 300
+ "a": "Hp",
+ "n": 900
}
]
},
@@ -331,7 +317,7 @@
"Id": 13,
"NodeType": 2,
"NodeIcon": "mj_icon_attack",
- "listIndex": 3,
+ "listIndex": 4,
"Front": [
11,
12
@@ -340,18 +326,705 @@
{
"a": "attr",
"t": "diamond",
- "n": 54
+ "n": 500
+ }
+ ],
+ "PrivilegeId": 5,
+ "AttributeDesc": {
+ "key": "",
+ "text": ""
+ },
+ "Attribute": []
+ },
+ {
+ "Id": 14,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 5,
+ "Front": [
+ 13
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 250
}
],
"PrivilegeId": 0,
"AttributeDesc": {
- "key": "stonehenge_talenttree_AttributeDesc_13",
- "text": "全局生命提升{0}"
+ "key": "stonehenge_talenttree_AttributeDesc_14",
+ "text": "在巨石迷阵中，全体卡牌攻击提升70"
},
"Attribute": [
{
- "a": "hp",
- "n": 1100
+ "a": "Atk",
+ "n": 70
+ }
+ ]
+ },
+ {
+ "Id": 15,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 5,
+ "Front": [
+ 13
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 250
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_15",
+ "text": "在巨石迷阵中，全体卡牌生命提升1050"
+ },
+ "Attribute": [
+ {
+ "a": "Hp",
+ "n": 1050
+ }
+ ]
+ },
+ {
+ "Id": 16,
+ "NodeType": 2,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 5,
+ "Front": [
+ 14,
+ 15
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 600
+ }
+ ],
+ "PrivilegeId": 2,
+ "AttributeDesc": {
+ "key": "",
+ "text": ""
+ },
+ "Attribute": []
+ },
+ {
+ "Id": 17,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 6,
+ "Front": [
+ 16
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 300
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_17",
+ "text": "在巨石迷阵中，全体卡牌攻击提升70"
+ },
+ "Attribute": [
+ {
+ "a": "Atk",
+ "n": 70
+ }
+ ]
+ },
+ {
+ "Id": 18,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 6,
+ "Front": [
+ 16
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 300
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_18",
+ "text": "在巨石迷阵中，全体卡牌生命提升1050"
+ },
+ "Attribute": [
+ {
+ "a": "Hp",
+ "n": 1050
+ }
+ ]
+ },
+ {
+ "Id": 19,
+ "NodeType": 2,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 6,
+ "Front": [
+ 17,
+ 18
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 800
+ }
+ ],
+ "PrivilegeId": 8,
+ "AttributeDesc": {
+ "key": "",
+ "text": ""
+ },
+ "Attribute": []
+ },
+ {
+ "Id": 20,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 7,
+ "Front": [
+ 19
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 400
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_20",
+ "text": "在巨石迷阵中，全体卡牌攻击提升80"
+ },
+ "Attribute": [
+ {
+ "a": "Atk",
+ "n": 80
+ }
+ ]
+ },
+ {
+ "Id": 21,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 7,
+ "Front": [
+ 19
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 400
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_21",
+ "text": "在巨石迷阵中，全体卡牌生命提升1200"
+ },
+ "Attribute": [
+ {
+ "a": "Hp",
+ "n": 1200
+ }
+ ]
+ },
+ {
+ "Id": 22,
+ "NodeType": 2,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 7,
+ "Front": [
+ 20,
+ 21
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1000
+ }
+ ],
+ "PrivilegeId": 3,
+ "AttributeDesc": {
+ "key": "",
+ "text": ""
+ },
+ "Attribute": []
+ },
+ {
+ "Id": 23,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 8,
+ "Front": [
+ 22
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 500
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_23",
+ "text": "在巨石迷阵中，全体卡牌攻击提升80"
+ },
+ "Attribute": [
+ {
+ "a": "Atk",
+ "n": 80
+ }
+ ]
+ },
+ {
+ "Id": 24,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 8,
+ "Front": [
+ 22
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 500
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_24",
+ "text": "在巨石迷阵中，全体卡牌生命提升1200"
+ },
+ "Attribute": [
+ {
+ "a": "Hp",
+ "n": 1200
+ }
+ ]
+ },
+ {
+ "Id": 25,
+ "NodeType": 2,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 8,
+ "Front": [
+ 23,
+ 24
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1500
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_25",
+ "text": "在巨石迷阵中，全体卡牌速度增加5%，全体卡牌暴击增加5%"
+ },
+ "Attribute": [
+ {
+ "a": "Speed",
+ "n": 50
+ },
+ {
+ "a": "Crit",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "Id": 26,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 9,
+ "Front": [
+ 25
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 750
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_26",
+ "text": "在巨石迷阵中，全体卡牌攻击提升80"
+ },
+ "Attribute": [
+ {
+ "a": "Atk",
+ "n": 80
+ }
+ ]
+ },
+ {
+ "Id": 27,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 9,
+ "Front": [
+ 25
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 750
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_27",
+ "text": "在巨石迷阵中，全体卡牌生命提升1200"
+ },
+ "Attribute": [
+ {
+ "a": "Hp",
+ "n": 1200
+ }
+ ]
+ },
+ {
+ "Id": 28,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 9,
+ "Front": [
+ 26
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 750
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_28",
+ "text": "在巨石迷阵中，全体卡牌暴击伤害提升5%"
+ },
+ "Attribute": [
+ {
+ "a": "CritDam",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "Id": 29,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 9,
+ "Front": [
+ 27
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 750
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_29",
+ "text": "在巨石迷阵中，全体卡牌攻击提升100"
+ },
+ "Attribute": [
+ {
+ "a": "Atk",
+ "n": 100
+ }
+ ]
+ },
+ {
+ "Id": 30,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 9,
+ "Front": [
+ 28
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 750
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_30",
+ "text": "在巨石迷阵中，全体卡牌生命提升1500"
+ },
+ "Attribute": [
+ {
+ "a": "Hp",
+ "n": 1500
+ }
+ ]
+ },
+ {
+ "Id": 31,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 9,
+ "Front": [
+ 29
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 750
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_31",
+ "text": "在巨石迷阵中，全体卡牌暴击伤害提升5%"
+ },
+ "Attribute": [
+ {
+ "a": "CritDam",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "Id": 32,
+ "NodeType": 2,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 9,
+ "Front": [
+ 30,
+ 31
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 2000
+ }
+ ],
+ "PrivilegeId": 7,
+ "AttributeDesc": {
+ "key": "",
+ "text": ""
+ },
+ "Attribute": []
+ },
+ {
+ "Id": 33,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 10,
+ "Front": [
+ 32
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1000
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_33",
+ "text": "在巨石迷阵中，全体卡牌攻击提升100"
+ },
+ "Attribute": [
+ {
+ "a": "Atk",
+ "n": 100
+ }
+ ]
+ },
+ {
+ "Id": 34,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 10,
+ "Front": [
+ 32
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1000
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_34",
+ "text": "在巨石迷阵中，全体卡牌生命提升1500"
+ },
+ "Attribute": [
+ {
+ "a": "Hp",
+ "n": 1500
+ }
+ ]
+ },
+ {
+ "Id": 35,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 10,
+ "Front": [
+ 33
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1000
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_35",
+ "text": "在巨石迷阵中，全体卡牌效果命中提升10%"
+ },
+ "Attribute": [
+ {
+ "a": "EffectHit",
+ "n": 100
+ }
+ ]
+ },
+ {
+ "Id": 36,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 10,
+ "Front": [
+ 34
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1000
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_36",
+ "text": "在巨石迷阵中，全体卡牌攻击提升100"
+ },
+ "Attribute": [
+ {
+ "a": "Atk",
+ "n": 100
+ }
+ ]
+ },
+ {
+ "Id": 37,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 10,
+ "Front": [
+ 35
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1000
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_37",
+ "text": "在巨石迷阵中，全体卡牌生命提升1500"
+ },
+ "Attribute": [
+ {
+ "a": "Hp",
+ "n": 1500
+ }
+ ]
+ },
+ {
+ "Id": 38,
+ "NodeType": 1,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 10,
+ "Front": [
+ 36
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1000
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_38",
+ "text": "在巨石迷阵中，全体卡牌效果命中提升10%"
+ },
+ "Attribute": [
+ {
+ "a": "EffectHit",
+ "n": 100
+ }
+ ]
+ },
+ {
+ "Id": 39,
+ "NodeType": 2,
+ "NodeIcon": "mj_icon_attack",
+ "listIndex": 10,
+ "Front": [
+ 37,
+ 38
+ ],
+ "CostItem": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 2000
+ }
+ ],
+ "PrivilegeId": 0,
+ "AttributeDesc": {
+ "key": "stonehenge_talenttree_AttributeDesc_39",
+ "text": "在巨石迷阵中，全体卡牌速度增加5%"
+ },
+ "Attribute": [
+ {
+ "a": "Speed",
+ "n": 50
}
]
}
diff --git a/bin/json/game_stonetask.json b/bin/json/game_stonetask.json
new file mode 100644
index 000000000..42487aa05
--- /dev/null
+++ b/bin/json/game_stonetask.json
@@ -0,0 +1,332 @@
+[
+ {
+ "TaskId": 22215001,
+ "TaskType": 1,
+ "TabText": {
+ "key": "stonehenge_task_TabText_1",
+ "text": "常规"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22215002,
+ "TaskType": 1,
+ "TabText": {
+ "key": "stonehenge_task_TabText_2",
+ "text": "常规"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22215003,
+ "TaskType": 1,
+ "TabText": {
+ "key": "stonehenge_task_TabText_3",
+ "text": "常规"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22215004,
+ "TaskType": 1,
+ "TabText": {
+ "key": "stonehenge_task_TabText_4",
+ "text": "常规"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22215005,
+ "TaskType": 1,
+ "TabText": {
+ "key": "stonehenge_task_TabText_5",
+ "text": "常规"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22215006,
+ "TaskType": 1,
+ "TabText": {
+ "key": "stonehenge_task_TabText_6",
+ "text": "常规"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216001,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_7",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216002,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_8",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216003,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_9",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216004,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_10",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216005,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_11",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216006,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_12",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216007,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_13",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216008,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_14",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216009,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_15",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216010,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_16",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216011,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_17",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216012,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_18",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216013,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_19",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216014,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_20",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216015,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_21",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "TaskId": 22216016,
+ "TaskType": 2,
+ "TabText": {
+ "key": "stonehenge_task_TabText_22",
+ "text": "挑战"
+ },
+ "TaskReward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index 4e98f5615..bbca5e83e 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -4,7 +4,7 @@
"FormatList": [
700011
],
- "BattleReadyID": 127,
+ "BattleReadyID": 201,
"EventList": [],
"playexp": {
"a": "attr",
@@ -18,7 +18,7 @@
"FormatList": [
700012
],
- "BattleReadyID": 127,
+ "BattleReadyID": 202,
"EventList": [],
"playexp": {
"a": "attr",
@@ -46,7 +46,7 @@
"FormatList": [
700014
],
- "BattleReadyID": 126,
+ "BattleReadyID": 203,
"EventList": [],
"playexp": {
"a": "attr",
diff --git a/modules/stonehenge/api_taskinfo.go b/modules/stonehenge/api_taskinfo.go
new file mode 100644
index 000000000..1ff217274
--- /dev/null
+++ b/modules/stonehenge/api_taskinfo.go
@@ -0,0 +1,53 @@
+package stonehenge
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+//参数校验
+func (this *apiComp) TaskInfoCheck(session comm.IUserSession, req *pb.StonehengeTaskInfoReq) (errdata *pb.ErrorData) {
+
+ return
+}
+
+func (this *apiComp) TaskInfo(session comm.IUserSession, req *pb.StonehengeTaskInfoReq) (errdata *pb.ErrorData) {
+ var (
+ info *pb.DBStonehenge
+ confs []*cfg.GameStoneTaskData
+ tasks []int32 = make([]int32, 0)
+ progress []*pb.ConIProgress
+ err error
+ )
+ if errdata = this.TaskInfoCheck(session, req); errdata != nil {
+ return
+ }
+ if info, err = this.module.modelStonehenge.GetStonehengeData(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if confs, err = this.module.configure.getGameStoneTaskDatas(); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ for _, v := range confs {
+ tasks = append(tasks, v.TaskId)
+ }
+
+ if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasks...); err != nil {
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "taskinfo", &pb.StonehengeTaskInfoResp{Conlds: progress, Task: info.Task})
+ return
+}
diff --git a/modules/stonehenge/api_taskreceive.go b/modules/stonehenge/api_taskreceive.go
new file mode 100644
index 000000000..f7b20bc38
--- /dev/null
+++ b/modules/stonehenge/api_taskreceive.go
@@ -0,0 +1,97 @@
+package stonehenge
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+//参数校验
+func (this *apiComp) TaskReceiveCheck(session comm.IUserSession, req *pb.StonehengeTaskReceiveReq) (errdata *pb.ErrorData) {
+
+ return
+}
+
+func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.StonehengeTaskReceiveReq) (errdata *pb.ErrorData) {
+ var (
+ info *pb.DBStonehenge
+ conf *cfg.GameStoneTaskData
+ progress []*pb.ConIProgress
+ award []*pb.UserAssets
+ ok bool
+ err error
+ )
+ if errdata = this.TaskReceiveCheck(session, req); errdata != nil {
+ return
+ }
+ if info, err = this.module.modelStonehenge.GetStonehengeData(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if _, ok = info.Task[req.Taskid]; ok {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.String(),
+ Message: "already received",
+ }
+ return
+ }
+
+ if conf, err = this.module.configure.getGameStoneTaskData(req.Taskid); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.TaskId); err != nil {
+ return
+ }
+
+ for _, v := range progress {
+ if v.State == pb.BuriedItemFinishState_buried_unfinish {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.String(),
+ Message: "task no finish",
+ }
+ return
+ }
+ }
+
+ if errdata = this.module.DispenseRes(session, conf.TaskReward, true); errdata != nil {
+ return
+ }
+
+ award = make([]*pb.UserAssets, 0)
+ for _, v := range conf.TaskReward {
+ award = append(award, &pb.UserAssets{
+ A: v.A,
+ T: v.T,
+ N: v.N,
+ })
+ }
+
+ info.Task[req.Taskid] = true
+
+ if err = this.module.modelStonehenge.Change(session.GetUserId(), map[string]interface{}{
+ "task": info.Task,
+ }); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ session.SendMsg(string(this.module.GetType()), "taskreceive", &pb.StonehengeTaskReceiveResp{Task: info.Task, Award: award})
+ return
+}
diff --git a/modules/stonehenge/configure.go b/modules/stonehenge/configure.go
index 33a9d9d86..54022b0cd 100644
--- a/modules/stonehenge/configure.go
+++ b/modules/stonehenge/configure.go
@@ -26,6 +26,7 @@ const (
game_stoneillustrated = "game_stoneillustrated.json"
game_storyconf = "game_stonestory.json" // 剧情表
game_stoneweek = "game_stoneweek.json" //周长
+ game_stonetask = "game_stonetask.json" //任务
)
///背包配置管理组件
@@ -93,6 +94,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadConfigure(game_stonetalent, cfg.NewGameStoneTalent)
err = this.LoadConfigure(game_storeconf, cfg.NewGameStoneStore)
err = this.LoadConfigure(game_stoneweek, cfg.NewGameStoneWeek)
+ err = this.LoadConfigure(game_stonetask, cfg.NewGameStoneTask)
//err = this.LoadConfigure(game_storyconf, cfg.NewGameStoneStory)
configure.RegisterConfigure(game_stageconf, cfg.NewGameStoneStage, this.LoadGameStoneStage)
configure.RegisterConfigure(game_buffconf, cfg.NewGameStoneBuff, this.LoadGameStoneBuff)
@@ -811,3 +813,33 @@ func (this *configureComp) getGameStoneWeekDatas() (confs []*cfg.GameStoneWeekDa
return
}
+func (this *configureComp) getGameStoneTaskData(id int32) (conf *cfg.GameStoneTaskData, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+ if v, err = this.GetConfigure(game_stonetask); err != nil {
+ return
+ } else {
+ if conf, ok = v.(*cfg.GameStoneTask).GetDataMap()[id]; !ok {
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_stonetask, id)
+ this.module.Errorln(err)
+ return
+ }
+ }
+
+ return
+}
+
+func (this *configureComp) getGameStoneTaskDatas() (confs []*cfg.GameStoneTaskData, err error) {
+ var (
+ v interface{}
+ )
+ if v, err = this.GetConfigure(game_stonetask); err != nil {
+ return
+ } else {
+ confs = v.(*cfg.GameStoneTask).GetDataList()
+ }
+
+ return
+}
diff --git a/modules/stonehenge/modelStonehenge.go b/modules/stonehenge/modelStonehenge.go
index 126d2ea33..39e6d1467 100644
--- a/modules/stonehenge/modelStonehenge.go
+++ b/modules/stonehenge/modelStonehenge.go
@@ -67,6 +67,7 @@ func (this *MStonehenge) GetStonehengeData(uid string) (info *pb.DBStonehenge, e
Talent: make(map[int32]bool),
Talentproperty: make(map[string]int32),
Privilege: make([]pb.StonehengePrivilege, 0),
+ Task: make(map[int32]bool),
}
err = this.Add(uid, info)
}
diff --git a/pb/stonehenge_db.pb.go b/pb/stonehenge_db.pb.go
index 05bec03c1..7363a1800 100644
--- a/pb/stonehenge_db.pb.go
+++ b/pb/stonehenge_db.pb.go
@@ -207,6 +207,7 @@ type DBStonehenge struct {
Privilege []StonehengePrivilege `protobuf:"varint,15,rep,packed,name=privilege,proto3,enum=StonehengePrivilege" json:"privilege"` //解锁特权
Integral int32 `protobuf:"varint,16,opt,name=integral,proto3" json:"integral"` //积分
Weeklyreward map[int32]bool `protobuf:"bytes,17,rep,name=weeklyreward,proto3" json:"weeklyreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周长奖励领取
+ Task map[int32]bool `protobuf:"bytes,18,rep,name=task,proto3" json:"task" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已领取的任务
}
func (x *DBStonehenge) Reset() {
@@ -360,6 +361,13 @@ func (x *DBStonehenge) GetWeeklyreward() map[int32]bool {
return nil
}
+func (x *DBStonehenge) GetTask() map[int32]bool {
+ if x != nil {
+ return x.Task
+ }
+ return nil
+}
+
type StageData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -643,7 +651,7 @@ var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{
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,
- 0xfe, 0x08, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
+ 0xe4, 0x09, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20,
@@ -687,79 +695,85 @@ var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{
0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65,
0x68, 0x65, 0x6e, 0x67, 0x65, 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, 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66,
- 0x66, 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, 0x1a, 0x44, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
- 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
- 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
- 0x01, 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,
+ 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x2b, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x12, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
+ 0x67, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x74, 0x61,
+ 0x73, 0x6b, 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 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, 0x1a,
- 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45,
+ 0x44, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+ 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21,
+ 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 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,
- 0x22, 0x5f, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a,
- 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x62, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
- 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x65,
- 0x6e, 0x65, 0x6d, 0x79, 0x62, 0x75, 0x66, 0x66, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09,
- 0x65, 0x6e, 0x65, 0x6d, 0x79, 0x62, 0x75, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
- 0x6d, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
- 0x64, 0x22, 0xa8, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x42, 0x6f, 0x73,
- 0x73, 0x12, 0x39, 0x0a, 0x09, 0x62, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01,
- 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x42, 0x6f,
- 0x73, 0x73, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72,
- 0x79, 0x52, 0x09, 0x62, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05,
- 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69,
- 0x6d, 0x65, 0x1a, 0x48, 0x0a, 0x0e, 0x42, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x45,
- 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74,
- 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xba, 0x01, 0x0a,
- 0x10, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f,
- 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
- 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
- 0x75, 0x69, 0x64, 0x12, 0x32, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
- 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
- 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x50, 0x0a, 0x0a, 0x41, 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, 0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65,
- 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x15, 0x44, 0x42,
- 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77,
- 0x61, 0x72, 0x64, 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, 0x62, 0x6f, 0x6f,
- 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x12,
- 0x37, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21,
- 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f,
- 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72,
- 0x79, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x67,
- 0x65, 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, 0x2a, 0x33, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
- 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x74, 0x6f,
- 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
- 0x5f, 0x4e, 0x6f, 0x6c, 0x6c, 0x10, 0x00, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
- 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 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, 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, 0x1a, 0x37, 0x0a,
+ 0x09, 0x54, 0x61, 0x73, 0x6b, 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, 0x22, 0x5f, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x67, 0x65, 0x44,
+ 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x62, 0x75, 0x66, 0x66,
+ 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x62, 0x75, 0x66,
+ 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x65, 0x6d, 0x79, 0x62, 0x75, 0x66, 0x66, 0x18, 0x02,
+ 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x65, 0x6e, 0x65, 0x6d, 0x79, 0x62, 0x75, 0x66, 0x66, 0x12,
+ 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0xa8, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x53, 0x74,
+ 0x6f, 0x6e, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x12, 0x39, 0x0a, 0x09, 0x62, 0x6f, 0x73, 0x73, 0x73,
+ 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x53,
+ 0x74, 0x6f, 0x6e, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61,
+ 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x62, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61,
+ 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x48, 0x0a, 0x0e, 0x42, 0x6f, 0x73, 0x73,
+ 0x73, 0x74, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+ 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x74,
+ 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+ 0x38, 0x01, 0x22, 0xba, 0x01, 0x0a, 0x10, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
+ 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x32, 0x0a, 0x05, 0x61, 0x77, 0x61,
+ 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f,
+ 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x2e, 0x41, 0x77, 0x61, 0x72,
+ 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x50, 0x0a,
+ 0x0a, 0x41, 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, 0x2c, 0x0a,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44,
+ 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41,
+ 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+ 0xb6, 0x01, 0x0a, 0x15, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
+ 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 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, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05,
+ 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x12, 0x37, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x03,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
+ 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61,
+ 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x1a, 0x38,
+ 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x67, 0x65, 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, 0x2a, 0x33, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e,
+ 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x12,
+ 0x1c, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69,
+ 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x4e, 0x6f, 0x6c, 0x6c, 0x10, 0x00, 0x42, 0x06, 0x5a,
+ 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -775,7 +789,7 @@ func file_stonehenge_stonehenge_db_proto_rawDescGZIP() []byte {
}
var file_stonehenge_stonehenge_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_stonehenge_stonehenge_db_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_stonehenge_stonehenge_db_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
var file_stonehenge_stonehenge_db_proto_goTypes = []interface{}{
(StonehengePrivilege)(0), // 0: StonehengePrivilege
(*RoomData)(nil), // 1: RoomData
@@ -794,10 +808,11 @@ var file_stonehenge_stonehenge_db_proto_goTypes = []interface{}{
nil, // 14: DBStonehenge.TalentEntry
nil, // 15: DBStonehenge.TalentpropertyEntry
nil, // 16: DBStonehenge.WeeklyrewardEntry
- nil, // 17: DBStoneBoss.BossstageEntry
- nil, // 18: DBStonehengeBook.AwardEntry
- nil, // 19: DBStonehengeBookAward.StageEntry
- (*BattleRole)(nil), // 20: BattleRole
+ nil, // 17: DBStonehenge.TaskEntry
+ nil, // 18: DBStoneBoss.BossstageEntry
+ nil, // 19: DBStonehengeBook.AwardEntry
+ nil, // 20: DBStonehengeBookAward.StageEntry
+ (*BattleRole)(nil), // 21: BattleRole
}
var file_stonehenge_stonehenge_db_proto_depIdxs = []int32{
7, // 0: RoomData.eventid:type_name -> RoomData.EventidEntry
@@ -812,17 +827,18 @@ var file_stonehenge_stonehenge_db_proto_depIdxs = []int32{
15, // 9: DBStonehenge.talentproperty:type_name -> DBStonehenge.TalentpropertyEntry
0, // 10: DBStonehenge.privilege:type_name -> StonehengePrivilege
16, // 11: DBStonehenge.weeklyreward:type_name -> DBStonehenge.WeeklyrewardEntry
- 17, // 12: DBStoneBoss.bossstage:type_name -> DBStoneBoss.BossstageEntry
- 18, // 13: DBStonehengeBook.award:type_name -> DBStonehengeBook.AwardEntry
- 19, // 14: DBStonehengeBookAward.stage:type_name -> DBStonehengeBookAward.StageEntry
- 20, // 15: DBStonehenge.HeroEntry.value:type_name -> BattleRole
- 3, // 16: DBStoneBoss.BossstageEntry.value:type_name -> StageData
- 6, // 17: DBStonehengeBook.AwardEntry.value:type_name -> DBStonehengeBookAward
- 18, // [18:18] is the sub-list for method output_type
- 18, // [18:18] is the sub-list for method input_type
- 18, // [18:18] is the sub-list for extension type_name
- 18, // [18:18] is the sub-list for extension extendee
- 0, // [0:18] is the sub-list for field type_name
+ 17, // 12: DBStonehenge.task:type_name -> DBStonehenge.TaskEntry
+ 18, // 13: DBStoneBoss.bossstage:type_name -> DBStoneBoss.BossstageEntry
+ 19, // 14: DBStonehengeBook.award:type_name -> DBStonehengeBook.AwardEntry
+ 20, // 15: DBStonehengeBookAward.stage:type_name -> DBStonehengeBookAward.StageEntry
+ 21, // 16: DBStonehenge.HeroEntry.value:type_name -> BattleRole
+ 3, // 17: DBStoneBoss.BossstageEntry.value:type_name -> StageData
+ 6, // 18: DBStonehengeBook.AwardEntry.value:type_name -> DBStonehengeBookAward
+ 19, // [19:19] is the sub-list for method output_type
+ 19, // [19:19] is the sub-list for method input_type
+ 19, // [19:19] is the sub-list for extension type_name
+ 19, // [19:19] is the sub-list for extension extendee
+ 0, // [0:19] is the sub-list for field type_name
}
func init() { file_stonehenge_stonehenge_db_proto_init() }
@@ -911,7 +927,7 @@ func file_stonehenge_stonehenge_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_stonehenge_stonehenge_db_proto_rawDesc,
NumEnums: 1,
- NumMessages: 19,
+ NumMessages: 20,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/stonehenge_msg.pb.go b/pb/stonehenge_msg.pb.go
index c68e4b056..f2038d3c4 100644
--- a/pb/stonehenge_msg.pb.go
+++ b/pb/stonehenge_msg.pb.go
@@ -1479,6 +1479,205 @@ func (x *StonehengeWeekAwardResp) GetAward() []*UserAssets {
return nil
}
+//周长奖励 领取
+type StonehengeTaskInfoReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *StonehengeTaskInfoReq) Reset() {
+ *x = StonehengeTaskInfoReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[26]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *StonehengeTaskInfoReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeTaskInfoReq) ProtoMessage() {}
+
+func (x *StonehengeTaskInfoReq) ProtoReflect() protoreflect.Message {
+ mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[26]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeTaskInfoReq.ProtoReflect.Descriptor instead.
+func (*StonehengeTaskInfoReq) Descriptor() ([]byte, []int) {
+ return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{26}
+}
+
+//周长奖励 领取回应
+type StonehengeTaskInfoResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Conlds []*ConIProgress `protobuf:"bytes,1,rep,name=conlds,proto3" json:"conlds"` //子任务进度数据
+ Task map[int32]bool `protobuf:"bytes,2,rep,name=task,proto3" json:"task" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已领取的任务
+}
+
+func (x *StonehengeTaskInfoResp) Reset() {
+ *x = StonehengeTaskInfoResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[27]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *StonehengeTaskInfoResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeTaskInfoResp) ProtoMessage() {}
+
+func (x *StonehengeTaskInfoResp) ProtoReflect() protoreflect.Message {
+ mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[27]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeTaskInfoResp.ProtoReflect.Descriptor instead.
+func (*StonehengeTaskInfoResp) Descriptor() ([]byte, []int) {
+ return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{27}
+}
+
+func (x *StonehengeTaskInfoResp) GetConlds() []*ConIProgress {
+ if x != nil {
+ return x.Conlds
+ }
+ return nil
+}
+
+func (x *StonehengeTaskInfoResp) GetTask() map[int32]bool {
+ if x != nil {
+ return x.Task
+ }
+ return nil
+}
+
+//周长奖励 领取
+type StonehengeTaskReceiveReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Taskid int32 `protobuf:"varint,1,opt,name=taskid,proto3" json:"taskid"`
+}
+
+func (x *StonehengeTaskReceiveReq) Reset() {
+ *x = StonehengeTaskReceiveReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[28]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *StonehengeTaskReceiveReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeTaskReceiveReq) ProtoMessage() {}
+
+func (x *StonehengeTaskReceiveReq) ProtoReflect() protoreflect.Message {
+ mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[28]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeTaskReceiveReq.ProtoReflect.Descriptor instead.
+func (*StonehengeTaskReceiveReq) Descriptor() ([]byte, []int) {
+ return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{28}
+}
+
+func (x *StonehengeTaskReceiveReq) GetTaskid() int32 {
+ if x != nil {
+ return x.Taskid
+ }
+ return 0
+}
+
+//周长奖励 领取回应
+type StonehengeTaskReceiveResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Task map[int32]bool `protobuf:"bytes,1,rep,name=task,proto3" json:"task" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已领取的任务
+ Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
+}
+
+func (x *StonehengeTaskReceiveResp) Reset() {
+ *x = StonehengeTaskReceiveResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[29]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *StonehengeTaskReceiveResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeTaskReceiveResp) ProtoMessage() {}
+
+func (x *StonehengeTaskReceiveResp) ProtoReflect() protoreflect.Message {
+ mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[29]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeTaskReceiveResp.ProtoReflect.Descriptor instead.
+func (*StonehengeTaskReceiveResp) Descriptor() ([]byte, []int) {
+ return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{29}
+}
+
+func (x *StonehengeTaskReceiveResp) GetTask() map[int32]bool {
+ if x != nil {
+ return x.Task
+ }
+ return nil
+}
+
+func (x *StonehengeTaskReceiveResp) GetAward() []*UserAssets {
+ if x != nil {
+ return x.Award
+ }
+ return nil
+}
+
var File_stonehenge_stonehenge_msg_proto protoreflect.FileDescriptor
var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
@@ -1489,189 +1688,218 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
0x6f, 0x1a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c,
0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x16,
- 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c,
- 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x5c, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
- 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 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, 0x12, 0x20, 0x0a, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04,
- 0x62, 0x6f, 0x73, 0x73, 0x22, 0x61, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
- 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12,
- 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x68, 0x69,
- 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x66, 0x66, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x66, 0x66, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a,
- 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
- 0x73, 0x74, 0x61, 0x67, 0x65, 0x69, 0x64, 0x22, 0xb8, 0x01, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e,
- 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c,
- 0x52, 0x65, 0x73, 0x70, 0x12, 0x37, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45,
- 0x6e, 0x74, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65,
- 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x1d, 0x0a,
- 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f,
- 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x1a, 0x44, 0x0a, 0x09,
- 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
- 0x38, 0x01, 0x22, 0x2f, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
- 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70,
- 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6f, 0x72,
- 0x74, 0x61, 0x6c, 0x22, 0x4f, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
- 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 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, 0x12, 0x16, 0x0a, 0x06,
- 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6f,
- 0x72, 0x74, 0x61, 0x6c, 0x22, 0x9d, 0x01, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
- 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 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, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a,
- 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70,
- 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18,
- 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x25, 0x0a,
- 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
- 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65,
- 0x70, 0x6f, 0x72, 0x74, 0x22, 0x9e, 0x03, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
- 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 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, 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, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65,
- 0x77, 0x61, 0x72, 0x64, 0x12, 0x32, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x05, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45,
- 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74,
- 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x3e, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72,
- 0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x53, 0x74, 0x6f,
+ 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65,
+ 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
+ 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x5c,
+ 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c,
+ 0x69, 0x73, 0x74, 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, 0x12, 0x20, 0x0a, 0x04, 0x62, 0x6f,
+ 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f,
+ 0x6e, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x22, 0x61, 0x0a, 0x17,
+ 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x4c,
+ 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x66,
+ 0x66, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x66,
+ 0x66, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x69, 0x64,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x69, 0x64, 0x22,
+ 0xb8, 0x01, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e,
+ 0x74, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x37, 0x0a, 0x04,
+ 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x53, 0x74, 0x6f,
+ 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65,
+ 0x6c, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+ 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04,
+ 0x72, 0x6f, 0x6f, 0x6d, 0x1a, 0x44, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72,
+ 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+ 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2f, 0x0a, 0x15, 0x53, 0x74,
+ 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d,
+ 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x22, 0x4f, 0x0a, 0x16, 0x53,
+ 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f,
+ 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 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, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x22, 0x9d, 0x01, 0x0a,
+ 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74,
+ 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, 0x16, 0x0a,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70,
+ 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70,
+ 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18,
+ 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
+ 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x9e, 0x03, 0x0a,
+ 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74,
+ 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, 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, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77,
+ 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
+ 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x32, 0x0a, 0x04,
+ 0x68, 0x65, 0x72, 0x6f, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x74, 0x6f,
0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70,
- 0x2e, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08,
- 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x62,
- 0x75, 0x66, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x62, 0x75,
- 0x66, 0x66, 0x1a, 0x44, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
- 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
- 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72,
- 0x62, 0x75, 0x66, 0x66, 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, 0x1a, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
- 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
- 0x71, 0x22, 0x3a, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47,
- 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d,
- 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, 0x7e, 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, 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, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65,
- 0x77, 0x61, 0x72, 0x64, 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, 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,
+ 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f,
+ 0x12, 0x3e, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45,
+ 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66,
+ 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66,
+ 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x62, 0x75, 0x66, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x62, 0x75, 0x66, 0x66, 0x1a, 0x44, 0x0a, 0x09, 0x48, 0x65,
+ 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+ 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+ 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 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, 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,
+ 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x1a, 0x0a,
+ 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f,
+ 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x19, 0x53, 0x74, 0x6f,
+ 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e,
+ 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 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, 0x7e, 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, 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, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77,
+ 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
+ 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 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, 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, 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,
+ 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, 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, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54,
+ 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0xaf, 0x01, 0x0a, 0x16, 0x53,
+ 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66,
+ 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67,
+ 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x12, 0x35, 0x0a, 0x04,
+ 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x53, 0x74, 0x6f,
+ 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+ 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x74,
+ 0x61, 0x73, 0x6b, 0x1a, 0x37, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 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, 0x22, 0x32, 0x0a, 0x18,
+ 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
+ 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64,
+ 0x22, 0xb1, 0x01, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54,
+ 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x38,
+ 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x53,
+ 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63,
+ 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72,
+ 0x64, 0x18, 0x02, 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, 0x37, 0x0a, 0x09, 0x54,
+ 0x61, 0x73, 0x6b, 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 (
@@ -1686,7 +1914,7 @@ func file_stonehenge_stonehenge_msg_proto_rawDescGZIP() []byte {
return file_stonehenge_stonehenge_msg_proto_rawDescData
}
-var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 33)
+var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 39)
var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{
(*StonehengeGetListReq)(nil), // 0: StonehengeGetListReq
(*StonehengeGetListResp)(nil), // 1: StonehengeGetListResp
@@ -1714,57 +1942,68 @@ var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{
(*StonehengeBookAwardResp)(nil), // 23: StonehengeBookAwardResp
(*StonehengeWeekAwardReq)(nil), // 24: StonehengeWeekAwardReq
(*StonehengeWeekAwardResp)(nil), // 25: StonehengeWeekAwardResp
- nil, // 26: StonehengeEnterLevelResp.HeroEntry
- nil, // 27: StonehengeEventResp.HeroEntry
- nil, // 28: StonehengeEventResp.UserbuffEntry
- nil, // 29: StonehengeStoreResp.ShopEntry
- nil, // 30: StonehengeActivateTalentResp.TalentEntry
- nil, // 31: StonehengeActivateTalentResp.TalentpropertyEntry
- nil, // 32: StonehengeWeekAwardResp.WeeklyrewardEntry
- (*DBStonehenge)(nil), // 33: DBStonehenge
- (*DBStoneBoss)(nil), // 34: DBStoneBoss
- (*RoomData)(nil), // 35: RoomData
- (*BattleReport)(nil), // 36: BattleReport
- (*UserAtno)(nil), // 37: UserAtno
- (*BattleFormation)(nil), // 38: BattleFormation
- (*BattleInfo)(nil), // 39: BattleInfo
- (StonehengePrivilege)(0), // 40: StonehengePrivilege
- (*DBStonehengeBook)(nil), // 41: DBStonehengeBook
- (*UserAssets)(nil), // 42: UserAssets
- (*BattleRole)(nil), // 43: BattleRole
+ (*StonehengeTaskInfoReq)(nil), // 26: StonehengeTaskInfoReq
+ (*StonehengeTaskInfoResp)(nil), // 27: StonehengeTaskInfoResp
+ (*StonehengeTaskReceiveReq)(nil), // 28: StonehengeTaskReceiveReq
+ (*StonehengeTaskReceiveResp)(nil), // 29: StonehengeTaskReceiveResp
+ nil, // 30: StonehengeEnterLevelResp.HeroEntry
+ nil, // 31: StonehengeEventResp.HeroEntry
+ nil, // 32: StonehengeEventResp.UserbuffEntry
+ nil, // 33: StonehengeStoreResp.ShopEntry
+ nil, // 34: StonehengeActivateTalentResp.TalentEntry
+ nil, // 35: StonehengeActivateTalentResp.TalentpropertyEntry
+ nil, // 36: StonehengeWeekAwardResp.WeeklyrewardEntry
+ nil, // 37: StonehengeTaskInfoResp.TaskEntry
+ nil, // 38: StonehengeTaskReceiveResp.TaskEntry
+ (*DBStonehenge)(nil), // 39: DBStonehenge
+ (*DBStoneBoss)(nil), // 40: DBStoneBoss
+ (*RoomData)(nil), // 41: RoomData
+ (*BattleReport)(nil), // 42: BattleReport
+ (*UserAtno)(nil), // 43: UserAtno
+ (*BattleFormation)(nil), // 44: BattleFormation
+ (*BattleInfo)(nil), // 45: BattleInfo
+ (StonehengePrivilege)(0), // 46: StonehengePrivilege
+ (*DBStonehengeBook)(nil), // 47: DBStonehengeBook
+ (*UserAssets)(nil), // 48: UserAssets
+ (*ConIProgress)(nil), // 49: ConIProgress
+ (*BattleRole)(nil), // 50: BattleRole
}
var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{
- 33, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge
- 34, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss
- 26, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry
- 35, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData
- 35, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData
- 36, // 5: StonehengeEventReq.report:type_name -> BattleReport
- 35, // 6: StonehengeEventResp.room:type_name -> RoomData
- 37, // 7: StonehengeEventResp.reward:type_name -> UserAtno
- 27, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry
- 28, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry
- 35, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData
- 33, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge
- 37, // 12: StonehengeFinishResp.reward:type_name -> UserAtno
- 38, // 13: StonehengeBattleReq.battle:type_name -> BattleFormation
- 39, // 14: StonehengeBattleResp.info:type_name -> BattleInfo
- 35, // 15: StonehengeStoryResp.room:type_name -> RoomData
- 29, // 16: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry
- 30, // 17: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry
- 31, // 18: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry
- 40, // 19: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege
- 41, // 20: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook
- 42, // 21: StonehengeBookAwardResp.award:type_name -> UserAssets
- 32, // 22: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry
- 42, // 23: StonehengeWeekAwardResp.award:type_name -> UserAssets
- 43, // 24: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole
- 43, // 25: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole
- 26, // [26:26] is the sub-list for method output_type
- 26, // [26:26] is the sub-list for method input_type
- 26, // [26:26] is the sub-list for extension type_name
- 26, // [26:26] is the sub-list for extension extendee
- 0, // [0:26] is the sub-list for field type_name
+ 39, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge
+ 40, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss
+ 30, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry
+ 41, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData
+ 41, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData
+ 42, // 5: StonehengeEventReq.report:type_name -> BattleReport
+ 41, // 6: StonehengeEventResp.room:type_name -> RoomData
+ 43, // 7: StonehengeEventResp.reward:type_name -> UserAtno
+ 31, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry
+ 32, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry
+ 41, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData
+ 39, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge
+ 43, // 12: StonehengeFinishResp.reward:type_name -> UserAtno
+ 44, // 13: StonehengeBattleReq.battle:type_name -> BattleFormation
+ 45, // 14: StonehengeBattleResp.info:type_name -> BattleInfo
+ 41, // 15: StonehengeStoryResp.room:type_name -> RoomData
+ 33, // 16: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry
+ 34, // 17: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry
+ 35, // 18: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry
+ 46, // 19: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege
+ 47, // 20: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook
+ 48, // 21: StonehengeBookAwardResp.award:type_name -> UserAssets
+ 36, // 22: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry
+ 48, // 23: StonehengeWeekAwardResp.award:type_name -> UserAssets
+ 49, // 24: StonehengeTaskInfoResp.conlds:type_name -> ConIProgress
+ 37, // 25: StonehengeTaskInfoResp.task:type_name -> StonehengeTaskInfoResp.TaskEntry
+ 38, // 26: StonehengeTaskReceiveResp.task:type_name -> StonehengeTaskReceiveResp.TaskEntry
+ 48, // 27: StonehengeTaskReceiveResp.award:type_name -> UserAssets
+ 50, // 28: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole
+ 50, // 29: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole
+ 30, // [30:30] is the sub-list for method output_type
+ 30, // [30:30] is the sub-list for method input_type
+ 30, // [30:30] is the sub-list for extension type_name
+ 30, // [30:30] is the sub-list for extension extendee
+ 0, // [0:30] is the sub-list for field type_name
}
func init() { file_stonehenge_stonehenge_msg_proto_init() }
@@ -1775,6 +2014,7 @@ func file_stonehenge_stonehenge_msg_proto_init() {
file_stonehenge_stonehenge_db_proto_init()
file_battle_battle_db_proto_init()
file_battle_battle_msg_proto_init()
+ file_buried_buried_db_proto_init()
file_comm_proto_init()
if !protoimpl.UnsafeEnabled {
file_stonehenge_stonehenge_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
@@ -2089,6 +2329,54 @@ func file_stonehenge_stonehenge_msg_proto_init() {
return nil
}
}
+ file_stonehenge_stonehenge_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*StonehengeTaskInfoReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_stonehenge_stonehenge_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*StonehengeTaskInfoResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_stonehenge_stonehenge_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*StonehengeTaskReceiveReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_stonehenge_stonehenge_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*StonehengeTaskReceiveResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -2096,7 +2384,7 @@ func file_stonehenge_stonehenge_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_stonehenge_stonehenge_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 33,
+ NumMessages: 39,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/sys/configure/structs/Game.PropertyType.go b/sys/configure/structs/Game.PropertyType.go
index f402697f4..82e5527f9 100644
--- a/sys/configure/structs/Game.PropertyType.go
+++ b/sys/configure/structs/Game.PropertyType.go
@@ -119,5 +119,8 @@ const (
GamePropertyType_Base_Shield = 107
GamePropertyType_Ext_Shield = 108
GamePropertyType_TreCrit = 109
- GamePropertyType_Max = 110
+ GamePropertyType_SealMaxHp = 110
+ GamePropertyType_SealMaxHp_Per = 111
+ GamePropertyType_SealMaxHp_Fix = 112
+ GamePropertyType_Max = 113
)
diff --git a/sys/configure/structs/Game.SkillProperty.go b/sys/configure/structs/Game.SkillProperty.go
new file mode 100644
index 000000000..71ab1ebda
--- /dev/null
+++ b/sys/configure/structs/Game.SkillProperty.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameSkillProperty struct {
+ _dataMap map[int32]*GameSkillPropertyData
+ _dataList []*GameSkillPropertyData
+}
+
+func NewGameSkillProperty(_buf []map[string]interface{}) (*GameSkillProperty, error) {
+ _dataList := make([]*GameSkillPropertyData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSkillPropertyData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSkillPropertyData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.ProType] = _v
+ }
+ }
+ return &GameSkillProperty{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSkillProperty) GetDataMap() map[int32]*GameSkillPropertyData {
+ return table._dataMap
+}
+
+func (table *GameSkillProperty) GetDataList() []*GameSkillPropertyData {
+ return table._dataList
+}
+
+func (table *GameSkillProperty) Get(key int32) *GameSkillPropertyData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SkillPropertyData.go b/sys/configure/structs/Game.SkillPropertyData.go
new file mode 100644
index 000000000..b63457878
--- /dev/null
+++ b/sys/configure/structs/Game.SkillPropertyData.go
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameSkillPropertyData struct {
+ ProType int32
+ ProLevel int32
+ LimitValue int32
+ MinValue int32
+ MaxValue int32
+ BaseTerms int32
+ ExtraTerms int32
+ PerTerms int32
+ FixTerms int32
+}
+
+const TypeId_GameSkillPropertyData = 880868628
+
+func (*GameSkillPropertyData) GetTypeId() int32 {
+ return 880868628
+}
+
+func (_v *GameSkillPropertyData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ProType"].(float64); !_ok_ { err = errors.New("ProType error"); return }; _v.ProType = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ProLevel"].(float64); !_ok_ { err = errors.New("ProLevel error"); return }; _v.ProLevel = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LimitValue"].(float64); !_ok_ { err = errors.New("LimitValue error"); return }; _v.LimitValue = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MinValue"].(float64); !_ok_ { err = errors.New("MinValue error"); return }; _v.MinValue = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxValue"].(float64); !_ok_ { err = errors.New("MaxValue error"); return }; _v.MaxValue = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BaseTerms"].(float64); !_ok_ { err = errors.New("BaseTerms error"); return }; _v.BaseTerms = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ExtraTerms"].(float64); !_ok_ { err = errors.New("ExtraTerms error"); return }; _v.ExtraTerms = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PerTerms"].(float64); !_ok_ { err = errors.New("PerTerms error"); return }; _v.PerTerms = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FixTerms"].(float64); !_ok_ { err = errors.New("FixTerms error"); return }; _v.FixTerms = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameSkillPropertyData(_buf map[string]interface{}) (*GameSkillPropertyData, error) {
+ v := &GameSkillPropertyData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.StoneTask.go b/sys/configure/structs/Game.StoneTask.go
new file mode 100644
index 000000000..ad0fc96ba
--- /dev/null
+++ b/sys/configure/structs/Game.StoneTask.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameStoneTask struct {
+ _dataMap map[int32]*GameStoneTaskData
+ _dataList []*GameStoneTaskData
+}
+
+func NewGameStoneTask(_buf []map[string]interface{}) (*GameStoneTask, error) {
+ _dataList := make([]*GameStoneTaskData, 0, len(_buf))
+ dataMap := make(map[int32]*GameStoneTaskData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameStoneTaskData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.TaskId] = _v
+ }
+ }
+ return &GameStoneTask{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameStoneTask) GetDataMap() map[int32]*GameStoneTaskData {
+ return table._dataMap
+}
+
+func (table *GameStoneTask) GetDataList() []*GameStoneTaskData {
+ return table._dataList
+}
+
+func (table *GameStoneTask) Get(key int32) *GameStoneTaskData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.StoneTaskData.go b/sys/configure/structs/Game.StoneTaskData.go
new file mode 100644
index 000000000..983ded364
--- /dev/null
+++ b/sys/configure/structs/Game.StoneTaskData.go
@@ -0,0 +1,54 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameStoneTaskData struct {
+ TaskId int32
+ TaskType int32
+ TabText string
+ TaskReward []*Gameatn
+}
+
+const TypeId_GameStoneTaskData = -345237160
+
+func (*GameStoneTaskData) GetTypeId() int32 {
+ return -345237160
+}
+
+func (_v *GameStoneTaskData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TaskId"].(float64); !_ok_ { err = errors.New("TaskId error"); return }; _v.TaskId = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TaskType"].(float64); !_ok_ { err = errors.New("TaskType error"); return }; _v.TaskType = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["TabText"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TabText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TabText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["TaskReward"].([]interface{}); !_ok_ { err = errors.New("TaskReward error"); return }
+
+ _v.TaskReward = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.TaskReward = append(_v.TaskReward, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameStoneTaskData(_buf map[string]interface{}) (*GameStoneTaskData, error) {
+ v := &GameStoneTaskData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index aa9b909b1..9766f9e37 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -17,6 +17,7 @@ type Tables struct {
SkillAfteratk *GameSkillAfteratk
SkillBuff *GameSkillBuff
SkillPassive *GameSkillPassive
+ SkillProperty *GameSkillProperty
Hero *GameHero
HeroStargrow *GameHeroStargrow
HeroLevelgrow *GameHeroLevelgrow
@@ -219,6 +220,7 @@ type Tables struct {
StoneStory *GameStoneStory
StoneWeek *GameStoneWeek
StoneTalent *GameStoneTalent
+ StoneTask *GameStoneTask
StoneIllustrated *GameStoneIllustrated
StonePrivilege *GameStonePrivilege
GameSummaryTab *GameGameSummaryTab
@@ -290,6 +292,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.SkillPassive, err = NewGameSkillPassive(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_skillproperty") ; err != nil {
+ return nil, err
+ }
+ if tables.SkillProperty, err = NewGameSkillProperty(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_hero") ; err != nil {
return nil, err
}
@@ -1502,6 +1510,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.StoneTalent, err = NewGameStoneTalent(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_stonetask") ; err != nil {
+ return nil, err
+ }
+ if tables.StoneTask, err = NewGameStoneTask(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_stoneillustrated") ; err != nil {
return nil, err
}
diff --git a/sys/configure/structs/game.coinData.go b/sys/configure/structs/game.coinData.go
index ccc4b083d..5a04b35dc 100644
--- a/sys/configure/structs/game.coinData.go
+++ b/sys/configure/structs/game.coinData.go
@@ -19,7 +19,8 @@ type GameCoinData struct {
Access []int32
Img string
Intr string
- Intr2 string
+ Describe string
+ Dialogue string
}
const TypeId_GameCoinData = 1416227927
@@ -50,7 +51,8 @@ func (_v *GameCoinData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _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["intr2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr2 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr2, _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; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["dialogue"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Dialogue error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Dialogue, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}