diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 4fd7506ec..c208d1d59 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -963,7 +963,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_28",
- "text": "搜集{1}{0}个"
+ "text": "搜集4个"
},
"type": 187,
"valid": 0,
@@ -5422,7 +5422,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_163",
- "text": "和师傅聊聊10360"
+ "text": "和师傅聊聊"
},
"type": 20001,
"valid": 1,
@@ -5641,7 +5641,7 @@
},
"value": 1,
"filter": [
- 1103006
+ 1103009
],
"filter2": []
},
@@ -5670,7 +5670,7 @@
},
"value": 1,
"filter": [
- 1103009
+ 1103011
],
"filter2": []
},
@@ -5699,7 +5699,7 @@
},
"value": 1,
"filter": [
- 1103010
+ 1103015
],
"filter2": []
},
@@ -5910,7 +5910,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_179",
- "text": "通关冒险之旅【4-1】"
+ "text": "111"
},
"type": 61,
"valid": 0,
@@ -5938,13 +5938,13 @@
},
{
"id": 12070451,
- "rtype": 0,
+ "rtype": 1,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_180",
- "text": "通关冒险之旅【4-2】"
+ "text": "初入童话王国"
},
"type": 61,
"valid": 0,
@@ -5954,7 +5954,65 @@
"n": 1
},
"Npc_event_type": 0,
- "NPC": 110331,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070452,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_181",
+ "text": "跟随穿靴猫"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070453,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_182",
+ "text": "调查毒苹果酒吧"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
"tipstxt": {
"key": "",
"text": ""
@@ -5965,73 +6023,15 @@
],
"filter2": []
},
- {
- "id": 12070452,
- "rtype": 0,
- "ctype": 1,
- "notify": [],
- "type_sp": 1,
- "tasktxt": {
- "key": "buried_buried_condi_tasktxt_181",
- "text": "通关冒险之旅【4-3】"
- },
- "type": 61,
- "valid": 0,
- "head": {
- "a": "attr",
- "t": "gold",
- "n": 1
- },
- "Npc_event_type": 0,
- "NPC": 110332,
- "tipstxt": {
- "key": "",
- "text": ""
- },
- "value": 1,
- "filter": [
- 1104009
- ],
- "filter2": []
- },
- {
- "id": 12070453,
- "rtype": 0,
- "ctype": 1,
- "notify": [],
- "type_sp": 1,
- "tasktxt": {
- "key": "buried_buried_condi_tasktxt_182",
- "text": "通关冒险之旅【4-4】"
- },
- "type": 61,
- "valid": 0,
- "head": {
- "a": "attr",
- "t": "gold",
- "n": 1
- },
- "Npc_event_type": 0,
- "NPC": 110333,
- "tipstxt": {
- "key": "",
- "text": ""
- },
- "value": 1,
- "filter": [
- 1104012
- ],
- "filter2": []
- },
{
"id": 12070454,
- "rtype": 0,
+ "rtype": 1,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_183",
- "text": "通关冒险之旅【4-5】"
+ "text": "脱离幻境"
},
"type": 61,
"valid": 0,
@@ -6041,7 +6041,94 @@
"n": 1
},
"Npc_event_type": 0,
- "NPC": 110334,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104008
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070455,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_184",
+ "text": "跟随匹诺曹"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104010
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070456,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_185",
+ "text": "营救姜饼人"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104011
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070457,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_186",
+ "text": "获得黑市邀请函"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
"tipstxt": {
"key": "",
"text": ""
@@ -6052,102 +6139,15 @@
],
"filter2": []
},
- {
- "id": 12070455,
- "rtype": 0,
- "ctype": 1,
- "notify": [],
- "type_sp": 1,
- "tasktxt": {
- "key": "buried_buried_condi_tasktxt_184",
- "text": "通关冒险之旅【4-6】"
- },
- "type": 61,
- "valid": 0,
- "head": {
- "a": "attr",
- "t": "gold",
- "n": 1
- },
- "Npc_event_type": 0,
- "NPC": 110335,
- "tipstxt": {
- "key": "",
- "text": ""
- },
- "value": 1,
- "filter": [
- 1104017
- ],
- "filter2": []
- },
- {
- "id": 12070456,
- "rtype": 0,
- "ctype": 1,
- "notify": [],
- "type_sp": 1,
- "tasktxt": {
- "key": "buried_buried_condi_tasktxt_185",
- "text": "通关冒险之旅【4-7】"
- },
- "type": 61,
- "valid": 0,
- "head": {
- "a": "attr",
- "t": "gold",
- "n": 1
- },
- "Npc_event_type": 0,
- "NPC": 110336,
- "tipstxt": {
- "key": "",
- "text": ""
- },
- "value": 1,
- "filter": [
- 1104021
- ],
- "filter2": []
- },
- {
- "id": 12070457,
- "rtype": 0,
- "ctype": 1,
- "notify": [],
- "type_sp": 1,
- "tasktxt": {
- "key": "buried_buried_condi_tasktxt_186",
- "text": "通关冒险之旅【4-8】"
- },
- "type": 61,
- "valid": 0,
- "head": {
- "a": "attr",
- "t": "gold",
- "n": 1
- },
- "Npc_event_type": 0,
- "NPC": 110337,
- "tipstxt": {
- "key": "",
- "text": ""
- },
- "value": 1,
- "filter": [
- 1104024
- ],
- "filter2": []
- },
{
"id": 12070458,
- "rtype": 0,
+ "rtype": 1,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_187",
- "text": "通关冒险之旅【4-9】"
+ "text": "进入黑市"
},
"type": 61,
"valid": 0,
@@ -6157,26 +6157,26 @@
"n": 1
},
"Npc_event_type": 0,
- "NPC": 110338,
+ "NPC": 110364,
"tipstxt": {
"key": "",
"text": ""
},
"value": 1,
"filter": [
- 1104028
+ 1104016
],
"filter2": []
},
{
"id": 12070459,
- "rtype": 0,
+ "rtype": 1,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_188",
- "text": "通关冒险之旅【4-10】"
+ "text": "逃离黑市"
},
"type": 61,
"valid": 0,
@@ -6186,14 +6186,14 @@
"n": 1
},
"Npc_event_type": 0,
- "NPC": 110339,
+ "NPC": 110364,
"tipstxt": {
"key": "",
"text": ""
},
"value": 1,
"filter": [
- 1104031
+ 1104019
],
"filter2": []
},
@@ -6205,9 +6205,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_189",
- "text": "击退恐惧灵蜘蛛"
+ "text": "果酱教授的阴谋"
},
- "type": 70,
+ "type": 61,
"valid": 0,
"head": {
"a": "attr",
@@ -6215,21 +6215,161 @@
"n": 1
},
"Npc_event_type": 0,
- "NPC": 10444,
+ "NPC": 110364,
"tipstxt": {
"key": "",
"text": ""
},
"value": 1,
"filter": [
- 116
+ 1104021
],
- "filter2": [
- "通关的关卡ID",
- "0",
- "0",
- "0"
- ]
+ "filter2": []
+ },
+ {
+ "id": 12070461,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_190",
+ "text": "逃离天坑"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104025
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070462,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_191",
+ "text": "阻止果酱教授"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104027
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070463,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_192",
+ "text": "击败火龙"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104029
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070464,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_193",
+ "text": "追击果酱教授"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 110364,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104031
+ ],
+ "filter2": []
+ },
+ {
+ "id": 12070465,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_194",
+ "text": "通关冒险之旅【4-15】"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104003
+ ],
+ "filter2": []
},
{
"id": 12070470,
@@ -6238,7 +6378,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_190",
+ "key": "buried_buried_condi_tasktxt_196",
"text": "冰霜泰坦难度1"
},
"type": 73,
@@ -6273,7 +6413,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_191",
+ "key": "buried_buried_condi_tasktxt_197",
"text": "剧情"
},
"type": 20001,
@@ -6307,7 +6447,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_192",
+ "key": "buried_buried_condi_tasktxt_198",
"text": "6件装备+6"
},
"type": 43,
@@ -6341,7 +6481,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_193",
+ "key": "buried_buried_condi_tasktxt_199",
"text": "冒险5-4通关"
},
"type": 61,
@@ -6375,7 +6515,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_194",
+ "key": "buried_buried_condi_tasktxt_200",
"text": "冰霜泰坦难度1"
},
"type": 73,
@@ -6410,7 +6550,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_195",
+ "key": "buried_buried_condi_tasktxt_201",
"text": "冒险5-8通关"
},
"type": 61,
@@ -6444,7 +6584,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_196",
+ "key": "buried_buried_condi_tasktxt_202",
"text": "剧情"
},
"type": 20001,
@@ -6478,7 +6618,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_197",
+ "key": "buried_buried_condi_tasktxt_203",
"text": "剧情"
},
"type": 20001,
@@ -6512,7 +6652,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_198",
+ "key": "buried_buried_condi_tasktxt_204",
"text": "高能武者挑战塔5层"
},
"type": 168,
@@ -6546,7 +6686,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_199",
+ "key": "buried_buried_condi_tasktxt_205",
"text": "击退恐惧灵蜘蛛"
},
"type": 70,
@@ -6580,7 +6720,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_200",
+ "key": "buried_buried_condi_tasktxt_206",
"text": "击退恐惧灵蜘蛛"
},
"type": 70,
@@ -6614,7 +6754,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_201",
+ "key": "buried_buried_condi_tasktxt_207",
"text": "击退恐惧灵蜘蛛"
},
"type": 70,
@@ -6648,7 +6788,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_202",
+ "key": "buried_buried_condi_tasktxt_208",
"text": "冰霜泰坦难度1"
},
"type": 73,
@@ -6683,7 +6823,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_203",
+ "key": "buried_buried_condi_tasktxt_209",
"text": "主角星座觉醒3次"
},
"type": 173,
@@ -6715,7 +6855,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_204",
+ "key": "buried_buried_condi_tasktxt_210",
"text": "9件装备强化+6"
},
"type": 43,
@@ -6749,7 +6889,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_205",
+ "key": "buried_buried_condi_tasktxt_211",
"text": "击退恐惧灵蜘蛛"
},
"type": 70,
@@ -6783,7 +6923,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_206",
+ "key": "buried_buried_condi_tasktxt_212",
"text": "击退恐惧灵蜘蛛"
},
"type": 70,
@@ -6817,7 +6957,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_207",
+ "key": "buried_buried_condi_tasktxt_213",
"text": "剧情"
},
"type": 20001,
@@ -6851,7 +6991,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_208",
+ "key": "buried_buried_condi_tasktxt_214",
"text": "冒险6-8通关"
},
"type": 61,
@@ -6885,7 +7025,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_209",
+ "key": "buried_buried_condi_tasktxt_215",
"text": "冰霜泰坦难度1"
},
"type": 73,
@@ -6920,7 +7060,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_210",
+ "key": "buried_buried_condi_tasktxt_216",
"text": "12件装备强化+6"
},
"type": 43,
@@ -6954,7 +7094,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_211",
+ "key": "buried_buried_condi_tasktxt_217",
"text": "武馆木桩解锁3根"
},
"type": 152,
@@ -6986,7 +7126,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_212",
+ "key": "buried_buried_condi_tasktxt_218",
"text": "高能武者挑战塔10层"
},
"type": 168,
@@ -7020,7 +7160,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_213",
+ "key": "buried_buried_condi_tasktxt_219",
"text": "冒险7-8通关"
},
"type": 61,
@@ -7054,7 +7194,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_214",
+ "key": "buried_buried_condi_tasktxt_220",
"text": "击退恐惧灵蜘蛛"
},
"type": 70,
@@ -7088,7 +7228,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_215",
+ "key": "buried_buried_condi_tasktxt_221",
"text": "击退恐惧灵蜘蛛"
},
"type": 70,
@@ -7122,7 +7262,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_216",
+ "key": "buried_buried_condi_tasktxt_222",
"text": "穿+6的无极神功套装"
},
"type": 93,
@@ -7157,7 +7297,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_217",
+ "key": "buried_buried_condi_tasktxt_223",
"text": "加入任意俱乐部"
},
"type": 109,
@@ -7189,7 +7329,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_218",
+ "key": "buried_buried_condi_tasktxt_224",
"text": "森林泰坦难度1"
},
"type": 73,
@@ -7224,7 +7364,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_219",
+ "key": "buried_buried_condi_tasktxt_225",
"text": "森林泰坦难度1"
},
"type": 73,
@@ -7259,7 +7399,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_220",
+ "key": "buried_buried_condi_tasktxt_226",
"text": "守护者回响解锁次数10次"
},
"type": 199,
@@ -7291,7 +7431,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_221",
+ "key": "buried_buried_condi_tasktxt_227",
"text": "守护者回响解锁次数15次"
},
"type": 199,
@@ -7323,7 +7463,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_222",
+ "key": "buried_buried_condi_tasktxt_228",
"text": "冒险8-8通关"
},
"type": 61,
@@ -7357,7 +7497,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_223",
+ "key": "buried_buried_condi_tasktxt_229",
"text": "12件装备强化+9"
},
"type": 43,
@@ -7391,7 +7531,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_224",
+ "key": "buried_buried_condi_tasktxt_230",
"text": "竞技场3胜"
},
"type": 131,
@@ -7423,7 +7563,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_225",
+ "key": "buried_buried_condi_tasktxt_231",
"text": "森林泰坦难度1"
},
"type": 73,
@@ -7458,7 +7598,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_226",
+ "key": "buried_buried_condi_tasktxt_232",
"text": "守护者回响解锁解锁20次"
},
"type": 199,
@@ -7490,7 +7630,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_227",
+ "key": "buried_buried_condi_tasktxt_233",
"text": "冒险9-8通关"
},
"type": 61,
@@ -7524,7 +7664,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_228",
+ "key": "buried_buried_condi_tasktxt_234",
"text": "搜集12个4星装备"
},
"type": 50,
@@ -7558,7 +7698,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_229",
+ "key": "buried_buried_condi_tasktxt_235",
"text": "高能武者挑战塔20层"
},
"type": 168,
@@ -7592,7 +7732,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_230",
+ "key": "buried_buried_condi_tasktxt_236",
"text": "冒险10-8通关"
},
"type": 61,
@@ -7626,7 +7766,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_231",
+ "key": "buried_buried_condi_tasktxt_237",
"text": "森林泰坦难度1"
},
"type": 73,
@@ -7661,7 +7801,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_232",
+ "key": "buried_buried_condi_tasktxt_238",
"text": "18件强化+9"
},
"type": 43,
@@ -7695,7 +7835,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_233",
+ "key": "buried_buried_condi_tasktxt_239",
"text": "冒险11-8通关"
},
"type": 61,
@@ -7729,7 +7869,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_234",
+ "key": "buried_buried_condi_tasktxt_240",
"text": "守护者回响解锁25次"
},
"type": 199,
@@ -7761,7 +7901,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_235",
+ "key": "buried_buried_condi_tasktxt_241",
"text": "冒险12-3通关"
},
"type": 61,
@@ -7795,7 +7935,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_236",
+ "key": "buried_buried_condi_tasktxt_242",
"text": "森林泰坦难度2"
},
"type": 73,
@@ -7830,7 +7970,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_237",
+ "key": "buried_buried_condi_tasktxt_243",
"text": "8件任意装备强化+12"
},
"type": 43,
@@ -7864,7 +8004,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_238",
+ "key": "buried_buried_condi_tasktxt_244",
"text": "冒险12-6通关"
},
"type": 61,
@@ -7898,7 +8038,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_239",
+ "key": "buried_buried_condi_tasktxt_245",
"text": "竞技场获胜20次"
},
"type": 131,
@@ -7930,7 +8070,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_240",
+ "key": "buried_buried_condi_tasktxt_246",
"text": "冒险12-8通关"
},
"type": 61,
@@ -7964,7 +8104,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_241",
+ "key": "buried_buried_condi_tasktxt_247",
"text": "冒险之旅困难1-3"
},
"type": 61,
@@ -7998,7 +8138,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_242",
+ "key": "buried_buried_condi_tasktxt_248",
"text": "冒险之旅困难1-6"
},
"type": 61,
@@ -8032,7 +8172,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_243",
+ "key": "buried_buried_condi_tasktxt_249",
"text": "冒险之旅困难2-3"
},
"type": 61,
@@ -8066,7 +8206,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_244",
+ "key": "buried_buried_condi_tasktxt_250",
"text": "冒险之旅困难2-6"
},
"type": 61,
@@ -8100,7 +8240,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_245",
+ "key": "buried_buried_condi_tasktxt_251",
"text": "冒险之旅困难3-3"
},
"type": 61,
@@ -8134,7 +8274,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_246",
+ "key": "buried_buried_condi_tasktxt_252",
"text": "冒险之旅困难3-6"
},
"type": 61,
@@ -8168,7 +8308,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_247",
+ "key": "buried_buried_condi_tasktxt_253",
"text": "冒险之旅困难4-3"
},
"type": 61,
@@ -8202,7 +8342,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_248",
+ "key": "buried_buried_condi_tasktxt_254",
"text": "冒险之旅困难4-6"
},
"type": 61,
@@ -8236,7 +8376,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_249",
+ "key": "buried_buried_condi_tasktxt_255",
"text": "冒险之旅困难5-3"
},
"type": 61,
@@ -8270,7 +8410,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_250",
+ "key": "buried_buried_condi_tasktxt_256",
"text": "冒险之旅困难5-6"
},
"type": 61,
@@ -8304,7 +8444,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_251",
+ "key": "buried_buried_condi_tasktxt_257",
"text": "冒险之旅困难6-3"
},
"type": 61,
@@ -8338,7 +8478,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_252",
+ "key": "buried_buried_condi_tasktxt_258",
"text": "冒险之旅困难6-6"
},
"type": 61,
@@ -8372,7 +8512,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_253",
+ "key": "buried_buried_condi_tasktxt_259",
"text": "冒险之旅困难7-3"
},
"type": 61,
@@ -8406,7 +8546,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_254",
+ "key": "buried_buried_condi_tasktxt_260",
"text": "冒险之旅困难7-6"
},
"type": 61,
@@ -8440,7 +8580,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_255",
+ "key": "buried_buried_condi_tasktxt_261",
"text": "冒险之旅困难8-3"
},
"type": 61,
@@ -8474,7 +8614,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_256",
+ "key": "buried_buried_condi_tasktxt_262",
"text": "冒险之旅困难8-6"
},
"type": 61,
@@ -8508,7 +8648,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_257",
+ "key": "buried_buried_condi_tasktxt_263",
"text": "冒险之旅困难9-3"
},
"type": 61,
@@ -8542,7 +8682,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_258",
+ "key": "buried_buried_condi_tasktxt_264",
"text": "冒险之旅困难9-6"
},
"type": 61,
@@ -8576,7 +8716,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_259",
+ "key": "buried_buried_condi_tasktxt_265",
"text": "冒险之旅困难10-3"
},
"type": 61,
@@ -8610,7 +8750,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_260",
+ "key": "buried_buried_condi_tasktxt_266",
"text": "冒险之旅困难10-6"
},
"type": 61,
@@ -8644,7 +8784,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_261",
+ "key": "buried_buried_condi_tasktxt_267",
"text": "冒险之旅困难11-3"
},
"type": 61,
@@ -8678,7 +8818,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_262",
+ "key": "buried_buried_condi_tasktxt_268",
"text": "冒险之旅困难11-6"
},
"type": 61,
@@ -8712,7 +8852,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_263",
+ "key": "buried_buried_condi_tasktxt_269",
"text": "冒险之旅困难12-3"
},
"type": 61,
@@ -8746,7 +8886,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_264",
+ "key": "buried_buried_condi_tasktxt_270",
"text": "冒险之旅困难12-6"
},
"type": 61,
@@ -8780,7 +8920,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_265",
+ "key": "buried_buried_condi_tasktxt_271",
"text": "本周竞技场挑战10次"
},
"type": 130,
@@ -8807,7 +8947,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_266",
+ "key": "buried_buried_condi_tasktxt_272",
"text": "本周竞技场挑战30次"
},
"type": 130,
@@ -8834,7 +8974,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_267",
+ "key": "buried_buried_condi_tasktxt_273",
"text": "本周竞技场挑战50次"
},
"type": 130,
@@ -8861,7 +9001,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_268",
+ "key": "buried_buried_condi_tasktxt_274",
"text": "本周竞技场胜利10次"
},
"type": 130,
@@ -8888,7 +9028,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_269",
+ "key": "buried_buried_condi_tasktxt_275",
"text": "本周竞技场胜利20次"
},
"type": 130,
@@ -8915,7 +9055,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_270",
+ "key": "buried_buried_condi_tasktxt_276",
"text": "本周竞技场胜利30次"
},
"type": 130,
@@ -8942,10 +9082,10 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_271",
+ "key": "buried_buried_condi_tasktxt_277",
"text": "本周累计梦境回廊消耗300体力"
},
- "type": 201,
+ "type": 248,
"valid": 0,
"head": {
"a": "attr",
@@ -8959,7 +9099,9 @@
"text": ""
},
"value": 300,
- "filter": [],
+ "filter": [
+ 4
+ ],
"filter2": []
},
{
@@ -8969,10 +9111,10 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_272",
+ "key": "buried_buried_condi_tasktxt_278",
"text": "本周累计梦境回廊消耗600体力"
},
- "type": 201,
+ "type": 248,
"valid": 0,
"head": {
"a": "attr",
@@ -8986,7 +9128,9 @@
"text": ""
},
"value": 600,
- "filter": [],
+ "filter": [
+ 4
+ ],
"filter2": []
},
{
@@ -8996,10 +9140,10 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_273",
+ "key": "buried_buried_condi_tasktxt_279",
"text": "本周累计梦境回廊消耗1000体力"
},
- "type": 201,
+ "type": 248,
"valid": 0,
"head": {
"a": "attr",
@@ -9013,7 +9157,9 @@
"text": ""
},
"value": 1000,
- "filter": [],
+ "filter": [
+ 4
+ ],
"filter2": []
},
{
@@ -9023,7 +9169,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_274",
+ "key": "buried_buried_condi_tasktxt_280",
"text": "本周累计消耗3000000点金币"
},
"type": 68,
@@ -9050,7 +9196,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_275",
+ "key": "buried_buried_condi_tasktxt_281",
"text": "本周累计消耗6000000点金币"
},
"type": 68,
@@ -9077,7 +9223,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_276",
+ "key": "buried_buried_condi_tasktxt_282",
"text": "本周累计消耗10000000点金币"
},
"type": 68,
@@ -9104,10 +9250,10 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_277",
+ "key": "buried_buried_condi_tasktxt_283",
"text": "本周累计装备副本消耗300体力"
},
- "type": 201,
+ "type": 248,
"valid": 0,
"head": {
"a": "attr",
@@ -9121,7 +9267,9 @@
"text": ""
},
"value": 300,
- "filter": [],
+ "filter": [
+ 1
+ ],
"filter2": []
},
{
@@ -9131,10 +9279,10 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_278",
+ "key": "buried_buried_condi_tasktxt_284",
"text": "本周累计装备副本消耗600体力"
},
- "type": 201,
+ "type": 248,
"valid": 0,
"head": {
"a": "attr",
@@ -9148,7 +9296,9 @@
"text": ""
},
"value": 600,
- "filter": [],
+ "filter": [
+ 1
+ ],
"filter2": []
},
{
@@ -9158,10 +9308,10 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_279",
+ "key": "buried_buried_condi_tasktxt_285",
"text": "本周累计装备副本消耗1000体力"
},
- "type": 201,
+ "type": 248,
"valid": 0,
"head": {
"a": "attr",
@@ -9175,7 +9325,9 @@
"text": ""
},
"value": 1000,
- "filter": [],
+ "filter": [
+ 1
+ ],
"filter2": []
},
{
@@ -9185,7 +9337,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_280",
+ "key": "buried_buried_condi_tasktxt_286",
"text": "本周累计回响副本消耗300体力"
},
"type": 202,
@@ -9212,7 +9364,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_281",
+ "key": "buried_buried_condi_tasktxt_287",
"text": "本周累计回响副本消耗600体力"
},
"type": 202,
@@ -9239,7 +9391,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_282",
+ "key": "buried_buried_condi_tasktxt_288",
"text": "本周累计回响副本消耗1000体力"
},
"type": 202,
@@ -9266,7 +9418,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_283",
+ "key": "buried_buried_condi_tasktxt_289",
"text": "备用埋点"
},
"type": 43,
@@ -9295,7 +9447,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_284",
+ "key": "buried_buried_condi_tasktxt_290",
"text": "挑战悍娇虎"
},
"type": 70,
@@ -9324,7 +9476,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_285",
+ "key": "buried_buried_condi_tasktxt_291",
"text": "收集木炭"
},
"type": 187,
@@ -9353,7 +9505,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_286",
+ "key": "buried_buried_condi_tasktxt_292",
"text": "加入鼻涕粗战斗"
},
"type": 70,
@@ -9382,7 +9534,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_287",
+ "key": "buried_buried_condi_tasktxt_293",
"text": "阻止他们战斗"
},
"type": 70,
@@ -9411,7 +9563,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_288",
+ "key": "buried_buried_condi_tasktxt_294",
"text": "和鼻涕粗聊聊"
},
"type": 20001,
@@ -9440,7 +9592,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_289",
+ "key": "buried_buried_condi_tasktxt_295",
"text": "完成梦境难度1"
},
"type": 73,
@@ -9470,7 +9622,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_290",
+ "key": "buried_buried_condi_tasktxt_296",
"text": "完成一次狩猎"
},
"type": 200,
@@ -9497,7 +9649,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_291",
+ "key": "buried_buried_condi_tasktxt_297",
"text": "尝试击败火焰泰坦1"
},
"type": 73,
@@ -9527,7 +9679,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_292",
+ "key": "buried_buried_condi_tasktxt_298",
"text": "尝试穿戴装备"
},
"type": 98,
@@ -9556,7 +9708,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_293",
+ "key": "buried_buried_condi_tasktxt_299",
"text": "前往石阵秘境"
},
"type": 98,
@@ -9585,7 +9737,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_294",
+ "key": "buried_buried_condi_tasktxt_300",
"text": "让邦尼兔升到10级"
},
"type": 4,
@@ -9614,7 +9766,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_295",
+ "key": "buried_buried_condi_tasktxt_301",
"text": "尝试锻造装备"
},
"type": 148,
@@ -9641,7 +9793,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_296",
+ "key": "buried_buried_condi_tasktxt_302",
"text": "强化4件装备+3"
},
"type": 43,
@@ -9670,7 +9822,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_297",
+ "key": "buried_buried_condi_tasktxt_303",
"text": "强化6件装备+3"
},
"type": 43,
@@ -9699,7 +9851,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_298",
+ "key": "buried_buried_condi_tasktxt_304",
"text": "创建自己的公会"
},
"type": 109,
@@ -9726,7 +9878,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_299",
+ "key": "buried_buried_condi_tasktxt_305",
"text": "阿宝升到20级"
},
"type": 4,
@@ -9755,7 +9907,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_300",
+ "key": "buried_buried_condi_tasktxt_306",
"text": "邦尼兔升到20级"
},
"type": 4,
@@ -9784,7 +9936,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_301",
+ "key": "buried_buried_condi_tasktxt_307",
"text": "应对师傅的训练"
},
"type": 70,
@@ -9813,7 +9965,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_302",
+ "key": "buried_buried_condi_tasktxt_308",
"text": "前往功夫熊猫城市"
},
"type": 212,
@@ -9842,7 +9994,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_303",
+ "key": "buried_buried_condi_tasktxt_309",
"text": "购买超级芯片"
},
"type": 209,
@@ -9871,7 +10023,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_304",
+ "key": "buried_buried_condi_tasktxt_310",
"text": "出售货物给功夫熊猫"
},
"type": 210,
@@ -9900,7 +10052,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_305",
+ "key": "buried_buried_condi_tasktxt_311",
"text": "特产出售给魔法精灵"
},
"type": 211,
@@ -9929,7 +10081,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_306",
+ "key": "buried_buried_condi_tasktxt_312",
"text": "火焰泰坦难度2"
},
"type": 73,
@@ -9961,7 +10113,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_307",
+ "key": "buried_buried_condi_tasktxt_313",
"text": "使用好友助战守护者1次"
},
"type": 12,
@@ -9990,7 +10142,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_308",
+ "key": "buried_buried_condi_tasktxt_314",
"text": "进行3次普通招募"
},
"type": 14,
@@ -10019,7 +10171,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_309",
+ "key": "buried_buried_condi_tasktxt_315",
"text": "为任意守护者提升5级"
},
"type": 24,
@@ -10048,7 +10200,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_310",
+ "key": "buried_buried_condi_tasktxt_316",
"text": "强化任意装备成功6次"
},
"type": 47,
@@ -10077,7 +10229,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_311",
+ "key": "buried_buried_condi_tasktxt_317",
"text": "消费500000金币"
},
"type": 68,
@@ -10106,7 +10258,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_312",
+ "key": "buried_buried_condi_tasktxt_318",
"text": "消费300钻石"
},
"type": 104,
@@ -10135,7 +10287,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_313",
+ "key": "buried_buried_condi_tasktxt_319",
"text": "完成1次功夫陪练任务"
},
"type": 186,
@@ -10164,7 +10316,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_314",
+ "key": "buried_buried_condi_tasktxt_320",
"text": "挑战3次竞技场"
},
"type": 130,
@@ -10193,7 +10345,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_315",
+ "key": "buried_buried_condi_tasktxt_321",
"text": "挑战3次“维京远征”副本"
},
"type": 172,
@@ -10222,7 +10374,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_316",
+ "key": "buried_buried_condi_tasktxt_322",
"text": "挑战3次“猎魂”副本"
},
"type": 200,
@@ -10249,7 +10401,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_317",
+ "key": "buried_buried_condi_tasktxt_323",
"text": "完成一次考试"
},
"type": 204,
@@ -10276,7 +10428,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_318",
+ "key": "buried_buried_condi_tasktxt_324",
"text": "完成一次考试"
},
"type": 204,
@@ -10303,7 +10455,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_319",
+ "key": "buried_buried_condi_tasktxt_325",
"text": "完成一次考试"
},
"type": 204,
@@ -10330,7 +10482,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_320",
+ "key": "buried_buried_condi_tasktxt_326",
"text": "完成一次考试"
},
"type": 204,
@@ -10357,7 +10509,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_321",
+ "key": "buried_buried_condi_tasktxt_327",
"text": "完成一次考试"
},
"type": 204,
@@ -10384,7 +10536,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_322",
+ "key": "buried_buried_condi_tasktxt_328",
"text": "完成一次考试"
},
"type": 204,
@@ -10411,7 +10563,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_323",
+ "key": "buried_buried_condi_tasktxt_329",
"text": "完成一次考试"
},
"type": 204,
@@ -10438,7 +10590,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_324",
+ "key": "buried_buried_condi_tasktxt_330",
"text": "获取烤乳猪"
},
"type": 187,
@@ -10467,7 +10619,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_325",
+ "key": "buried_buried_condi_tasktxt_331",
"text": "获取烤乳猪"
},
"type": 187,
@@ -10496,7 +10648,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_326",
+ "key": "buried_buried_condi_tasktxt_332",
"text": "获取烤乳猪"
},
"type": 187,
@@ -10525,7 +10677,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_327",
+ "key": "buried_buried_condi_tasktxt_333",
"text": "获取烤乳猪"
},
"type": 187,
@@ -10554,7 +10706,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_328",
+ "key": "buried_buried_condi_tasktxt_334",
"text": "获取烤乳猪"
},
"type": 187,
@@ -10583,7 +10735,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_329",
+ "key": "buried_buried_condi_tasktxt_335",
"text": "寻找所有宝箱"
},
"type": 205,
@@ -10610,7 +10762,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_330",
+ "key": "buried_buried_condi_tasktxt_336",
"text": "寻找所有宝箱"
},
"type": 205,
@@ -10637,7 +10789,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_331",
+ "key": "buried_buried_condi_tasktxt_337",
"text": "寻找所有宝箱"
},
"type": 205,
@@ -10664,7 +10816,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_332",
+ "key": "buried_buried_condi_tasktxt_338",
"text": "寻找所有宝箱"
},
"type": 205,
@@ -10691,7 +10843,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_333",
+ "key": "buried_buried_condi_tasktxt_339",
"text": "寻找所有宝箱"
},
"type": 205,
@@ -10718,7 +10870,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_334",
+ "key": "buried_buried_condi_tasktxt_340",
"text": "清理所有怪物"
},
"type": 70,
@@ -10747,7 +10899,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_335",
+ "key": "buried_buried_condi_tasktxt_341",
"text": "清理所有怪物"
},
"type": 70,
@@ -10776,7 +10928,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_336",
+ "key": "buried_buried_condi_tasktxt_342",
"text": "清理所有怪物"
},
"type": 70,
@@ -10805,7 +10957,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_337",
+ "key": "buried_buried_condi_tasktxt_343",
"text": "清理所有怪物"
},
"type": 70,
@@ -10834,7 +10986,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_338",
+ "key": "buried_buried_condi_tasktxt_344",
"text": "清理所有怪物"
},
"type": 70,
@@ -10863,7 +11015,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_339",
+ "key": "buried_buried_condi_tasktxt_345",
"text": "清理所有怪物"
},
"type": 70,
@@ -10892,7 +11044,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_340",
+ "key": "buried_buried_condi_tasktxt_346",
"text": "检查第一个可疑点"
},
"type": 206,
@@ -10919,7 +11071,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_341",
+ "key": "buried_buried_condi_tasktxt_347",
"text": "检查第二个可疑点"
},
"type": 206,
@@ -10946,7 +11098,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_342",
+ "key": "buried_buried_condi_tasktxt_348",
"text": "检查第三个可疑点"
},
"type": 206,
@@ -10973,7 +11125,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_343",
+ "key": "buried_buried_condi_tasktxt_349",
"text": "检查第一个可疑点"
},
"type": 206,
@@ -11000,7 +11152,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_344",
+ "key": "buried_buried_condi_tasktxt_350",
"text": "检查第二个可疑点"
},
"type": 206,
@@ -11027,7 +11179,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_345",
+ "key": "buried_buried_condi_tasktxt_351",
"text": "检查第三个可疑点"
},
"type": 206,
@@ -11054,7 +11206,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_346",
+ "key": "buried_buried_condi_tasktxt_352",
"text": "检查第一个可疑点"
},
"type": 206,
@@ -11081,7 +11233,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_347",
+ "key": "buried_buried_condi_tasktxt_353",
"text": "检查第二个可疑点"
},
"type": 206,
@@ -11108,7 +11260,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_348",
+ "key": "buried_buried_condi_tasktxt_354",
"text": "检查第三个可疑点"
},
"type": 206,
@@ -11135,7 +11287,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_349",
+ "key": "buried_buried_condi_tasktxt_355",
"text": "检查第一个可疑点"
},
"type": 206,
@@ -11162,7 +11314,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_350",
+ "key": "buried_buried_condi_tasktxt_356",
"text": "检查第二个可疑点"
},
"type": 206,
@@ -11189,7 +11341,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_351",
+ "key": "buried_buried_condi_tasktxt_357",
"text": "检查第三个可疑点"
},
"type": 206,
@@ -11216,7 +11368,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_352",
+ "key": "buried_buried_condi_tasktxt_358",
"text": "检查第一个可疑点"
},
"type": 206,
@@ -11243,7 +11395,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_353",
+ "key": "buried_buried_condi_tasktxt_359",
"text": "检查第二个可疑点"
},
"type": 206,
@@ -11270,7 +11422,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_354",
+ "key": "buried_buried_condi_tasktxt_360",
"text": "检查第三个可疑点"
},
"type": 206,
@@ -11297,7 +11449,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_355",
+ "key": "buried_buried_condi_tasktxt_361",
"text": "找对象聊天1"
},
"type": 187,
@@ -11326,7 +11478,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_356",
+ "key": "buried_buried_condi_tasktxt_362",
"text": "找瘦警卫聊聊"
},
"type": 20001,
@@ -11355,7 +11507,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_357",
+ "key": "buried_buried_condi_tasktxt_363",
"text": "找对象聊天3"
},
"type": 187,
@@ -11384,7 +11536,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_358",
+ "key": "buried_buried_condi_tasktxt_364",
"text": "找对象聊天4"
},
"type": 187,
@@ -11413,7 +11565,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_359",
+ "key": "buried_buried_condi_tasktxt_365",
"text": "和师傅聊天"
},
"type": 20001,
@@ -11442,7 +11594,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_360",
+ "key": "buried_buried_condi_tasktxt_366",
"text": "找对象聊天6"
},
"type": 20001,
@@ -11471,7 +11623,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_361",
+ "key": "buried_buried_condi_tasktxt_367",
"text": "找对象聊天7"
},
"type": 20001,
@@ -11500,7 +11652,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_362",
+ "key": "buried_buried_condi_tasktxt_368",
"text": "找菲奥娜聊聊"
},
"type": 20001,
@@ -11529,7 +11681,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_363",
+ "key": "buried_buried_condi_tasktxt_369",
"text": "找对象聊天9"
},
"type": 20001,
@@ -11558,7 +11710,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_364",
+ "key": "buried_buried_condi_tasktxt_370",
"text": "找平先生聊聊"
},
"type": 20001,
@@ -11587,7 +11739,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_365",
+ "key": "buried_buried_condi_tasktxt_371",
"text": "找对象聊天11"
},
"type": 20001,
@@ -11616,7 +11768,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_366",
+ "key": "buried_buried_condi_tasktxt_372",
"text": "找对象聊天12"
},
"type": 20001,
@@ -11645,7 +11797,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_367",
+ "key": "buried_buried_condi_tasktxt_373",
"text": "找对象聊天13"
},
"type": 20001,
@@ -11674,7 +11826,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_368",
+ "key": "buried_buried_condi_tasktxt_374",
"text": "找菲奥娜聊聊"
},
"type": 20001,
@@ -11703,7 +11855,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_369",
+ "key": "buried_buried_condi_tasktxt_375",
"text": "找对象聊天15"
},
"type": 20001,
@@ -11732,7 +11884,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_370",
+ "key": "buried_buried_condi_tasktxt_376",
"text": "[成长返还任务]将邦尼兔提升至10级"
},
"type": 4,
@@ -11761,7 +11913,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_371",
+ "key": "buried_buried_condi_tasktxt_377",
"text": "[成长返还任务]将邦尼兔提升至28级"
},
"type": 4,
@@ -11790,7 +11942,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_372",
+ "key": "buried_buried_condi_tasktxt_378",
"text": "[成长返还任务]将邦尼兔提升至5星"
},
"type": 6,
@@ -11819,7 +11971,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_373",
+ "key": "buried_buried_condi_tasktxt_379",
"text": "[挑战任务]传承者达到10级"
},
"type": 20,
@@ -11846,7 +11998,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_374",
+ "key": "buried_buried_condi_tasktxt_380",
"text": "[挑战任务]传承者达到30级"
},
"type": 20,
@@ -11873,7 +12025,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_375",
+ "key": "buried_buried_condi_tasktxt_381",
"text": "[挑战任务]拥有一个30级守护者"
},
"type": 111,
@@ -11902,7 +12054,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_376",
+ "key": "buried_buried_condi_tasktxt_382",
"text": "[挑战任务]进行一次十连抽"
},
"type": 141,
@@ -11929,7 +12081,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_377",
+ "key": "buried_buried_condi_tasktxt_383",
"text": "[挑战任务]消费1000钻石"
},
"type": 104,
@@ -11956,7 +12108,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_378",
+ "key": "buried_buried_condi_tasktxt_384",
"text": "[挑战任务]猎魂挑战1次"
},
"type": 200,
@@ -11983,7 +12135,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_379",
+ "key": "buried_buried_condi_tasktxt_385",
"text": "[成长返还任务]将邦尼兔提升至25级"
},
"type": 4,
@@ -12012,7 +12164,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_380",
+ "key": "buried_buried_condi_tasktxt_386",
"text": "[成长返还任务]将邦尼兔提升至30级"
},
"type": 4,
@@ -12041,7 +12193,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_381",
+ "key": "buried_buried_condi_tasktxt_387",
"text": "[成长返还任务]将邦尼兔提升至35级"
},
"type": 4,
@@ -12070,7 +12222,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_382",
+ "key": "buried_buried_condi_tasktxt_388",
"text": "[成长返还任务]将邦尼兔提升至40级"
},
"type": 4,
@@ -12099,7 +12251,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_383",
+ "key": "buried_buried_condi_tasktxt_389",
"text": "[挑战任务]传承者达到14级"
},
"type": 20,
@@ -12126,7 +12278,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_384",
+ "key": "buried_buried_condi_tasktxt_390",
"text": "[挑战任务]传承者达到17级"
},
"type": 20,
@@ -12153,7 +12305,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_385",
+ "key": "buried_buried_condi_tasktxt_391",
"text": "[挑战任务]传承者达到20级"
},
"type": 20,
@@ -12180,7 +12332,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_386",
+ "key": "buried_buried_condi_tasktxt_392",
"text": "[挑战任务]传承者达到22级"
},
"type": 20,
@@ -12207,7 +12359,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_387",
+ "key": "buried_buried_condi_tasktxt_393",
"text": "[挑战任务]传承者达到25级"
},
"type": 20,
@@ -12234,7 +12386,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_388",
+ "key": "buried_buried_condi_tasktxt_394",
"text": "[挑战任务]拥有一个15级守护者"
},
"type": 111,
@@ -12263,7 +12415,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_389",
+ "key": "buried_buried_condi_tasktxt_395",
"text": "[挑战任务]拥有一个20级守护者"
},
"type": 111,
@@ -12292,7 +12444,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_390",
+ "key": "buried_buried_condi_tasktxt_396",
"text": "[挑战任务]拥有一个25级守护者"
},
"type": 111,
@@ -12321,7 +12473,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_391",
+ "key": "buried_buried_condi_tasktxt_397",
"text": "[挑战任务]拥有一个35级守护者"
},
"type": 111,
@@ -12350,7 +12502,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_392",
+ "key": "buried_buried_condi_tasktxt_398",
"text": "[挑战任务]拥有一个40级守护者"
},
"type": 111,
@@ -12379,7 +12531,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_393",
+ "key": "buried_buried_condi_tasktxt_399",
"text": "[挑战任务]拥有一个45级守护者"
},
"type": 111,
@@ -12408,7 +12560,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_394",
+ "key": "buried_buried_condi_tasktxt_400",
"text": "[挑战任务]进行二次十连抽"
},
"type": 141,
@@ -12435,7 +12587,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_395",
+ "key": "buried_buried_condi_tasktxt_401",
"text": "[挑战任务]进行三次十连抽"
},
"type": 141,
@@ -12462,7 +12614,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_396",
+ "key": "buried_buried_condi_tasktxt_402",
"text": "[挑战任务]进行四次十连抽"
},
"type": 141,
@@ -12489,7 +12641,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_397",
+ "key": "buried_buried_condi_tasktxt_403",
"text": "[挑战任务]进行五次十连抽"
},
"type": 141,
@@ -12516,7 +12668,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_398",
+ "key": "buried_buried_condi_tasktxt_404",
"text": "[挑战任务]进行六次十连抽"
},
"type": 141,
@@ -12543,7 +12695,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_399",
+ "key": "buried_buried_condi_tasktxt_405",
"text": "[挑战任务]进行七次十连抽"
},
"type": 141,
@@ -12570,7 +12722,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_400",
+ "key": "buried_buried_condi_tasktxt_406",
"text": "[挑战任务]消费1200钻石"
},
"type": 104,
@@ -12597,7 +12749,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_401",
+ "key": "buried_buried_condi_tasktxt_407",
"text": "[挑战任务]消费1400钻石"
},
"type": 104,
@@ -12624,7 +12776,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_402",
+ "key": "buried_buried_condi_tasktxt_408",
"text": "[挑战任务]消费1600钻石"
},
"type": 104,
@@ -12651,7 +12803,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_403",
+ "key": "buried_buried_condi_tasktxt_409",
"text": "[挑战任务]消费2000钻石"
},
"type": 104,
@@ -12678,7 +12830,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_404",
+ "key": "buried_buried_condi_tasktxt_410",
"text": "[挑战任务]消费2200钻石"
},
"type": 104,
@@ -12705,7 +12857,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_405",
+ "key": "buried_buried_condi_tasktxt_411",
"text": "[挑战任务]消费2400钻石"
},
"type": 104,
@@ -12732,7 +12884,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_406",
+ "key": "buried_buried_condi_tasktxt_412",
"text": "拥有1个60级守护者"
},
"type": 111,
@@ -12761,7 +12913,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_407",
+ "key": "buried_buried_condi_tasktxt_413",
"text": "将牙仙回响等级提升至满级"
},
"type": 125,
@@ -12790,7 +12942,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_408",
+ "key": "buried_buried_condi_tasktxt_414",
"text": "将睡神回响等级提升到满级"
},
"type": 125,
@@ -12819,7 +12971,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_409",
+ "key": "buried_buried_condi_tasktxt_415",
"text": "将圣诞老人回响等级提升到满级"
},
"type": 125,
@@ -12848,7 +13000,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_410",
+ "key": "buried_buried_condi_tasktxt_416",
"text": "将亚丝翠回响等级提升到满级"
},
"type": 125,
@@ -12877,7 +13029,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_411",
+ "key": "buried_buried_condi_tasktxt_417",
"text": "将悍娇虎回响等级提升到满级"
},
"type": 125,
@@ -12906,7 +13058,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_412",
+ "key": "buried_buried_condi_tasktxt_418",
"text": "将鹤大师提回响等级提升到满级"
},
"type": 125,
@@ -12935,7 +13087,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_413",
+ "key": "buried_buried_condi_tasktxt_419",
"text": "拥有2个60级守护者"
},
"type": 111,
@@ -12964,7 +13116,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_414",
+ "key": "buried_buried_condi_tasktxt_420",
"text": "拥有3个60级守护者"
},
"type": 111,
@@ -12993,7 +13145,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_415",
+ "key": "buried_buried_condi_tasktxt_421",
"text": "拥有4个60级守护者"
},
"type": 111,
@@ -13022,7 +13174,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_416",
+ "key": "buried_buried_condi_tasktxt_422",
"text": "拥有5个60级守护者"
},
"type": 111,
@@ -13051,7 +13203,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_417",
+ "key": "buried_buried_condi_tasktxt_423",
"text": "拥有6个60级守护者"
},
"type": 111,
@@ -13080,7 +13232,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_418",
+ "key": "buried_buried_condi_tasktxt_424",
"text": "拥有7个60级守护者"
},
"type": 111,
@@ -13109,7 +13261,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_419",
+ "key": "buried_buried_condi_tasktxt_425",
"text": "冰霜泰坦难度8通关1次"
},
"type": 73,
@@ -13139,7 +13291,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_420",
+ "key": "buried_buried_condi_tasktxt_426",
"text": "火焰泰坦难度8通关1次"
},
"type": 73,
@@ -13169,7 +13321,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_421",
+ "key": "buried_buried_condi_tasktxt_427",
"text": "森林泰坦难度8通关1次"
},
"type": 73,
@@ -13199,7 +13351,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_422",
+ "key": "buried_buried_condi_tasktxt_428",
"text": "冰霜泰坦通关50次"
},
"type": 73,
@@ -13229,7 +13381,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_423",
+ "key": "buried_buried_condi_tasktxt_429",
"text": "火焰泰坦通关50次"
},
"type": 73,
@@ -13259,7 +13411,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_424",
+ "key": "buried_buried_condi_tasktxt_430",
"text": "森林泰坦通关50次"
},
"type": 73,
@@ -13289,7 +13441,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_425",
+ "key": "buried_buried_condi_tasktxt_431",
"text": "冰霜泰坦难度2通关1次"
},
"type": 73,
@@ -13319,7 +13471,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_426",
+ "key": "buried_buried_condi_tasktxt_432",
"text": "火焰泰坦难度2通关1次"
},
"type": 73,
@@ -13349,7 +13501,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_427",
+ "key": "buried_buried_condi_tasktxt_433",
"text": "森林泰坦难度2通关1次"
},
"type": 73,
@@ -13379,7 +13531,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_428",
+ "key": "buried_buried_condi_tasktxt_434",
"text": "冰霜泰坦难度3通关1次"
},
"type": 73,
@@ -13409,7 +13561,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_429",
+ "key": "buried_buried_condi_tasktxt_435",
"text": "火焰泰坦难度3通关1次"
},
"type": 73,
@@ -13439,7 +13591,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_430",
+ "key": "buried_buried_condi_tasktxt_436",
"text": "森林泰坦难度3通关1次"
},
"type": 73,
@@ -13469,7 +13621,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_431",
+ "key": "buried_buried_condi_tasktxt_437",
"text": "冰霜泰坦难度4通关1次"
},
"type": 73,
@@ -13499,7 +13651,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_432",
+ "key": "buried_buried_condi_tasktxt_438",
"text": "火焰泰坦难度4通关1次"
},
"type": 73,
@@ -13529,7 +13681,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_433",
+ "key": "buried_buried_condi_tasktxt_439",
"text": "森林泰坦难度4通关1次"
},
"type": 73,
@@ -13559,7 +13711,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_434",
+ "key": "buried_buried_condi_tasktxt_440",
"text": "冰霜泰坦难度5通关1次"
},
"type": 73,
@@ -13589,7 +13741,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_435",
+ "key": "buried_buried_condi_tasktxt_441",
"text": "火焰泰坦难度5通关1次"
},
"type": 73,
@@ -13619,7 +13771,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_436",
+ "key": "buried_buried_condi_tasktxt_442",
"text": "森林泰坦难度5通关1次"
},
"type": 73,
@@ -13649,7 +13801,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_437",
+ "key": "buried_buried_condi_tasktxt_443",
"text": "冰霜泰坦难度6通关1次"
},
"type": 73,
@@ -13679,7 +13831,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_438",
+ "key": "buried_buried_condi_tasktxt_444",
"text": "火焰泰坦难度6通关1次"
},
"type": 73,
@@ -13709,7 +13861,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_439",
+ "key": "buried_buried_condi_tasktxt_445",
"text": "森林泰坦难度6通关1次"
},
"type": 73,
@@ -13739,7 +13891,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_440",
+ "key": "buried_buried_condi_tasktxt_446",
"text": "冰霜泰坦难度7通关1次"
},
"type": 73,
@@ -13769,7 +13921,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_441",
+ "key": "buried_buried_condi_tasktxt_447",
"text": "火焰泰坦难度7通关1次"
},
"type": 73,
@@ -13799,7 +13951,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_442",
+ "key": "buried_buried_condi_tasktxt_448",
"text": "森林泰坦难度7通关1次"
},
"type": 73,
@@ -13829,7 +13981,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_443",
+ "key": "buried_buried_condi_tasktxt_449",
"text": "当日消耗100点体力"
},
"type": 213,
@@ -13858,7 +14010,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_444",
+ "key": "buried_buried_condi_tasktxt_450",
"text": "消费100000金币"
},
"type": 68,
@@ -13887,7 +14039,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_445",
+ "key": "buried_buried_condi_tasktxt_451",
"text": "消费100钻石"
},
"type": 104,
@@ -13916,7 +14068,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_446",
+ "key": "buried_buried_condi_tasktxt_452",
"text": "当日消耗30点体力"
},
"type": 213,
@@ -13945,7 +14097,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_447",
+ "key": "buried_buried_condi_tasktxt_453",
"text": "使用好友助战守护者1次"
},
"type": 12,
@@ -13974,7 +14126,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_448",
+ "key": "buried_buried_condi_tasktxt_454",
"text": "进行1次普通招募"
},
"type": 14,
@@ -14003,7 +14155,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_449",
+ "key": "buried_buried_condi_tasktxt_455",
"text": "为任意守护者提升3级"
},
"type": 24,
@@ -14032,7 +14184,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_450",
+ "key": "buried_buried_condi_tasktxt_456",
"text": "强化任意装备成功3次"
},
"type": 47,
@@ -14061,7 +14213,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_451",
+ "key": "buried_buried_condi_tasktxt_457",
"text": "消费300000金币"
},
"type": 68,
@@ -14090,7 +14242,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_452",
+ "key": "buried_buried_condi_tasktxt_458",
"text": "消费300钻石"
},
"type": 104,
@@ -14119,7 +14271,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_453",
+ "key": "buried_buried_condi_tasktxt_459",
"text": "当日消耗100点体力"
},
"type": 213,
@@ -14148,7 +14300,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_454",
+ "key": "buried_buried_condi_tasktxt_460",
"text": "使用好友助战守护者3次"
},
"type": 12,
@@ -14177,7 +14329,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_455",
+ "key": "buried_buried_condi_tasktxt_461",
"text": "进行1次普通招募"
},
"type": 14,
@@ -14206,7 +14358,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_456",
+ "key": "buried_buried_condi_tasktxt_462",
"text": "为任意守护者提升10级"
},
"type": 24,
@@ -14235,7 +14387,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_457",
+ "key": "buried_buried_condi_tasktxt_463",
"text": "强化任意装备成功10次"
},
"type": 47,
@@ -14264,7 +14416,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_458",
+ "key": "buried_buried_condi_tasktxt_464",
"text": "消费2000000金币"
},
"type": 68,
@@ -14293,7 +14445,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_459",
+ "key": "buried_buried_condi_tasktxt_465",
"text": "消费1000钻石"
},
"type": 104,
@@ -14322,7 +14474,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_460",
+ "key": "buried_buried_condi_tasktxt_466",
"text": "当日消耗300点体力"
},
"type": 213,
@@ -14351,7 +14503,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_461",
+ "key": "buried_buried_condi_tasktxt_467",
"text": "使用好友助战守护者10次"
},
"type": 12,
@@ -14380,7 +14532,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_462",
+ "key": "buried_buried_condi_tasktxt_468",
"text": "进行10次普通招募"
},
"type": 14,
@@ -14409,7 +14561,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_463",
+ "key": "buried_buried_condi_tasktxt_469",
"text": "为任意守护者提升20级"
},
"type": 24,
@@ -14438,7 +14590,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_464",
+ "key": "buried_buried_condi_tasktxt_470",
"text": "强化任意装备成功20次"
},
"type": 47,
@@ -14465,7 +14617,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_465",
+ "key": "buried_buried_condi_tasktxt_471",
"text": "首次触发剧情《对猩猩宝具》"
},
"type": 215,
@@ -14494,7 +14646,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_466",
+ "key": "buried_buried_condi_tasktxt_472",
"text": "首次触发剧情《齐齐整整》"
},
"type": 215,
@@ -14523,7 +14675,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_467",
+ "key": "buried_buried_condi_tasktxt_473",
"text": "首次触发剧情《日记是无辜的》"
},
"type": 215,
@@ -14552,7 +14704,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_468",
+ "key": "buried_buried_condi_tasktxt_474",
"text": "首次触发剧情《神功大成》"
},
"type": 215,
@@ -14581,7 +14733,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_469",
+ "key": "buried_buried_condi_tasktxt_475",
"text": "首次触发剧情《做原始人》"
},
"type": 215,
@@ -14610,7 +14762,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_470",
+ "key": "buried_buried_condi_tasktxt_476",
"text": "首次触发剧情《是水果不是蘑菇》"
},
"type": 215,
@@ -14639,7 +14791,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_471",
+ "key": "buried_buried_condi_tasktxt_477",
"text": "全阵容职业1通关石阵5"
},
"type": 216,
@@ -14669,7 +14821,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_472",
+ "key": "buried_buried_condi_tasktxt_478",
"text": "全阵容职业1通关石阵6"
},
"type": 216,
@@ -14699,7 +14851,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_473",
+ "key": "buried_buried_condi_tasktxt_479",
"text": "全阵容职业1通关石阵7"
},
"type": 216,
@@ -14729,7 +14881,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_474",
+ "key": "buried_buried_condi_tasktxt_480",
"text": "全阵容职业1通关石阵8"
},
"type": 216,
@@ -14759,7 +14911,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_475",
+ "key": "buried_buried_condi_tasktxt_481",
"text": "全阵容职业2通关石阵5"
},
"type": 216,
@@ -14789,7 +14941,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_476",
+ "key": "buried_buried_condi_tasktxt_482",
"text": "全阵容职业2通关石阵6"
},
"type": 216,
@@ -14819,7 +14971,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_477",
+ "key": "buried_buried_condi_tasktxt_483",
"text": "全阵容职业2通关石阵7"
},
"type": 216,
@@ -14849,7 +15001,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_478",
+ "key": "buried_buried_condi_tasktxt_484",
"text": "全阵容职业2通关石阵8"
},
"type": 216,
@@ -14879,7 +15031,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_479",
+ "key": "buried_buried_condi_tasktxt_485",
"text": "全阵容职业3通关石阵5"
},
"type": 216,
@@ -14909,7 +15061,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_480",
+ "key": "buried_buried_condi_tasktxt_486",
"text": "全阵容职业3通关石阵6"
},
"type": 216,
@@ -14939,7 +15091,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_481",
+ "key": "buried_buried_condi_tasktxt_487",
"text": "全阵容职业3通关石阵7"
},
"type": 216,
@@ -14969,7 +15121,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_482",
+ "key": "buried_buried_condi_tasktxt_488",
"text": "全阵容职业3通关石阵8"
},
"type": 216,
@@ -14999,7 +15151,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_483",
+ "key": "buried_buried_condi_tasktxt_489",
"text": "全阵容职业4通关石阵5"
},
"type": 216,
@@ -15029,7 +15181,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_484",
+ "key": "buried_buried_condi_tasktxt_490",
"text": "全阵容职业4通关石阵6"
},
"type": 216,
@@ -15059,7 +15211,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_485",
+ "key": "buried_buried_condi_tasktxt_491",
"text": "全阵容职业4通关石阵7"
},
"type": 216,
@@ -15089,7 +15241,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_486",
+ "key": "buried_buried_condi_tasktxt_492",
"text": "全阵容职业4通关石阵8"
},
"type": 216,
@@ -15121,7 +15273,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_487",
+ "key": "buried_buried_condi_tasktxt_493",
"text": "第一次获得5星英雄"
},
"type": 228,
@@ -15152,7 +15304,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_488",
+ "key": "buried_buried_condi_tasktxt_494",
"text": "当天充值达到1000积分"
},
"type": 214,
@@ -15181,7 +15333,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_489",
+ "key": "buried_buried_condi_tasktxt_495",
"text": "购买1级月卡礼包"
},
"type": 229,
@@ -15212,7 +15364,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_490",
+ "key": "buried_buried_condi_tasktxt_496",
"text": "累计充值达到2000积分"
},
"type": 214,
@@ -15241,7 +15393,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_491",
+ "key": "buried_buried_condi_tasktxt_497",
"text": "在周五登录一次游戏"
},
"type": 230,
@@ -15272,7 +15424,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_492",
+ "key": "buried_buried_condi_tasktxt_498",
"text": "每期循环塔到达第2层"
},
"type": 231,
@@ -15301,7 +15453,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_493",
+ "key": "buried_buried_condi_tasktxt_499",
"text": "种族塔通关火的热情阵容2层"
},
"type": 232,
@@ -15332,7 +15484,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_494",
+ "key": "buried_buried_condi_tasktxt_500",
"text": "冒险之旅第一章与埃雷特作战"
},
"type": 61,
@@ -15363,7 +15515,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_495",
+ "key": "buried_buried_condi_tasktxt_501",
"text": "冒险之旅第一章找到黑袍人"
},
"type": 61,
@@ -15394,7 +15546,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_496",
+ "key": "buried_buried_condi_tasktxt_502",
"text": "冒险之旅第一章与冰霜泰坦战斗"
},
"type": 61,
@@ -15425,7 +15577,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_497",
+ "key": "buried_buried_condi_tasktxt_503",
"text": "冒险之旅第一章听完埃雷特的的回忆"
},
"type": 61,
@@ -15456,7 +15608,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_498",
+ "key": "buried_buried_condi_tasktxt_504",
"text": "冒险之旅第一章埃雷特挑战回忆"
},
"type": 61,
@@ -15487,7 +15639,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_499",
+ "key": "buried_buried_condi_tasktxt_505",
"text": "冒险之旅第一章困难关卡通关"
},
"type": 61,
@@ -15518,7 +15670,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_500",
+ "key": "buried_buried_condi_tasktxt_506",
"text": "参加捕羊大赛3次"
},
"type": 234,
@@ -15547,7 +15699,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_501",
+ "key": "buried_buried_condi_tasktxt_507",
"text": "第一章商店购买10件商品"
},
"type": 66,
@@ -15578,7 +15730,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_502",
+ "key": "buried_buried_condi_tasktxt_508",
"text": "完成第一章所有探索"
},
"type": 61,
@@ -15609,7 +15761,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_503",
+ "key": "buried_buried_condi_tasktxt_509",
"text": "冒险之旅第一章成就解锁"
},
"type": 61,
@@ -15640,7 +15792,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_504",
+ "key": "buried_buried_condi_tasktxt_510",
"text": "冒险之旅第二章躲过愤怒的瓜哥"
},
"type": 61,
@@ -15671,7 +15823,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_505",
+ "key": "buried_buried_condi_tasktxt_511",
"text": "冒险之旅第二章学习铁拳猴语"
},
"type": 61,
@@ -15702,7 +15854,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_506",
+ "key": "buried_buried_condi_tasktxt_512",
"text": "冒险之旅第二章通关冒险石阵秘境"
},
"type": 61,
@@ -15733,7 +15885,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_507",
+ "key": "buried_buried_condi_tasktxt_513",
"text": "冒险之旅第二章打败大猩猩"
},
"type": 61,
@@ -15764,7 +15916,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_508",
+ "key": "buried_buried_condi_tasktxt_514",
"text": "冒险之旅第二章挑战关卡通关"
},
"type": 61,
@@ -15795,7 +15947,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_509",
+ "key": "buried_buried_condi_tasktxt_515",
"text": "冒险之旅第二章困难关卡通关"
},
"type": 61,
@@ -15826,7 +15978,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_510",
+ "key": "buried_buried_condi_tasktxt_516",
"text": "全阵容职业1通关石阵5"
},
"type": 216,
@@ -15858,7 +16010,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_511",
+ "key": "buried_buried_condi_tasktxt_517",
"text": "第二章商店购买10件商品"
},
"type": 66,
@@ -15889,7 +16041,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_512",
+ "key": "buried_buried_condi_tasktxt_518",
"text": "完成第二章所有探索"
},
"type": 61,
@@ -15920,7 +16072,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_513",
+ "key": "buried_buried_condi_tasktxt_519",
"text": "冒险之旅第三章抓住刚越狱的果酱教授"
},
"type": 61,
@@ -15951,7 +16103,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_514",
+ "key": "buried_buried_condi_tasktxt_520",
"text": "冒险之旅第三章营救沃尔夫"
},
"type": 61,
@@ -15982,7 +16134,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_515",
+ "key": "buried_buried_condi_tasktxt_521",
"text": "冒险之旅第三章护送月光原石"
},
"type": 61,
@@ -16013,7 +16165,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_516",
+ "key": "buried_buried_condi_tasktxt_522",
"text": "冒险之旅第三章追击黑衣人"
},
"type": 61,
@@ -16044,7 +16196,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_517",
+ "key": "buried_buried_condi_tasktxt_523",
"text": "冒险之旅第三章击败豚鼠灵"
},
"type": 61,
@@ -16075,7 +16227,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_518",
+ "key": "buried_buried_condi_tasktxt_524",
"text": "冒险之旅第三章通关冒险难度挑战"
},
"type": 61,
@@ -16106,7 +16258,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_519",
+ "key": "buried_buried_condi_tasktxt_525",
"text": "冒险之旅第三章通关困难难度挑战"
},
"type": 61,
@@ -16137,7 +16289,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_520",
+ "key": "buried_buried_condi_tasktxt_526",
"text": "第三章商店购买10件商品"
},
"type": 66,
@@ -16168,7 +16320,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_521",
+ "key": "buried_buried_condi_tasktxt_527",
"text": "完成第三章所有探索"
},
"type": 61,
@@ -16190,6 +16342,285 @@
],
"filter2": []
},
+ {
+ "id": 11004001,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_528",
+ "text": "冒险之旅第四章找到匹诺曹"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104007
+ ],
+ "filter2": []
+ },
+ {
+ "id": 11004002,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_529",
+ "text": "冒险之旅第四章猫猫变身"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104013
+ ],
+ "filter2": []
+ },
+ {
+ "id": 11004003,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_530",
+ "text": "冒险之旅第四章逃出天坑"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104023
+ ],
+ "filter2": []
+ },
+ {
+ "id": 11004004,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_531",
+ "text": "冒险之旅第四章击败火龙"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104029
+ ],
+ "filter2": []
+ },
+ {
+ "id": 11004005,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_532",
+ "text": "冒险之旅第四章追击果酱教授"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104031
+ ],
+ "filter2": []
+ },
+ {
+ "id": 11004006,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_533",
+ "text": "冒险之旅第四章通关冒险难度挑战"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104073
+ ],
+ "filter2": []
+ },
+ {
+ "id": 11004007,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_534",
+ "text": "冒险之旅第四章通关困难难度挑战"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104081
+ ],
+ "filter2": []
+ },
+ {
+ "id": 11004008,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_535",
+ "text": "第四章商店购买10件商品"
+ },
+ "type": 66,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 10,
+ "filter": [
+ 10
+ ],
+ "filter2": []
+ },
+ {
+ "id": 11004009,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [
+ "achieve"
+ ],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_536",
+ "text": "完成第四章所有探索"
+ },
+ "type": 61,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 1104065
+ ],
+ "filter2": []
+ },
{
"id": 600000010,
"rtype": 1,
@@ -16197,7 +16628,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_522",
+ "key": "buried_buried_condi_tasktxt_537",
"text": "看看希卡普在哪？"
},
"type": 20001,
@@ -16226,7 +16657,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_523",
+ "key": "buried_buried_condi_tasktxt_538",
"text": "阿宝娃娃"
},
"type": 187,
@@ -16255,7 +16686,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_524",
+ "key": "buried_buried_condi_tasktxt_539",
"text": "小虎娃娃"
},
"type": 187,
@@ -16284,7 +16715,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_525",
+ "key": "buried_buried_condi_tasktxt_540",
"text": "螳螂娃娃"
},
"type": 187,
@@ -16313,7 +16744,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_526",
+ "key": "buried_buried_condi_tasktxt_541",
"text": "金猴娃娃"
},
"type": 187,
@@ -16344,7 +16775,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_527",
+ "key": "buried_buried_condi_tasktxt_542",
"text": "完成俱乐部任务3次"
},
"type": 156,
@@ -16373,7 +16804,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_528",
+ "key": "buried_buried_condi_tasktxt_543",
"text": "累计消费3000钻石"
},
"type": 104,
@@ -16402,7 +16833,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_529",
+ "key": "buried_buried_condi_tasktxt_544",
"text": "传承者达到20级"
},
"type": 20,
@@ -16431,7 +16862,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_530",
+ "key": "buried_buried_condi_tasktxt_545",
"text": "累计召唤20次守护者"
},
"type": 14,
@@ -16460,7 +16891,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_531",
+ "key": "buried_buried_condi_tasktxt_546",
"text": "完成5个日常任务"
},
"type": 240,
@@ -16489,7 +16920,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_532",
+ "key": "buried_buried_condi_tasktxt_547",
"text": "在任意商店购买5次商品"
},
"type": 241,
@@ -16518,7 +16949,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_533",
+ "key": "buried_buried_condi_tasktxt_548",
"text": "进行10次竞技挑战"
},
"type": 130,
@@ -16547,7 +16978,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_534",
+ "key": "buried_buried_condi_tasktxt_549",
"text": "参加3次捕羊大赛"
},
"type": 234,
@@ -16576,7 +17007,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_535",
+ "key": "buried_buried_condi_tasktxt_550",
"text": "辉月等级达到3级"
},
"type": 242,
@@ -16605,7 +17036,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_536",
+ "key": "buried_buried_condi_tasktxt_551",
"text": "完成3次每日一练"
},
"type": 185,
@@ -16634,7 +17065,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_537",
+ "key": "buried_buried_condi_tasktxt_552",
"text": "辉月盾收集1个"
},
"type": 187,
@@ -16665,7 +17096,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_538",
+ "key": "buried_buried_condi_tasktxt_553",
"text": "传承者达到5级"
},
"type": 20,
@@ -16694,7 +17125,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_539",
+ "key": "buried_buried_condi_tasktxt_554",
"text": "阿宝强化至10级"
},
"type": 4,
@@ -16725,7 +17156,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_540",
+ "key": "buried_buried_condi_tasktxt_555",
"text": "拥有3名10级守护者"
},
"type": 111,
@@ -16756,8 +17187,8 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_541",
- "text": "塔岗监狱挑战1次"
+ "key": "buried_buried_condi_tasktxt_556",
+ "text": "在塔岗监狱中消耗15点体力"
},
"type": 237,
"valid": 1,
@@ -16772,7 +17203,7 @@
"key": "",
"text": ""
},
- "value": 1,
+ "value": 15,
"filter": [],
"filter2": []
},
@@ -16785,7 +17216,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_542",
+ "key": "buried_buried_condi_tasktxt_557",
"text": "任意商品购买1次"
},
"type": 64,
@@ -16814,7 +17245,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_543",
+ "key": "buried_buried_condi_tasktxt_558",
"text": "在驯龙商店购买任意道具1次"
},
"type": 66,
@@ -16845,7 +17276,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_544",
+ "key": "buried_buried_condi_tasktxt_559",
"text": "商店购买消耗龙币15个"
},
"type": 67,
@@ -16876,7 +17307,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_545",
+ "key": "buried_buried_condi_tasktxt_560",
"text": "商店刷新1次"
},
"type": 105,
@@ -16905,7 +17336,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_546",
+ "key": "buried_buried_condi_tasktxt_561",
"text": "穿戴1件1星装备"
},
"type": 41,
@@ -16936,8 +17367,8 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_547",
- "text": "穿戴1件2级装备"
+ "key": "buried_buried_condi_tasktxt_562",
+ "text": "穿戴1套2级装备"
},
"type": 98,
"valid": 1,
@@ -16967,7 +17398,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_548",
+ "key": "buried_buried_condi_tasktxt_563",
"text": "将4件装备强化至2级"
},
"type": 43,
@@ -16998,7 +17429,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_549",
+ "key": "buried_buried_condi_tasktxt_564",
"text": "强化装备1次"
},
"type": 47,
@@ -17027,7 +17458,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_550",
+ "key": "buried_buried_condi_tasktxt_565",
"text": "获得1件初始属性大于2条的1星装备"
},
"type": 99,
@@ -17059,7 +17490,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_551",
+ "key": "buried_buried_condi_tasktxt_566",
"text": "格伦科提升至2级"
},
"type": 235,
@@ -17090,7 +17521,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_552",
+ "key": "buried_buried_condi_tasktxt_567",
"text": "参加一次捕羊大赛"
},
"type": 234,
@@ -17119,7 +17550,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_553",
+ "key": "buried_buried_condi_tasktxt_568",
"text": "拥有1名好友"
},
"type": 10,
@@ -17148,7 +17579,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_554",
+ "key": "buried_buried_condi_tasktxt_569",
"text": "赠送1次友情点"
},
"type": 11,
@@ -17177,7 +17608,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_555",
+ "key": "buried_buried_condi_tasktxt_570",
"text": "更换1次助战守护者"
},
"type": 13,
@@ -17206,7 +17637,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_556",
+ "key": "buried_buried_condi_tasktxt_571",
"text": "使用好友助战1次"
},
"type": 12,
@@ -17235,7 +17666,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_557",
+ "key": "buried_buried_condi_tasktxt_572",
"text": "通关1次火焰泰坦"
},
"type": 76,
@@ -17266,7 +17697,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_558",
+ "key": "buried_buried_condi_tasktxt_573",
"text": "通关1次冰霜泰坦"
},
"type": 76,
@@ -17297,7 +17728,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_559",
+ "key": "buried_buried_condi_tasktxt_574",
"text": "通关1次森林泰坦"
},
"type": 76,
@@ -17328,7 +17759,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_560",
+ "key": "buried_buried_condi_tasktxt_575",
"text": "通关难度2的冰霜泰坦1次"
},
"type": 77,
@@ -17346,7 +17777,8 @@
},
"value": 1,
"filter": [
- 2
+ 2,
+ 1
],
"filter2": []
},
@@ -17359,7 +17791,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_561",
+ "key": "buried_buried_condi_tasktxt_576",
"text": "在维京远征种消耗28体力"
},
"type": 201,
@@ -17388,7 +17820,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_562",
+ "key": "buried_buried_condi_tasktxt_577",
"text": "在铁匠铺打造1件装备"
},
"type": 148,
@@ -17417,7 +17849,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_563",
+ "key": "buried_buried_condi_tasktxt_578",
"text": "拥有4名20级守护者"
},
"type": 111,
@@ -17448,7 +17880,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_564",
+ "key": "buried_buried_condi_tasktxt_579",
"text": "讲4件装备强化至5级"
},
"type": 43,
@@ -17479,7 +17911,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_565",
+ "key": "buried_buried_condi_tasktxt_580",
"text": "通关1次猎魂挑战"
},
"type": 200,
@@ -17508,7 +17940,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_566",
+ "key": "buried_buried_condi_tasktxt_581",
"text": "通关1次巨型猩猩的猎魂挑战"
},
"type": 83,
@@ -17539,7 +17971,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_567",
+ "key": "buried_buried_condi_tasktxt_582",
"text": "在猎魂挑战中消耗42体力"
},
"type": 202,
@@ -17568,7 +18000,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_568",
+ "key": "buried_buried_condi_tasktxt_583",
"text": "任意守护者回响累计2次"
},
"type": 39,
@@ -17597,7 +18029,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_569",
+ "key": "buried_buried_condi_tasktxt_584",
"text": "累计武馆训练10分钟"
},
"type": 135,
@@ -17626,7 +18058,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_570",
+ "key": "buried_buried_condi_tasktxt_585",
"text": "拥有4名30级守护者"
},
"type": 111,
@@ -17657,7 +18089,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_571",
+ "key": "buried_buried_condi_tasktxt_586",
"text": "将4件装备强化至10级"
},
"type": 43,
@@ -17688,7 +18120,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_572",
+ "key": "buried_buried_condi_tasktxt_587",
"text": "拥有4名40级守护者"
},
"type": 111,
@@ -17719,7 +18151,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_573",
+ "key": "buried_buried_condi_tasktxt_588",
"text": "将4件装备强化至15级"
},
"type": 43,
@@ -17750,7 +18182,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_574",
+ "key": "buried_buried_condi_tasktxt_589",
"text": "任意守护者回响累计10次"
},
"type": 39,
@@ -17779,7 +18211,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_575",
+ "key": "buried_buried_condi_tasktxt_590",
"text": "竞技场积分达到1000分"
},
"type": 128,
@@ -17808,7 +18240,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_576",
+ "key": "buried_buried_condi_tasktxt_591",
"text": "竞技场获胜1次"
},
"type": 130,
@@ -17837,7 +18269,7 @@
],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_577",
+ "key": "buried_buried_condi_tasktxt_592",
"text": "竞技场达到青铜段位"
},
"type": 129,
@@ -17864,7 +18296,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_578",
+ "key": "buried_buried_condi_tasktxt_593",
"text": "首次将2件套全部装备强化15并穿戴"
},
"type": 98,
@@ -17893,7 +18325,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_579",
+ "key": "buried_buried_condi_tasktxt_594",
"text": "首次将4件套全部装备强化15并穿戴"
},
"type": 98,
@@ -17922,7 +18354,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_580",
+ "key": "buried_buried_condi_tasktxt_595",
"text": "火的热情守护者觉醒1次"
},
"type": 121,
@@ -17951,7 +18383,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_581",
+ "key": "buried_buried_condi_tasktxt_596",
"text": "火的热情守护者觉醒2次"
},
"type": 121,
@@ -17980,7 +18412,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_582",
+ "key": "buried_buried_condi_tasktxt_597",
"text": "火的热情守护者觉醒3次"
},
"type": 121,
@@ -18009,7 +18441,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_583",
+ "key": "buried_buried_condi_tasktxt_598",
"text": "火的热情守护者觉醒4次"
},
"type": 121,
@@ -18038,7 +18470,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_584",
+ "key": "buried_buried_condi_tasktxt_599",
"text": "火的热情守护者觉醒5次"
},
"type": 121,
@@ -18067,7 +18499,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_585",
+ "key": "buried_buried_condi_tasktxt_600",
"text": "火的热情守护者觉醒6次"
},
"type": 121,
@@ -18096,7 +18528,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_586",
+ "key": "buried_buried_condi_tasktxt_601",
"text": "水的包容守护者觉醒1次"
},
"type": 121,
@@ -18125,7 +18557,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_587",
+ "key": "buried_buried_condi_tasktxt_602",
"text": "水的包容守护者觉醒2次"
},
"type": 121,
@@ -18154,7 +18586,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_588",
+ "key": "buried_buried_condi_tasktxt_603",
"text": "水的包容守护者觉醒3次"
},
"type": 121,
@@ -18183,7 +18615,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_589",
+ "key": "buried_buried_condi_tasktxt_604",
"text": "水的包容守护者觉醒4次"
},
"type": 121,
@@ -18212,7 +18644,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_590",
+ "key": "buried_buried_condi_tasktxt_605",
"text": "水的包容守护者觉醒5次"
},
"type": 121,
@@ -18241,7 +18673,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_591",
+ "key": "buried_buried_condi_tasktxt_606",
"text": "水的包容守护者觉醒6次"
},
"type": 121,
@@ -18270,7 +18702,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_592",
+ "key": "buried_buried_condi_tasktxt_607",
"text": "林的感观守护者觉醒1次"
},
"type": 121,
@@ -18299,7 +18731,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_593",
+ "key": "buried_buried_condi_tasktxt_608",
"text": "林的感观守护者觉醒2次"
},
"type": 121,
@@ -18328,7 +18760,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_594",
+ "key": "buried_buried_condi_tasktxt_609",
"text": "林的感观守护者觉醒3次"
},
"type": 121,
@@ -18357,7 +18789,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_595",
+ "key": "buried_buried_condi_tasktxt_610",
"text": "林的感观守护者觉醒4次"
},
"type": 121,
@@ -18386,7 +18818,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_596",
+ "key": "buried_buried_condi_tasktxt_611",
"text": "林的感观守护者觉醒5次"
},
"type": 121,
@@ -18415,7 +18847,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_597",
+ "key": "buried_buried_condi_tasktxt_612",
"text": "林的感观守护者觉醒6次"
},
"type": 121,
@@ -18444,7 +18876,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_598",
+ "key": "buried_buried_condi_tasktxt_613",
"text": "光的荣耀守护者觉醒1次"
},
"type": 121,
@@ -18473,7 +18905,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_599",
+ "key": "buried_buried_condi_tasktxt_614",
"text": "光的荣耀守护者觉醒2次"
},
"type": 121,
@@ -18502,7 +18934,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_600",
+ "key": "buried_buried_condi_tasktxt_615",
"text": "光的荣耀守护者觉醒3次"
},
"type": 121,
@@ -18531,7 +18963,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_601",
+ "key": "buried_buried_condi_tasktxt_616",
"text": "光的荣耀守护者觉醒4次"
},
"type": 121,
@@ -18560,7 +18992,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_602",
+ "key": "buried_buried_condi_tasktxt_617",
"text": "光的荣耀守护者觉醒5次"
},
"type": 121,
@@ -18589,7 +19021,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_603",
+ "key": "buried_buried_condi_tasktxt_618",
"text": "光的荣耀守护者觉醒6次"
},
"type": 121,
@@ -18618,7 +19050,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_604",
+ "key": "buried_buried_condi_tasktxt_619",
"text": "守护者总共鸣5次"
},
"type": 39,
@@ -18645,7 +19077,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_605",
+ "key": "buried_buried_condi_tasktxt_620",
"text": "守护者总共鸣10次"
},
"type": 39,
@@ -18672,7 +19104,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_606",
+ "key": "buried_buried_condi_tasktxt_621",
"text": "守护者总共鸣20次"
},
"type": 39,
@@ -18699,7 +19131,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_607",
+ "key": "buried_buried_condi_tasktxt_622",
"text": "守护者总共鸣50次"
},
"type": 39,
@@ -18726,7 +19158,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_608",
+ "key": "buried_buried_condi_tasktxt_623",
"text": "守护者技能累计升级5次"
},
"type": 53,
@@ -18753,7 +19185,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_609",
+ "key": "buried_buried_condi_tasktxt_624",
"text": "守护者技能累计升级10次"
},
"type": 53,
@@ -18780,7 +19212,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_610",
+ "key": "buried_buried_condi_tasktxt_625",
"text": "守护者技能累计升级20次"
},
"type": 53,
@@ -18807,7 +19239,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_611",
+ "key": "buried_buried_condi_tasktxt_626",
"text": "守护者技能累计升级50次"
},
"type": 53,
@@ -18834,7 +19266,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_612",
+ "key": "buried_buried_condi_tasktxt_627",
"text": "1位守护者技能全部升满"
},
"type": 54,
@@ -18861,7 +19293,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_613",
+ "key": "buried_buried_condi_tasktxt_628",
"text": "3位守护者技能全部升满"
},
"type": 54,
@@ -18888,7 +19320,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_614",
+ "key": "buried_buried_condi_tasktxt_629",
"text": "5位守护者技能全部升满"
},
"type": 54,
@@ -18915,7 +19347,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
- "key": "buried_buried_condi_tasktxt_615",
+ "key": "buried_buried_condi_tasktxt_630",
"text": "10位守护者技能全部升满"
},
"type": 54,
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index d2ae1be31..b06bb6c98 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -608,7 +608,7 @@
},
{
"id": 98,
- "insert": 4,
+ "insert": 2,
"filter": [
"gte"
]
@@ -618,7 +618,7 @@
"insert": 3,
"filter": [
"gte",
- "eq"
+ "gte"
]
},
{
@@ -798,9 +798,7 @@
{
"id": 129,
"insert": 1,
- "filter": [
- "gte"
- ]
+ "filter": []
},
{
"id": 130,
diff --git a/bin/json/game_cardpool.json b/bin/json/game_cardpool.json
index 598fe56d4..ba0e8c0e9 100644
--- a/bin/json/game_cardpool.json
+++ b/bin/json/game_cardpool.json
@@ -56,1331 +56,1301 @@
{
"key": 10,
"card_pool_type": "pro_pool20003",
- "id": "23011",
+ "id": "33001",
"weight": 1
},
{
"key": 11,
"card_pool_type": "pro_pool20003",
- "id": "33001",
+ "id": "33002",
"weight": 1
},
{
"key": 12,
"card_pool_type": "pro_pool20003",
- "id": "33002",
+ "id": "33003",
"weight": 1
},
{
"key": 13,
"card_pool_type": "pro_pool20003",
- "id": "33003",
+ "id": "33005",
"weight": 1
},
{
"key": 14,
"card_pool_type": "pro_pool20003",
- "id": "33005",
+ "id": "43001",
"weight": 1
},
{
"key": 15,
"card_pool_type": "pro_pool20003",
- "id": "43001",
+ "id": "43003",
"weight": 1
},
{
"key": 16,
"card_pool_type": "pro_pool20003",
- "id": "43003",
+ "id": "43004",
"weight": 1
},
{
"key": 17,
"card_pool_type": "pro_pool20003",
- "id": "43004",
+ "id": "43006",
"weight": 1
},
{
"key": 18,
- "card_pool_type": "pro_pool20003",
- "id": "43006",
+ "card_pool_type": "pro_pool20004",
+ "id": "14001",
"weight": 1
},
{
"key": 19,
"card_pool_type": "pro_pool20004",
- "id": "14001",
+ "id": "14002",
"weight": 1
},
{
"key": 20,
"card_pool_type": "pro_pool20004",
- "id": "14002",
+ "id": "14005",
"weight": 1
},
{
"key": 21,
"card_pool_type": "pro_pool20004",
- "id": "14005",
+ "id": "14007",
"weight": 1
},
{
"key": 22,
"card_pool_type": "pro_pool20004",
- "id": "14007",
+ "id": "24001",
"weight": 1
},
{
"key": 23,
"card_pool_type": "pro_pool20004",
- "id": "24001",
+ "id": "24002",
"weight": 1
},
{
"key": 24,
"card_pool_type": "pro_pool20004",
- "id": "24002",
+ "id": "24004",
"weight": 1
},
{
"key": 25,
"card_pool_type": "pro_pool20004",
- "id": "24004",
+ "id": "24005",
"weight": 1
},
{
"key": 26,
"card_pool_type": "pro_pool20004",
- "id": "24005",
+ "id": "24008",
"weight": 1
},
{
"key": 27,
"card_pool_type": "pro_pool20004",
- "id": "24008",
+ "id": "24009",
"weight": 1
},
{
"key": 28,
"card_pool_type": "pro_pool20004",
- "id": "24009",
+ "id": "25001",
"weight": 1
},
{
"key": 29,
"card_pool_type": "pro_pool20004",
- "id": "25001",
+ "id": "34002",
"weight": 1
},
{
"key": 30,
"card_pool_type": "pro_pool20004",
- "id": "34002",
+ "id": "34004",
"weight": 1
},
{
"key": 31,
"card_pool_type": "pro_pool20004",
- "id": "34004",
+ "id": "34005",
"weight": 1
},
{
"key": 32,
"card_pool_type": "pro_pool20004",
- "id": "34005",
+ "id": "34008",
"weight": 1
},
{
"key": 33,
"card_pool_type": "pro_pool20004",
- "id": "34008",
+ "id": "13004",
"weight": 1
},
{
"key": 34,
"card_pool_type": "pro_pool20004",
- "id": "13004",
+ "id": "35006",
"weight": 1
},
{
"key": 35,
"card_pool_type": "pro_pool20004",
- "id": "35006",
+ "id": "44001",
"weight": 1
},
{
"key": 36,
"card_pool_type": "pro_pool20004",
- "id": "44001",
+ "id": "44003",
"weight": 1
},
{
"key": 37,
"card_pool_type": "pro_pool20004",
- "id": "44003",
+ "id": "44004",
"weight": 1
},
{
"key": 38,
"card_pool_type": "pro_pool20004",
- "id": "44004",
+ "id": "44006",
"weight": 1
},
{
"key": 39,
"card_pool_type": "pro_pool20004",
- "id": "44006",
+ "id": "43002",
"weight": 1
},
{
"key": 40,
"card_pool_type": "pro_pool20004",
- "id": "43002",
+ "id": "43007",
"weight": 1
},
{
"key": 41,
- "card_pool_type": "pro_pool20004",
- "id": "43007",
+ "card_pool_type": "pro_pool20005",
+ "id": "15002",
"weight": 1
},
{
"key": 42,
"card_pool_type": "pro_pool20005",
- "id": "15002",
+ "id": "15003",
"weight": 1
},
{
"key": 43,
"card_pool_type": "pro_pool20005",
- "id": "15003",
+ "id": "15004",
"weight": 1
},
{
"key": 44,
"card_pool_type": "pro_pool20005",
- "id": "15004",
+ "id": "15005",
"weight": 1
},
{
"key": 45,
"card_pool_type": "pro_pool20005",
- "id": "15005",
+ "id": "25002",
"weight": 1
},
{
"key": 46,
"card_pool_type": "pro_pool20005",
- "id": "25002",
+ "id": "35005",
"weight": 1
},
{
"key": 47,
"card_pool_type": "pro_pool20005",
- "id": "35005",
+ "id": "35001",
"weight": 1
},
{
"key": 48,
"card_pool_type": "pro_pool20005",
- "id": "35001",
+ "id": "35002",
"weight": 1
},
{
"key": 49,
"card_pool_type": "pro_pool20005",
- "id": "35002",
+ "id": "44005",
"weight": 1
},
{
"key": 50,
"card_pool_type": "pro_pool20005",
- "id": "44005",
+ "id": "44002",
"weight": 1
},
{
"key": 51,
- "card_pool_type": "pro_pool20005",
- "id": "44002",
+ "card_pool_type": "base_pool10003",
+ "id": "13001",
"weight": 1
},
{
"key": 52,
"card_pool_type": "base_pool10003",
- "id": "13001",
+ "id": "13002",
"weight": 1
},
{
"key": 53,
"card_pool_type": "base_pool10003",
- "id": "13002",
+ "id": "13003",
"weight": 1
},
{
"key": 54,
"card_pool_type": "base_pool10003",
- "id": "13003",
+ "id": "13005",
"weight": 1
},
{
"key": 55,
"card_pool_type": "base_pool10003",
- "id": "13005",
+ "id": "23003",
"weight": 1
},
{
"key": 56,
"card_pool_type": "base_pool10003",
- "id": "23003",
+ "id": "23004",
"weight": 1
},
{
"key": 57,
"card_pool_type": "base_pool10003",
- "id": "23004",
+ "id": "33001",
"weight": 1
},
{
"key": 58,
"card_pool_type": "base_pool10003",
- "id": "23011",
+ "id": "33002",
"weight": 1
},
{
"key": 59,
"card_pool_type": "base_pool10003",
- "id": "33001",
+ "id": "33003",
"weight": 1
},
{
"key": 60,
"card_pool_type": "base_pool10003",
- "id": "33002",
+ "id": "33005",
"weight": 1
},
{
"key": 61,
"card_pool_type": "base_pool10003",
- "id": "33003",
+ "id": "43001",
"weight": 1
},
{
"key": 62,
"card_pool_type": "base_pool10003",
- "id": "33005",
+ "id": "43003",
"weight": 1
},
{
"key": 63,
"card_pool_type": "base_pool10003",
- "id": "43001",
+ "id": "43004",
"weight": 1
},
{
"key": 64,
"card_pool_type": "base_pool10003",
- "id": "43003",
+ "id": "43006",
"weight": 1
},
{
"key": 65,
- "card_pool_type": "base_pool10003",
- "id": "43004",
+ "card_pool_type": "base_pool10004",
+ "id": "14001",
"weight": 1
},
{
"key": 66,
- "card_pool_type": "base_pool10003",
- "id": "43006",
+ "card_pool_type": "base_pool10004",
+ "id": "14002",
"weight": 1
},
{
"key": 67,
"card_pool_type": "base_pool10004",
- "id": "14001",
+ "id": "14005",
"weight": 1
},
{
"key": 68,
"card_pool_type": "base_pool10004",
- "id": "14002",
+ "id": "14007",
"weight": 1
},
{
"key": 69,
"card_pool_type": "base_pool10004",
- "id": "14005",
+ "id": "24001",
"weight": 1
},
{
"key": 70,
"card_pool_type": "base_pool10004",
- "id": "14007",
+ "id": "24002",
"weight": 1
},
{
"key": 71,
"card_pool_type": "base_pool10004",
- "id": "24001",
+ "id": "24004",
"weight": 1
},
{
"key": 72,
"card_pool_type": "base_pool10004",
- "id": "24002",
+ "id": "24005",
"weight": 1
},
{
"key": 73,
"card_pool_type": "base_pool10004",
- "id": "24004",
+ "id": "24008",
"weight": 1
},
{
"key": 74,
"card_pool_type": "base_pool10004",
- "id": "24005",
+ "id": "24009",
"weight": 1
},
{
"key": 75,
"card_pool_type": "base_pool10004",
- "id": "24008",
+ "id": "25001",
"weight": 1
},
{
"key": 76,
"card_pool_type": "base_pool10004",
- "id": "24009",
+ "id": "34002",
"weight": 1
},
{
"key": 77,
"card_pool_type": "base_pool10004",
- "id": "25001",
+ "id": "34004",
"weight": 1
},
{
"key": 78,
"card_pool_type": "base_pool10004",
- "id": "34002",
+ "id": "34005",
"weight": 1
},
{
"key": 79,
"card_pool_type": "base_pool10004",
- "id": "34004",
+ "id": "34008",
"weight": 1
},
{
"key": 80,
"card_pool_type": "base_pool10004",
- "id": "34005",
+ "id": "13004",
"weight": 1
},
{
"key": 81,
"card_pool_type": "base_pool10004",
- "id": "34008",
+ "id": "35006",
"weight": 1
},
{
"key": 82,
"card_pool_type": "base_pool10004",
- "id": "13004",
+ "id": "44001",
"weight": 1
},
{
"key": 83,
"card_pool_type": "base_pool10004",
- "id": "35006",
+ "id": "44003",
"weight": 1
},
{
"key": 84,
"card_pool_type": "base_pool10004",
- "id": "44001",
+ "id": "44004",
"weight": 1
},
{
"key": 85,
"card_pool_type": "base_pool10004",
- "id": "44003",
+ "id": "44006",
"weight": 1
},
{
"key": 86,
"card_pool_type": "base_pool10004",
- "id": "44004",
+ "id": "43002",
"weight": 1
},
{
"key": 87,
"card_pool_type": "base_pool10004",
- "id": "44006",
+ "id": "43007",
"weight": 1
},
{
"key": 88,
- "card_pool_type": "base_pool10004",
- "id": "43002",
+ "card_pool_type": "base_pool10005",
+ "id": "15002",
"weight": 1
},
{
"key": 89,
- "card_pool_type": "base_pool10004",
- "id": "43007",
+ "card_pool_type": "base_pool10005",
+ "id": "15003",
"weight": 1
},
{
"key": 90,
"card_pool_type": "base_pool10005",
- "id": "15002",
+ "id": "15004",
"weight": 1
},
{
"key": 91,
"card_pool_type": "base_pool10005",
- "id": "15003",
+ "id": "15005",
"weight": 1
},
{
"key": 92,
"card_pool_type": "base_pool10005",
- "id": "15004",
+ "id": "25002",
"weight": 1
},
{
"key": 93,
"card_pool_type": "base_pool10005",
- "id": "15005",
+ "id": "35005",
"weight": 1
},
{
"key": 94,
"card_pool_type": "base_pool10005",
- "id": "25002",
+ "id": "35001",
"weight": 1
},
{
"key": 95,
"card_pool_type": "base_pool10005",
- "id": "35005",
+ "id": "35002",
"weight": 1
},
{
"key": 96,
"card_pool_type": "base_pool10005",
- "id": "35001",
+ "id": "44005",
"weight": 1
},
{
"key": 97,
"card_pool_type": "base_pool10005",
- "id": "35002",
+ "id": "44002",
"weight": 1
},
{
"key": 98,
- "card_pool_type": "base_pool10005",
- "id": "44005",
+ "card_pool_type": "base_pool20003",
+ "id": "13001",
"weight": 1
},
{
"key": 99,
- "card_pool_type": "base_pool10005",
- "id": "44002",
+ "card_pool_type": "base_pool20003",
+ "id": "13002",
"weight": 1
},
{
"key": 100,
"card_pool_type": "base_pool20003",
- "id": "13001",
+ "id": "13003",
"weight": 1
},
{
"key": 101,
"card_pool_type": "base_pool20003",
- "id": "13002",
+ "id": "13005",
"weight": 1
},
{
"key": 102,
"card_pool_type": "base_pool20003",
- "id": "13003",
+ "id": "23003",
"weight": 1
},
{
"key": 103,
"card_pool_type": "base_pool20003",
- "id": "13005",
+ "id": "23004",
"weight": 1
},
{
"key": 104,
"card_pool_type": "base_pool20003",
- "id": "23003",
+ "id": "33001",
"weight": 1
},
{
"key": 105,
"card_pool_type": "base_pool20003",
- "id": "23004",
+ "id": "33002",
"weight": 1
},
{
"key": 106,
"card_pool_type": "base_pool20003",
- "id": "23011",
+ "id": "33003",
"weight": 1
},
{
"key": 107,
"card_pool_type": "base_pool20003",
- "id": "33001",
+ "id": "33005",
"weight": 1
},
{
"key": 108,
"card_pool_type": "base_pool20003",
- "id": "33002",
+ "id": "43001",
"weight": 1
},
{
"key": 109,
"card_pool_type": "base_pool20003",
- "id": "33003",
+ "id": "43003",
"weight": 1
},
{
"key": 110,
"card_pool_type": "base_pool20003",
- "id": "33005",
+ "id": "43004",
"weight": 1
},
{
"key": 111,
"card_pool_type": "base_pool20003",
- "id": "43001",
+ "id": "43006",
"weight": 1
},
{
"key": 112,
- "card_pool_type": "base_pool20003",
- "id": "43003",
+ "card_pool_type": "base_pool20004",
+ "id": "14001",
"weight": 1
},
{
"key": 113,
- "card_pool_type": "base_pool20003",
- "id": "43004",
+ "card_pool_type": "base_pool20004",
+ "id": "14002",
"weight": 1
},
{
"key": 114,
- "card_pool_type": "base_pool20003",
- "id": "43006",
+ "card_pool_type": "base_pool20004",
+ "id": "14005",
"weight": 1
},
{
"key": 115,
"card_pool_type": "base_pool20004",
- "id": "14001",
+ "id": "14007",
"weight": 1
},
{
"key": 116,
"card_pool_type": "base_pool20004",
- "id": "14002",
+ "id": "24001",
"weight": 1
},
{
"key": 117,
"card_pool_type": "base_pool20004",
- "id": "14005",
+ "id": "24002",
"weight": 1
},
{
"key": 118,
"card_pool_type": "base_pool20004",
- "id": "14007",
+ "id": "24004",
"weight": 1
},
{
"key": 119,
"card_pool_type": "base_pool20004",
- "id": "24001",
+ "id": "24005",
"weight": 1
},
{
"key": 120,
"card_pool_type": "base_pool20004",
- "id": "24002",
+ "id": "24008",
"weight": 1
},
{
"key": 121,
"card_pool_type": "base_pool20004",
- "id": "24004",
+ "id": "24009",
"weight": 1
},
{
"key": 122,
"card_pool_type": "base_pool20004",
- "id": "24005",
+ "id": "25001",
"weight": 1
},
{
"key": 123,
"card_pool_type": "base_pool20004",
- "id": "24008",
+ "id": "34002",
"weight": 1
},
{
"key": 124,
"card_pool_type": "base_pool20004",
- "id": "24009",
+ "id": "34004",
"weight": 1
},
{
"key": 125,
"card_pool_type": "base_pool20004",
- "id": "25001",
+ "id": "34005",
"weight": 1
},
{
"key": 126,
"card_pool_type": "base_pool20004",
- "id": "34002",
+ "id": "34008",
"weight": 1
},
{
"key": 127,
"card_pool_type": "base_pool20004",
- "id": "34004",
+ "id": "13004",
"weight": 1
},
{
"key": 128,
"card_pool_type": "base_pool20004",
- "id": "34005",
+ "id": "35006",
"weight": 1
},
{
"key": 129,
"card_pool_type": "base_pool20004",
- "id": "34008",
+ "id": "44001",
"weight": 1
},
{
"key": 130,
"card_pool_type": "base_pool20004",
- "id": "13004",
+ "id": "44003",
"weight": 1
},
{
"key": 131,
"card_pool_type": "base_pool20004",
- "id": "35006",
+ "id": "44004",
"weight": 1
},
{
"key": 132,
"card_pool_type": "base_pool20004",
- "id": "44001",
+ "id": "44006",
"weight": 1
},
{
"key": 133,
"card_pool_type": "base_pool20004",
- "id": "44003",
+ "id": "43002",
"weight": 1
},
{
"key": 134,
"card_pool_type": "base_pool20004",
- "id": "44004",
+ "id": "43007",
"weight": 1
},
{
"key": 135,
- "card_pool_type": "base_pool20004",
- "id": "44006",
+ "card_pool_type": "base_pool20005",
+ "id": "15002",
"weight": 1
},
{
"key": 136,
- "card_pool_type": "base_pool20004",
- "id": "43002",
+ "card_pool_type": "base_pool20005",
+ "id": "15003",
"weight": 1
},
{
"key": 137,
- "card_pool_type": "base_pool20004",
- "id": "43007",
+ "card_pool_type": "base_pool20005",
+ "id": "15004",
"weight": 1
},
{
"key": 138,
"card_pool_type": "base_pool20005",
- "id": "15002",
+ "id": "15005",
"weight": 1
},
{
"key": 139,
"card_pool_type": "base_pool20005",
- "id": "15003",
+ "id": "25002",
"weight": 1
},
{
"key": 140,
"card_pool_type": "base_pool20005",
- "id": "15004",
+ "id": "35005",
"weight": 1
},
{
"key": 141,
"card_pool_type": "base_pool20005",
- "id": "15005",
+ "id": "35001",
"weight": 1
},
{
"key": 142,
"card_pool_type": "base_pool20005",
- "id": "25002",
+ "id": "35002",
"weight": 1
},
{
"key": 143,
"card_pool_type": "base_pool20005",
- "id": "35005",
+ "id": "44005",
"weight": 1
},
{
"key": 144,
"card_pool_type": "base_pool20005",
- "id": "35001",
+ "id": "44002",
"weight": 1
},
{
"key": 145,
- "card_pool_type": "base_pool20005",
- "id": "35002",
+ "card_pool_type": "base_pool30003",
+ "id": "13001",
"weight": 1
},
{
"key": 146,
- "card_pool_type": "base_pool20005",
- "id": "44005",
+ "card_pool_type": "base_pool30003",
+ "id": "13002",
"weight": 1
},
{
"key": 147,
- "card_pool_type": "base_pool20005",
- "id": "44002",
+ "card_pool_type": "base_pool30003",
+ "id": "13003",
"weight": 1
},
{
"key": 148,
"card_pool_type": "base_pool30003",
- "id": "13001",
+ "id": "13005",
"weight": 1
},
{
"key": 149,
- "card_pool_type": "base_pool30003",
- "id": "13002",
+ "card_pool_type": "base_pool30004",
+ "id": "14001",
"weight": 1
},
{
"key": 150,
- "card_pool_type": "base_pool30003",
- "id": "13003",
+ "card_pool_type": "base_pool30004",
+ "id": "14002",
"weight": 1
},
{
"key": 151,
- "card_pool_type": "base_pool30003",
- "id": "13005",
+ "card_pool_type": "base_pool30004",
+ "id": "14005",
"weight": 1
},
{
"key": 152,
"card_pool_type": "base_pool30004",
- "id": "14001",
+ "id": "14007",
"weight": 1
},
{
"key": 153,
- "card_pool_type": "base_pool30004",
- "id": "14002",
+ "card_pool_type": "base_pool30005",
+ "id": "15002",
"weight": 1
},
{
"key": 154,
- "card_pool_type": "base_pool30004",
- "id": "14005",
+ "card_pool_type": "base_pool30005",
+ "id": "15003",
"weight": 1
},
{
"key": 155,
- "card_pool_type": "base_pool30004",
- "id": "14007",
+ "card_pool_type": "base_pool30005",
+ "id": "15004",
"weight": 1
},
{
"key": 156,
"card_pool_type": "base_pool30005",
- "id": "15002",
- "weight": 1
- },
- {
- "key": 157,
- "card_pool_type": "base_pool30005",
- "id": "15003",
- "weight": 1
- },
- {
- "key": 158,
- "card_pool_type": "base_pool30005",
- "id": "15004",
- "weight": 1
- },
- {
- "key": 159,
- "card_pool_type": "base_pool30005",
"id": "15005",
"weight": 1
},
{
- "key": 160,
+ "key": 157,
"card_pool_type": "base_pool40003",
"id": "23003",
"weight": 1
},
{
- "key": 161,
+ "key": 158,
"card_pool_type": "base_pool40003",
"id": "23004",
"weight": 1
},
+ {
+ "key": 159,
+ "card_pool_type": "base_pool40004",
+ "id": "24001",
+ "weight": 1
+ },
+ {
+ "key": 160,
+ "card_pool_type": "base_pool40004",
+ "id": "24002",
+ "weight": 1
+ },
+ {
+ "key": 161,
+ "card_pool_type": "base_pool40004",
+ "id": "24004",
+ "weight": 1
+ },
{
"key": 162,
- "card_pool_type": "base_pool40003",
- "id": "23011",
+ "card_pool_type": "base_pool40004",
+ "id": "24005",
"weight": 1
},
{
"key": 163,
"card_pool_type": "base_pool40004",
- "id": "24001",
+ "id": "24008",
"weight": 1
},
{
"key": 164,
"card_pool_type": "base_pool40004",
- "id": "24002",
+ "id": "24009",
"weight": 1
},
{
"key": 165,
"card_pool_type": "base_pool40004",
- "id": "24004",
- "weight": 1
- },
- {
- "key": 166,
- "card_pool_type": "base_pool40004",
- "id": "24005",
- "weight": 1
- },
- {
- "key": 167,
- "card_pool_type": "base_pool40004",
- "id": "24008",
- "weight": 1
- },
- {
- "key": 168,
- "card_pool_type": "base_pool40004",
- "id": "24009",
- "weight": 1
- },
- {
- "key": 169,
- "card_pool_type": "base_pool40004",
"id": "25001",
"weight": 1
},
{
- "key": 170,
+ "key": 166,
"card_pool_type": "base_pool40005",
"id": "25002",
"weight": 1
},
{
- "key": 171,
+ "key": 167,
"card_pool_type": "base_pool50003",
"id": "33001",
"weight": 1
},
{
- "key": 172,
+ "key": 168,
"card_pool_type": "base_pool50003",
"id": "33002",
"weight": 1
},
{
- "key": 173,
+ "key": 169,
"card_pool_type": "base_pool50003",
"id": "33003",
"weight": 1
},
{
- "key": 174,
+ "key": 170,
"card_pool_type": "base_pool50003",
"id": "33005",
"weight": 1
},
+ {
+ "key": 171,
+ "card_pool_type": "base_pool50004",
+ "id": "34002",
+ "weight": 1
+ },
+ {
+ "key": 172,
+ "card_pool_type": "base_pool50004",
+ "id": "34004",
+ "weight": 1
+ },
+ {
+ "key": 173,
+ "card_pool_type": "base_pool50004",
+ "id": "34005",
+ "weight": 1
+ },
+ {
+ "key": 174,
+ "card_pool_type": "base_pool50004",
+ "id": "34008",
+ "weight": 1
+ },
{
"key": 175,
"card_pool_type": "base_pool50004",
- "id": "34002",
+ "id": "13004",
"weight": 1
},
{
"key": 176,
"card_pool_type": "base_pool50004",
- "id": "34004",
- "weight": 1
- },
- {
- "key": 177,
- "card_pool_type": "base_pool50004",
- "id": "34005",
- "weight": 1
- },
- {
- "key": 178,
- "card_pool_type": "base_pool50004",
- "id": "34008",
- "weight": 1
- },
- {
- "key": 179,
- "card_pool_type": "base_pool50004",
- "id": "13004",
- "weight": 1
- },
- {
- "key": 180,
- "card_pool_type": "base_pool50004",
"id": "35006",
"weight": 1
},
{
- "key": 181,
+ "key": 177,
"card_pool_type": "base_pool50005",
"id": "35001",
"weight": 1
},
{
- "key": 182,
+ "key": 178,
"card_pool_type": "base_pool50005",
"id": "35002",
"weight": 1
},
{
- "key": 183,
+ "key": 179,
"card_pool_type": "base_pool50005",
"id": "35005",
"weight": 1
},
{
- "key": 184,
+ "key": 180,
"card_pool_type": "base_pool70003",
"id": "13001",
"weight": 1
},
{
- "key": 185,
+ "key": 181,
"card_pool_type": "base_pool70003",
"id": "13002",
"weight": 1
},
{
- "key": 186,
+ "key": 182,
"card_pool_type": "base_pool70003",
"id": "13003",
"weight": 1
},
{
- "key": 187,
+ "key": 183,
"card_pool_type": "base_pool70003",
"id": "13005",
"weight": 1
},
{
- "key": 188,
+ "key": 184,
"card_pool_type": "base_pool70003",
"id": "23003",
"weight": 1
},
{
- "key": 189,
+ "key": 185,
"card_pool_type": "base_pool70003",
"id": "23004",
"weight": 1
},
{
- "key": 190,
- "card_pool_type": "base_pool70003",
- "id": "23011",
- "weight": 1
- },
- {
- "key": 191,
+ "key": 186,
"card_pool_type": "base_pool70003",
"id": "33001",
"weight": 1
},
{
- "key": 192,
+ "key": 187,
"card_pool_type": "base_pool70003",
"id": "33002",
"weight": 1
},
{
- "key": 193,
+ "key": 188,
"card_pool_type": "base_pool70003",
"id": "33003",
"weight": 1
},
{
- "key": 194,
+ "key": 189,
"card_pool_type": "base_pool70003",
"id": "33005",
"weight": 1
},
{
- "key": 195,
+ "key": 190,
"card_pool_type": "base_pool70003",
"id": "43001",
"weight": 1
},
{
- "key": 196,
+ "key": 191,
"card_pool_type": "base_pool70003",
"id": "43003",
"weight": 1
},
{
- "key": 197,
+ "key": 192,
"card_pool_type": "base_pool70003",
"id": "43004",
"weight": 1
},
{
- "key": 198,
+ "key": 193,
"card_pool_type": "base_pool70003",
"id": "43006",
"weight": 1
},
{
- "key": 199,
+ "key": 194,
"card_pool_type": "base_pool70004",
"id": "14001",
"weight": 1
},
{
- "key": 200,
+ "key": 195,
"card_pool_type": "base_pool70004",
"id": "14002",
"weight": 1
},
{
- "key": 201,
+ "key": 196,
"card_pool_type": "base_pool70004",
"id": "14005",
"weight": 1
},
{
- "key": 202,
+ "key": 197,
"card_pool_type": "base_pool70004",
"id": "14007",
"weight": 1
},
{
- "key": 203,
+ "key": 198,
"card_pool_type": "base_pool70004",
"id": "24001",
"weight": 1
},
{
- "key": 204,
+ "key": 199,
"card_pool_type": "base_pool70004",
"id": "24002",
"weight": 1
},
{
- "key": 205,
+ "key": 200,
"card_pool_type": "base_pool70004",
"id": "24004",
"weight": 1
},
{
- "key": 206,
+ "key": 201,
"card_pool_type": "base_pool70004",
"id": "24005",
"weight": 1
},
{
- "key": 207,
+ "key": 202,
"card_pool_type": "base_pool70004",
"id": "24008",
"weight": 1
},
{
- "key": 208,
+ "key": 203,
"card_pool_type": "base_pool70004",
"id": "24009",
"weight": 1
},
{
- "key": 209,
+ "key": 204,
"card_pool_type": "base_pool70004",
"id": "25001",
"weight": 1
},
{
- "key": 210,
+ "key": 205,
"card_pool_type": "base_pool70004",
"id": "34002",
"weight": 1
},
{
- "key": 211,
+ "key": 206,
"card_pool_type": "base_pool70004",
"id": "34004",
"weight": 1
},
{
- "key": 212,
+ "key": 207,
"card_pool_type": "base_pool70004",
"id": "34005",
"weight": 1
},
{
- "key": 213,
+ "key": 208,
"card_pool_type": "base_pool70004",
"id": "34008",
"weight": 1
},
{
- "key": 214,
+ "key": 209,
"card_pool_type": "base_pool70004",
"id": "13004",
"weight": 1
},
{
- "key": 215,
+ "key": 210,
"card_pool_type": "base_pool70004",
"id": "35006",
"weight": 1
},
{
- "key": 216,
+ "key": 211,
"card_pool_type": "base_pool70004",
"id": "44001",
"weight": 1
},
{
- "key": 217,
+ "key": 212,
"card_pool_type": "base_pool70004",
"id": "44003",
"weight": 1
},
{
- "key": 218,
+ "key": 213,
"card_pool_type": "base_pool70004",
"id": "44004",
"weight": 1
},
{
- "key": 219,
+ "key": 214,
"card_pool_type": "base_pool70004",
"id": "44006",
"weight": 1
},
{
- "key": 220,
+ "key": 215,
"card_pool_type": "base_pool70004",
"id": "43002",
"weight": 1
},
{
- "key": 221,
+ "key": 216,
"card_pool_type": "base_pool70004",
"id": "43007",
"weight": 1
},
{
- "key": 222,
+ "key": 217,
"card_pool_type": "base_pool70005",
"id": "15002",
"weight": 1
},
{
- "key": 223,
+ "key": 218,
"card_pool_type": "base_pool70005",
"id": "15003",
"weight": 1
},
{
- "key": 224,
+ "key": 219,
"card_pool_type": "base_pool70005",
"id": "15004",
"weight": 1
},
{
- "key": 225,
+ "key": 220,
"card_pool_type": "base_pool70005",
"id": "15005",
"weight": 1
},
{
- "key": 226,
+ "key": 221,
"card_pool_type": "base_pool70005",
"id": "25002",
"weight": 1
},
{
- "key": 227,
+ "key": 222,
"card_pool_type": "base_pool70005",
"id": "35005",
"weight": 1
},
{
- "key": 228,
+ "key": 223,
"card_pool_type": "base_pool70005",
"id": "35001",
"weight": 1
},
{
- "key": 229,
+ "key": 224,
"card_pool_type": "base_pool70005",
"id": "35002",
"weight": 1
},
{
- "key": 230,
+ "key": 225,
"card_pool_type": "base_pool70005",
"id": "44005",
"weight": 1
},
{
- "key": 231,
+ "key": 226,
"card_pool_type": "base_pool70005",
"id": "44002",
"weight": 1
diff --git a/bin/json/game_combatbox.json b/bin/json/game_combatbox.json
index ca91a19ea..c93bfc232 100644
--- a/bin/json/game_combatbox.json
+++ b/bin/json/game_combatbox.json
@@ -73,11 +73,11 @@
},
{
"id": 10301,
- "drop": 16001002
+ "drop": 16001001
},
{
"id": 10302,
- "drop": 16001002
+ "drop": 16001001
},
{
"id": 10303,
diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json
index e7d3797db..2a16161e1 100644
--- a/bin/json/game_combatlevel.json
+++ b/bin/json/game_combatlevel.json
@@ -460,7 +460,7 @@
"scene": "leveldemo_chapter_2",
"levelname": "Save the holy tree",
"maintask": [
- 11187019
+ 11187003
],
"subtask": [
0
@@ -489,9 +489,9 @@
"n": 1
}
],
- "debrisitemid": 11187020,
- "scenemusic": "scenemusic_leveldemo_fcamer_1_10",
- "atmosphere": "atmospheremusic_leveldemo_fcamer_1_10"
+ "debrisitemid": 11187018,
+ "scenemusic": "scenemusic_leveldemo_fcamer_1_9",
+ "atmosphere": "atmospheremusic_leveldemo_fcamer_1_9"
},
{
"id": 20003,
diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json
index 8124ef91b..0960b6b26 100644
--- a/bin/json/game_combatmanster.json
+++ b/bin/json/game_combatmanster.json
@@ -395,7 +395,7 @@
"award": [
{
"a": "item",
- "t": "16001001",
+ "t": "16001002",
"n": 1
}
]
diff --git a/bin/json/game_dragonlvitem.json b/bin/json/game_dragonlvitem.json
index 839971d90..11465803e 100644
--- a/bin/json/game_dragonlvitem.json
+++ b/bin/json/game_dragonlvitem.json
@@ -6,9 +6,9 @@
"num": 0,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -19,9 +19,9 @@
"num": 2,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -32,9 +32,9 @@
"num": 4,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -45,9 +45,9 @@
"num": 6,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -65,9 +65,9 @@
"num": 0,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -78,9 +78,9 @@
"num": 2,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -91,9 +91,9 @@
"num": 4,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -104,9 +104,9 @@
"num": 6,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -124,9 +124,9 @@
"num": 0,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -137,9 +137,9 @@
"num": 2,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -150,9 +150,9 @@
"num": 4,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -163,9 +163,9 @@
"num": 6,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -183,9 +183,9 @@
"num": 0,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -196,9 +196,9 @@
"num": 2,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -209,9 +209,9 @@
"num": 4,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -222,9 +222,9 @@
"num": 6,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -242,9 +242,9 @@
"num": 0,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -255,9 +255,9 @@
"num": 2,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -268,9 +268,9 @@
"num": 4,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
@@ -281,9 +281,9 @@
"num": 6,
"item": [
{
- "a": "item",
- "t": "10000001",
- "n": 1
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
}
]
},
diff --git a/bin/json/game_drawpool.json b/bin/json/game_drawpool.json
index 924ef8ed9..c0c0c67bc 100644
--- a/bin/json/game_drawpool.json
+++ b/bin/json/game_drawpool.json
@@ -288,7 +288,7 @@
"text": "
1.召唤中，获取SSR卡时有[color=#37d8a9]50%[/color]概率可获得本次卡池概率提升的SSR卡
2.可以在列表中，选择心仪的守护者作为本期的概率提升SSR
3.每次召唤到的SSR角色不是保底SSR角色时，下次召唤到的SSR角色必为该保底SSR角色
4.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
5.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
6.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
7.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
8.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
9.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
10.中途更换选定英雄，仍将[color=#37d8a9]保留[/color]保底次数
11.限定卡池结束后，召唤保底次数将[color=#37d8a9]保留[/color]至下个限定卡池"
},
"weightreadonly": "SSR|2%,SR|20%,R|78%",
- "upweight": 5000
+ "upweight": 500
},
{
"key": 8,
diff --git a/bin/json/game_drawreplace.json b/bin/json/game_drawreplace.json
index 8a6af0c6d..77a9af167 100644
--- a/bin/json/game_drawreplace.json
+++ b/bin/json/game_drawreplace.json
@@ -3,7 +3,7 @@
"id": 1,
"pool": 1,
"hero_initial": "14003",
- "hero_replace": "14003",
+ "hero_replace": "15005",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
diff --git a/bin/json/game_eventlottery.json b/bin/json/game_eventlottery.json
index d92865ddb..a994b636f 100644
--- a/bin/json/game_eventlottery.json
+++ b/bin/json/game_eventlottery.json
@@ -37,7 +37,7 @@
"GroupId": 16010101,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 17002003,
"SubGroupNum": 1,
@@ -70,7 +70,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100003,
"SubGroupNum": 1,
@@ -81,7 +81,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100004,
"SubGroupNum": 1,
@@ -92,7 +92,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100005,
"SubGroupNum": 1,
@@ -103,7 +103,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100006,
"SubGroupNum": 1,
@@ -114,7 +114,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100007,
"SubGroupNum": 1,
@@ -125,7 +125,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100008,
"SubGroupNum": 1,
@@ -136,7 +136,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100009,
"SubGroupNum": 1,
@@ -147,7 +147,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100010,
"SubGroupNum": 1,
@@ -158,7 +158,7 @@
"GroupId": 12100000,
"GroupType": 0,
"SubGroupWt": 0,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 12100011,
"SubGroupNum": 1,
@@ -334,7 +334,7 @@
"GroupId": 14010100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14110102,
"SubGroupNum": 1,
@@ -345,7 +345,7 @@
"GroupId": 14010100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14110103,
"SubGroupNum": 1,
@@ -367,7 +367,7 @@
"GroupId": 14010100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14110105,
"SubGroupNum": 1,
@@ -389,7 +389,7 @@
"GroupId": 14010200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14110202,
"SubGroupNum": 1,
@@ -400,7 +400,7 @@
"GroupId": 14010200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14110203,
"SubGroupNum": 1,
@@ -422,7 +422,7 @@
"GroupId": 14010200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14110205,
"SubGroupNum": 1,
@@ -444,7 +444,7 @@
"GroupId": 14010300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14110302,
"SubGroupNum": 1,
@@ -455,7 +455,7 @@
"GroupId": 14010300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14110303,
"SubGroupNum": 1,
@@ -477,7 +477,7 @@
"GroupId": 14010300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14110305,
"SubGroupNum": 1,
@@ -499,7 +499,7 @@
"GroupId": 14020100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120102,
"SubGroupNum": 1,
@@ -510,7 +510,7 @@
"GroupId": 14020100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120103,
"SubGroupNum": 1,
@@ -532,7 +532,7 @@
"GroupId": 14020100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14120105,
"SubGroupNum": 1,
@@ -554,7 +554,7 @@
"GroupId": 14020200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120202,
"SubGroupNum": 1,
@@ -565,7 +565,7 @@
"GroupId": 14020200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120203,
"SubGroupNum": 1,
@@ -587,7 +587,7 @@
"GroupId": 14020200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14120205,
"SubGroupNum": 1,
@@ -609,7 +609,7 @@
"GroupId": 14020300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120302,
"SubGroupNum": 1,
@@ -620,7 +620,7 @@
"GroupId": 14020300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120303,
"SubGroupNum": 1,
@@ -642,7 +642,7 @@
"GroupId": 14020300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14120305,
"SubGroupNum": 1,
@@ -664,7 +664,7 @@
"GroupId": 14020500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120502,
"SubGroupNum": 1,
@@ -675,7 +675,7 @@
"GroupId": 14020500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120503,
"SubGroupNum": 1,
@@ -697,7 +697,7 @@
"GroupId": 14020500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14120505,
"SubGroupNum": 1,
@@ -719,7 +719,7 @@
"GroupId": 14020600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120602,
"SubGroupNum": 1,
@@ -730,7 +730,7 @@
"GroupId": 14020600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14120603,
"SubGroupNum": 1,
@@ -752,7 +752,7 @@
"GroupId": 14020600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14120605,
"SubGroupNum": 1,
@@ -774,7 +774,7 @@
"GroupId": 14030100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130102,
"SubGroupNum": 1,
@@ -785,7 +785,7 @@
"GroupId": 14030100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130103,
"SubGroupNum": 1,
@@ -807,7 +807,7 @@
"GroupId": 14030100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14130105,
"SubGroupNum": 1,
@@ -829,7 +829,7 @@
"GroupId": 14030200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130202,
"SubGroupNum": 1,
@@ -840,7 +840,7 @@
"GroupId": 14030200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130203,
"SubGroupNum": 1,
@@ -862,7 +862,7 @@
"GroupId": 14030200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14130205,
"SubGroupNum": 1,
@@ -884,7 +884,7 @@
"GroupId": 14030300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130302,
"SubGroupNum": 1,
@@ -895,7 +895,7 @@
"GroupId": 14030300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130303,
"SubGroupNum": 1,
@@ -917,7 +917,7 @@
"GroupId": 14030300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14130305,
"SubGroupNum": 1,
@@ -939,7 +939,7 @@
"GroupId": 14030500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130502,
"SubGroupNum": 1,
@@ -950,7 +950,7 @@
"GroupId": 14030500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130503,
"SubGroupNum": 1,
@@ -972,7 +972,7 @@
"GroupId": 14030500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14130505,
"SubGroupNum": 1,
@@ -994,7 +994,7 @@
"GroupId": 14030600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130602,
"SubGroupNum": 1,
@@ -1005,7 +1005,7 @@
"GroupId": 14030600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14130603,
"SubGroupNum": 1,
@@ -1027,7 +1027,7 @@
"GroupId": 14030600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14130605,
"SubGroupNum": 1,
@@ -1049,7 +1049,7 @@
"GroupId": 14040100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140102,
"SubGroupNum": 1,
@@ -1060,7 +1060,7 @@
"GroupId": 14040100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140103,
"SubGroupNum": 1,
@@ -1082,7 +1082,7 @@
"GroupId": 14040100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14140105,
"SubGroupNum": 1,
@@ -1104,7 +1104,7 @@
"GroupId": 14040200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140202,
"SubGroupNum": 1,
@@ -1115,7 +1115,7 @@
"GroupId": 14040200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140203,
"SubGroupNum": 1,
@@ -1137,7 +1137,7 @@
"GroupId": 14040200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14140205,
"SubGroupNum": 1,
@@ -1159,7 +1159,7 @@
"GroupId": 14040300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140302,
"SubGroupNum": 1,
@@ -1170,7 +1170,7 @@
"GroupId": 14040300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140303,
"SubGroupNum": 1,
@@ -1192,7 +1192,7 @@
"GroupId": 14040300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14140305,
"SubGroupNum": 1,
@@ -1214,7 +1214,7 @@
"GroupId": 14040500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140502,
"SubGroupNum": 1,
@@ -1225,7 +1225,7 @@
"GroupId": 14040500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140503,
"SubGroupNum": 1,
@@ -1247,7 +1247,7 @@
"GroupId": 14040500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14140505,
"SubGroupNum": 1,
@@ -1269,7 +1269,7 @@
"GroupId": 14040600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140602,
"SubGroupNum": 1,
@@ -1280,7 +1280,7 @@
"GroupId": 14040600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140603,
"SubGroupNum": 1,
@@ -1302,7 +1302,7 @@
"GroupId": 14040600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14140605,
"SubGroupNum": 1,
@@ -1324,7 +1324,7 @@
"GroupId": 14040900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140902,
"SubGroupNum": 1,
@@ -1335,7 +1335,7 @@
"GroupId": 14040900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14140903,
"SubGroupNum": 1,
@@ -1357,7 +1357,7 @@
"GroupId": 14040900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14140905,
"SubGroupNum": 1,
@@ -1379,7 +1379,7 @@
"GroupId": 14041000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14141002,
"SubGroupNum": 1,
@@ -1390,7 +1390,7 @@
"GroupId": 14041000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14141003,
"SubGroupNum": 1,
@@ -1412,7 +1412,7 @@
"GroupId": 14041000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14141005,
"SubGroupNum": 1,
@@ -1434,7 +1434,7 @@
"GroupId": 14050100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150102,
"SubGroupNum": 1,
@@ -1445,7 +1445,7 @@
"GroupId": 14050100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150103,
"SubGroupNum": 1,
@@ -1467,7 +1467,7 @@
"GroupId": 14050100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14150105,
"SubGroupNum": 1,
@@ -1489,7 +1489,7 @@
"GroupId": 14050200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150202,
"SubGroupNum": 1,
@@ -1500,7 +1500,7 @@
"GroupId": 14050200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150203,
"SubGroupNum": 1,
@@ -1522,7 +1522,7 @@
"GroupId": 14050200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14150205,
"SubGroupNum": 1,
@@ -1544,7 +1544,7 @@
"GroupId": 14050300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150302,
"SubGroupNum": 1,
@@ -1555,7 +1555,7 @@
"GroupId": 14050300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150303,
"SubGroupNum": 1,
@@ -1577,7 +1577,7 @@
"GroupId": 14050300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14150305,
"SubGroupNum": 1,
@@ -1599,7 +1599,7 @@
"GroupId": 14050500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150502,
"SubGroupNum": 1,
@@ -1610,7 +1610,7 @@
"GroupId": 14050500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150503,
"SubGroupNum": 1,
@@ -1632,7 +1632,7 @@
"GroupId": 14050500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14150505,
"SubGroupNum": 1,
@@ -1654,7 +1654,7 @@
"GroupId": 14050600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150602,
"SubGroupNum": 1,
@@ -1665,7 +1665,7 @@
"GroupId": 14050600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150603,
"SubGroupNum": 1,
@@ -1687,7 +1687,7 @@
"GroupId": 14050600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14150605,
"SubGroupNum": 1,
@@ -1709,7 +1709,7 @@
"GroupId": 14050900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150902,
"SubGroupNum": 1,
@@ -1720,7 +1720,7 @@
"GroupId": 14050900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14150903,
"SubGroupNum": 1,
@@ -1742,7 +1742,7 @@
"GroupId": 14050900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14150905,
"SubGroupNum": 1,
@@ -1764,7 +1764,7 @@
"GroupId": 14051000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14151002,
"SubGroupNum": 1,
@@ -1775,7 +1775,7 @@
"GroupId": 14051000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14151003,
"SubGroupNum": 1,
@@ -1797,7 +1797,7 @@
"GroupId": 14051000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14151005,
"SubGroupNum": 1,
@@ -1819,7 +1819,7 @@
"GroupId": 14060100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160102,
"SubGroupNum": 1,
@@ -1830,7 +1830,7 @@
"GroupId": 14060100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160103,
"SubGroupNum": 1,
@@ -1852,7 +1852,7 @@
"GroupId": 14060100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14160105,
"SubGroupNum": 1,
@@ -1874,7 +1874,7 @@
"GroupId": 14060200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160202,
"SubGroupNum": 1,
@@ -1885,7 +1885,7 @@
"GroupId": 14060200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160203,
"SubGroupNum": 1,
@@ -1907,7 +1907,7 @@
"GroupId": 14060200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14160205,
"SubGroupNum": 1,
@@ -1929,7 +1929,7 @@
"GroupId": 14060300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160302,
"SubGroupNum": 1,
@@ -1940,7 +1940,7 @@
"GroupId": 14060300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160303,
"SubGroupNum": 1,
@@ -1962,7 +1962,7 @@
"GroupId": 14060300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14160305,
"SubGroupNum": 1,
@@ -1984,7 +1984,7 @@
"GroupId": 14060500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160502,
"SubGroupNum": 1,
@@ -1995,7 +1995,7 @@
"GroupId": 14060500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160503,
"SubGroupNum": 1,
@@ -2017,7 +2017,7 @@
"GroupId": 14060500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14160505,
"SubGroupNum": 1,
@@ -2039,7 +2039,7 @@
"GroupId": 14060600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160602,
"SubGroupNum": 1,
@@ -2050,7 +2050,7 @@
"GroupId": 14060600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160603,
"SubGroupNum": 1,
@@ -2072,7 +2072,7 @@
"GroupId": 14060600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14160605,
"SubGroupNum": 1,
@@ -2094,7 +2094,7 @@
"GroupId": 14060900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160902,
"SubGroupNum": 1,
@@ -2105,7 +2105,7 @@
"GroupId": 14060900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14160903,
"SubGroupNum": 1,
@@ -2127,7 +2127,7 @@
"GroupId": 14060900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14160905,
"SubGroupNum": 1,
@@ -2149,7 +2149,7 @@
"GroupId": 14061000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14161002,
"SubGroupNum": 1,
@@ -2160,7 +2160,7 @@
"GroupId": 14061000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14161003,
"SubGroupNum": 1,
@@ -2182,7 +2182,7 @@
"GroupId": 14061000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14161005,
"SubGroupNum": 1,
@@ -2204,7 +2204,7 @@
"GroupId": 14070100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170102,
"SubGroupNum": 1,
@@ -2215,7 +2215,7 @@
"GroupId": 14070100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170103,
"SubGroupNum": 1,
@@ -2237,7 +2237,7 @@
"GroupId": 14070100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14170105,
"SubGroupNum": 1,
@@ -2259,7 +2259,7 @@
"GroupId": 14070200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170202,
"SubGroupNum": 1,
@@ -2270,7 +2270,7 @@
"GroupId": 14070200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170203,
"SubGroupNum": 1,
@@ -2292,7 +2292,7 @@
"GroupId": 14070200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14170205,
"SubGroupNum": 1,
@@ -2314,7 +2314,7 @@
"GroupId": 14070300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170302,
"SubGroupNum": 1,
@@ -2325,7 +2325,7 @@
"GroupId": 14070300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170303,
"SubGroupNum": 1,
@@ -2347,7 +2347,7 @@
"GroupId": 14070300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14170305,
"SubGroupNum": 1,
@@ -2369,7 +2369,7 @@
"GroupId": 14070500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170502,
"SubGroupNum": 1,
@@ -2380,7 +2380,7 @@
"GroupId": 14070500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170503,
"SubGroupNum": 1,
@@ -2402,7 +2402,7 @@
"GroupId": 14070500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14170505,
"SubGroupNum": 1,
@@ -2424,7 +2424,7 @@
"GroupId": 14070600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170602,
"SubGroupNum": 1,
@@ -2435,7 +2435,7 @@
"GroupId": 14070600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170603,
"SubGroupNum": 1,
@@ -2457,7 +2457,7 @@
"GroupId": 14070600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14170605,
"SubGroupNum": 1,
@@ -2479,7 +2479,7 @@
"GroupId": 14070900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170902,
"SubGroupNum": 1,
@@ -2490,7 +2490,7 @@
"GroupId": 14070900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14170903,
"SubGroupNum": 1,
@@ -2512,7 +2512,7 @@
"GroupId": 14070900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14170905,
"SubGroupNum": 1,
@@ -2534,7 +2534,7 @@
"GroupId": 14071000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14171002,
"SubGroupNum": 1,
@@ -2545,7 +2545,7 @@
"GroupId": 14071000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14171003,
"SubGroupNum": 1,
@@ -2567,7 +2567,7 @@
"GroupId": 14071000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14171005,
"SubGroupNum": 1,
@@ -2589,7 +2589,7 @@
"GroupId": 14080100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180102,
"SubGroupNum": 1,
@@ -2600,7 +2600,7 @@
"GroupId": 14080100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180103,
"SubGroupNum": 1,
@@ -2622,7 +2622,7 @@
"GroupId": 14080100,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14180105,
"SubGroupNum": 1,
@@ -2644,7 +2644,7 @@
"GroupId": 14080200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180202,
"SubGroupNum": 1,
@@ -2655,7 +2655,7 @@
"GroupId": 14080200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180203,
"SubGroupNum": 1,
@@ -2677,7 +2677,7 @@
"GroupId": 14080200,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14180205,
"SubGroupNum": 1,
@@ -2699,7 +2699,7 @@
"GroupId": 14080300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180302,
"SubGroupNum": 1,
@@ -2710,7 +2710,7 @@
"GroupId": 14080300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180303,
"SubGroupNum": 1,
@@ -2732,7 +2732,7 @@
"GroupId": 14080300,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14180305,
"SubGroupNum": 1,
@@ -2754,7 +2754,7 @@
"GroupId": 14080500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180502,
"SubGroupNum": 1,
@@ -2765,7 +2765,7 @@
"GroupId": 14080500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180503,
"SubGroupNum": 1,
@@ -2787,7 +2787,7 @@
"GroupId": 14080500,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14180505,
"SubGroupNum": 1,
@@ -2809,7 +2809,7 @@
"GroupId": 14080600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180602,
"SubGroupNum": 1,
@@ -2820,7 +2820,7 @@
"GroupId": 14080600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180603,
"SubGroupNum": 1,
@@ -2842,7 +2842,7 @@
"GroupId": 14080600,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14180605,
"SubGroupNum": 1,
@@ -2864,7 +2864,7 @@
"GroupId": 14080900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180902,
"SubGroupNum": 1,
@@ -2875,7 +2875,7 @@
"GroupId": 14080900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14180903,
"SubGroupNum": 1,
@@ -2897,7 +2897,7 @@
"GroupId": 14080900,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14180905,
"SubGroupNum": 1,
@@ -2919,7 +2919,7 @@
"GroupId": 14081000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14181002,
"SubGroupNum": 1,
@@ -2930,7 +2930,7 @@
"GroupId": 14081000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1001,
"SubGroupType": 0,
"EventID": 14181003,
"SubGroupNum": 1,
@@ -2952,7 +2952,7 @@
"GroupId": 14081000,
"GroupType": 2,
"SubGroupWt": 1000,
- "SubGroupId": 0,
+ "SubGroupId": 1002,
"SubGroupType": 0,
"EventID": 14181005,
"SubGroupNum": 1,
diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json
index 8507cf70b..896c5c1e5 100644
--- a/bin/json/game_gamesummary.json
+++ b/bin/json/game_gamesummary.json
@@ -6,7 +6,7 @@
"text": "驯龙养成"
},
"tabId": 11001,
- "type": 0,
+ "type": 1,
"jumpId": 10045,
"icon": "ty_icon_xlyc",
"mapPos": {
@@ -39,7 +39,7 @@
"text": "捕羊大赛"
},
"tabId": 11001,
- "type": 1,
+ "type": 0,
"jumpId": 10042,
"icon": "ty_qp_by",
"mapPos": {
diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json
index 8547d6b27..96c7da044 100644
--- a/bin/json/game_gamesummarytab.json
+++ b/bin/json/game_gamesummarytab.json
@@ -9,9 +9,9 @@
"icon": "hkz_wftj_mj",
"mapPos": {
"x": 0,
- "y": 618
+ "y": 657
},
- "scale": 1,
+ "scale": 1.3,
"usetext": {
"key": "gamesummary_fathernode_usetext_1",
"text": "起初，没有人在意这次冒险，对于反派来说，这不过是又一次嘲讽失败者的机会。"
@@ -26,10 +26,10 @@
},
"icon": "hkz_wftj_sl02",
"mapPos": {
- "x": -369,
- "y": 1664
+ "x": -551,
+ "y": 1955
},
- "scale": 1,
+ "scale": 1.3,
"usetext": {
"key": "gamesummary_fathernode_usetext_2",
"text": "探险！这是永远不会停歇的主题！开始你的[color=#ffcc00]冒险之旅[/color]吧！"
@@ -44,10 +44,10 @@
},
"icon": "hkz_wftj_zxgk",
"mapPos": {
- "x": -1827,
- "y": 1878
+ "x": -1783,
+ "y": 1910
},
- "scale": 1,
+ "scale": 1.3,
"usetext": {
"key": "gamesummary_fathernode_usetext_3",
"text": "坏蛋联盟打算设计一场大骗局，让世人都以为他们是真的洗心革面、改邪归正…"
@@ -62,10 +62,10 @@
},
"icon": "hkz_wftj_jjc",
"mapPos": {
- "x": -1027,
- "y": 1878
+ "x": -2383,
+ "y": 1455
},
- "scale": 1,
+ "scale": 1.3,
"usetext": {
"key": "gamesummary_fathernode_usetext_4",
"text": "很久很久以前，在遥远的大沼泽里住着一个叫史瑞克的绿色怪物…"
diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json
index a14b898e5..5455be408 100644
--- a/bin/json/game_guide.json
+++ b/bin/json/game_guide.json
@@ -356,7 +356,7 @@
"x": 0,
"y": 0
},
- "fingerTime": 0.5,
+ "fingerTime": 1,
"objSize": {
"x": 0,
"y": 0
@@ -2291,7 +2291,7 @@
"interface": "",
"condition": "",
"followtj": "",
- "followguide": 1000914,
+ "followguide": 0,
"finger": [
"herocard",
"btn_wear$"
@@ -2584,7 +2584,7 @@
"startPar": "",
"parameter": "",
"interface": "",
- "condition": "worldtask_20150",
+ "condition": "",
"followtj": "",
"followguide": 1001302,
"finger": [
@@ -3261,7 +3261,7 @@
"startPar": "",
"parameter": "",
"interface": "",
- "condition": "FinishLevel_1101037",
+ "condition": "",
"followtj": "",
"followguide": 1001802,
"finger": [
diff --git a/bin/json/game_guildtask.json b/bin/json/game_guildtask.json
index 7614d01fb..08619d257 100644
--- a/bin/json/game_guildtask.json
+++ b/bin/json/game_guildtask.json
@@ -2,7 +2,7 @@
{
"type_id": 50000001,
"id_list": 1,
- "jump_interface": 10020,
+ "jump_interface": 10004,
"task_display": {
"key": "guild_guild_task_task_display_1",
"text": "使用好友助战守护者1次"
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 8dfbbbc76..9144381de 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -1681,8 +1681,8 @@
1,
1
],
- "icon": "23004",
- "vocal": "23004",
+ "icon": "23011",
+ "vocal": "23011",
"tujing": [
107
],
@@ -1691,7 +1691,7 @@
"key": "",
"text": ""
},
- "events": "hero_23004",
+ "events": "hero_23011",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -1721,7 +1721,7 @@
"herofrag": [
{
"a": "item",
- "t": "12023004",
+ "t": "12023011",
"n": 1
}
],
diff --git a/bin/json/game_herotalent.json b/bin/json/game_herotalent.json
index f9be51e41..bf7ccdc61 100644
--- a/bin/json/game_herotalent.json
+++ b/bin/json/game_herotalent.json
@@ -16,7 +16,7 @@
"key": "hero_talent_hero_talent_skilltxt_1",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -56,7 +56,7 @@
"key": "hero_talent_hero_talent_skilltxt_2",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -96,7 +96,7 @@
"key": "hero_talent_hero_talent_skilltxt_6",
"text": "2技能攻击有30%概率附加1回合【沉默】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -136,7 +136,7 @@
"key": "hero_talent_hero_talent_skilltxt_8",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -176,7 +176,7 @@
"key": "hero_talent_hero_talent_skilltxt_9",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -216,7 +216,7 @@
"key": "hero_talent_hero_talent_skilltxt_10",
"text": "2技能攻击身上有沉默的目标时有30%概率附加1回合【眩晕】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -256,7 +256,7 @@
"key": "hero_talent_hero_talent_skilltxt_11",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -301,7 +301,7 @@
"key": "hero_talent_hero_talent_skilltxt_13",
"text": "对当前血量高于50%的目标造成伤害提升10%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -341,7 +341,7 @@
"key": "hero_talent_hero_talent_skilltxt_15",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -381,7 +381,7 @@
"key": "hero_talent_hero_talent_skilltxt_16",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -426,7 +426,7 @@
"key": "hero_talent_hero_talent_skilltxt_17",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -466,7 +466,7 @@
"key": "hero_talent_hero_talent_skilltxt_19",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -511,7 +511,7 @@
"key": "hero_talent_hero_talent_skilltxt_20",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -551,7 +551,7 @@
"key": "hero_talent_hero_talent_skilltxt_22",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -591,7 +591,7 @@
"key": "hero_talent_hero_talent_skilltxt_23",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -631,7 +631,7 @@
"key": "hero_talent_hero_talent_skilltxt_27",
"text": "1技能每次攻击降低目标10%行动值"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -671,7 +671,7 @@
"key": "hero_talent_hero_talent_skilltxt_29",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -711,7 +711,7 @@
"key": "hero_talent_hero_talent_skilltxt_30",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -751,7 +751,7 @@
"key": "hero_talent_hero_talent_skilltxt_31",
"text": "攻击血量低于50%的目标时40%概率额外附加1回合【中毒】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -791,7 +791,7 @@
"key": "hero_talent_hero_talent_skilltxt_32",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -836,7 +836,7 @@
"key": "hero_talent_hero_talent_skilltxt_34",
"text": "2技能攻击时若目标身上已有【中毒】则额外为目标附加1回合【中毒】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -876,7 +876,7 @@
"key": "hero_talent_hero_talent_skilltxt_36",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -916,7 +916,7 @@
"key": "hero_talent_hero_talent_skilltxt_37",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -961,7 +961,7 @@
"key": "hero_talent_hero_talent_skilltxt_38",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -1001,7 +1001,7 @@
"key": "hero_talent_hero_talent_skilltxt_40",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -1046,7 +1046,7 @@
"key": "hero_talent_hero_talent_skilltxt_41",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -1086,7 +1086,7 @@
"key": "hero_talent_hero_talent_skilltxt_43",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -1126,7 +1126,7 @@
"key": "hero_talent_hero_talent_skilltxt_44",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -1166,7 +1166,7 @@
"key": "hero_talent_hero_talent_skilltxt_48",
"text": "受到治疗效果增加10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -1206,7 +1206,7 @@
"key": "hero_talent_hero_talent_skilltxt_50",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -1246,7 +1246,7 @@
"key": "hero_talent_hero_talent_skilltxt_51",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -1286,7 +1286,7 @@
"key": "hero_talent_hero_talent_skilltxt_52",
"text": "增加自身最大血量3%的防御"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -1326,7 +1326,7 @@
"key": "hero_talent_hero_talent_skilltxt_53",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -1371,7 +1371,7 @@
"key": "hero_talent_hero_talent_skilltxt_55",
"text": "血量低于60%时，获得10%的吸血效果"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -1411,7 +1411,7 @@
"key": "hero_talent_hero_talent_skilltxt_57",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -1451,7 +1451,7 @@
"key": "hero_talent_hero_talent_skilltxt_58",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -1496,7 +1496,7 @@
"key": "hero_talent_hero_talent_skilltxt_59",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -1536,7 +1536,7 @@
"key": "hero_talent_hero_talent_skilltxt_61",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -1581,7 +1581,7 @@
"key": "hero_talent_hero_talent_skilltxt_62",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -1621,7 +1621,7 @@
"key": "hero_talent_hero_talent_skilltxt_64",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -1661,7 +1661,7 @@
"key": "hero_talent_hero_talent_skilltxt_65",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -1701,7 +1701,7 @@
"key": "hero_talent_hero_talent_skilltxt_69",
"text": "血量低于60%时，获得10%的吸血效果"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -1741,7 +1741,7 @@
"key": "hero_talent_hero_talent_skilltxt_71",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -1781,7 +1781,7 @@
"key": "hero_talent_hero_talent_skilltxt_72",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -1821,7 +1821,7 @@
"key": "hero_talent_hero_talent_skilltxt_73",
"text": "血量首次低于60%时净化自己身上全部减益效果"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -1861,7 +1861,7 @@
"key": "hero_talent_hero_talent_skilltxt_74",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -1906,7 +1906,7 @@
"key": "hero_talent_hero_talent_skilltxt_76",
"text": "释放2技能后30%概率为自身添加2回合【对峙】状态"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -1946,7 +1946,7 @@
"key": "hero_talent_hero_talent_skilltxt_78",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -1986,7 +1986,7 @@
"key": "hero_talent_hero_talent_skilltxt_79",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -2031,7 +2031,7 @@
"key": "hero_talent_hero_talent_skilltxt_80",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -2071,7 +2071,7 @@
"key": "hero_talent_hero_talent_skilltxt_82",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -2116,7 +2116,7 @@
"key": "hero_talent_hero_talent_skilltxt_83",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -2156,7 +2156,7 @@
"key": "hero_talent_hero_talent_skilltxt_85",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -2196,7 +2196,7 @@
"key": "hero_talent_hero_talent_skilltxt_86",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -2236,7 +2236,7 @@
"key": "hero_talent_hero_talent_skilltxt_90",
"text": "自身血量小于50%时增加30点速度"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -2276,7 +2276,7 @@
"key": "hero_talent_hero_talent_skilltxt_92",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -2316,7 +2316,7 @@
"key": "hero_talent_hero_talent_skilltxt_93",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -2356,7 +2356,7 @@
"key": "hero_talent_hero_talent_skilltxt_94",
"text": "场上每存活1名友方自身效果抵抗增加5%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -2396,7 +2396,7 @@
"key": "hero_talent_hero_talent_skilltxt_95",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -2441,7 +2441,7 @@
"key": "hero_talent_hero_talent_skilltxt_97",
"text": "2技能50%概率额外为1名友方增加2回合【暴击提升】，1回合【攻击提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -2481,7 +2481,7 @@
"key": "hero_talent_hero_talent_skilltxt_99",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -2521,7 +2521,7 @@
"key": "hero_talent_hero_talent_skilltxt_100",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -2566,7 +2566,7 @@
"key": "hero_talent_hero_talent_skilltxt_101",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -2606,7 +2606,7 @@
"key": "hero_talent_hero_talent_skilltxt_103",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -2651,7 +2651,7 @@
"key": "hero_talent_hero_talent_skilltxt_104",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -2691,7 +2691,7 @@
"key": "hero_talent_hero_talent_skilltxt_106",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -2731,7 +2731,7 @@
"key": "hero_talent_hero_talent_skilltxt_107",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -2771,7 +2771,7 @@
"key": "hero_talent_hero_talent_skilltxt_111",
"text": "敌方有目标死亡时自身增加5%攻击"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -2811,7 +2811,7 @@
"key": "hero_talent_hero_talent_skilltxt_113",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -2851,7 +2851,7 @@
"key": "hero_talent_hero_talent_skilltxt_114",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -2891,7 +2891,7 @@
"key": "hero_talent_hero_talent_skilltxt_115",
"text": "击杀目标时立即回复自身20%已损失血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -2931,7 +2931,7 @@
"key": "hero_talent_hero_talent_skilltxt_116",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -2976,7 +2976,7 @@
"key": "hero_talent_hero_talent_skilltxt_118",
"text": "血量首次低于50%时立即获得3层【酋长之怒】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -3016,7 +3016,7 @@
"key": "hero_talent_hero_talent_skilltxt_120",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -3056,7 +3056,7 @@
"key": "hero_talent_hero_talent_skilltxt_121",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -3101,7 +3101,7 @@
"key": "hero_talent_hero_talent_skilltxt_122",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -3141,7 +3141,7 @@
"key": "hero_talent_hero_talent_skilltxt_124",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -3186,7 +3186,7 @@
"key": "hero_talent_hero_talent_skilltxt_125",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -3226,7 +3226,7 @@
"key": "hero_talent_hero_talent_skilltxt_127",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -3266,7 +3266,7 @@
"key": "hero_talent_hero_talent_skilltxt_128",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -3306,7 +3306,7 @@
"key": "hero_talent_hero_talent_skilltxt_132",
"text": "自身血量小于50%时增加10%吸血"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -3346,7 +3346,7 @@
"key": "hero_talent_hero_talent_skilltxt_134",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -3386,7 +3386,7 @@
"key": "hero_talent_hero_talent_skilltxt_135",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -3426,7 +3426,7 @@
"key": "hero_talent_hero_talent_skilltxt_136",
"text": "非自身回合进行攻击时造成伤害提升12%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -3466,7 +3466,7 @@
"key": "hero_talent_hero_talent_skilltxt_137",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -3511,7 +3511,7 @@
"key": "hero_talent_hero_talent_skilltxt_139",
"text": "3技能每次伤害有10%概率额外为目标附加2回合【速度下降】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -3551,7 +3551,7 @@
"key": "hero_talent_hero_talent_skilltxt_141",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -3591,7 +3591,7 @@
"key": "hero_talent_hero_talent_skilltxt_142",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -3636,7 +3636,7 @@
"key": "hero_talent_hero_talent_skilltxt_143",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -3676,7 +3676,7 @@
"key": "hero_talent_hero_talent_skilltxt_145",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -3721,7 +3721,7 @@
"key": "hero_talent_hero_talent_skilltxt_146",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -3761,7 +3761,7 @@
"key": "hero_talent_hero_talent_skilltxt_148",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -3801,7 +3801,7 @@
"key": "hero_talent_hero_talent_skilltxt_149",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -3841,7 +3841,7 @@
"key": "hero_talent_hero_talent_skilltxt_153",
"text": "血量低于50%时，自身附加1回合【速度提升】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -3881,7 +3881,7 @@
"key": "hero_talent_hero_talent_skilltxt_155",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -3921,7 +3921,7 @@
"key": "hero_talent_hero_talent_skilltxt_156",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -3961,7 +3961,7 @@
"key": "hero_talent_hero_talent_skilltxt_157",
"text": "对克制的目标造成伤害提升12%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -4001,7 +4001,7 @@
"key": "hero_talent_hero_talent_skilltxt_158",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -4046,7 +4046,7 @@
"key": "hero_talent_hero_talent_skilltxt_160",
"text": "2技能有50%概率附加1回合【眩晕】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -4086,7 +4086,7 @@
"key": "hero_talent_hero_talent_skilltxt_162",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -4126,7 +4126,7 @@
"key": "hero_talent_hero_talent_skilltxt_163",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -4171,7 +4171,7 @@
"key": "hero_talent_hero_talent_skilltxt_164",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -4211,7 +4211,7 @@
"key": "hero_talent_hero_talent_skilltxt_166",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -4256,7 +4256,7 @@
"key": "hero_talent_hero_talent_skilltxt_167",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -4296,7 +4296,7 @@
"key": "hero_talent_hero_talent_skilltxt_169",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -4336,7 +4336,7 @@
"key": "hero_talent_hero_talent_skilltxt_170",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -4376,7 +4376,7 @@
"key": "hero_talent_hero_talent_skilltxt_174",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -4416,7 +4416,7 @@
"key": "hero_talent_hero_talent_skilltxt_176",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -4456,7 +4456,7 @@
"key": "hero_talent_hero_talent_skilltxt_177",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -4496,7 +4496,7 @@
"key": "hero_talent_hero_talent_skilltxt_178",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -4536,7 +4536,7 @@
"key": "hero_talent_hero_talent_skilltxt_179",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -4581,7 +4581,7 @@
"key": "hero_talent_hero_talent_skilltxt_181",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -4621,7 +4621,7 @@
"key": "hero_talent_hero_talent_skilltxt_183",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -4661,7 +4661,7 @@
"key": "hero_talent_hero_talent_skilltxt_184",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -4706,7 +4706,7 @@
"key": "hero_talent_hero_talent_skilltxt_185",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -4746,7 +4746,7 @@
"key": "hero_talent_hero_talent_skilltxt_187",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -4791,7 +4791,7 @@
"key": "hero_talent_hero_talent_skilltxt_188",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -4831,7 +4831,7 @@
"key": "hero_talent_hero_talent_skilltxt_190",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -4871,7 +4871,7 @@
"key": "hero_talent_hero_talent_skilltxt_191",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -4911,7 +4911,7 @@
"key": "hero_talent_hero_talent_skilltxt_195",
"text": "对克制的目标造成伤害提升12%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -4951,7 +4951,7 @@
"key": "hero_talent_hero_talent_skilltxt_197",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -4991,7 +4991,7 @@
"key": "hero_talent_hero_talent_skilltxt_198",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -5031,7 +5031,7 @@
"key": "hero_talent_hero_talent_skilltxt_199",
"text": "击杀目标时立即回复自身20%已损失血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -5071,7 +5071,7 @@
"key": "hero_talent_hero_talent_skilltxt_200",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -5116,7 +5116,7 @@
"key": "hero_talent_hero_talent_skilltxt_202",
"text": "每次释放2技能时自身所有增益效果持续回合数+1"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -5156,7 +5156,7 @@
"key": "hero_talent_hero_talent_skilltxt_204",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -5196,7 +5196,7 @@
"key": "hero_talent_hero_talent_skilltxt_205",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -5241,7 +5241,7 @@
"key": "hero_talent_hero_talent_skilltxt_206",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -5281,7 +5281,7 @@
"key": "hero_talent_hero_talent_skilltxt_208",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -5326,7 +5326,7 @@
"key": "hero_talent_hero_talent_skilltxt_209",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -5366,7 +5366,7 @@
"key": "hero_talent_hero_talent_skilltxt_211",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -5406,7 +5406,7 @@
"key": "hero_talent_hero_talent_skilltxt_212",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -5446,7 +5446,7 @@
"key": "hero_talent_hero_talent_skilltxt_216",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -5486,7 +5486,7 @@
"key": "hero_talent_hero_talent_skilltxt_218",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -5526,7 +5526,7 @@
"key": "hero_talent_hero_talent_skilltxt_219",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -5566,7 +5566,7 @@
"key": "hero_talent_hero_talent_skilltxt_220",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -5606,7 +5606,7 @@
"key": "hero_talent_hero_talent_skilltxt_221",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -5651,7 +5651,7 @@
"key": "hero_talent_hero_talent_skilltxt_223",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -5691,7 +5691,7 @@
"key": "hero_talent_hero_talent_skilltxt_225",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -5731,7 +5731,7 @@
"key": "hero_talent_hero_talent_skilltxt_226",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -5776,7 +5776,7 @@
"key": "hero_talent_hero_talent_skilltxt_227",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -5816,7 +5816,7 @@
"key": "hero_talent_hero_talent_skilltxt_229",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -5861,7 +5861,7 @@
"key": "hero_talent_hero_talent_skilltxt_230",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -5901,7 +5901,7 @@
"key": "hero_talent_hero_talent_skilltxt_232",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -5941,7 +5941,7 @@
"key": "hero_talent_hero_talent_skilltxt_233",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -5981,7 +5981,7 @@
"key": "hero_talent_hero_talent_skilltxt_237",
"text": "血量首次低于50%时为自身添加持续1回合【防御提升】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -6021,7 +6021,7 @@
"key": "hero_talent_hero_talent_skilltxt_239",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -6061,7 +6061,7 @@
"key": "hero_talent_hero_talent_skilltxt_240",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -6101,7 +6101,7 @@
"key": "hero_talent_hero_talent_skilltxt_241",
"text": "受到致命伤害时增加20%吸血"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -6141,7 +6141,7 @@
"key": "hero_talent_hero_talent_skilltxt_242",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -6186,7 +6186,7 @@
"key": "hero_talent_hero_talent_skilltxt_244",
"text": "对峙状态下造成伤害增加30%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -6226,7 +6226,7 @@
"key": "hero_talent_hero_talent_skilltxt_246",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -6266,7 +6266,7 @@
"key": "hero_talent_hero_talent_skilltxt_247",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -6311,7 +6311,7 @@
"key": "hero_talent_hero_talent_skilltxt_248",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -6351,7 +6351,7 @@
"key": "hero_talent_hero_talent_skilltxt_250",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -6396,7 +6396,7 @@
"key": "hero_talent_hero_talent_skilltxt_251",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -6436,7 +6436,7 @@
"key": "hero_talent_hero_talent_skilltxt_253",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -6476,7 +6476,7 @@
"key": "hero_talent_hero_talent_skilltxt_254",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -6516,7 +6516,7 @@
"key": "hero_talent_hero_talent_skilltxt_258",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -6556,7 +6556,7 @@
"key": "hero_talent_hero_talent_skilltxt_260",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -6596,7 +6596,7 @@
"key": "hero_talent_hero_talent_skilltxt_261",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -6636,7 +6636,7 @@
"key": "hero_talent_hero_talent_skilltxt_262",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -6676,7 +6676,7 @@
"key": "hero_talent_hero_talent_skilltxt_263",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -6721,7 +6721,7 @@
"key": "hero_talent_hero_talent_skilltxt_265",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -6761,7 +6761,7 @@
"key": "hero_talent_hero_talent_skilltxt_267",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -6801,7 +6801,7 @@
"key": "hero_talent_hero_talent_skilltxt_268",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -6846,7 +6846,7 @@
"key": "hero_talent_hero_talent_skilltxt_269",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -6886,7 +6886,7 @@
"key": "hero_talent_hero_talent_skilltxt_271",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -6931,7 +6931,7 @@
"key": "hero_talent_hero_talent_skilltxt_272",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -6971,7 +6971,7 @@
"key": "hero_talent_hero_talent_skilltxt_274",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -7011,7 +7011,7 @@
"key": "hero_talent_hero_talent_skilltxt_275",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -7051,7 +7051,7 @@
"key": "hero_talent_hero_talent_skilltxt_279",
"text": "血量高于60%时攻击增加10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -7091,7 +7091,7 @@
"key": "hero_talent_hero_talent_skilltxt_281",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -7131,7 +7131,7 @@
"key": "hero_talent_hero_talent_skilltxt_282",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -7171,7 +7171,7 @@
"key": "hero_talent_hero_talent_skilltxt_283",
"text": "1技能每次攻击时额外夺取目标一个增益"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -7211,7 +7211,7 @@
"key": "hero_talent_hero_talent_skilltxt_284",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -7256,7 +7256,7 @@
"key": "hero_talent_hero_talent_skilltxt_286",
"text": "【算术】达到8层后为立即获得1回合【无敌】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -7296,7 +7296,7 @@
"key": "hero_talent_hero_talent_skilltxt_288",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -7336,7 +7336,7 @@
"key": "hero_talent_hero_talent_skilltxt_289",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -7381,7 +7381,7 @@
"key": "hero_talent_hero_talent_skilltxt_290",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -7421,7 +7421,7 @@
"key": "hero_talent_hero_talent_skilltxt_292",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -7466,7 +7466,7 @@
"key": "hero_talent_hero_talent_skilltxt_293",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -7506,7 +7506,7 @@
"key": "hero_talent_hero_talent_skilltxt_295",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -7546,7 +7546,7 @@
"key": "hero_talent_hero_talent_skilltxt_296",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -7586,7 +7586,7 @@
"key": "hero_talent_hero_talent_skilltxt_300",
"text": "对克制的目标造成伤害提升12%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -7626,7 +7626,7 @@
"key": "hero_talent_hero_talent_skilltxt_302",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -7666,7 +7666,7 @@
"key": "hero_talent_hero_talent_skilltxt_303",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -7706,7 +7706,7 @@
"key": "hero_talent_hero_talent_skilltxt_304",
"text": "造成击杀时回复自身15%血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -7746,7 +7746,7 @@
"key": "hero_talent_hero_talent_skilltxt_305",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -7791,7 +7791,7 @@
"key": "hero_talent_hero_talent_skilltxt_307",
"text": "回复此次伤害50%的血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -7831,7 +7831,7 @@
"key": "hero_talent_hero_talent_skilltxt_309",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -7871,7 +7871,7 @@
"key": "hero_talent_hero_talent_skilltxt_310",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -7916,7 +7916,7 @@
"key": "hero_talent_hero_talent_skilltxt_311",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -7956,7 +7956,7 @@
"key": "hero_talent_hero_talent_skilltxt_313",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -8001,7 +8001,7 @@
"key": "hero_talent_hero_talent_skilltxt_314",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -8041,7 +8041,7 @@
"key": "hero_talent_hero_talent_skilltxt_316",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -8081,7 +8081,7 @@
"key": "hero_talent_hero_talent_skilltxt_317",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -8121,7 +8121,7 @@
"key": "hero_talent_hero_talent_skilltxt_321",
"text": "血量高于60%时攻击增加10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -8161,7 +8161,7 @@
"key": "hero_talent_hero_talent_skilltxt_323",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -8201,7 +8201,7 @@
"key": "hero_talent_hero_talent_skilltxt_324",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -8241,7 +8241,7 @@
"key": "hero_talent_hero_talent_skilltxt_325",
"text": "1技能攻击时额外偷取目标10%行动值"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -8281,7 +8281,7 @@
"key": "hero_talent_hero_talent_skilltxt_326",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -8326,7 +8326,7 @@
"key": "hero_talent_hero_talent_skilltxt_328",
"text": "攻击行动值为0的目标时额外附加1回合【眩晕】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -8366,7 +8366,7 @@
"key": "hero_talent_hero_talent_skilltxt_330",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -8406,7 +8406,7 @@
"key": "hero_talent_hero_talent_skilltxt_331",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -8451,7 +8451,7 @@
"key": "hero_talent_hero_talent_skilltxt_332",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -8491,7 +8491,7 @@
"key": "hero_talent_hero_talent_skilltxt_334",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -8536,7 +8536,7 @@
"key": "hero_talent_hero_talent_skilltxt_335",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -8576,7 +8576,7 @@
"key": "hero_talent_hero_talent_skilltxt_337",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -8616,7 +8616,7 @@
"key": "hero_talent_hero_talent_skilltxt_338",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -8656,7 +8656,7 @@
"key": "hero_talent_hero_talent_skilltxt_342",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -8696,7 +8696,7 @@
"key": "hero_talent_hero_talent_skilltxt_344",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -8736,7 +8736,7 @@
"key": "hero_talent_hero_talent_skilltxt_345",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -8776,7 +8776,7 @@
"key": "hero_talent_hero_talent_skilltxt_346",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -8816,7 +8816,7 @@
"key": "hero_talent_hero_talent_skilltxt_347",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -8861,7 +8861,7 @@
"key": "hero_talent_hero_talent_skilltxt_349",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -8901,7 +8901,7 @@
"key": "hero_talent_hero_talent_skilltxt_351",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -8941,7 +8941,7 @@
"key": "hero_talent_hero_talent_skilltxt_352",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -8986,7 +8986,7 @@
"key": "hero_talent_hero_talent_skilltxt_353",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -9026,7 +9026,7 @@
"key": "hero_talent_hero_talent_skilltxt_355",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -9071,7 +9071,7 @@
"key": "hero_talent_hero_talent_skilltxt_356",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -9111,7 +9111,7 @@
"key": "hero_talent_hero_talent_skilltxt_358",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -9151,7 +9151,7 @@
"key": "hero_talent_hero_talent_skilltxt_359",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -9191,7 +9191,7 @@
"key": "hero_talent_hero_talent_skilltxt_363",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -9231,7 +9231,7 @@
"key": "hero_talent_hero_talent_skilltxt_365",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -9271,7 +9271,7 @@
"key": "hero_talent_hero_talent_skilltxt_366",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -9311,7 +9311,7 @@
"key": "hero_talent_hero_talent_skilltxt_367",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -9351,7 +9351,7 @@
"key": "hero_talent_hero_talent_skilltxt_368",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -9396,7 +9396,7 @@
"key": "hero_talent_hero_talent_skilltxt_370",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -9436,7 +9436,7 @@
"key": "hero_talent_hero_talent_skilltxt_372",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -9476,7 +9476,7 @@
"key": "hero_talent_hero_talent_skilltxt_373",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -9521,7 +9521,7 @@
"key": "hero_talent_hero_talent_skilltxt_374",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -9561,7 +9561,7 @@
"key": "hero_talent_hero_talent_skilltxt_376",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -9606,7 +9606,7 @@
"key": "hero_talent_hero_talent_skilltxt_377",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -9646,7 +9646,7 @@
"key": "hero_talent_hero_talent_skilltxt_379",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -9686,7 +9686,7 @@
"key": "hero_talent_hero_talent_skilltxt_380",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -9726,7 +9726,7 @@
"key": "hero_talent_hero_talent_skilltxt_384",
"text": "血量高于60%时防御增加10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -9766,7 +9766,7 @@
"key": "hero_talent_hero_talent_skilltxt_386",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -9806,7 +9806,7 @@
"key": "hero_talent_hero_talent_skilltxt_387",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -9846,7 +9846,7 @@
"key": "hero_talent_hero_talent_skilltxt_388",
"text": "受到暴击伤害降低10%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -9886,7 +9886,7 @@
"key": "hero_talent_hero_talent_skilltxt_389",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -9931,7 +9931,7 @@
"key": "hero_talent_hero_talent_skilltxt_391",
"text": "2技能每次攻击额外降低目标15%行动值"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -9971,7 +9971,7 @@
"key": "hero_talent_hero_talent_skilltxt_393",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -10011,7 +10011,7 @@
"key": "hero_talent_hero_talent_skilltxt_394",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -10056,7 +10056,7 @@
"key": "hero_talent_hero_talent_skilltxt_395",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -10096,7 +10096,7 @@
"key": "hero_talent_hero_talent_skilltxt_397",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -10141,7 +10141,7 @@
"key": "hero_talent_hero_talent_skilltxt_398",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -10181,7 +10181,7 @@
"key": "hero_talent_hero_talent_skilltxt_400",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -10221,7 +10221,7 @@
"key": "hero_talent_hero_talent_skilltxt_401",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -10261,7 +10261,7 @@
"key": "hero_talent_hero_talent_skilltxt_405",
"text": "血量高于60%时防御增加10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -10301,7 +10301,7 @@
"key": "hero_talent_hero_talent_skilltxt_407",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -10341,7 +10341,7 @@
"key": "hero_talent_hero_talent_skilltxt_408",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -10381,7 +10381,7 @@
"key": "hero_talent_hero_talent_skilltxt_409",
"text": "受到暴击伤害降低10%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -10421,7 +10421,7 @@
"key": "hero_talent_hero_talent_skilltxt_410",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -10466,7 +10466,7 @@
"key": "hero_talent_hero_talent_skilltxt_412",
"text": "2技能目标若身上有眩晕效果则附加1回合【石化】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -10506,7 +10506,7 @@
"key": "hero_talent_hero_talent_skilltxt_414",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -10546,7 +10546,7 @@
"key": "hero_talent_hero_talent_skilltxt_415",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -10591,7 +10591,7 @@
"key": "hero_talent_hero_talent_skilltxt_416",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -10631,7 +10631,7 @@
"key": "hero_talent_hero_talent_skilltxt_418",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -10676,7 +10676,7 @@
"key": "hero_talent_hero_talent_skilltxt_419",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -10716,7 +10716,7 @@
"key": "hero_talent_hero_talent_skilltxt_421",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -10756,7 +10756,7 @@
"key": "hero_talent_hero_talent_skilltxt_422",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -10796,7 +10796,7 @@
"key": "hero_talent_hero_talent_skilltxt_426",
"text": "血量高于60%时攻击增加10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -10836,7 +10836,7 @@
"key": "hero_talent_hero_talent_skilltxt_428",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -10876,7 +10876,7 @@
"key": "hero_talent_hero_talent_skilltxt_429",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -10916,7 +10916,7 @@
"key": "hero_talent_hero_talent_skilltxt_430",
"text": "造成暴击伤害增加10%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -10956,7 +10956,7 @@
"key": "hero_talent_hero_talent_skilltxt_431",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -11001,7 +11001,7 @@
"key": "hero_talent_hero_talent_skilltxt_433",
"text": "1技能若成功击杀目标，则获得额外回合。"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -11041,7 +11041,7 @@
"key": "hero_talent_hero_talent_skilltxt_435",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -11081,7 +11081,7 @@
"key": "hero_talent_hero_talent_skilltxt_436",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -11126,7 +11126,7 @@
"key": "hero_talent_hero_talent_skilltxt_437",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -11166,7 +11166,7 @@
"key": "hero_talent_hero_talent_skilltxt_439",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -11211,7 +11211,7 @@
"key": "hero_talent_hero_talent_skilltxt_440",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -11251,7 +11251,7 @@
"key": "hero_talent_hero_talent_skilltxt_442",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -11291,7 +11291,7 @@
"key": "hero_talent_hero_talent_skilltxt_443",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -11331,7 +11331,7 @@
"key": "hero_talent_hero_talent_skilltxt_447",
"text": "血量为100%时，暴击率提升25%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -11371,7 +11371,7 @@
"key": "hero_talent_hero_talent_skilltxt_449",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -11411,7 +11411,7 @@
"key": "hero_talent_hero_talent_skilltxt_450",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -11451,7 +11451,7 @@
"key": "hero_talent_hero_talent_skilltxt_451",
"text": "对克制的目标造成伤害提升12%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -11491,7 +11491,7 @@
"key": "hero_talent_hero_talent_skilltxt_452",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -11536,7 +11536,7 @@
"key": "hero_talent_hero_talent_skilltxt_454",
"text": "受到有【童真】的目标攻击是100%反击目标"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -11576,7 +11576,7 @@
"key": "hero_talent_hero_talent_skilltxt_456",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -11616,7 +11616,7 @@
"key": "hero_talent_hero_talent_skilltxt_457",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -11661,7 +11661,7 @@
"key": "hero_talent_hero_talent_skilltxt_458",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -11701,7 +11701,7 @@
"key": "hero_talent_hero_talent_skilltxt_460",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -11746,7 +11746,7 @@
"key": "hero_talent_hero_talent_skilltxt_461",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -11786,7 +11786,7 @@
"key": "hero_talent_hero_talent_skilltxt_463",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -11826,7 +11826,7 @@
"key": "hero_talent_hero_talent_skilltxt_464",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -11866,7 +11866,7 @@
"key": "hero_talent_hero_talent_skilltxt_468",
"text": "血量首次低于50%时立即净化自身全部减益"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -11906,7 +11906,7 @@
"key": "hero_talent_hero_talent_skilltxt_470",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -11946,7 +11946,7 @@
"key": "hero_talent_hero_talent_skilltxt_471",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -11986,7 +11986,7 @@
"key": "hero_talent_hero_talent_skilltxt_472",
"text": "2技能额外附加1回合【防御提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -12026,7 +12026,7 @@
"key": "hero_talent_hero_talent_skilltxt_473",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -12071,7 +12071,7 @@
"key": "hero_talent_hero_talent_skilltxt_475",
"text": "对睡眠状态的敌人造成的伤害提升20%。"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -12111,7 +12111,7 @@
"key": "hero_talent_hero_talent_skilltxt_477",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -12151,7 +12151,7 @@
"key": "hero_talent_hero_talent_skilltxt_478",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -12196,7 +12196,7 @@
"key": "hero_talent_hero_talent_skilltxt_479",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -12236,7 +12236,7 @@
"key": "hero_talent_hero_talent_skilltxt_481",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -12281,7 +12281,7 @@
"key": "hero_talent_hero_talent_skilltxt_482",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -12321,7 +12321,7 @@
"key": "hero_talent_hero_talent_skilltxt_484",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -12361,7 +12361,7 @@
"key": "hero_talent_hero_talent_skilltxt_485",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -12401,7 +12401,7 @@
"key": "hero_talent_hero_talent_skilltxt_489",
"text": "敌方有目标死亡时自身增加20点速度"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -12441,7 +12441,7 @@
"key": "hero_talent_hero_talent_skilltxt_491",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -12481,7 +12481,7 @@
"key": "hero_talent_hero_talent_skilltxt_492",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -12521,7 +12521,7 @@
"key": "hero_talent_hero_talent_skilltxt_493",
"text": "30%概率附加为自身【速度提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -12561,7 +12561,7 @@
"key": "hero_talent_hero_talent_skilltxt_494",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -12606,7 +12606,7 @@
"key": "hero_talent_hero_talent_skilltxt_496",
"text": "击杀目标时回复自身20%血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -12646,7 +12646,7 @@
"key": "hero_talent_hero_talent_skilltxt_498",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -12686,7 +12686,7 @@
"key": "hero_talent_hero_talent_skilltxt_499",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -12731,7 +12731,7 @@
"key": "hero_talent_hero_talent_skilltxt_500",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -12771,7 +12771,7 @@
"key": "hero_talent_hero_talent_skilltxt_502",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -12816,7 +12816,7 @@
"key": "hero_talent_hero_talent_skilltxt_503",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -12856,7 +12856,7 @@
"key": "hero_talent_hero_talent_skilltxt_505",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -12896,7 +12896,7 @@
"key": "hero_talent_hero_talent_skilltxt_506",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -12936,7 +12936,7 @@
"key": "hero_talent_hero_talent_skilltxt_510",
"text": "首次行动前自身受到的伤害降低18%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -12976,7 +12976,7 @@
"key": "hero_talent_hero_talent_skilltxt_512",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -13016,7 +13016,7 @@
"key": "hero_talent_hero_talent_skilltxt_513",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -13056,7 +13056,7 @@
"key": "hero_talent_hero_talent_skilltxt_514",
"text": "有技能处于冷却状态时速度增加18"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -13096,7 +13096,7 @@
"key": "hero_talent_hero_talent_skilltxt_515",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -13141,7 +13141,7 @@
"key": "hero_talent_hero_talent_skilltxt_517",
"text": "3技能新增为随机1个友方附加2回合【不灭金身】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -13181,7 +13181,7 @@
"key": "hero_talent_hero_talent_skilltxt_519",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -13221,7 +13221,7 @@
"key": "hero_talent_hero_talent_skilltxt_520",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -13266,7 +13266,7 @@
"key": "hero_talent_hero_talent_skilltxt_521",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -13306,7 +13306,7 @@
"key": "hero_talent_hero_talent_skilltxt_523",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -13351,7 +13351,7 @@
"key": "hero_talent_hero_talent_skilltxt_524",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -13391,7 +13391,7 @@
"key": "hero_talent_hero_talent_skilltxt_526",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -13431,7 +13431,7 @@
"key": "hero_talent_hero_talent_skilltxt_527",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -13471,7 +13471,7 @@
"key": "hero_talent_hero_talent_skilltxt_531",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -13511,7 +13511,7 @@
"key": "hero_talent_hero_talent_skilltxt_533",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -13551,7 +13551,7 @@
"key": "hero_talent_hero_talent_skilltxt_534",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -13591,7 +13591,7 @@
"key": "hero_talent_hero_talent_skilltxt_535",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -13631,7 +13631,7 @@
"key": "hero_talent_hero_talent_skilltxt_536",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -13676,7 +13676,7 @@
"key": "hero_talent_hero_talent_skilltxt_538",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -13716,7 +13716,7 @@
"key": "hero_talent_hero_talent_skilltxt_540",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -13756,7 +13756,7 @@
"key": "hero_talent_hero_talent_skilltxt_541",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -13801,7 +13801,7 @@
"key": "hero_talent_hero_talent_skilltxt_542",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -13841,7 +13841,7 @@
"key": "hero_talent_hero_talent_skilltxt_544",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -13886,7 +13886,7 @@
"key": "hero_talent_hero_talent_skilltxt_545",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -13926,7 +13926,7 @@
"key": "hero_talent_hero_talent_skilltxt_547",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -13966,7 +13966,7 @@
"key": "hero_talent_hero_talent_skilltxt_548",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -14006,7 +14006,7 @@
"key": "hero_talent_hero_talent_skilltxt_552",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -14046,7 +14046,7 @@
"key": "hero_talent_hero_talent_skilltxt_554",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -14086,7 +14086,7 @@
"key": "hero_talent_hero_talent_skilltxt_555",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -14126,7 +14126,7 @@
"key": "hero_talent_hero_talent_skilltxt_556",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -14166,7 +14166,7 @@
"key": "hero_talent_hero_talent_skilltxt_557",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -14211,7 +14211,7 @@
"key": "hero_talent_hero_talent_skilltxt_559",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -14251,7 +14251,7 @@
"key": "hero_talent_hero_talent_skilltxt_561",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -14291,7 +14291,7 @@
"key": "hero_talent_hero_talent_skilltxt_562",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -14336,7 +14336,7 @@
"key": "hero_talent_hero_talent_skilltxt_563",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -14376,7 +14376,7 @@
"key": "hero_talent_hero_talent_skilltxt_565",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -14421,7 +14421,7 @@
"key": "hero_talent_hero_talent_skilltxt_566",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -14461,7 +14461,7 @@
"key": "hero_talent_hero_talent_skilltxt_568",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -14501,7 +14501,7 @@
"key": "hero_talent_hero_talent_skilltxt_569",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -14541,7 +14541,7 @@
"key": "hero_talent_hero_talent_skilltxt_573",
"text": "血量100%时造成伤害增加10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -14581,7 +14581,7 @@
"key": "hero_talent_hero_talent_skilltxt_575",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -14621,7 +14621,7 @@
"key": "hero_talent_hero_talent_skilltxt_576",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -14661,7 +14661,7 @@
"key": "hero_talent_hero_talent_skilltxt_577",
"text": "2技能40%概率附加1回合【烙印】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -14701,7 +14701,7 @@
"key": "hero_talent_hero_talent_skilltxt_578",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -14746,7 +14746,7 @@
"key": "hero_talent_hero_talent_skilltxt_580",
"text": "3技能攻击目标时额外附加2回合【防御下降】效果。"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -14786,7 +14786,7 @@
"key": "hero_talent_hero_talent_skilltxt_582",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -14826,7 +14826,7 @@
"key": "hero_talent_hero_talent_skilltxt_583",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -14871,7 +14871,7 @@
"key": "hero_talent_hero_talent_skilltxt_584",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -14911,7 +14911,7 @@
"key": "hero_talent_hero_talent_skilltxt_586",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -14956,7 +14956,7 @@
"key": "hero_talent_hero_talent_skilltxt_587",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -14996,7 +14996,7 @@
"key": "hero_talent_hero_talent_skilltxt_589",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -15036,7 +15036,7 @@
"key": "hero_talent_hero_talent_skilltxt_590",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -15076,7 +15076,7 @@
"key": "hero_talent_hero_talent_skilltxt_594",
"text": "暴击时20%概率驱散目标一个增益"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -15116,7 +15116,7 @@
"key": "hero_talent_hero_talent_skilltxt_596",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -15156,7 +15156,7 @@
"key": "hero_talent_hero_talent_skilltxt_597",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -15196,7 +15196,7 @@
"key": "hero_talent_hero_talent_skilltxt_598",
"text": "攻击处于无法行动状态的目标时造成伤害增加12%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -15236,7 +15236,7 @@
"key": "hero_talent_hero_talent_skilltxt_599",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -15281,7 +15281,7 @@
"key": "hero_talent_hero_talent_skilltxt_601",
"text": "2技能每次伤害额外吸收目标10%行动值"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -15321,7 +15321,7 @@
"key": "hero_talent_hero_talent_skilltxt_603",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -15361,7 +15361,7 @@
"key": "hero_talent_hero_talent_skilltxt_604",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -15406,7 +15406,7 @@
"key": "hero_talent_hero_talent_skilltxt_605",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -15446,7 +15446,7 @@
"key": "hero_talent_hero_talent_skilltxt_607",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -15491,7 +15491,7 @@
"key": "hero_talent_hero_talent_skilltxt_608",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -15531,7 +15531,7 @@
"key": "hero_talent_hero_talent_skilltxt_610",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -15571,7 +15571,7 @@
"key": "hero_talent_hero_talent_skilltxt_611",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -15611,7 +15611,7 @@
"key": "hero_talent_hero_talent_skilltxt_615",
"text": "血量首次低于30%时受到伤害降低30%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -15651,7 +15651,7 @@
"key": "hero_talent_hero_talent_skilltxt_617",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -15691,7 +15691,7 @@
"key": "hero_talent_hero_talent_skilltxt_618",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -15731,7 +15731,7 @@
"key": "hero_talent_hero_talent_skilltxt_619",
"text": "2技能攻击目标时有50%概率附加1回合【防御下降】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -15771,7 +15771,7 @@
"key": "hero_talent_hero_talent_skilltxt_620",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -15816,7 +15816,7 @@
"key": "hero_talent_hero_talent_skilltxt_622",
"text": "任意技能造成暴击后减少2技能1回合冷却"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -15856,7 +15856,7 @@
"key": "hero_talent_hero_talent_skilltxt_624",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -15896,7 +15896,7 @@
"key": "hero_talent_hero_talent_skilltxt_625",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -15941,7 +15941,7 @@
"key": "hero_talent_hero_talent_skilltxt_626",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -15981,7 +15981,7 @@
"key": "hero_talent_hero_talent_skilltxt_628",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -16026,7 +16026,7 @@
"key": "hero_talent_hero_talent_skilltxt_629",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -16066,7 +16066,7 @@
"key": "hero_talent_hero_talent_skilltxt_631",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -16106,7 +16106,7 @@
"key": "hero_talent_hero_talent_skilltxt_632",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -16146,7 +16146,7 @@
"key": "hero_talent_hero_talent_skilltxt_636",
"text": "血量100%时造成伤害提升10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -16186,7 +16186,7 @@
"key": "hero_talent_hero_talent_skilltxt_638",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -16226,7 +16226,7 @@
"key": "hero_talent_hero_talent_skilltxt_639",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -16266,7 +16266,7 @@
"key": "hero_talent_hero_talent_skilltxt_640",
"text": "场上每存活1名友方自身攻击增加3%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -16306,7 +16306,7 @@
"key": "hero_talent_hero_talent_skilltxt_641",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -16351,7 +16351,7 @@
"key": "hero_talent_hero_talent_skilltxt_643",
"text": "1技能夺取增益，若夺取成功，对目标附加1回合【烙印】状态"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -16391,7 +16391,7 @@
"key": "hero_talent_hero_talent_skilltxt_645",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -16431,7 +16431,7 @@
"key": "hero_talent_hero_talent_skilltxt_646",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -16476,7 +16476,7 @@
"key": "hero_talent_hero_talent_skilltxt_647",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -16516,7 +16516,7 @@
"key": "hero_talent_hero_talent_skilltxt_649",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -16561,7 +16561,7 @@
"key": "hero_talent_hero_talent_skilltxt_650",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -16601,7 +16601,7 @@
"key": "hero_talent_hero_talent_skilltxt_652",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -16641,7 +16641,7 @@
"key": "hero_talent_hero_talent_skilltxt_653",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -16681,7 +16681,7 @@
"key": "hero_talent_hero_talent_skilltxt_657",
"text": "血量首次低于60%时净化自己身上全部减益效果"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -16721,7 +16721,7 @@
"key": "hero_talent_hero_talent_skilltxt_659",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -16761,7 +16761,7 @@
"key": "hero_talent_hero_talent_skilltxt_660",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -16801,7 +16801,7 @@
"key": "hero_talent_hero_talent_skilltxt_661",
"text": "场上每存活1名友方自身防御增加5%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -16841,7 +16841,7 @@
"key": "hero_talent_hero_talent_skilltxt_662",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -16886,7 +16886,7 @@
"key": "hero_talent_hero_talent_skilltxt_664",
"text": "2技能额外增加吸收10%行动值"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -16926,7 +16926,7 @@
"key": "hero_talent_hero_talent_skilltxt_666",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -16966,7 +16966,7 @@
"key": "hero_talent_hero_talent_skilltxt_667",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -17011,7 +17011,7 @@
"key": "hero_talent_hero_talent_skilltxt_668",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -17051,7 +17051,7 @@
"key": "hero_talent_hero_talent_skilltxt_670",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -17096,7 +17096,7 @@
"key": "hero_talent_hero_talent_skilltxt_671",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -17136,7 +17136,7 @@
"key": "hero_talent_hero_talent_skilltxt_673",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -17176,7 +17176,7 @@
"key": "hero_talent_hero_talent_skilltxt_674",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -17216,7 +17216,7 @@
"key": "hero_talent_hero_talent_skilltxt_678",
"text": "血量100%时最终治疗量增加10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -17256,7 +17256,7 @@
"key": "hero_talent_hero_talent_skilltxt_680",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -17296,7 +17296,7 @@
"key": "hero_talent_hero_talent_skilltxt_681",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -17336,7 +17336,7 @@
"key": "hero_talent_hero_talent_skilltxt_682",
"text": "友方角色处于无法行动状态时增加15速度"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -17376,7 +17376,7 @@
"key": "hero_talent_hero_talent_skilltxt_683",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -17421,7 +17421,7 @@
"key": "hero_talent_hero_talent_skilltxt_685",
"text": "2技能平衡血量后立即回复所有目标15%血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -17461,7 +17461,7 @@
"key": "hero_talent_hero_talent_skilltxt_687",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -17501,7 +17501,7 @@
"key": "hero_talent_hero_talent_skilltxt_688",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -17546,7 +17546,7 @@
"key": "hero_talent_hero_talent_skilltxt_689",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -17586,7 +17586,7 @@
"key": "hero_talent_hero_talent_skilltxt_691",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -17631,7 +17631,7 @@
"key": "hero_talent_hero_talent_skilltxt_692",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -17671,7 +17671,7 @@
"key": "hero_talent_hero_talent_skilltxt_694",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -17711,7 +17711,7 @@
"key": "hero_talent_hero_talent_skilltxt_695",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -17751,7 +17751,7 @@
"key": "hero_talent_hero_talent_skilltxt_699",
"text": "血量首次低于50%时为随机1个敌方附加1回合【冰冻】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -17791,7 +17791,7 @@
"key": "hero_talent_hero_talent_skilltxt_701",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -17831,7 +17831,7 @@
"key": "hero_talent_hero_talent_skilltxt_702",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -17871,7 +17871,7 @@
"key": "hero_talent_hero_talent_skilltxt_703",
"text": "攻击处于【冰冻】状态的目标伤害增加10%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -17911,7 +17911,7 @@
"key": "hero_talent_hero_talent_skilltxt_704",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -17956,7 +17956,7 @@
"key": "hero_talent_hero_talent_skilltxt_706",
"text": "攻击处于【速度下降】的目标额外附加1回合【冰冻】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -17996,7 +17996,7 @@
"key": "hero_talent_hero_talent_skilltxt_708",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -18036,7 +18036,7 @@
"key": "hero_talent_hero_talent_skilltxt_709",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -18081,7 +18081,7 @@
"key": "hero_talent_hero_talent_skilltxt_710",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -18121,7 +18121,7 @@
"key": "hero_talent_hero_talent_skilltxt_712",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -18166,7 +18166,7 @@
"key": "hero_talent_hero_talent_skilltxt_713",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -18206,7 +18206,7 @@
"key": "hero_talent_hero_talent_skilltxt_715",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -18246,7 +18246,7 @@
"key": "hero_talent_hero_talent_skilltxt_716",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -18286,7 +18286,7 @@
"key": "hero_talent_hero_talent_skilltxt_720",
"text": "血量首次低于60%时将自身全部减益随机转移给一个敌方目标"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -18326,7 +18326,7 @@
"key": "hero_talent_hero_talent_skilltxt_722",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -18366,7 +18366,7 @@
"key": "hero_talent_hero_talent_skilltxt_723",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -18406,7 +18406,7 @@
"key": "hero_talent_hero_talent_skilltxt_724",
"text": "释放2技能时若自身没有减益转移则对敌方一个目标随机附加1回合【防御下降】、【攻击下降】、【效果抵抗下降】、【效果命中下降】、【速度下降】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -18446,7 +18446,7 @@
"key": "hero_talent_hero_talent_skilltxt_725",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -18491,7 +18491,7 @@
"key": "hero_talent_hero_talent_skilltxt_727",
"text": "释放1技能时有50%概率额外附加2回合【攻击下降】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -18531,7 +18531,7 @@
"key": "hero_talent_hero_talent_skilltxt_729",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -18571,7 +18571,7 @@
"key": "hero_talent_hero_talent_skilltxt_730",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -18616,7 +18616,7 @@
"key": "hero_talent_hero_talent_skilltxt_731",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -18656,7 +18656,7 @@
"key": "hero_talent_hero_talent_skilltxt_733",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -18701,7 +18701,7 @@
"key": "hero_talent_hero_talent_skilltxt_734",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -18741,7 +18741,7 @@
"key": "hero_talent_hero_talent_skilltxt_736",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -18781,7 +18781,7 @@
"key": "hero_talent_hero_talent_skilltxt_737",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -18821,7 +18821,7 @@
"key": "hero_talent_hero_talent_skilltxt_741",
"text": "血量首次低于50%时50%概率为自身附加2回合【复苏】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -18861,7 +18861,7 @@
"key": "hero_talent_hero_talent_skilltxt_743",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -18901,7 +18901,7 @@
"key": "hero_talent_hero_talent_skilltxt_744",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -18941,7 +18941,7 @@
"key": "hero_talent_hero_talent_skilltxt_745",
"text": "2技能有50%概率额外附加1回合【中毒】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -18981,7 +18981,7 @@
"key": "hero_talent_hero_talent_skilltxt_746",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -19026,7 +19026,7 @@
"key": "hero_talent_hero_talent_skilltxt_748",
"text": "释放1技能时有30%概率追加1次攻击"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -19066,7 +19066,7 @@
"key": "hero_talent_hero_talent_skilltxt_750",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -19106,7 +19106,7 @@
"key": "hero_talent_hero_talent_skilltxt_751",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -19151,7 +19151,7 @@
"key": "hero_talent_hero_talent_skilltxt_752",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -19191,7 +19191,7 @@
"key": "hero_talent_hero_talent_skilltxt_754",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -19236,7 +19236,7 @@
"key": "hero_talent_hero_talent_skilltxt_755",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -19276,7 +19276,7 @@
"key": "hero_talent_hero_talent_skilltxt_757",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -19316,7 +19316,7 @@
"key": "hero_talent_hero_talent_skilltxt_758",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -19356,7 +19356,7 @@
"key": "hero_talent_hero_talent_skilltxt_762",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -19396,7 +19396,7 @@
"key": "hero_talent_hero_talent_skilltxt_764",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -19436,7 +19436,7 @@
"key": "hero_talent_hero_talent_skilltxt_765",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -19476,7 +19476,7 @@
"key": "hero_talent_hero_talent_skilltxt_766",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -19516,7 +19516,7 @@
"key": "hero_talent_hero_talent_skilltxt_767",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -19561,7 +19561,7 @@
"key": "hero_talent_hero_talent_skilltxt_769",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -19601,7 +19601,7 @@
"key": "hero_talent_hero_talent_skilltxt_771",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -19641,7 +19641,7 @@
"key": "hero_talent_hero_talent_skilltxt_772",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -19686,7 +19686,7 @@
"key": "hero_talent_hero_talent_skilltxt_773",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -19726,7 +19726,7 @@
"key": "hero_talent_hero_talent_skilltxt_775",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -19771,7 +19771,7 @@
"key": "hero_talent_hero_talent_skilltxt_776",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -19811,7 +19811,7 @@
"key": "hero_talent_hero_talent_skilltxt_778",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -19851,7 +19851,7 @@
"key": "hero_talent_hero_talent_skilltxt_779",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -19891,7 +19891,7 @@
"key": "hero_talent_hero_talent_skilltxt_783",
"text": "血量低于60%时，受到伤害降低10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -19931,7 +19931,7 @@
"key": "hero_talent_hero_talent_skilltxt_785",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -19971,7 +19971,7 @@
"key": "hero_talent_hero_talent_skilltxt_786",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -20011,7 +20011,7 @@
"key": "hero_talent_hero_talent_skilltxt_787",
"text": "血量首次低于60%时净化自己身上全部减益效果"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -20051,7 +20051,7 @@
"key": "hero_talent_hero_talent_skilltxt_788",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -20096,7 +20096,7 @@
"key": "hero_talent_hero_talent_skilltxt_790",
"text": "1技能有80%概率附加1回合【禁疗】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -20136,7 +20136,7 @@
"key": "hero_talent_hero_talent_skilltxt_792",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -20176,7 +20176,7 @@
"key": "hero_talent_hero_talent_skilltxt_793",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -20221,7 +20221,7 @@
"key": "hero_talent_hero_talent_skilltxt_794",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -20261,7 +20261,7 @@
"key": "hero_talent_hero_talent_skilltxt_796",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -20306,7 +20306,7 @@
"key": "hero_talent_hero_talent_skilltxt_797",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -20346,7 +20346,7 @@
"key": "hero_talent_hero_talent_skilltxt_799",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -20386,7 +20386,7 @@
"key": "hero_talent_hero_talent_skilltxt_800",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -20426,7 +20426,7 @@
"key": "hero_talent_hero_talent_skilltxt_804",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -20466,7 +20466,7 @@
"key": "hero_talent_hero_talent_skilltxt_806",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -20506,7 +20506,7 @@
"key": "hero_talent_hero_talent_skilltxt_807",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -20546,7 +20546,7 @@
"key": "hero_talent_hero_talent_skilltxt_808",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -20586,7 +20586,7 @@
"key": "hero_talent_hero_talent_skilltxt_809",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -20631,7 +20631,7 @@
"key": "hero_talent_hero_talent_skilltxt_811",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -20671,7 +20671,7 @@
"key": "hero_talent_hero_talent_skilltxt_813",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -20711,7 +20711,7 @@
"key": "hero_talent_hero_talent_skilltxt_814",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -20756,7 +20756,7 @@
"key": "hero_talent_hero_talent_skilltxt_815",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -20796,7 +20796,7 @@
"key": "hero_talent_hero_talent_skilltxt_817",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -20841,7 +20841,7 @@
"key": "hero_talent_hero_talent_skilltxt_818",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -20881,7 +20881,7 @@
"key": "hero_talent_hero_talent_skilltxt_820",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -20921,7 +20921,7 @@
"key": "hero_talent_hero_talent_skilltxt_821",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -20961,7 +20961,7 @@
"key": "hero_talent_hero_talent_skilltxt_825",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -21001,7 +21001,7 @@
"key": "hero_talent_hero_talent_skilltxt_827",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -21041,7 +21041,7 @@
"key": "hero_talent_hero_talent_skilltxt_828",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -21081,7 +21081,7 @@
"key": "hero_talent_hero_talent_skilltxt_829",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -21121,7 +21121,7 @@
"key": "hero_talent_hero_talent_skilltxt_830",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -21166,7 +21166,7 @@
"key": "hero_talent_hero_talent_skilltxt_832",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -21206,7 +21206,7 @@
"key": "hero_talent_hero_talent_skilltxt_834",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -21246,7 +21246,7 @@
"key": "hero_talent_hero_talent_skilltxt_835",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -21291,7 +21291,7 @@
"key": "hero_talent_hero_talent_skilltxt_836",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -21331,7 +21331,7 @@
"key": "hero_talent_hero_talent_skilltxt_838",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -21376,7 +21376,7 @@
"key": "hero_talent_hero_talent_skilltxt_839",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -21416,7 +21416,7 @@
"key": "hero_talent_hero_talent_skilltxt_841",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -21456,7 +21456,7 @@
"key": "hero_talent_hero_talent_skilltxt_842",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -21496,7 +21496,7 @@
"key": "hero_talent_hero_talent_skilltxt_846",
"text": "血量首次低于50%时立即获得30%行动值"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -21536,7 +21536,7 @@
"key": "hero_talent_hero_talent_skilltxt_848",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -21576,7 +21576,7 @@
"key": "hero_talent_hero_talent_skilltxt_849",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -21616,7 +21616,7 @@
"key": "hero_talent_hero_talent_skilltxt_850",
"text": "2技能额外回复1名友方30%行动值"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -21656,7 +21656,7 @@
"key": "hero_talent_hero_talent_skilltxt_851",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -21701,7 +21701,7 @@
"key": "hero_talent_hero_talent_skilltxt_853",
"text": "2技能有50%概率额外附加2回合【防御提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -21741,7 +21741,7 @@
"key": "hero_talent_hero_talent_skilltxt_855",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -21781,7 +21781,7 @@
"key": "hero_talent_hero_talent_skilltxt_856",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -21826,7 +21826,7 @@
"key": "hero_talent_hero_talent_skilltxt_857",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -21866,7 +21866,7 @@
"key": "hero_talent_hero_talent_skilltxt_859",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -21911,7 +21911,7 @@
"key": "hero_talent_hero_talent_skilltxt_860",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -21951,7 +21951,7 @@
"key": "hero_talent_hero_talent_skilltxt_862",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -21991,7 +21991,7 @@
"key": "hero_talent_hero_talent_skilltxt_863",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -22031,7 +22031,7 @@
"key": "hero_talent_hero_talent_skilltxt_867",
"text": "血量100%时造成伤害提升10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -22071,7 +22071,7 @@
"key": "hero_talent_hero_talent_skilltxt_869",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -22111,7 +22111,7 @@
"key": "hero_talent_hero_talent_skilltxt_870",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -22151,7 +22151,7 @@
"key": "hero_talent_hero_talent_skilltxt_871",
"text": "血量低于50%时获得10%吸血"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -22191,7 +22191,7 @@
"key": "hero_talent_hero_talent_skilltxt_872",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -22236,7 +22236,7 @@
"key": "hero_talent_hero_talent_skilltxt_874",
"text": "2技能额外偷取目标15%行动值"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -22276,7 +22276,7 @@
"key": "hero_talent_hero_talent_skilltxt_876",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -22316,7 +22316,7 @@
"key": "hero_talent_hero_talent_skilltxt_877",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -22361,7 +22361,7 @@
"key": "hero_talent_hero_talent_skilltxt_878",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -22401,7 +22401,7 @@
"key": "hero_talent_hero_talent_skilltxt_880",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -22446,7 +22446,7 @@
"key": "hero_talent_hero_talent_skilltxt_881",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -22486,7 +22486,7 @@
"key": "hero_talent_hero_talent_skilltxt_883",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -22526,7 +22526,7 @@
"key": "hero_talent_hero_talent_skilltxt_884",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -22566,7 +22566,7 @@
"key": "hero_talent_hero_talent_skilltxt_888",
"text": "血量100%时造成伤害提升10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -22606,7 +22606,7 @@
"key": "hero_talent_hero_talent_skilltxt_890",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -22646,7 +22646,7 @@
"key": "hero_talent_hero_talent_skilltxt_891",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -22686,7 +22686,7 @@
"key": "hero_talent_hero_talent_skilltxt_892",
"text": "场上每存活1名友方自身攻击增加3%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -22726,7 +22726,7 @@
"key": "hero_talent_hero_talent_skilltxt_893",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -22771,7 +22771,7 @@
"key": "hero_talent_hero_talent_skilltxt_895",
"text": "2技能给友方额外附加2回合【攻击提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -22811,7 +22811,7 @@
"key": "hero_talent_hero_talent_skilltxt_897",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -22851,7 +22851,7 @@
"key": "hero_talent_hero_talent_skilltxt_898",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -22896,7 +22896,7 @@
"key": "hero_talent_hero_talent_skilltxt_899",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -22936,7 +22936,7 @@
"key": "hero_talent_hero_talent_skilltxt_901",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -22981,7 +22981,7 @@
"key": "hero_talent_hero_talent_skilltxt_902",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -23021,7 +23021,7 @@
"key": "hero_talent_hero_talent_skilltxt_904",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -23061,7 +23061,7 @@
"key": "hero_talent_hero_talent_skilltxt_905",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -23101,7 +23101,7 @@
"key": "hero_talent_hero_talent_skilltxt_909",
"text": "受到暴击伤害降低10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -23141,7 +23141,7 @@
"key": "hero_talent_hero_talent_skilltxt_911",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -23181,7 +23181,7 @@
"key": "hero_talent_hero_talent_skilltxt_912",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -23221,7 +23221,7 @@
"key": "hero_talent_hero_talent_skilltxt_913",
"text": "攻击时，有18%的概率无视效果抵抗"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -23261,7 +23261,7 @@
"key": "hero_talent_hero_talent_skilltxt_914",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -23306,7 +23306,7 @@
"key": "hero_talent_hero_talent_skilltxt_916",
"text": "2技能反击目标时额外附加1回合【中毒】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -23346,7 +23346,7 @@
"key": "hero_talent_hero_talent_skilltxt_918",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -23386,7 +23386,7 @@
"key": "hero_talent_hero_talent_skilltxt_919",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -23431,7 +23431,7 @@
"key": "hero_talent_hero_talent_skilltxt_920",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -23471,7 +23471,7 @@
"key": "hero_talent_hero_talent_skilltxt_922",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -23516,7 +23516,7 @@
"key": "hero_talent_hero_talent_skilltxt_923",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -23556,7 +23556,7 @@
"key": "hero_talent_hero_talent_skilltxt_925",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -23596,7 +23596,7 @@
"key": "hero_talent_hero_talent_skilltxt_926",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -23636,7 +23636,7 @@
"key": "hero_talent_hero_talent_skilltxt_930",
"text": "首次行动前自身受到的伤害降低18%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -23676,7 +23676,7 @@
"key": "hero_talent_hero_talent_skilltxt_932",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -23716,7 +23716,7 @@
"key": "hero_talent_hero_talent_skilltxt_933",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -23756,7 +23756,7 @@
"key": "hero_talent_hero_talent_skilltxt_934",
"text": "冰霜杰克自身免疫冰冻效果"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -23796,7 +23796,7 @@
"key": "hero_talent_hero_talent_skilltxt_935",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -23841,7 +23841,7 @@
"key": "hero_talent_hero_talent_skilltxt_937",
"text": "释放3技能时有30%概率为自身附加2回合【速度提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -23881,7 +23881,7 @@
"key": "hero_talent_hero_talent_skilltxt_939",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -23921,7 +23921,7 @@
"key": "hero_talent_hero_talent_skilltxt_940",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -23966,7 +23966,7 @@
"key": "hero_talent_hero_talent_skilltxt_941",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -24006,7 +24006,7 @@
"key": "hero_talent_hero_talent_skilltxt_943",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -24051,7 +24051,7 @@
"key": "hero_talent_hero_talent_skilltxt_944",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -24091,7 +24091,7 @@
"key": "hero_talent_hero_talent_skilltxt_946",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -24131,7 +24131,7 @@
"key": "hero_talent_hero_talent_skilltxt_947",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -24171,7 +24171,7 @@
"key": "hero_talent_hero_talent_skilltxt_951",
"text": "血量首次低于30%时获得一个最大血量20%的【护盾】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -24211,7 +24211,7 @@
"key": "hero_talent_hero_talent_skilltxt_953",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -24251,7 +24251,7 @@
"key": "hero_talent_hero_talent_skilltxt_954",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -24291,7 +24291,7 @@
"key": "hero_talent_hero_talent_skilltxt_955",
"text": "2技能有50%概率驱散目标一个增益"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -24331,7 +24331,7 @@
"key": "hero_talent_hero_talent_skilltxt_956",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -24376,7 +24376,7 @@
"key": "hero_talent_hero_talent_skilltxt_958",
"text": "菲欧娜获得的护盾值可叠加"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -24416,7 +24416,7 @@
"key": "hero_talent_hero_talent_skilltxt_960",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -24456,7 +24456,7 @@
"key": "hero_talent_hero_talent_skilltxt_961",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -24501,7 +24501,7 @@
"key": "hero_talent_hero_talent_skilltxt_962",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -24541,7 +24541,7 @@
"key": "hero_talent_hero_talent_skilltxt_964",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -24586,7 +24586,7 @@
"key": "hero_talent_hero_talent_skilltxt_965",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -24626,7 +24626,7 @@
"key": "hero_talent_hero_talent_skilltxt_967",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -24666,7 +24666,7 @@
"key": "hero_talent_hero_talent_skilltxt_968",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -24706,7 +24706,7 @@
"key": "hero_talent_hero_talent_skilltxt_972",
"text": "血量首次低于50%是立即获得30%行动条"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -24746,7 +24746,7 @@
"key": "hero_talent_hero_talent_skilltxt_974",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -24786,7 +24786,7 @@
"key": "hero_talent_hero_talent_skilltxt_975",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -24826,7 +24826,7 @@
"key": "hero_talent_hero_talent_skilltxt_976",
"text": "2技能有20%概率击退目标10%行动条"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -24866,7 +24866,7 @@
"key": "hero_talent_hero_talent_skilltxt_977",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -24911,7 +24911,7 @@
"key": "hero_talent_hero_talent_skilltxt_979",
"text": "对处于【无法行动】状态的角色造成伤害增加30%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -24951,7 +24951,7 @@
"key": "hero_talent_hero_talent_skilltxt_981",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -24991,7 +24991,7 @@
"key": "hero_talent_hero_talent_skilltxt_982",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -25036,7 +25036,7 @@
"key": "hero_talent_hero_talent_skilltxt_983",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -25076,7 +25076,7 @@
"key": "hero_talent_hero_talent_skilltxt_985",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -25121,7 +25121,7 @@
"key": "hero_talent_hero_talent_skilltxt_986",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -25161,7 +25161,7 @@
"key": "hero_talent_hero_talent_skilltxt_988",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -25201,7 +25201,7 @@
"key": "hero_talent_hero_talent_skilltxt_989",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -25241,7 +25241,7 @@
"key": "hero_talent_hero_talent_skilltxt_993",
"text": "血量低于50%时造成伤害提升10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -25281,7 +25281,7 @@
"key": "hero_talent_hero_talent_skilltxt_995",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -25321,7 +25321,7 @@
"key": "hero_talent_hero_talent_skilltxt_996",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -25361,7 +25361,7 @@
"key": "hero_talent_hero_talent_skilltxt_997",
"text": "受到伤害降低10%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -25401,7 +25401,7 @@
"key": "hero_talent_hero_talent_skilltxt_998",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -25446,7 +25446,7 @@
"key": "hero_talent_hero_talent_skilltxt_1000",
"text": "所有造成的减益效果增加1回合持续时间"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -25486,7 +25486,7 @@
"key": "hero_talent_hero_talent_skilltxt_1002",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -25526,7 +25526,7 @@
"key": "hero_talent_hero_talent_skilltxt_1003",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -25571,7 +25571,7 @@
"key": "hero_talent_hero_talent_skilltxt_1004",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -25611,7 +25611,7 @@
"key": "hero_talent_hero_talent_skilltxt_1006",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -25656,7 +25656,7 @@
"key": "hero_talent_hero_talent_skilltxt_1007",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -25696,7 +25696,7 @@
"key": "hero_talent_hero_talent_skilltxt_1009",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -25736,7 +25736,7 @@
"key": "hero_talent_hero_talent_skilltxt_1010",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -25776,7 +25776,7 @@
"key": "hero_talent_hero_talent_skilltxt_1014",
"text": "首次行动前自身受到的伤害降低18%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -25816,7 +25816,7 @@
"key": "hero_talent_hero_talent_skilltxt_1016",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -25856,7 +25856,7 @@
"key": "hero_talent_hero_talent_skilltxt_1017",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -25896,7 +25896,7 @@
"key": "hero_talent_hero_talent_skilltxt_1018",
"text": "附加效果是有15%概率无视目标抵抗"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -25936,7 +25936,7 @@
"key": "hero_talent_hero_talent_skilltxt_1019",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -25981,7 +25981,7 @@
"key": "hero_talent_hero_talent_skilltxt_1021",
"text": "转嫁成功或驱散成功时每转嫁或驱散一个效果降低目标4%最大血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -26021,7 +26021,7 @@
"key": "hero_talent_hero_talent_skilltxt_1023",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -26061,7 +26061,7 @@
"key": "hero_talent_hero_talent_skilltxt_1024",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -26106,7 +26106,7 @@
"key": "hero_talent_hero_talent_skilltxt_1025",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -26146,7 +26146,7 @@
"key": "hero_talent_hero_talent_skilltxt_1027",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -26191,7 +26191,7 @@
"key": "hero_talent_hero_talent_skilltxt_1028",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -26231,7 +26231,7 @@
"key": "hero_talent_hero_talent_skilltxt_1030",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -26271,7 +26271,7 @@
"key": "hero_talent_hero_talent_skilltxt_1031",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -26311,7 +26311,7 @@
"key": "hero_talent_hero_talent_skilltxt_1035",
"text": "血量首次低于50%时获得10%吸血"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -26351,7 +26351,7 @@
"key": "hero_talent_hero_talent_skilltxt_1037",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -26391,7 +26391,7 @@
"key": "hero_talent_hero_talent_skilltxt_1038",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -26431,7 +26431,7 @@
"key": "hero_talent_hero_talent_skilltxt_1039",
"text": "【梦魇】首次达到十层时获得1回合【无敌】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -26471,7 +26471,7 @@
"key": "hero_talent_hero_talent_skilltxt_1040",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -26516,7 +26516,7 @@
"key": "hero_talent_hero_talent_skilltxt_1042",
"text": "对无增益的目标造成伤害增加20%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -26556,7 +26556,7 @@
"key": "hero_talent_hero_talent_skilltxt_1044",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -26596,7 +26596,7 @@
"key": "hero_talent_hero_talent_skilltxt_1045",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -26641,7 +26641,7 @@
"key": "hero_talent_hero_talent_skilltxt_1046",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -26681,7 +26681,7 @@
"key": "hero_talent_hero_talent_skilltxt_1048",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -26726,7 +26726,7 @@
"key": "hero_talent_hero_talent_skilltxt_1049",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -26766,7 +26766,7 @@
"key": "hero_talent_hero_talent_skilltxt_1051",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -26806,7 +26806,7 @@
"key": "hero_talent_hero_talent_skilltxt_1052",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -26846,7 +26846,7 @@
"key": "hero_talent_hero_talent_skilltxt_1056",
"text": "首次攻击造成的伤害提升20%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -26886,7 +26886,7 @@
"key": "hero_talent_hero_talent_skilltxt_1058",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -26926,7 +26926,7 @@
"key": "hero_talent_hero_talent_skilltxt_1059",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -26966,7 +26966,7 @@
"key": "hero_talent_hero_talent_skilltxt_1060",
"text": "每次出手有20%概率为自身附加1回合【攻击提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -27006,7 +27006,7 @@
"key": "hero_talent_hero_talent_skilltxt_1061",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -27051,7 +27051,7 @@
"key": "hero_talent_hero_talent_skilltxt_1063",
"text": "每次出手有30%概率为自身附加1回合【暴击提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -27091,7 +27091,7 @@
"key": "hero_talent_hero_talent_skilltxt_1065",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -27131,7 +27131,7 @@
"key": "hero_talent_hero_talent_skilltxt_1066",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -27176,7 +27176,7 @@
"key": "hero_talent_hero_talent_skilltxt_1067",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -27216,7 +27216,7 @@
"key": "hero_talent_hero_talent_skilltxt_1069",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -27261,7 +27261,7 @@
"key": "hero_talent_hero_talent_skilltxt_1070",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -27301,7 +27301,7 @@
"key": "hero_talent_hero_talent_skilltxt_1072",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -27341,7 +27341,7 @@
"key": "hero_talent_hero_talent_skilltxt_1073",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -27381,7 +27381,7 @@
"key": "hero_talent_hero_talent_skilltxt_1077",
"text": "3技能新增效果：每次攻击时，每点速度提供攻击力0.33%的额外伤害"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -27421,7 +27421,7 @@
"key": "hero_talent_hero_talent_skilltxt_1079",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -27461,7 +27461,7 @@
"key": "hero_talent_hero_talent_skilltxt_1080",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -27501,7 +27501,7 @@
"key": "hero_talent_hero_talent_skilltxt_1081",
"text": "2技能30%概率附带1回合【攻击下降】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -27541,7 +27541,7 @@
"key": "hero_talent_hero_talent_skilltxt_1082",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -27586,7 +27586,7 @@
"key": "hero_talent_hero_talent_skilltxt_1084",
"text": "攻击时附带消耗自身血量5%，附带消耗血量100%的伤害"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -27626,7 +27626,7 @@
"key": "hero_talent_hero_talent_skilltxt_1086",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -27666,7 +27666,7 @@
"key": "hero_talent_hero_talent_skilltxt_1087",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -27711,7 +27711,7 @@
"key": "hero_talent_hero_talent_skilltxt_1088",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -27751,7 +27751,7 @@
"key": "hero_talent_hero_talent_skilltxt_1090",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -27796,7 +27796,7 @@
"key": "hero_talent_hero_talent_skilltxt_1091",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -27836,7 +27836,7 @@
"key": "hero_talent_hero_talent_skilltxt_1093",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -27876,7 +27876,7 @@
"key": "hero_talent_hero_talent_skilltxt_1094",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -27916,7 +27916,7 @@
"key": "hero_talent_hero_talent_skilltxt_1098",
"text": "血量首次低于50%时50%概率为自身附加2回合【复苏】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -27956,7 +27956,7 @@
"key": "hero_talent_hero_talent_skilltxt_1100",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -27996,7 +27996,7 @@
"key": "hero_talent_hero_talent_skilltxt_1101",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -28036,7 +28036,7 @@
"key": "hero_talent_hero_talent_skilltxt_1102",
"text": "有技能处于冷却状态时速度增加18"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -28076,7 +28076,7 @@
"key": "hero_talent_hero_talent_skilltxt_1103",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -28121,7 +28121,7 @@
"key": "hero_talent_hero_talent_skilltxt_1105",
"text": "2技能额外附加2回合【复苏】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -28161,7 +28161,7 @@
"key": "hero_talent_hero_talent_skilltxt_1107",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -28201,7 +28201,7 @@
"key": "hero_talent_hero_talent_skilltxt_1108",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -28246,7 +28246,7 @@
"key": "hero_talent_hero_talent_skilltxt_1109",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -28286,7 +28286,7 @@
"key": "hero_talent_hero_talent_skilltxt_1111",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -28331,7 +28331,7 @@
"key": "hero_talent_hero_talent_skilltxt_1112",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -28371,7 +28371,7 @@
"key": "hero_talent_hero_talent_skilltxt_1114",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -28411,7 +28411,7 @@
"key": "hero_talent_hero_talent_skilltxt_1115",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -28451,7 +28451,7 @@
"key": "hero_talent_hero_talent_skilltxt_1119",
"text": "血量首次低于50%时50%概率为自身附加2回合【复苏】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -28491,7 +28491,7 @@
"key": "hero_talent_hero_talent_skilltxt_1121",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -28531,7 +28531,7 @@
"key": "hero_talent_hero_talent_skilltxt_1122",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -28571,7 +28571,7 @@
"key": "hero_talent_hero_talent_skilltxt_1123",
"text": "有技能处于冷却状态时速度增加18"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -28611,7 +28611,7 @@
"key": "hero_talent_hero_talent_skilltxt_1124",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -28656,7 +28656,7 @@
"key": "hero_talent_hero_talent_skilltxt_1126",
"text": "释放3技能时有30%概率为目标附加2回合【速度下降】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -28696,7 +28696,7 @@
"key": "hero_talent_hero_talent_skilltxt_1128",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -28736,7 +28736,7 @@
"key": "hero_talent_hero_talent_skilltxt_1129",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -28781,7 +28781,7 @@
"key": "hero_talent_hero_talent_skilltxt_1130",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -28821,7 +28821,7 @@
"key": "hero_talent_hero_talent_skilltxt_1132",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -28866,7 +28866,7 @@
"key": "hero_talent_hero_talent_skilltxt_1133",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -28906,7 +28906,7 @@
"key": "hero_talent_hero_talent_skilltxt_1135",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -28946,7 +28946,7 @@
"key": "hero_talent_hero_talent_skilltxt_1136",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -28986,7 +28986,7 @@
"key": "hero_talent_hero_talent_skilltxt_1140",
"text": "果酱教授自身免疫石化"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -29026,7 +29026,7 @@
"key": "hero_talent_hero_talent_skilltxt_1142",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -29066,7 +29066,7 @@
"key": "hero_talent_hero_talent_skilltxt_1143",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -29106,7 +29106,7 @@
"key": "hero_talent_hero_talent_skilltxt_1144",
"text": "每次攻击有30%概率为目标随机附加1个减益"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -29146,7 +29146,7 @@
"key": "hero_talent_hero_talent_skilltxt_1145",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -29191,7 +29191,7 @@
"key": "hero_talent_hero_talent_skilltxt_1147",
"text": "若目标身上存在减益状态，每个最终伤害增加25%。"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -29231,7 +29231,7 @@
"key": "hero_talent_hero_talent_skilltxt_1149",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -29271,7 +29271,7 @@
"key": "hero_talent_hero_talent_skilltxt_1150",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -29316,7 +29316,7 @@
"key": "hero_talent_hero_talent_skilltxt_1151",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -29356,7 +29356,7 @@
"key": "hero_talent_hero_talent_skilltxt_1153",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -29401,7 +29401,7 @@
"key": "hero_talent_hero_talent_skilltxt_1154",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -29441,7 +29441,7 @@
"key": "hero_talent_hero_talent_skilltxt_1156",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -29481,7 +29481,7 @@
"key": "hero_talent_hero_talent_skilltxt_1157",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -29521,7 +29521,7 @@
"key": "hero_talent_hero_talent_skilltxt_1161",
"text": "2技能有25%概率附加1回合【攻击提升】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -29561,7 +29561,7 @@
"key": "hero_talent_hero_talent_skilltxt_1163",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -29601,7 +29601,7 @@
"key": "hero_talent_hero_talent_skilltxt_1164",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -29641,7 +29641,7 @@
"key": "hero_talent_hero_talent_skilltxt_1165",
"text": "2技能有25%概率附加1回合【暴击概率提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -29681,7 +29681,7 @@
"key": "hero_talent_hero_talent_skilltxt_1166",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -29726,7 +29726,7 @@
"key": "hero_talent_hero_talent_skilltxt_1168",
"text": "3技能有60%概率附加1回合【防御下降】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -29766,7 +29766,7 @@
"key": "hero_talent_hero_talent_skilltxt_1170",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -29806,7 +29806,7 @@
"key": "hero_talent_hero_talent_skilltxt_1171",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -29851,7 +29851,7 @@
"key": "hero_talent_hero_talent_skilltxt_1172",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -29891,7 +29891,7 @@
"key": "hero_talent_hero_talent_skilltxt_1174",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -29936,7 +29936,7 @@
"key": "hero_talent_hero_talent_skilltxt_1175",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -29976,7 +29976,7 @@
"key": "hero_talent_hero_talent_skilltxt_1177",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -30016,7 +30016,7 @@
"key": "hero_talent_hero_talent_skilltxt_1178",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -30056,7 +30056,7 @@
"key": "hero_talent_hero_talent_skilltxt_1182",
"text": "血量低于60%时，获得10%吸血"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -30096,7 +30096,7 @@
"key": "hero_talent_hero_talent_skilltxt_1184",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -30136,7 +30136,7 @@
"key": "hero_talent_hero_talent_skilltxt_1185",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -30176,7 +30176,7 @@
"key": "hero_talent_hero_talent_skilltxt_1186",
"text": "血量首次低于30%时获得一个最大血量10%的【护盾】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -30216,7 +30216,7 @@
"key": "hero_talent_hero_talent_skilltxt_1187",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -30261,7 +30261,7 @@
"key": "hero_talent_hero_talent_skilltxt_1189",
"text": "2技能有50%概率驱散目标一个增益"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -30301,7 +30301,7 @@
"key": "hero_talent_hero_talent_skilltxt_1191",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -30341,7 +30341,7 @@
"key": "hero_talent_hero_talent_skilltxt_1192",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -30386,7 +30386,7 @@
"key": "hero_talent_hero_talent_skilltxt_1193",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -30426,7 +30426,7 @@
"key": "hero_talent_hero_talent_skilltxt_1195",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -30471,7 +30471,7 @@
"key": "hero_talent_hero_talent_skilltxt_1196",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -30511,7 +30511,7 @@
"key": "hero_talent_hero_talent_skilltxt_1198",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -30551,7 +30551,7 @@
"key": "hero_talent_hero_talent_skilltxt_1199",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -30591,7 +30591,7 @@
"key": "hero_talent_hero_talent_skilltxt_1203",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -30631,7 +30631,7 @@
"key": "hero_talent_hero_talent_skilltxt_1205",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -30671,7 +30671,7 @@
"key": "hero_talent_hero_talent_skilltxt_1206",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -30711,7 +30711,7 @@
"key": "hero_talent_hero_talent_skilltxt_1207",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -30751,7 +30751,7 @@
"key": "hero_talent_hero_talent_skilltxt_1208",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -30796,7 +30796,7 @@
"key": "hero_talent_hero_talent_skilltxt_1210",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -30836,7 +30836,7 @@
"key": "hero_talent_hero_talent_skilltxt_1212",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -30876,7 +30876,7 @@
"key": "hero_talent_hero_talent_skilltxt_1213",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -30921,7 +30921,7 @@
"key": "hero_talent_hero_talent_skilltxt_1214",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -30961,7 +30961,7 @@
"key": "hero_talent_hero_talent_skilltxt_1216",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -31006,7 +31006,7 @@
"key": "hero_talent_hero_talent_skilltxt_1217",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -31046,7 +31046,7 @@
"key": "hero_talent_hero_talent_skilltxt_1219",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -31086,7 +31086,7 @@
"key": "hero_talent_hero_talent_skilltxt_1220",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -31126,7 +31126,7 @@
"key": "hero_talent_hero_talent_skilltxt_1224",
"text": "1技能每次攻击有25%概率额外附加1回合【禁疗】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -31166,7 +31166,7 @@
"key": "hero_talent_hero_talent_skilltxt_1226",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -31206,7 +31206,7 @@
"key": "hero_talent_hero_talent_skilltxt_1227",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -31246,7 +31246,7 @@
"key": "hero_talent_hero_talent_skilltxt_1228",
"text": "自身处于无法行动状态时受到伤害降低16%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -31286,7 +31286,7 @@
"key": "hero_talent_hero_talent_skilltxt_1229",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -31331,7 +31331,7 @@
"key": "hero_talent_hero_talent_skilltxt_1231",
"text": "附加增益时每个增益回复自身2%最大血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -31371,7 +31371,7 @@
"key": "hero_talent_hero_talent_skilltxt_1233",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -31411,7 +31411,7 @@
"key": "hero_talent_hero_talent_skilltxt_1234",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -31456,7 +31456,7 @@
"key": "hero_talent_hero_talent_skilltxt_1235",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -31496,7 +31496,7 @@
"key": "hero_talent_hero_talent_skilltxt_1237",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -31541,7 +31541,7 @@
"key": "hero_talent_hero_talent_skilltxt_1238",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -31581,7 +31581,7 @@
"key": "hero_talent_hero_talent_skilltxt_1240",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -31621,7 +31621,7 @@
"key": "hero_talent_hero_talent_skilltxt_1241",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -31661,7 +31661,7 @@
"key": "hero_talent_hero_talent_skilltxt_1245",
"text": "戈伯自身免疫眩晕"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -31701,7 +31701,7 @@
"key": "hero_talent_hero_talent_skilltxt_1247",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -31741,7 +31741,7 @@
"key": "hero_talent_hero_talent_skilltxt_1248",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -31781,7 +31781,7 @@
"key": "hero_talent_hero_talent_skilltxt_1249",
"text": "血量首次低于60%时净化自己身上全部减益效果"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -31821,7 +31821,7 @@
"key": "hero_talent_hero_talent_skilltxt_1250",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -31866,7 +31866,7 @@
"key": "hero_talent_hero_talent_skilltxt_1252",
"text": "1技能附加2回合【眩晕】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -31906,7 +31906,7 @@
"key": "hero_talent_hero_talent_skilltxt_1254",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -31946,7 +31946,7 @@
"key": "hero_talent_hero_talent_skilltxt_1255",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -31991,7 +31991,7 @@
"key": "hero_talent_hero_talent_skilltxt_1256",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -32031,7 +32031,7 @@
"key": "hero_talent_hero_talent_skilltxt_1258",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -32076,7 +32076,7 @@
"key": "hero_talent_hero_talent_skilltxt_1259",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -32116,7 +32116,7 @@
"key": "hero_talent_hero_talent_skilltxt_1261",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -32156,7 +32156,7 @@
"key": "hero_talent_hero_talent_skilltxt_1262",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -32196,7 +32196,7 @@
"key": "hero_talent_hero_talent_skilltxt_1266",
"text": "2技能造成暴击后有30%概率追加1次1技能"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -32236,7 +32236,7 @@
"key": "hero_talent_hero_talent_skilltxt_1268",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -32276,7 +32276,7 @@
"key": "hero_talent_hero_talent_skilltxt_1269",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -32316,7 +32316,7 @@
"key": "hero_talent_hero_talent_skilltxt_1270",
"text": "造成击杀后立即回复自身20%最大血量"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -32356,7 +32356,7 @@
"key": "hero_talent_hero_talent_skilltxt_1271",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -32401,7 +32401,7 @@
"key": "hero_talent_hero_talent_skilltxt_1273",
"text": "2技能造成暴击后额外附加2回合【流血】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -32441,7 +32441,7 @@
"key": "hero_talent_hero_talent_skilltxt_1275",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -32481,7 +32481,7 @@
"key": "hero_talent_hero_talent_skilltxt_1276",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -32526,7 +32526,7 @@
"key": "hero_talent_hero_talent_skilltxt_1277",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -32566,7 +32566,7 @@
"key": "hero_talent_hero_talent_skilltxt_1279",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -32611,7 +32611,7 @@
"key": "hero_talent_hero_talent_skilltxt_1280",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -32651,7 +32651,7 @@
"key": "hero_talent_hero_talent_skilltxt_1282",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -32691,7 +32691,7 @@
"key": "hero_talent_hero_talent_skilltxt_1283",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -32731,7 +32731,7 @@
"key": "hero_talent_hero_talent_skilltxt_1287",
"text": "场上每存活1名友方自身防御增加3%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -32771,7 +32771,7 @@
"key": "hero_talent_hero_talent_skilltxt_1289",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -32811,7 +32811,7 @@
"key": "hero_talent_hero_talent_skilltxt_1290",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -32851,7 +32851,7 @@
"key": "hero_talent_hero_talent_skilltxt_1291",
"text": "自身处于无法行动状态时受到伤害降低16%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -32891,7 +32891,7 @@
"key": "hero_talent_hero_talent_skilltxt_1292",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -32936,7 +32936,7 @@
"key": "hero_talent_hero_talent_skilltxt_1294",
"text": "1技能每次攻击有25%概率额外附加1回合【禁疗】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -32976,7 +32976,7 @@
"key": "hero_talent_hero_talent_skilltxt_1296",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -33016,7 +33016,7 @@
"key": "hero_talent_hero_talent_skilltxt_1297",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -33061,7 +33061,7 @@
"key": "hero_talent_hero_talent_skilltxt_1298",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -33101,7 +33101,7 @@
"key": "hero_talent_hero_talent_skilltxt_1300",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -33146,7 +33146,7 @@
"key": "hero_talent_hero_talent_skilltxt_1301",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -33186,7 +33186,7 @@
"key": "hero_talent_hero_talent_skilltxt_1303",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -33226,7 +33226,7 @@
"key": "hero_talent_hero_talent_skilltxt_1304",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -33266,7 +33266,7 @@
"key": "hero_talent_hero_talent_skilltxt_1308",
"text": "血量首次低于60%时，获得2回合【速度提升】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -33306,7 +33306,7 @@
"key": "hero_talent_hero_talent_skilltxt_1310",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -33346,7 +33346,7 @@
"key": "hero_talent_hero_talent_skilltxt_1311",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -33386,7 +33386,7 @@
"key": "hero_talent_hero_talent_skilltxt_1312",
"text": "场上每存活1名友方自身效果抵抗增加5%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -33426,7 +33426,7 @@
"key": "hero_talent_hero_talent_skilltxt_1313",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -33471,7 +33471,7 @@
"key": "hero_talent_hero_talent_skilltxt_1315",
"text": "血量首次低于60%时净化自己身上全部减益效果"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -33511,7 +33511,7 @@
"key": "hero_talent_hero_talent_skilltxt_1317",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -33551,7 +33551,7 @@
"key": "hero_talent_hero_talent_skilltxt_1318",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -33596,7 +33596,7 @@
"key": "hero_talent_hero_talent_skilltxt_1319",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -33636,7 +33636,7 @@
"key": "hero_talent_hero_talent_skilltxt_1321",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -33681,7 +33681,7 @@
"key": "hero_talent_hero_talent_skilltxt_1322",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -33721,7 +33721,7 @@
"key": "hero_talent_hero_talent_skilltxt_1324",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -33761,7 +33761,7 @@
"key": "hero_talent_hero_talent_skilltxt_1325",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -33801,7 +33801,7 @@
"key": "hero_talent_hero_talent_skilltxt_1329",
"text": "血量首次低于30%时获得一个最大血量20%的【护盾】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -33841,7 +33841,7 @@
"key": "hero_talent_hero_talent_skilltxt_1331",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -33881,7 +33881,7 @@
"key": "hero_talent_hero_talent_skilltxt_1332",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -33921,7 +33921,7 @@
"key": "hero_talent_hero_talent_skilltxt_1333",
"text": "2技能攻击目标时若目标身上没有【黑客前瞻】则随机附加1个减益效果"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -33961,7 +33961,7 @@
"key": "hero_talent_hero_talent_skilltxt_1334",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -34006,7 +34006,7 @@
"key": "hero_talent_hero_talent_skilltxt_1336",
"text": "每次伤害附带自身5%血量100%伤害"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -34046,7 +34046,7 @@
"key": "hero_talent_hero_talent_skilltxt_1338",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -34086,7 +34086,7 @@
"key": "hero_talent_hero_talent_skilltxt_1339",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -34131,7 +34131,7 @@
"key": "hero_talent_hero_talent_skilltxt_1340",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -34171,7 +34171,7 @@
"key": "hero_talent_hero_talent_skilltxt_1342",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -34216,7 +34216,7 @@
"key": "hero_talent_hero_talent_skilltxt_1343",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -34256,7 +34256,7 @@
"key": "hero_talent_hero_talent_skilltxt_1345",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -34296,7 +34296,7 @@
"key": "hero_talent_hero_talent_skilltxt_1346",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -34336,7 +34336,7 @@
"key": "hero_talent_hero_talent_skilltxt_1350",
"text": "血量100%时造成伤害提升10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -34376,7 +34376,7 @@
"key": "hero_talent_hero_talent_skilltxt_1352",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -34416,7 +34416,7 @@
"key": "hero_talent_hero_talent_skilltxt_1353",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -34456,7 +34456,7 @@
"key": "hero_talent_hero_talent_skilltxt_1354",
"text": "血量首次低于50%时获得15%吸血"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -34496,7 +34496,7 @@
"key": "hero_talent_hero_talent_skilltxt_1355",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -34541,7 +34541,7 @@
"key": "hero_talent_hero_talent_skilltxt_1357",
"text": "对无增益的目标造成伤害增加20%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -34581,7 +34581,7 @@
"key": "hero_talent_hero_talent_skilltxt_1359",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -34621,7 +34621,7 @@
"key": "hero_talent_hero_talent_skilltxt_1360",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -34666,7 +34666,7 @@
"key": "hero_talent_hero_talent_skilltxt_1361",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -34706,7 +34706,7 @@
"key": "hero_talent_hero_talent_skilltxt_1363",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -34751,7 +34751,7 @@
"key": "hero_talent_hero_talent_skilltxt_1364",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -34791,7 +34791,7 @@
"key": "hero_talent_hero_talent_skilltxt_1366",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -34831,7 +34831,7 @@
"key": "hero_talent_hero_talent_skilltxt_1367",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -34871,7 +34871,7 @@
"key": "hero_talent_hero_talent_skilltxt_1371",
"text": "血量首次低于50%时获得10%吸血"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -34911,7 +34911,7 @@
"key": "hero_talent_hero_talent_skilltxt_1373",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -34951,7 +34951,7 @@
"key": "hero_talent_hero_talent_skilltxt_1374",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -34991,7 +34991,7 @@
"key": "hero_talent_hero_talent_skilltxt_1375",
"text": "1技能驱散目标2个强化效果。"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -35031,7 +35031,7 @@
"key": "hero_talent_hero_talent_skilltxt_1376",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -35076,7 +35076,7 @@
"key": "hero_talent_hero_talent_skilltxt_1378",
"text": "对无增益的目标造成伤害增加20%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -35116,7 +35116,7 @@
"key": "hero_talent_hero_talent_skilltxt_1380",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -35156,7 +35156,7 @@
"key": "hero_talent_hero_talent_skilltxt_1381",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -35201,7 +35201,7 @@
"key": "hero_talent_hero_talent_skilltxt_1382",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -35241,7 +35241,7 @@
"key": "hero_talent_hero_talent_skilltxt_1384",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -35286,7 +35286,7 @@
"key": "hero_talent_hero_talent_skilltxt_1385",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -35326,7 +35326,7 @@
"key": "hero_talent_hero_talent_skilltxt_1387",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -35366,7 +35366,7 @@
"key": "hero_talent_hero_talent_skilltxt_1388",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -35406,7 +35406,7 @@
"key": "hero_talent_hero_talent_skilltxt_1392",
"text": "防御百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "defpro",
"attrvar": 100,
"hp": 18,
@@ -35446,7 +35446,7 @@
"key": "hero_talent_hero_talent_skilltxt_1394",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -35486,7 +35486,7 @@
"key": "hero_talent_hero_talent_skilltxt_1395",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -35526,7 +35526,7 @@
"key": "hero_talent_hero_talent_skilltxt_1396",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -35566,7 +35566,7 @@
"key": "hero_talent_hero_talent_skilltxt_1397",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -35611,7 +35611,7 @@
"key": "hero_talent_hero_talent_skilltxt_1399",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 100,
"hp": 0,
@@ -35651,7 +35651,7 @@
"key": "hero_talent_hero_talent_skilltxt_1401",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -35691,7 +35691,7 @@
"key": "hero_talent_hero_talent_skilltxt_1402",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -35736,7 +35736,7 @@
"key": "hero_talent_hero_talent_skilltxt_1403",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -35776,7 +35776,7 @@
"key": "hero_talent_hero_talent_skilltxt_1405",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -35821,7 +35821,7 @@
"key": "hero_talent_hero_talent_skilltxt_1406",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -35861,7 +35861,7 @@
"key": "hero_talent_hero_talent_skilltxt_1408",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -35901,7 +35901,7 @@
"key": "hero_talent_hero_talent_skilltxt_1409",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -35941,7 +35941,7 @@
"key": "hero_talent_hero_talent_skilltxt_1413",
"text": "血量首次低于50%时获得1个最大血量20%的【护盾】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -35981,7 +35981,7 @@
"key": "hero_talent_hero_talent_skilltxt_1415",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -36021,7 +36021,7 @@
"key": "hero_talent_hero_talent_skilltxt_1416",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -36061,7 +36061,7 @@
"key": "hero_talent_hero_talent_skilltxt_1417",
"text": "受到暴击伤害降低18%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -36101,7 +36101,7 @@
"key": "hero_talent_hero_talent_skilltxt_1418",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -36146,7 +36146,7 @@
"key": "hero_talent_hero_talent_skilltxt_1420",
"text": "3技能有25%概率附加2回合【复苏】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -36186,7 +36186,7 @@
"key": "hero_talent_hero_talent_skilltxt_1422",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -36226,7 +36226,7 @@
"key": "hero_talent_hero_talent_skilltxt_1423",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -36271,7 +36271,7 @@
"key": "hero_talent_hero_talent_skilltxt_1424",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -36311,7 +36311,7 @@
"key": "hero_talent_hero_talent_skilltxt_1426",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -36356,7 +36356,7 @@
"key": "hero_talent_hero_talent_skilltxt_1427",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -36396,7 +36396,7 @@
"key": "hero_talent_hero_talent_skilltxt_1429",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -36436,7 +36436,7 @@
"key": "hero_talent_hero_talent_skilltxt_1430",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -36476,7 +36476,7 @@
"key": "hero_talent_hero_talent_skilltxt_1434",
"text": "血量100%时造成伤害提升10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -36516,7 +36516,7 @@
"key": "hero_talent_hero_talent_skilltxt_1436",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -36556,7 +36556,7 @@
"key": "hero_talent_hero_talent_skilltxt_1437",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -36596,7 +36596,7 @@
"key": "hero_talent_hero_talent_skilltxt_1438",
"text": "场上每存活1名友方自身攻击增加3%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -36636,7 +36636,7 @@
"key": "hero_talent_hero_talent_skilltxt_1439",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -36681,7 +36681,7 @@
"key": "hero_talent_hero_talent_skilltxt_1441",
"text": "若吉蒂在场，2技能自身额外获得2回合【攻击提升】"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -36721,7 +36721,7 @@
"key": "hero_talent_hero_talent_skilltxt_1443",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -36761,7 +36761,7 @@
"key": "hero_talent_hero_talent_skilltxt_1444",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -36806,7 +36806,7 @@
"key": "hero_talent_hero_talent_skilltxt_1445",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -36846,7 +36846,7 @@
"key": "hero_talent_hero_talent_skilltxt_1447",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -36891,7 +36891,7 @@
"key": "hero_talent_hero_talent_skilltxt_1448",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -36931,7 +36931,7 @@
"key": "hero_talent_hero_talent_skilltxt_1450",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -36971,7 +36971,7 @@
"key": "hero_talent_hero_talent_skilltxt_1451",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -37011,7 +37011,7 @@
"key": "hero_talent_hero_talent_skilltxt_1455",
"text": "血量100%时造成伤害提升10%"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -37051,7 +37051,7 @@
"key": "hero_talent_hero_talent_skilltxt_1457",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -37091,7 +37091,7 @@
"key": "hero_talent_hero_talent_skilltxt_1458",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -37131,7 +37131,7 @@
"key": "hero_talent_hero_talent_skilltxt_1459",
"text": "攻击时有18%概率无视目标效果抵抗"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -37171,7 +37171,7 @@
"key": "hero_talent_hero_talent_skilltxt_1460",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -37216,7 +37216,7 @@
"key": "hero_talent_hero_talent_skilltxt_1462",
"text": "2技能额外增加目标所有技能1回合CD"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -37256,7 +37256,7 @@
"key": "hero_talent_hero_talent_skilltxt_1464",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -37296,7 +37296,7 @@
"key": "hero_talent_hero_talent_skilltxt_1465",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -37341,7 +37341,7 @@
"key": "hero_talent_hero_talent_skilltxt_1466",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -37381,7 +37381,7 @@
"key": "hero_talent_hero_talent_skilltxt_1468",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -37426,7 +37426,7 @@
"key": "hero_talent_hero_talent_skilltxt_1469",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
@@ -37466,7 +37466,7 @@
"key": "hero_talent_hero_talent_skilltxt_1471",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 30,
"hp": 16,
@@ -37506,7 +37506,7 @@
"key": "hero_talent_hero_talent_skilltxt_1472",
"text": "攻击+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon01",
"attrkey": "atk",
"attrvar": 60,
"hp": 10,
@@ -37546,7 +37546,7 @@
"key": "hero_talent_hero_talent_skilltxt_1476",
"text": "血量首次低于50%时获得1个最大血量20%的【护盾】"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 18,
@@ -37586,7 +37586,7 @@
"key": "hero_talent_hero_talent_skilltxt_1478",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 27,
"hp": 0,
@@ -37626,7 +37626,7 @@
"key": "hero_talent_hero_talent_skilltxt_1479",
"text": "防御+{0}"
},
- "skillicon": "js_jx_img_icon05",
+ "skillicon": "js_jx_img_icon02",
"attrkey": "def",
"attrvar": 54,
"hp": 0,
@@ -37666,7 +37666,7 @@
"key": "hero_talent_hero_talent_skilltxt_1480",
"text": "每损失10%的血量最终治疗量增加2%"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -37706,7 +37706,7 @@
"key": "hero_talent_hero_talent_skilltxt_1481",
"text": "生命百分比+{0}"
},
- "skillicon": "js_jx_img_icon01",
+ "skillicon": "js_jx_img_icon06",
"attrkey": "hppro",
"attrvar": 50,
"hp": 0,
@@ -37751,7 +37751,7 @@
"key": "hero_talent_hero_talent_skilltxt_1483",
"text": "每次治疗目标后为目标附加1回合复苏"
},
- "skillicon": "js_jx_img_icon04",
+ "skillicon": "js_jx_img_icon09",
"attrkey": "",
"attrvar": 0,
"hp": 0,
@@ -37791,7 +37791,7 @@
"key": "hero_talent_hero_talent_skilltxt_1485",
"text": "生命+{0}"
},
- "skillicon": "js_jx_img_icon02",
+ "skillicon": "js_jx_img_icon03",
"attrkey": "hp",
"attrvar": 450,
"hp": 0,
@@ -37831,7 +37831,7 @@
"key": "hero_talent_hero_talent_skilltxt_1486",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 300,
"hp": 0,
@@ -37876,7 +37876,7 @@
"key": "hero_talent_hero_talent_skilltxt_1487",
"text": "攻击百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon05",
"attrkey": "atkpro",
"attrvar": 600,
"hp": 0,
@@ -37916,7 +37916,7 @@
"key": "hero_talent_hero_talent_skilltxt_1489",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon03",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 30,
"hp": 0,
@@ -37961,7 +37961,7 @@
"key": "hero_talent_hero_talent_skilltxt_1490",
"text": "速度百分比+{0}"
},
- "skillicon": "js_jx_img_icon06",
+ "skillicon": "js_jx_img_icon04",
"attrkey": "speedpro",
"attrvar": 60,
"hp": 0,
diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json
index 437dad7ee..35f31642b 100644
--- a/bin/json/game_huntingopentime.json
+++ b/bin/json/game_huntingopentime.json
@@ -5,7 +5,7 @@
1,
3,
5,
- 7
+ 0
],
"name": {
"key": "hunting_opentime_name_1",
@@ -29,7 +29,7 @@
1,
3,
5,
- 7
+ 0
],
"name": {
"key": "hunting_opentime_name_2",
@@ -53,7 +53,7 @@
2,
4,
6,
- 7
+ 0
],
"name": {
"key": "hunting_opentime_name_3",
@@ -77,7 +77,7 @@
2,
4,
6,
- 7
+ 0
],
"name": {
"key": "hunting_opentime_name_4",
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 5eb29108f..2641bbae6 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -711,7 +711,7 @@
],
"use_skip": 10038,
"upper_limit": 999,
- "img": "wp_icon_10020",
+ "img": "item_10000021",
"intr": {
"key": "item_item_intr_10000021",
"text": "蕴含着热情之火力量的圣枝，用于属性招募抽取守护者。"
@@ -809,7 +809,7 @@
],
"use_skip": 10038,
"upper_limit": 999,
- "img": "wp_icon_10022",
+ "img": "item_10000023",
"intr": {
"key": "item_item_intr_10000023",
"text": "蕴含着包容之水力量的圣枝，用于属性招募抽取守护者。"
@@ -858,7 +858,7 @@
],
"use_skip": 10038,
"upper_limit": 999,
- "img": "wp_icon_10024",
+ "img": "item_10000024",
"intr": {
"key": "item_item_intr_10000024",
"text": "蕴含着荣耀之光力量的圣枝，用于属性招募抽取守护者。"
@@ -5227,7 +5227,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_14002",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12014002",
"text": "大龙守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5325,7 +5325,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_14004",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12014004",
"text": "克莱尔·努涅斯守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5423,7 +5423,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_14006",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12014006",
"text": "布兰奇守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5521,7 +5521,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_15001",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12015001",
"text": "吉姆·莱克守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5766,7 +5766,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_23001",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12023001",
"text": "斯梅克船长守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5815,7 +5815,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_23002",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12023002",
"text": "警卫队长守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5864,7 +5864,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_23003",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12023003",
"text": "黛塔黛恩守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6060,7 +6060,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_24003",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12024003",
"text": "睡神沙人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6207,7 +6207,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_24006",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12024006",
"text": "凯尔守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6256,7 +6256,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_24007",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12024007",
"text": "小钱守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6452,7 +6452,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_25002",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12025002",
"text": "沃尔夫先生守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6501,7 +6501,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_25003",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12025003",
"text": "羊仙姑守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6550,7 +6550,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_25004",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12025004",
"text": "波比守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6599,7 +6599,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_33001",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12033001",
"text": "巫嘎守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6746,7 +6746,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_33004",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12033004",
"text": "普鲁格兰杰守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6795,7 +6795,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_33005",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12033005",
"text": "鼻涕粗守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6844,7 +6844,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_33006",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12033006",
"text": "珍妮丝·邓普顿守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6893,7 +6893,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_34001",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12034001",
"text": "贫嘴驴守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6991,7 +6991,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_34003",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12034003",
"text": "圣诞老人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7040,7 +7040,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_34004",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12034004",
"text": "瓜哥守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7138,7 +7138,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_34006",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12034006",
"text": "冰霜杰克守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7187,7 +7187,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_34007",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12034007",
"text": "菲奥娜守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7383,7 +7383,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_35003",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12035003",
"text": "漆黑守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7432,7 +7432,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_35004",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12035004",
"text": "黛安·福克斯顿守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7726,7 +7726,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_43004",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12043004",
"text": "姜饼人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7775,7 +7775,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_43005",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12043005",
"text": "瓦希尔指挥官守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7873,7 +7873,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_43007",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12043007",
"text": "戈伯守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7922,7 +7922,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_44001",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12044001",
"text": "美肚鲨守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -8020,7 +8020,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_44003",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12044003",
"text": "匹诺曹守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -8216,7 +8216,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_45001",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12045001",
"text": "乌龟大师守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -8265,7 +8265,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_45002",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12045002",
"text": "梅林守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -8363,7 +8363,7 @@
],
"use_skip": 166,
"upper_limit": 0,
- "img": "xxtx_js_45004",
+ "img": "xxtx_js_25001",
"intr": {
"key": "item_item_intr_12045004",
"text": "穿靴子的猫守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json
index b41be30e5..4ff875d22 100644
--- a/bin/json/game_loading.json
+++ b/bin/json/game_loading.json
@@ -86,8 +86,8 @@
{
"scene": "ArenaScene",
"subScene": "",
- "image": "ld_boss_bg",
- "icon": "loading_icon_gfxm",
+ "image": "ld_mh_bg_fc",
+ "icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_7",
"text": "「竞技场」"
@@ -139,6 +139,48 @@
"text": "冰岛内部隐藏的溶洞区域，听说这里里面好像有些……宝藏？"
}
},
+ {
+ "scene": "CombatLevelScene",
+ "subScene": "20001",
+ "image": "ld_mh_bg_tjp",
+ "icon": "loading_icon_gfxm",
+ "title": {
+ "key": "loading_Sheet1_title_41",
+ "text": "「冰岛龙穴」"
+ },
+ "prompt": {
+ "key": "loading_Sheet1_prompt_10",
+ "text": "冰岛内部隐藏的溶洞区域，听说这里里面好像有些……宝藏？"
+ }
+ },
+ {
+ "scene": "CombatLevelScene",
+ "subScene": "20002",
+ "image": "ld_mh_bg_kmlcb",
+ "icon": "loading_icon_gfxm",
+ "title": {
+ "key": "loading_Sheet1_title_39",
+ "text": "「冰岛龙穴」"
+ },
+ "prompt": {
+ "key": "loading_Sheet1_prompt_39",
+ "text": "冰岛内部隐藏的溶洞区域，听说这里里面好像有些……宝藏？"
+ }
+ },
+ {
+ "scene": "CombatLevelScene",
+ "subScene": "20003",
+ "image": "ld_mh_bg_kmlcb",
+ "icon": "loading_icon_gfxm",
+ "title": {
+ "key": "loading_Sheet1_title_40",
+ "text": "「冰岛龙穴」"
+ },
+ "prompt": {
+ "key": "loading_Sheet1_prompt_40",
+ "text": "由阿瓦隆之心驱动着的浮游城堡，守护联盟的「智囊研究所」隐秘于此，在那里布兰奇等研究员进行着各种秘密研究。"
+ }
+ },
{
"scene": "scenesfight_06",
"subScene": "",
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index 106da51b2..c0cb74d9c 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -90487,11 +90487,11 @@
"groupwt": 1,
"groupid": 1001,
"subtype": 1,
- "groupnum": 4,
+ "groupnum": 1,
"itemid": {
"a": "item",
"t": "16001001",
- "n": 1
+ "n": 4
},
"itemdes": "",
"itemwt": 1000,
@@ -90539,7 +90539,7 @@
"itemid": {
"a": "item",
"t": "16001002",
- "n": 1
+ "n": 4
},
"itemdes": "",
"itemwt": 1000,
diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json
index 733d15d7b..a39ad6978 100644
--- a/bin/json/game_mail.json
+++ b/bin/json/game_mail.json
@@ -427,5 +427,71 @@
},
"reword": [],
"duration": 720
+ },
+ {
+ "id": "SeasonViking1Reward",
+ "title": {
+ "key": "mail_mail_title_20",
+ "text": "维京boss1排行奖励"
+ },
+ "postmark": "yj_icon_yc_mfjl",
+ "recipient": {
+ "key": "mail_mail_recipient_20",
+ "text": "亲爱的玩家："
+ },
+ "content": {
+ "key": "mail_mail_content_6",
+ "text": "获得第{0}名，奖励请查收。"
+ },
+ "sender": {
+ "key": "mail_mail_sender_20",
+ "text": "系统"
+ },
+ "reword": [],
+ "duration": 720
+ },
+ {
+ "id": "SeasonViking2Reward",
+ "title": {
+ "key": "mail_mail_title_21",
+ "text": "维京boss1排行奖励"
+ },
+ "postmark": "yj_icon_yc_mfjl",
+ "recipient": {
+ "key": "mail_mail_recipient_21",
+ "text": "亲爱的玩家："
+ },
+ "content": {
+ "key": "mail_mail_content_6",
+ "text": "获得第{0}名，奖励请查收。"
+ },
+ "sender": {
+ "key": "mail_mail_sender_21",
+ "text": "系统"
+ },
+ "reword": [],
+ "duration": 720
+ },
+ {
+ "id": "SeasonViking3Reward",
+ "title": {
+ "key": "mail_mail_title_22",
+ "text": "维京boss1排行奖励"
+ },
+ "postmark": "yj_icon_yc_mfjl",
+ "recipient": {
+ "key": "mail_mail_recipient_22",
+ "text": "亲爱的玩家："
+ },
+ "content": {
+ "key": "mail_mail_content_6",
+ "text": "获得第{0}名，奖励请查收。"
+ },
+ "sender": {
+ "key": "mail_mail_sender_22",
+ "text": "系统"
+ },
+ "reword": [],
+ "duration": 720
}
]
\ No newline at end of file
diff --git a/bin/json/game_mainachievement.json b/bin/json/game_mainachievement.json
index 061fa295a..3c53d64da 100644
--- a/bin/json/game_mainachievement.json
+++ b/bin/json/game_mainachievement.json
@@ -608,152 +608,197 @@
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_28",
- "text": "碎片28"
+ "text": "找到匹诺曹"
},
- "taskid": 11001001,
+ "taskid": 11004001,
"reword": [
{
"a": "item",
"t": "10000008",
"n": 40
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000008"
},
{
"key": 110029,
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_29",
- "text": "碎片29"
+ "text": "猫猫变身"
},
- "taskid": 11001002,
+ "taskid": 11004002,
"reword": [
{
"a": "item",
"t": "10000008",
"n": 40
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000008"
},
{
"key": 110030,
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_30",
- "text": "碎片30"
+ "text": "逃出天坑"
},
- "taskid": 11001003,
+ "taskid": 11004003,
"reword": [
{
"a": "item",
"t": "10000009",
"n": 20
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000009"
},
{
"key": 110031,
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_31",
- "text": "碎片31"
+ "text": "击败火龙"
},
- "taskid": 11001004,
+ "taskid": 11004004,
"reword": [
{
"a": "item",
"t": "10000009",
"n": 20
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000009"
},
{
"key": 110032,
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_32",
- "text": "碎片32"
+ "text": "追击果酱教授"
},
- "taskid": 11001005,
+ "taskid": 11004005,
"reword": [
{
"a": "item",
"t": "10000009",
"n": 25
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000009"
},
{
"key": 110033,
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_33",
- "text": "碎片33"
+ "text": "通关冒险难度挑战"
},
- "taskid": 11001006,
+ "taskid": 11004006,
"reword": [
{
"a": "item",
"t": "10000009",
"n": 25
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000009"
},
{
"key": 110034,
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_34",
- "text": "碎片34"
+ "text": "通关困难难度挑战"
},
- "taskid": 11001007,
+ "taskid": 11004007,
"reword": [
{
"a": "item",
"t": "10000001",
"n": 1
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000001"
},
{
"key": 110035,
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_35",
- "text": "碎片35"
+ "text": "童话购物狂"
},
- "taskid": 11001007,
+ "taskid": 11004008,
"reword": [
{
"a": "item",
"t": "10000001",
"n": 1
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000001"
},
{
"key": 110036,
"id": 11004,
"title": {
"key": "mainchapter_main_achievement_title_36",
- "text": "碎片36"
+ "text": "完成第四章所有探索"
},
- "taskid": 11001009,
+ "taskid": 11004009,
"reword": [
{
"a": "item",
"t": "10000001",
"n": 1
+ },
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 100
}
],
- "icon": "item_50013001"
+ "icon": "item_10000001"
}
]
\ No newline at end of file
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 802cf64f6..18a89b1da 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -3817,7 +3817,7 @@
"progress": 1,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 200391,
+ "frontstoryid": 200392,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -4177,7 +4177,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 200391,
+ "frontstoryid": 0,
"afterstoryid": 200391,
"maingroupName": {
"key": "mainchapter_main_stage_maingroupName_11",
@@ -8864,7 +8864,7 @@
"chapterid": 11001,
"group_id": 100161,
"previous_group_id": [
- 100101
+ 100104
],
"previoustage": 0,
"buried_type": 0,
@@ -8951,7 +8951,7 @@
"chapterid": 11001,
"group_id": 100162,
"previous_group_id": [
- 100101
+ 100104
],
"previoustage": 0,
"buried_type": 2,
@@ -9038,7 +9038,7 @@
"chapterid": 11001,
"group_id": 100163,
"previous_group_id": [
- 100101
+ 100104
],
"previoustage": 0,
"buried_type": 0,
@@ -9125,7 +9125,7 @@
"chapterid": 11001,
"group_id": 100164,
"previous_group_id": [
- 100101
+ 100104
],
"previoustage": 0,
"buried_type": 0,
@@ -26974,7 +26974,7 @@
"destroy": 1,
"progress": 1,
"timelineplayer": 0,
- "stroyshow": 0,
+ "stroyshow": 1,
"frontstoryid": 203370,
"afterstoryid": 203371,
"maingroupName": {
@@ -27314,8 +27314,8 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
- "afterstoryid": 0,
+ "frontstoryid": 304000,
+ "afterstoryid": 304010,
"maingroupName": {
"key": "",
"text": ""
@@ -27443,7 +27443,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304020,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -27524,7 +27524,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304030,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -27605,7 +27605,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304040,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -27686,7 +27686,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304050,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -27767,7 +27767,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304060,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -27848,7 +27848,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304100,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -27929,7 +27929,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304110,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28010,7 +28010,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304120,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28091,7 +28091,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304130,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28172,8 +28172,8 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
- "afterstoryid": 0,
+ "frontstoryid": 304140,
+ "afterstoryid": 304150,
"maingroupName": {
"key": "",
"text": ""
@@ -28301,7 +28301,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304160,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28382,7 +28382,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304170,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28463,8 +28463,8 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
- "afterstoryid": 0,
+ "frontstoryid": 304180,
+ "afterstoryid": 304190,
"maingroupName": {
"key": "",
"text": ""
@@ -28592,7 +28592,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304200,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28673,7 +28673,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304210,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28754,7 +28754,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304220,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28835,7 +28835,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304230,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28916,7 +28916,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304240,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -28997,7 +28997,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304250,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29078,7 +29078,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304260,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29159,7 +29159,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304270,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29240,7 +29240,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304280,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29321,7 +29321,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304290,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29402,7 +29402,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304300,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29483,7 +29483,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304310,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29564,7 +29564,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304320,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29645,7 +29645,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304330,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29726,7 +29726,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304340,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29807,7 +29807,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304350,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -29888,7 +29888,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304360,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -30017,7 +30017,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304370,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -30098,7 +30098,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304380,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@@ -30179,7 +30179,7 @@
"progress": 0,
"timelineplayer": 0,
"stroyshow": 0,
- "frontstoryid": 0,
+ "frontstoryid": 304390,
"afterstoryid": 0,
"maingroupName": {
"key": "",
diff --git a/bin/json/game_model.json b/bin/json/game_model.json
index 87fbd4875..9f70f3c24 100644
--- a/bin/json/game_model.json
+++ b/bin/json/game_model.json
@@ -5082,12 +5082,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51054_story",
- "fight": "tx_js_51054_story",
- "img": "sbkp_js_51054_story",
- "heroimg": "hbkp_js_51054_story",
- "portrait": "zm_img_51054_story",
- "bust": "bust_51054_story",
+ "ico": "tx_js_51054",
+ "fight": "tx_js_51054",
+ "img": "sbkp_js_51054",
+ "heroimg": "hbkp_js_51054",
+ "portrait": "zm_img_51054",
+ "bust": "bust_51054",
"postxyz": [
0,
0,
@@ -5117,12 +5117,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51002_story",
- "fight": "tx_js_51002_story",
- "img": "sbkp_js_51002_story",
- "heroimg": "hbkp_js_51002_story",
- "portrait": "zm_img_51002_story",
- "bust": "bust_51002_story",
+ "ico": "tx_js_51002",
+ "fight": "tx_js_51002",
+ "img": "sbkp_js_51002",
+ "heroimg": "hbkp_js_51002",
+ "portrait": "zm_img_51002",
+ "bust": "bust_51002",
"postxyz": [
0,
0,
@@ -5152,12 +5152,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51003_story",
- "fight": "tx_js_51003_story",
- "img": "sbkp_js_51003_story",
- "heroimg": "hbkp_js_51003_story",
- "portrait": "zm_img_51003_story",
- "bust": "bust_51003_story",
+ "ico": "tx_js_51003",
+ "fight": "tx_js_51003",
+ "img": "sbkp_js_51003",
+ "heroimg": "hbkp_js_51003",
+ "portrait": "zm_img_51003",
+ "bust": "bust_51003",
"postxyz": [
0,
0,
@@ -5187,12 +5187,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51004_story",
- "fight": "tx_js_51004_story",
- "img": "sbkp_js_51004_story",
- "heroimg": "hbkp_js_51004_story",
- "portrait": "zm_img_51004_story",
- "bust": "bust_51004_story",
+ "ico": "tx_js_51004",
+ "fight": "tx_js_51004",
+ "img": "sbkp_js_51004",
+ "heroimg": "hbkp_js_51004",
+ "portrait": "zm_img_51004",
+ "bust": "bust_51004",
"postxyz": [
0,
0,
@@ -5222,12 +5222,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51005_story",
- "fight": "tx_js_51005_story",
- "img": "sbkp_js_51005_story",
- "heroimg": "hbkp_js_51005_story",
- "portrait": "zm_img_51005_story",
- "bust": "bust_51005_story",
+ "ico": "tx_js_51005",
+ "fight": "tx_js_51005",
+ "img": "sbkp_js_51005",
+ "heroimg": "hbkp_js_51005",
+ "portrait": "zm_img_51005",
+ "bust": "bust_51005",
"postxyz": [
0,
0,
@@ -5257,12 +5257,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51006_story",
- "fight": "tx_js_51006_story",
- "img": "sbkp_js_51006_story",
- "heroimg": "hbkp_js_51006_story",
- "portrait": "zm_img_51006_story",
- "bust": "bust_51006_story",
+ "ico": "tx_js_51006",
+ "fight": "tx_js_51006",
+ "img": "sbkp_js_51006",
+ "heroimg": "hbkp_js_51006",
+ "portrait": "zm_img_51006",
+ "bust": "bust_51006",
"postxyz": [
0,
0,
@@ -5292,12 +5292,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51010_story",
- "fight": "tx_js_51010_story",
- "img": "sbkp_js_51010_story",
- "heroimg": "hbkp_js_51010_story",
- "portrait": "zm_img_51010_story",
- "bust": "bust_51010_story",
+ "ico": "tx_js_51010",
+ "fight": "tx_js_51010",
+ "img": "sbkp_js_51010",
+ "heroimg": "hbkp_js_51010",
+ "portrait": "zm_img_51010",
+ "bust": "bust_51010",
"postxyz": [
0,
0,
@@ -5327,12 +5327,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51011_story",
- "fight": "tx_js_51011_story",
- "img": "sbkp_js_51011_story",
- "heroimg": "hbkp_js_51011_story",
- "portrait": "zm_img_51011_story",
- "bust": "bust_51011_story",
+ "ico": "tx_js_51011",
+ "fight": "tx_js_51011",
+ "img": "sbkp_js_51011",
+ "heroimg": "hbkp_js_51011",
+ "portrait": "zm_img_51011",
+ "bust": "bust_51011",
"postxyz": [
0,
0,
@@ -5362,12 +5362,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53001_story",
- "fight": "tx_js_53001_story",
- "img": "sbkp_js_53001_story",
- "heroimg": "hbkp_js_53001_story",
- "portrait": "zm_img_53001_story",
- "bust": "bust_53001_story",
+ "ico": "tx_js_53001",
+ "fight": "tx_js_53001",
+ "img": "sbkp_js_53001",
+ "heroimg": "hbkp_js_53001",
+ "portrait": "zm_img_53001",
+ "bust": "bust_53001",
"postxyz": [
0,
0,
@@ -5397,12 +5397,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53002_story",
- "fight": "tx_js_53002_story",
- "img": "sbkp_js_53002_story",
- "heroimg": "hbkp_js_53002_story",
- "portrait": "zm_img_53002_story",
- "bust": "bust_53002_story",
+ "ico": "tx_js_53002",
+ "fight": "tx_js_53002",
+ "img": "sbkp_js_53002",
+ "heroimg": "hbkp_js_53002",
+ "portrait": "zm_img_53002",
+ "bust": "bust_53002",
"postxyz": [
0,
0,
@@ -5432,12 +5432,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53003_story",
- "fight": "tx_js_53003_story",
- "img": "sbkp_js_53003_story",
- "heroimg": "hbkp_js_53003_story",
- "portrait": "zm_img_53003_story",
- "bust": "bust_53003_story",
+ "ico": "tx_js_53003",
+ "fight": "tx_js_53003",
+ "img": "sbkp_js_53003",
+ "heroimg": "hbkp_js_53003",
+ "portrait": "zm_img_53003",
+ "bust": "bust_53003",
"postxyz": [
0,
0,
@@ -5467,12 +5467,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51012_story",
- "fight": "tx_js_51012_story",
- "img": "sbkp_js_51012_story",
- "heroimg": "hbkp_js_51012_story",
- "portrait": "zm_img_51012_story",
- "bust": "bust_51012_story",
+ "ico": "tx_js_51012",
+ "fight": "tx_js_51012",
+ "img": "sbkp_js_51012",
+ "heroimg": "hbkp_js_51012",
+ "portrait": "zm_img_51012",
+ "bust": "bust_51012",
"postxyz": [
0,
0,
@@ -5502,12 +5502,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51050_story",
- "fight": "tx_js_51050_story",
- "img": "sbkp_js_51050_story",
- "heroimg": "hbkp_js_51050_story",
- "portrait": "zm_img_51050_story",
- "bust": "bust_51050_story",
+ "ico": "tx_js_51050",
+ "fight": "tx_js_51050",
+ "img": "sbkp_js_51050",
+ "heroimg": "hbkp_js_51050",
+ "portrait": "zm_img_51050",
+ "bust": "bust_51050",
"postxyz": [
0,
0,
@@ -5537,12 +5537,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51051_story",
- "fight": "tx_js_51051_story",
- "img": "sbkp_js_51051_story",
- "heroimg": "hbkp_js_51051_story",
- "portrait": "zm_img_51051_story",
- "bust": "bust_51051_story",
+ "ico": "tx_js_51051",
+ "fight": "tx_js_51051",
+ "img": "sbkp_js_51051",
+ "heroimg": "hbkp_js_51051",
+ "portrait": "zm_img_51051",
+ "bust": "bust_51051",
"postxyz": [
0,
0,
@@ -5572,12 +5572,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51052_story",
- "fight": "tx_js_51052_story",
- "img": "sbkp_js_51052_story",
- "heroimg": "hbkp_js_51052_story",
- "portrait": "zm_img_51052_story",
- "bust": "bust_51052_story",
+ "ico": "tx_js_51052",
+ "fight": "tx_js_51052",
+ "img": "sbkp_js_51052",
+ "heroimg": "hbkp_js_51052",
+ "portrait": "zm_img_51052",
+ "bust": "bust_51052",
"postxyz": [
0,
0,
@@ -5607,12 +5607,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51053_story",
- "fight": "tx_js_51053_story",
- "img": "sbkp_js_51053_story",
- "heroimg": "hbkp_js_51053_story",
- "portrait": "zm_img_51053_story",
- "bust": "bust_51053_story",
+ "ico": "tx_js_51053",
+ "fight": "tx_js_51053",
+ "img": "sbkp_js_51053",
+ "heroimg": "hbkp_js_51053",
+ "portrait": "zm_img_51053",
+ "bust": "bust_51053",
"postxyz": [
0,
0,
@@ -5642,12 +5642,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51002_story",
- "fight": "tx_js_51002_story",
- "img": "sbkp_js_51002_story",
- "heroimg": "hbkp_js_51002_story",
- "portrait": "zm_img_51002_story",
- "bust": "bust_51002_story",
+ "ico": "tx_js_51002",
+ "fight": "tx_js_51002",
+ "img": "sbkp_js_51002",
+ "heroimg": "hbkp_js_51002",
+ "portrait": "zm_img_51002",
+ "bust": "bust_51002",
"postxyz": [
0,
0,
@@ -5677,12 +5677,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51003_story",
- "fight": "tx_js_51003_story",
- "img": "sbkp_js_51003_story",
- "heroimg": "hbkp_js_51003_story",
- "portrait": "zm_img_51003_story",
- "bust": "bust_51003_story",
+ "ico": "tx_js_51003",
+ "fight": "tx_js_51003",
+ "img": "sbkp_js_51003",
+ "heroimg": "hbkp_js_51003",
+ "portrait": "zm_img_51003",
+ "bust": "bust_51003",
"postxyz": [
0,
0,
@@ -5712,12 +5712,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51004_story",
- "fight": "tx_js_51004_story",
- "img": "sbkp_js_51004_story",
- "heroimg": "hbkp_js_51004_story",
- "portrait": "zm_img_51004_story",
- "bust": "bust_51004_story",
+ "ico": "tx_js_51004",
+ "fight": "tx_js_51004",
+ "img": "sbkp_js_51004",
+ "heroimg": "hbkp_js_51004",
+ "portrait": "zm_img_51004",
+ "bust": "bust_51004",
"postxyz": [
0,
0,
@@ -5747,12 +5747,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51005_story",
- "fight": "tx_js_51005_story",
- "img": "sbkp_js_51005_story",
- "heroimg": "hbkp_js_51005_story",
- "portrait": "zm_img_51005_story",
- "bust": "bust_51005_story",
+ "ico": "tx_js_51005",
+ "fight": "tx_js_51005",
+ "img": "sbkp_js_51005",
+ "heroimg": "hbkp_js_51005",
+ "portrait": "zm_img_51005",
+ "bust": "bust_51005",
"postxyz": [
0,
0,
@@ -5782,12 +5782,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51006_story",
- "fight": "tx_js_51006_story",
- "img": "sbkp_js_51006_story",
- "heroimg": "hbkp_js_51006_story",
- "portrait": "zm_img_51006_story",
- "bust": "bust_51006_story",
+ "ico": "tx_js_51006",
+ "fight": "tx_js_51006",
+ "img": "sbkp_js_51006",
+ "heroimg": "hbkp_js_51006",
+ "portrait": "zm_img_51006",
+ "bust": "bust_51006",
"postxyz": [
0,
0,
@@ -5817,12 +5817,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51010_story",
- "fight": "tx_js_51010_story",
- "img": "sbkp_js_51010_story",
- "heroimg": "hbkp_js_51010_story",
- "portrait": "zm_img_51010_story",
- "bust": "bust_51010_story",
+ "ico": "tx_js_51010",
+ "fight": "tx_js_51010",
+ "img": "sbkp_js_51010",
+ "heroimg": "hbkp_js_51010",
+ "portrait": "zm_img_51010",
+ "bust": "bust_51010",
"postxyz": [
0,
0,
@@ -5852,12 +5852,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51011_story",
- "fight": "tx_js_51011_story",
- "img": "sbkp_js_51011_story",
- "heroimg": "hbkp_js_51011_story",
- "portrait": "zm_img_51011_story",
- "bust": "bust_51011_story",
+ "ico": "tx_js_51011",
+ "fight": "tx_js_51011",
+ "img": "sbkp_js_51011",
+ "heroimg": "hbkp_js_51011",
+ "portrait": "zm_img_51011",
+ "bust": "bust_51011",
"postxyz": [
0,
0,
@@ -5887,12 +5887,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53001_story",
- "fight": "tx_js_53001_story",
- "img": "sbkp_js_53001_story",
- "heroimg": "hbkp_js_53001_story",
- "portrait": "zm_img_53001_story",
- "bust": "bust_53001_story",
+ "ico": "tx_js_53001",
+ "fight": "tx_js_53001",
+ "img": "sbkp_js_53001",
+ "heroimg": "hbkp_js_53001",
+ "portrait": "zm_img_53001",
+ "bust": "bust_53001",
"postxyz": [
0,
0,
@@ -5922,12 +5922,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53002_story",
- "fight": "tx_js_53002_story",
- "img": "sbkp_js_53002_story",
- "heroimg": "hbkp_js_53002_story",
- "portrait": "zm_img_53002_story",
- "bust": "bust_53002_story",
+ "ico": "tx_js_53002",
+ "fight": "tx_js_53002",
+ "img": "sbkp_js_53002",
+ "heroimg": "hbkp_js_53002",
+ "portrait": "zm_img_53002",
+ "bust": "bust_53002",
"postxyz": [
0,
0,
@@ -5957,12 +5957,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53003_story",
- "fight": "tx_js_53003_story",
- "img": "sbkp_js_53003_story",
- "heroimg": "hbkp_js_53003_story",
- "portrait": "zm_img_53003_story",
- "bust": "bust_53003_story",
+ "ico": "tx_js_53003",
+ "fight": "tx_js_53003",
+ "img": "sbkp_js_53003",
+ "heroimg": "hbkp_js_53003",
+ "portrait": "zm_img_53003",
+ "bust": "bust_53003",
"postxyz": [
0,
0,
@@ -5992,12 +5992,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51012_story",
- "fight": "tx_js_51012_story",
- "img": "sbkp_js_51012_story",
- "heroimg": "hbkp_js_51012_story",
- "portrait": "zm_img_51012_story",
- "bust": "bust_51012_story",
+ "ico": "tx_js_51012",
+ "fight": "tx_js_51012",
+ "img": "sbkp_js_51012",
+ "heroimg": "hbkp_js_51012",
+ "portrait": "zm_img_51012",
+ "bust": "bust_51012",
"postxyz": [
0,
0,
@@ -6027,12 +6027,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51050_story",
- "fight": "tx_js_51050_story",
- "img": "sbkp_js_51050_story",
- "heroimg": "hbkp_js_51050_story",
- "portrait": "zm_img_51050_story",
- "bust": "bust_51050_story",
+ "ico": "tx_js_51050",
+ "fight": "tx_js_51050",
+ "img": "sbkp_js_51050",
+ "heroimg": "hbkp_js_51050",
+ "portrait": "zm_img_51050",
+ "bust": "bust_51050",
"postxyz": [
0,
0,
@@ -6062,12 +6062,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51051_story",
- "fight": "tx_js_51051_story",
- "img": "sbkp_js_51051_story",
- "heroimg": "hbkp_js_51051_story",
- "portrait": "zm_img_51051_story",
- "bust": "bust_51051_story",
+ "ico": "tx_js_51051",
+ "fight": "tx_js_51051",
+ "img": "sbkp_js_51051",
+ "heroimg": "hbkp_js_51051",
+ "portrait": "zm_img_51051",
+ "bust": "bust_51051",
"postxyz": [
0,
0,
@@ -6097,12 +6097,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51052_story",
- "fight": "tx_js_51052_story",
- "img": "sbkp_js_51052_story",
- "heroimg": "hbkp_js_51052_story",
- "portrait": "zm_img_51052_story",
- "bust": "bust_51052_story",
+ "ico": "tx_js_51052",
+ "fight": "tx_js_51052",
+ "img": "sbkp_js_51052",
+ "heroimg": "hbkp_js_51052",
+ "portrait": "zm_img_51052",
+ "bust": "bust_51052",
"postxyz": [
0,
0,
@@ -6132,12 +6132,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51053_story",
- "fight": "tx_js_51053_story",
- "img": "sbkp_js_51053_story",
- "heroimg": "hbkp_js_51053_story",
- "portrait": "zm_img_51053_story",
- "bust": "bust_51053_story",
+ "ico": "tx_js_51053",
+ "fight": "tx_js_51053",
+ "img": "sbkp_js_51053",
+ "heroimg": "hbkp_js_51053",
+ "portrait": "zm_img_51053",
+ "bust": "bust_51053",
"postxyz": [
0,
0,
@@ -6167,12 +6167,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51002_story",
- "fight": "tx_js_51002_story",
- "img": "sbkp_js_51002_story",
- "heroimg": "hbkp_js_51002_story",
- "portrait": "zm_img_51002_story",
- "bust": "bust_51002_story",
+ "ico": "tx_js_51002",
+ "fight": "tx_js_51002",
+ "img": "sbkp_js_51002",
+ "heroimg": "hbkp_js_51002",
+ "portrait": "zm_img_51002",
+ "bust": "bust_51002",
"postxyz": [
0,
0,
@@ -6202,12 +6202,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51003_story",
- "fight": "tx_js_51003_story",
- "img": "sbkp_js_51003_story",
- "heroimg": "hbkp_js_51003_story",
- "portrait": "zm_img_51003_story",
- "bust": "bust_51003_story",
+ "ico": "tx_js_51003",
+ "fight": "tx_js_51003",
+ "img": "sbkp_js_51003",
+ "heroimg": "hbkp_js_51003",
+ "portrait": "zm_img_51003",
+ "bust": "bust_51003",
"postxyz": [
0,
0,
@@ -6237,12 +6237,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51004_story",
- "fight": "tx_js_51004_story",
- "img": "sbkp_js_51004_story",
- "heroimg": "hbkp_js_51004_story",
- "portrait": "zm_img_51004_story",
- "bust": "bust_51004_story",
+ "ico": "tx_js_51004",
+ "fight": "tx_js_51004",
+ "img": "sbkp_js_51004",
+ "heroimg": "hbkp_js_51004",
+ "portrait": "zm_img_51004",
+ "bust": "bust_51004",
"postxyz": [
0,
0,
@@ -6272,12 +6272,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51005_story",
- "fight": "tx_js_51005_story",
- "img": "sbkp_js_51005_story",
- "heroimg": "hbkp_js_51005_story",
- "portrait": "zm_img_51005_story",
- "bust": "bust_51005_story",
+ "ico": "tx_js_51005",
+ "fight": "tx_js_51005",
+ "img": "sbkp_js_51005",
+ "heroimg": "hbkp_js_51005",
+ "portrait": "zm_img_51005",
+ "bust": "bust_51005",
"postxyz": [
0,
0,
@@ -6307,12 +6307,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51006_story",
- "fight": "tx_js_51006_story",
- "img": "sbkp_js_51006_story",
- "heroimg": "hbkp_js_51006_story",
- "portrait": "zm_img_51006_story",
- "bust": "bust_51006_story",
+ "ico": "tx_js_51006",
+ "fight": "tx_js_51006",
+ "img": "sbkp_js_51006",
+ "heroimg": "hbkp_js_51006",
+ "portrait": "zm_img_51006",
+ "bust": "bust_51006",
"postxyz": [
0,
0,
@@ -6342,12 +6342,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51010_story",
- "fight": "tx_js_51010_story",
- "img": "sbkp_js_51010_story",
- "heroimg": "hbkp_js_51010_story",
- "portrait": "zm_img_51010_story",
- "bust": "bust_51010_story",
+ "ico": "tx_js_51010",
+ "fight": "tx_js_51010",
+ "img": "sbkp_js_51010",
+ "heroimg": "hbkp_js_51010",
+ "portrait": "zm_img_51010",
+ "bust": "bust_51010",
"postxyz": [
0,
0,
@@ -6377,12 +6377,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51011_story",
- "fight": "tx_js_51011_story",
- "img": "sbkp_js_51011_story",
- "heroimg": "hbkp_js_51011_story",
- "portrait": "zm_img_51011_story",
- "bust": "bust_51011_story",
+ "ico": "tx_js_51011",
+ "fight": "tx_js_51011",
+ "img": "sbkp_js_51011",
+ "heroimg": "hbkp_js_51011",
+ "portrait": "zm_img_51011",
+ "bust": "bust_51011",
"postxyz": [
0,
0,
@@ -6412,12 +6412,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53001_story",
- "fight": "tx_js_53001_story",
- "img": "sbkp_js_53001_story",
- "heroimg": "hbkp_js_53001_story",
- "portrait": "zm_img_53001_story",
- "bust": "bust_53001_story",
+ "ico": "tx_js_53001",
+ "fight": "tx_js_53001",
+ "img": "sbkp_js_53001",
+ "heroimg": "hbkp_js_53001",
+ "portrait": "zm_img_53001",
+ "bust": "bust_53001",
"postxyz": [
0,
0,
@@ -6447,12 +6447,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53002_story",
- "fight": "tx_js_53002_story",
- "img": "sbkp_js_53002_story",
- "heroimg": "hbkp_js_53002_story",
- "portrait": "zm_img_53002_story",
- "bust": "bust_53002_story",
+ "ico": "tx_js_53002",
+ "fight": "tx_js_53002",
+ "img": "sbkp_js_53002",
+ "heroimg": "hbkp_js_53002",
+ "portrait": "zm_img_53002",
+ "bust": "bust_53002",
"postxyz": [
0,
0,
@@ -6482,12 +6482,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53003_story",
- "fight": "tx_js_53003_story",
- "img": "sbkp_js_53003_story",
- "heroimg": "hbkp_js_53003_story",
- "portrait": "zm_img_53003_story",
- "bust": "bust_53003_story",
+ "ico": "tx_js_53003",
+ "fight": "tx_js_53003",
+ "img": "sbkp_js_53003",
+ "heroimg": "hbkp_js_53003",
+ "portrait": "zm_img_53003",
+ "bust": "bust_53003",
"postxyz": [
0,
0,
@@ -6517,12 +6517,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51012_story",
- "fight": "tx_js_51012_story",
- "img": "sbkp_js_51012_story",
- "heroimg": "hbkp_js_51012_story",
- "portrait": "zm_img_51012_story",
- "bust": "bust_51012_story",
+ "ico": "tx_js_51012",
+ "fight": "tx_js_51012",
+ "img": "sbkp_js_51012",
+ "heroimg": "hbkp_js_51012",
+ "portrait": "zm_img_51012",
+ "bust": "bust_51012",
"postxyz": [
0,
0,
@@ -6552,12 +6552,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51050_story",
- "fight": "tx_js_51050_story",
- "img": "sbkp_js_51050_story",
- "heroimg": "hbkp_js_51050_story",
- "portrait": "zm_img_51050_story",
- "bust": "bust_51050_story",
+ "ico": "tx_js_51050",
+ "fight": "tx_js_51050",
+ "img": "sbkp_js_51050",
+ "heroimg": "hbkp_js_51050",
+ "portrait": "zm_img_51050",
+ "bust": "bust_51050",
"postxyz": [
0,
0,
@@ -6587,12 +6587,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51051_story",
- "fight": "tx_js_51051_story",
- "img": "sbkp_js_51051_story",
- "heroimg": "hbkp_js_51051_story",
- "portrait": "zm_img_51051_story",
- "bust": "bust_51051_story",
+ "ico": "tx_js_51051",
+ "fight": "tx_js_51051",
+ "img": "sbkp_js_51051",
+ "heroimg": "hbkp_js_51051",
+ "portrait": "zm_img_51051",
+ "bust": "bust_51051",
"postxyz": [
0,
0,
@@ -6622,12 +6622,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51052_story",
- "fight": "tx_js_51052_story",
- "img": "sbkp_js_51052_story",
- "heroimg": "hbkp_js_51052_story",
- "portrait": "zm_img_51052_story",
- "bust": "bust_51052_story",
+ "ico": "tx_js_51052",
+ "fight": "tx_js_51052",
+ "img": "sbkp_js_51052",
+ "heroimg": "hbkp_js_51052",
+ "portrait": "zm_img_51052",
+ "bust": "bust_51052",
"postxyz": [
0,
0,
@@ -6657,12 +6657,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51053_story",
- "fight": "tx_js_51053_story",
- "img": "sbkp_js_51053_story",
- "heroimg": "hbkp_js_51053_story",
- "portrait": "zm_img_51053_story",
- "bust": "bust_51053_story",
+ "ico": "tx_js_51053",
+ "fight": "tx_js_51053",
+ "img": "sbkp_js_51053",
+ "heroimg": "hbkp_js_51053",
+ "portrait": "zm_img_51053",
+ "bust": "bust_51053",
"postxyz": [
0,
0,
@@ -6688,16 +6688,16 @@
"id": "51056",
"preson": "51056",
"presonshow": "51056_exhibition",
- "presonstory": "51053_story",
+ "presonstory": "51056_story",
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51053_story",
- "fight": "tx_js_51053_story",
- "img": "sbkp_js_51053_story",
- "heroimg": "hbkp_js_51053_story",
- "portrait": "zm_img_51053_story",
- "bust": "bust_51053_story",
+ "ico": "tx_js_51056",
+ "fight": "tx_js_51056",
+ "img": "sbkp_js_51056",
+ "heroimg": "hbkp_js_51056",
+ "portrait": "zm_img_51056",
+ "bust": "bust_51056",
"postxyz": [
0,
0,
@@ -6723,16 +6723,16 @@
"id": "51057",
"preson": "51057",
"presonshow": "51057_exhibition",
- "presonstory": "51053_story",
+ "presonstory": "51057_story",
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51053_story",
- "fight": "tx_js_51053_story",
- "img": "sbkp_js_51053_story",
- "heroimg": "hbkp_js_51053_story",
- "portrait": "zm_img_51053_story",
- "bust": "bust_51053_story",
+ "ico": "tx_js_51057",
+ "fight": "tx_js_51057",
+ "img": "sbkp_js_51057",
+ "heroimg": "hbkp_js_51057",
+ "portrait": "zm_img_51057",
+ "bust": "bust_51057",
"postxyz": [
0,
0,
@@ -6762,12 +6762,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54011_story",
- "fight": "tx_js_54011_story",
- "img": "sbkp_js_54011_story",
- "heroimg": "hbkp_js_54011_story",
- "portrait": "zm_img_54011_story",
- "bust": "bust_54011_story",
+ "ico": "tx_js_54011",
+ "fight": "tx_js_54011",
+ "img": "sbkp_js_54011",
+ "heroimg": "hbkp_js_54011",
+ "portrait": "zm_img_54011",
+ "bust": "bust_54011",
"postxyz": [
0,
0,
@@ -6797,12 +6797,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54012_story",
- "fight": "tx_js_54012_story",
- "img": "sbkp_js_54012_story",
- "heroimg": "hbkp_js_54012_story",
- "portrait": "zm_img_54012_story",
- "bust": "bust_54012_story",
+ "ico": "tx_js_54012",
+ "fight": "tx_js_54012",
+ "img": "sbkp_js_54012",
+ "heroimg": "hbkp_js_54012",
+ "portrait": "zm_img_54012",
+ "bust": "bust_54012",
"postxyz": [
0,
0,
@@ -6832,12 +6832,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54013_story",
- "fight": "tx_js_54013_story",
- "img": "sbkp_js_54013_story",
- "heroimg": "hbkp_js_54013_story",
- "portrait": "zm_img_54013_story",
- "bust": "bust_54013_story",
+ "ico": "tx_js_54013",
+ "fight": "tx_js_54013",
+ "img": "sbkp_js_54013",
+ "heroimg": "hbkp_js_54013",
+ "portrait": "zm_img_54013",
+ "bust": "bust_54013",
"postxyz": [
0,
0,
@@ -6867,12 +6867,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54014_story",
- "fight": "tx_js_54014_story",
- "img": "sbkp_js_54014_story",
- "heroimg": "hbkp_js_54014_story",
- "portrait": "zm_img_54014_story",
- "bust": "bust_54014_story",
+ "ico": "tx_js_54014",
+ "fight": "tx_js_54014",
+ "img": "sbkp_js_54014",
+ "heroimg": "hbkp_js_54014",
+ "portrait": "zm_img_54014",
+ "bust": "bust_54014",
"postxyz": [
0,
0,
@@ -6902,12 +6902,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54015_story",
- "fight": "tx_js_54015_story",
- "img": "sbkp_js_54015_story",
- "heroimg": "hbkp_js_54015_story",
- "portrait": "zm_img_54015_story",
- "bust": "bust_54015_story",
+ "ico": "tx_js_54015",
+ "fight": "tx_js_54015",
+ "img": "sbkp_js_54015",
+ "heroimg": "hbkp_js_54015",
+ "portrait": "zm_img_54015",
+ "bust": "bust_54015",
"postxyz": [
0,
0,
@@ -6937,12 +6937,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54016_story",
- "fight": "tx_js_54016_story",
- "img": "sbkp_js_54016_story",
- "heroimg": "hbkp_js_54016_story",
- "portrait": "zm_img_54016_story",
- "bust": "bust_54016_story",
+ "ico": "tx_js_54016",
+ "fight": "tx_js_54016",
+ "img": "sbkp_js_54016",
+ "heroimg": "hbkp_js_54016",
+ "portrait": "zm_img_54016",
+ "bust": "bust_54016",
"postxyz": [
0,
0,
@@ -6972,12 +6972,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54017_story",
- "fight": "tx_js_54017_story",
- "img": "sbkp_js_54017_story",
- "heroimg": "hbkp_js_54017_story",
- "portrait": "zm_img_54017_story",
- "bust": "bust_54017_story",
+ "ico": "tx_js_54017",
+ "fight": "tx_js_54017",
+ "img": "sbkp_js_54017",
+ "heroimg": "hbkp_js_54017",
+ "portrait": "zm_img_54017",
+ "bust": "bust_54017",
"postxyz": [
0,
0,
@@ -7007,12 +7007,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_33003_story",
- "fight": "tx_js_33003_story",
- "img": "sbkp_js_33003_story",
- "heroimg": "hbkp_js_33003_story",
- "portrait": "zm_img_33003_story",
- "bust": "bust_33003_story",
+ "ico": "tx_js_33003",
+ "fight": "tx_js_33003",
+ "img": "sbkp_js_33003",
+ "heroimg": "hbkp_js_33003",
+ "portrait": "zm_img_33003",
+ "bust": "bust_33003",
"postxyz": [
0,
0,
@@ -7042,12 +7042,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51005_story",
- "fight": "tx_js_51005_story",
- "img": "sbkp_js_51005_story",
- "heroimg": "hbkp_js_51005_story",
- "portrait": "zm_img_51005_story",
- "bust": "bust_51005_story",
+ "ico": "tx_js_51005",
+ "fight": "tx_js_51005",
+ "img": "sbkp_js_51005",
+ "heroimg": "hbkp_js_51005",
+ "portrait": "zm_img_51005",
+ "bust": "bust_51005",
"postxyz": [
0,
0,
@@ -7077,12 +7077,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_23004_story",
- "fight": "tx_js_23004_story",
- "img": "sbkp_js_23004_story",
- "heroimg": "hbkp_js_23004_story",
- "portrait": "zm_img_23004_story",
- "bust": "bust_23004_story",
+ "ico": "tx_js_23004",
+ "fight": "tx_js_23004",
+ "img": "sbkp_js_23004",
+ "heroimg": "hbkp_js_23004",
+ "portrait": "zm_img_23004",
+ "bust": "bust_23004",
"postxyz": [
0,
0,
@@ -7112,12 +7112,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_53001_story",
- "fight": "tx_js_53001_story",
- "img": "sbkp_js_53001_story",
- "heroimg": "hbkp_js_53001_story",
- "portrait": "zm_img_53001_story",
- "bust": "bust_53001_story",
+ "ico": "tx_js_53001",
+ "fight": "tx_js_53001",
+ "img": "sbkp_js_53001",
+ "heroimg": "hbkp_js_53001",
+ "portrait": "zm_img_53001",
+ "bust": "bust_53001",
"postxyz": [
0,
0,
@@ -7147,12 +7147,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_14001_story",
- "fight": "tx_js_14001_story",
- "img": "sbkp_js_14001_story",
- "heroimg": "hbkp_js_14001_story",
- "portrait": "zm_img_14001_story",
- "bust": "bust_14001_story",
+ "ico": "tx_js_14001",
+ "fight": "tx_js_14001",
+ "img": "sbkp_js_14001",
+ "heroimg": "hbkp_js_14001",
+ "portrait": "zm_img_14001",
+ "bust": "bust_14001",
"postxyz": [
0,
0,
@@ -7182,12 +7182,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_51050_story",
- "fight": "tx_js_51050_story",
- "img": "sbkp_js_51050_story",
- "heroimg": "hbkp_js_51050_story",
- "portrait": "zm_img_51050_story",
- "bust": "bust_51050_story",
+ "ico": "tx_js_51050",
+ "fight": "tx_js_51050",
+ "img": "sbkp_js_51050",
+ "heroimg": "hbkp_js_51050",
+ "portrait": "zm_img_51050",
+ "bust": "bust_51050",
"postxyz": [
0,
0,
@@ -7217,12 +7217,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54018_story",
- "fight": "tx_js_54018_story",
- "img": "sbkp_js_54018_story",
- "heroimg": "hbkp_js_54018_story",
- "portrait": "zm_img_54018_story",
- "bust": "bust_54018_story",
+ "ico": "tx_js_54018",
+ "fight": "tx_js_54018",
+ "img": "sbkp_js_54018",
+ "heroimg": "hbkp_js_54018",
+ "portrait": "zm_img_54018",
+ "bust": "bust_54018",
"postxyz": [
0,
0,
@@ -7252,12 +7252,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54019_story",
- "fight": "tx_js_54019_story",
- "img": "sbkp_js_54019_story",
- "heroimg": "hbkp_js_54019_story",
- "portrait": "zm_img_54019_story",
- "bust": "bust_54019_story",
+ "ico": "tx_js_54019",
+ "fight": "tx_js_54019",
+ "img": "sbkp_js_54019",
+ "heroimg": "hbkp_js_54019",
+ "portrait": "zm_img_54019",
+ "bust": "bust_54019",
"postxyz": [
0,
0,
@@ -7287,12 +7287,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54020_story",
- "fight": "tx_js_54020_story",
- "img": "sbkp_js_54020_story",
- "heroimg": "hbkp_js_54020_story",
- "portrait": "zm_img_54020_story",
- "bust": "bust_54020_story",
+ "ico": "tx_js_54020",
+ "fight": "tx_js_54020",
+ "img": "sbkp_js_54020",
+ "heroimg": "hbkp_js_54020",
+ "portrait": "zm_img_54020",
+ "bust": "bust_54020",
"postxyz": [
0,
0,
@@ -7322,12 +7322,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54021_story",
- "fight": "tx_js_54021_story",
- "img": "sbkp_js_54021_story",
- "heroimg": "hbkp_js_54021_story",
- "portrait": "zm_img_54021_story",
- "bust": "bust_54021_story",
+ "ico": "tx_js_54021",
+ "fight": "tx_js_54021",
+ "img": "sbkp_js_54021",
+ "heroimg": "hbkp_js_54021",
+ "portrait": "zm_img_54021",
+ "bust": "bust_54021",
"postxyz": [
0,
0,
@@ -7357,12 +7357,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54022_story",
- "fight": "tx_js_54022_story",
- "img": "sbkp_js_54022_story",
- "heroimg": "hbkp_js_54022_story",
- "portrait": "zm_img_54022_story",
- "bust": "bust_54022_story",
+ "ico": "tx_js_54022",
+ "fight": "tx_js_54022",
+ "img": "sbkp_js_54022",
+ "heroimg": "hbkp_js_54022",
+ "portrait": "zm_img_54022",
+ "bust": "bust_54022",
"postxyz": [
0,
0,
@@ -7392,12 +7392,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54023_story",
- "fight": "tx_js_54023_story",
- "img": "sbkp_js_54023_story",
- "heroimg": "hbkp_js_54023_story",
- "portrait": "zm_img_54023_story",
- "bust": "bust_54023_story",
+ "ico": "tx_js_54023",
+ "fight": "tx_js_54023",
+ "img": "sbkp_js_54023",
+ "heroimg": "hbkp_js_54023",
+ "portrait": "zm_img_54023",
+ "bust": "bust_54023",
"postxyz": [
0,
0,
@@ -7427,12 +7427,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54024_story",
- "fight": "tx_js_54024_story",
- "img": "sbkp_js_54024_story",
- "heroimg": "hbkp_js_54024_story",
- "portrait": "zm_img_54024_story",
- "bust": "bust_54024_story",
+ "ico": "tx_js_54024",
+ "fight": "tx_js_54024",
+ "img": "sbkp_js_54024",
+ "heroimg": "hbkp_js_54024",
+ "portrait": "zm_img_54024",
+ "bust": "bust_54024",
"postxyz": [
0,
0,
@@ -7462,12 +7462,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_54025_story",
- "fight": "tx_js_54025_story",
- "img": "sbkp_js_54025_story",
- "heroimg": "hbkp_js_54025_story",
- "portrait": "zm_img_54025_story",
- "bust": "bust_54025_story",
+ "ico": "tx_js_54025",
+ "fight": "tx_js_54025",
+ "img": "sbkp_js_54025",
+ "heroimg": "hbkp_js_54025",
+ "portrait": "zm_img_54025",
+ "bust": "bust_54025",
"postxyz": [
0,
0,
@@ -7497,12 +7497,12 @@
"presondraw": "",
"height": 1,
"weight": 1,
- "ico": "tx_js_83007_story",
- "fight": "tx_js_83007_story",
- "img": "sbkp_js_83007_story",
- "heroimg": "hbkp_js_83007_story",
- "portrait": "zm_img_83007_story",
- "bust": "bust_83007_story",
+ "ico": "tx_js_83007",
+ "fight": "tx_js_83007",
+ "img": "sbkp_js_83007",
+ "heroimg": "hbkp_js_83007",
+ "portrait": "zm_img_83007",
+ "bust": "bust_83007",
"postxyz": [
0,
0,
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 245e1aee0..a11670733 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -11410,7 +11410,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 23011,
+ "heroid": -1,
"star": 4,
"equip": [],
"newskill": [],
@@ -11710,7 +11710,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 23011,
+ "heroid": -1,
"star": 4,
"equip": [],
"newskill": [],
@@ -13506,7 +13506,7 @@
},
{
"Id": 104161,
- "pos": 1,
+ "pos": 4,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
@@ -13566,7 +13566,7 @@
},
{
"Id": 104161,
- "pos": 4,
+ "pos": 1,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
@@ -243343,8 +243343,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.6,
+ "atkpro": 0.8,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243363,8 +243363,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.5,
+ "atkpro": 0.75,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243383,8 +243383,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.6,
+ "atkpro": 0.7,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243403,8 +243403,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.5,
+ "atkpro": 0.65,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243423,8 +243423,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.6,
+ "atkpro": 0.6,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243443,8 +243443,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.5,
+ "atkpro": 0.55,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243463,8 +243463,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.5,
+ "atkpro": 0.5,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243483,8 +243483,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.5,
+ "atkpro": 0.5,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243503,8 +243503,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.6,
+ "atkpro": 0.5,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@@ -243523,8 +243523,8 @@
"equip": [],
"newskill": [],
"lv": 5,
- "hppro": 1,
- "atkpro": 1,
+ "hppro": 0.6,
+ "atkpro": 0.5,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
diff --git a/bin/json/game_moontask.json b/bin/json/game_moontask.json
index d496ff0f9..a1ef71852 100644
--- a/bin/json/game_moontask.json
+++ b/bin/json/game_moontask.json
@@ -10,9 +10,9 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
@@ -20,24 +20,6 @@
{
"Id": 2,
"TaskGroup": 1002,
- "TaskId": 17100201,
- "TaskReward": [
- {
- "a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 3,
- "TaskGroup": 1002,
"TaskId": 17100202,
"TaskReward": [
{
@@ -46,15 +28,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 4,
+ "Id": 3,
"TaskGroup": 1002,
"TaskId": 17100203,
"TaskReward": [
@@ -64,15 +46,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 5,
+ "Id": 4,
"TaskGroup": 1002,
"TaskId": 17100204,
"TaskReward": [
@@ -81,34 +63,16 @@
"t": "gold",
"n": 5000
},
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 6,
- "TaskGroup": 1002,
- "TaskId": 17100205,
- "TaskReward": [
{
"a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 7,
+ "Id": 5,
"TaskGroup": 1002,
"TaskId": 17100206,
"TaskReward": [
@@ -117,88 +81,16 @@
"t": "gold",
"n": 5000
},
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 8,
- "TaskGroup": 1002,
- "TaskId": 17100207,
- "TaskReward": [
{
"a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 9,
- "TaskGroup": 1002,
- "TaskId": 17100208,
- "TaskReward": [
- {
- "a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 10,
- "TaskGroup": 1002,
- "TaskId": 17100209,
- "TaskReward": [
- {
- "a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 11,
- "TaskGroup": 1002,
- "TaskId": 17100210,
- "TaskReward": [
- {
- "a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 12,
+ "Id": 6,
"TaskGroup": 1002,
"TaskId": 17100211,
"TaskReward": [
@@ -207,52 +99,16 @@
"t": "gold",
"n": 5000
},
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 13,
- "TaskGroup": 1002,
- "TaskId": 17100212,
- "TaskReward": [
{
"a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 14,
- "TaskGroup": 1002,
- "TaskId": 17100213,
- "TaskReward": [
- {
- "a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 15,
+ "Id": 7,
"TaskGroup": 1002,
"TaskId": 17100214,
"TaskReward": [
@@ -262,15 +118,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 16,
+ "Id": 8,
"TaskGroup": 1002,
"TaskId": 17100215,
"TaskReward": [
@@ -280,15 +136,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 17,
+ "Id": 9,
"TaskGroup": 1003,
"TaskId": 17100301,
"TaskReward": [
@@ -297,34 +153,16 @@
"t": "gold",
"n": 5000
},
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 18,
- "TaskGroup": 1003,
- "TaskId": 17100302,
- "TaskReward": [
{
"a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 19,
+ "Id": 10,
"TaskGroup": 1003,
"TaskId": 17100303,
"TaskReward": [
@@ -333,34 +171,16 @@
"t": "gold",
"n": 5000
},
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 20,
- "TaskGroup": 1003,
- "TaskId": 17100304,
- "TaskReward": [
{
"a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 21,
+ "Id": 11,
"TaskGroup": 1003,
"TaskId": 17100305,
"TaskReward": [
@@ -370,15 +190,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 22,
+ "Id": 12,
"TaskGroup": 1003,
"TaskId": 17100306,
"TaskReward": [
@@ -388,15 +208,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 23,
+ "Id": 13,
"TaskGroup": 1003,
"TaskId": 17100307,
"TaskReward": [
@@ -405,34 +225,16 @@
"t": "gold",
"n": 5000
},
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 24,
- "TaskGroup": 1003,
- "TaskId": 17100308,
- "TaskReward": [
{
"a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 25,
+ "Id": 14,
"TaskGroup": 1003,
"TaskId": 17100309,
"TaskReward": [
@@ -442,15 +244,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 26,
+ "Id": 15,
"TaskGroup": 1003,
"TaskId": 17100310,
"TaskReward": [
@@ -460,15 +262,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 27,
+ "Id": 16,
"TaskGroup": 1003,
"TaskId": 17100311,
"TaskReward": [
@@ -478,15 +280,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 28,
+ "Id": 17,
"TaskGroup": 1003,
"TaskId": 17100312,
"TaskReward": [
@@ -496,15 +298,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 29,
+ "Id": 18,
"TaskGroup": 1004,
"TaskId": 17100401,
"TaskReward": [
@@ -513,34 +315,16 @@
"t": "gold",
"n": 5000
},
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
- "JumpFunction": 0
- },
- {
- "Id": 30,
- "TaskGroup": 1004,
- "TaskId": 17100402,
- "TaskReward": [
{
"a": "attr",
- "t": "gold",
- "n": 5000
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 31,
+ "Id": 19,
"TaskGroup": 1004,
"TaskId": 17100403,
"TaskReward": [
@@ -550,15 +334,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 32,
+ "Id": 20,
"TaskGroup": 1004,
"TaskId": 17100404,
"TaskReward": [
@@ -568,15 +352,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 33,
+ "Id": 21,
"TaskGroup": 1004,
"TaskId": 17100405,
"TaskReward": [
@@ -586,15 +370,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 34,
+ "Id": 22,
"TaskGroup": 1004,
"TaskId": 17100406,
"TaskReward": [
@@ -604,15 +388,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 35,
+ "Id": 23,
"TaskGroup": 1004,
"TaskId": 17100407,
"TaskReward": [
@@ -622,15 +406,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 36,
+ "Id": 24,
"TaskGroup": 1005,
"TaskId": 17100501,
"TaskReward": [
@@ -640,15 +424,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 37,
+ "Id": 25,
"TaskGroup": 1005,
"TaskId": 17100502,
"TaskReward": [
@@ -658,15 +442,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 38,
+ "Id": 26,
"TaskGroup": 1005,
"TaskId": 17100503,
"TaskReward": [
@@ -676,15 +460,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 39,
+ "Id": 27,
"TaskGroup": 1005,
"TaskId": 17100504,
"TaskReward": [
@@ -694,15 +478,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 40,
+ "Id": 28,
"TaskGroup": 1005,
"TaskId": 17100505,
"TaskReward": [
@@ -712,15 +496,15 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
},
{
- "Id": 41,
+ "Id": 29,
"TaskGroup": 1005,
"TaskId": 17100506,
"TaskReward": [
@@ -730,9 +514,9 @@
"n": 5000
},
{
- "a": "item",
- "t": "10000001",
- "n": 10
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"JumpFunction": 0
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 62a5a9c7e..4c162d1d2 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -268,5 +268,113 @@
],
"functionicon": "ty_qp_sj",
"jumpId": 1003
+ },
+ {
+ "Id": 17,
+ "scene": "GameMain",
+ "scenename": {
+ "key": "navigation_Sheet1_scenename_17",
+ "text": "中轴城"
+ },
+ "sceneicon": "ty_qp_my01",
+ "functionname": {
+ "key": "navigation_Sheet1_functionname_17",
+ "text": "纸牌接龙"
+ },
+ "npcName": [
+ "功能入口-纸牌接龙"
+ ],
+ "functionicon": "icon_zm",
+ "jumpId": 10074
+ },
+ {
+ "Id": 18,
+ "scene": "GameMain",
+ "scenename": {
+ "key": "navigation_Sheet1_scenename_18",
+ "text": "中轴城"
+ },
+ "sceneicon": "ty_qp_my01",
+ "functionname": {
+ "key": "navigation_Sheet1_functionname_18",
+ "text": "捉虫"
+ },
+ "npcName": [
+ "功能入口-捉虫"
+ ],
+ "functionicon": "ty_icon_zcz",
+ "jumpId": 10075
+ },
+ {
+ "Id": 19,
+ "scene": "GameMain",
+ "scenename": {
+ "key": "navigation_Sheet1_scenename_19",
+ "text": "中轴城"
+ },
+ "sceneicon": "ty_qp_my01",
+ "functionname": {
+ "key": "navigation_Sheet1_functionname_19",
+ "text": "猜颜色"
+ },
+ "npcName": [
+ "功能入口-藏书馆"
+ ],
+ "functionicon": "icon_zm",
+ "jumpId": 10077
+ },
+ {
+ "Id": 20,
+ "scene": "GameMain",
+ "scenename": {
+ "key": "navigation_Sheet1_scenename_20",
+ "text": "中轴城"
+ },
+ "sceneicon": "ty_qp_my01",
+ "functionname": {
+ "key": "navigation_Sheet1_functionname_20",
+ "text": "捕羊大赛"
+ },
+ "npcName": [
+ "功能入口-维京远征"
+ ],
+ "functionicon": "ty_qp_by",
+ "jumpId": 10078
+ },
+ {
+ "Id": 21,
+ "scene": "GameMain",
+ "scenename": {
+ "key": "navigation_Sheet1_scenename_21",
+ "text": "中轴城"
+ },
+ "sceneicon": "ty_qp_my01",
+ "functionname": {
+ "key": "navigation_Sheet1_functionname_21",
+ "text": "石阵秘境"
+ },
+ "npcName": [
+ "功能入口-石阵秘境"
+ ],
+ "functionicon": "ty_icon_szmj",
+ "jumpId": 10079
+ },
+ {
+ "Id": 22,
+ "scene": "GameMain",
+ "scenename": {
+ "key": "navigation_Sheet1_scenename_22",
+ "text": "中轴城"
+ },
+ "sceneicon": "ty_qp_my01",
+ "functionname": {
+ "key": "navigation_Sheet1_functionname_22",
+ "text": "猴拳猴语"
+ },
+ "npcName": [
+ "功能入口-猴拳猴语"
+ ],
+ "functionicon": "icon_zm",
+ "jumpId": 10076
}
]
\ No newline at end of file
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 49df140c4..05c750f3c 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -3300,5 +3300,33 @@
"key": "opencond_opencond_kqbx_text_114",
"text": "玩法功能开启"
}
+ },
+ {
+ "id": "accessavenues",
+ "name": {
+ "key": "opencond_opencond_name_114",
+ "text": "获取途径"
+ },
+ "main": [
+ {
+ "key": 2,
+ "param": 1102023
+ }
+ ],
+ "wkqbx": 2,
+ "img": "",
+ "prompt": {
+ "key": "",
+ "text": ""
+ },
+ "uiid": 0,
+ "activateType": 0,
+ "notify": [],
+ "kqbx": 0,
+ "kqbx_ui": "",
+ "kqbx_text": {
+ "key": "opencond_opencond_kqbx_text_115",
+ "text": "获取途径功能开启"
+ }
}
]
\ No newline at end of file
diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json
index 7aa76b12f..a5711478d 100644
--- a/bin/json/game_pagoda.json
+++ b/bin/json/game_pagoda.json
@@ -5,7 +5,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -41,7 +41,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -72,7 +72,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -103,7 +103,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -134,7 +134,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -176,7 +176,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -207,7 +207,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -238,7 +238,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -269,7 +269,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -300,7 +300,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 1,
- "tabIcon": "tx_jx_13002",
+ "tabIcon": "tx_jz_13002",
"tabTitle": {
"key": "pagoda1",
"text": "精悍打手"
@@ -343,7 +343,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -374,7 +374,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -405,7 +405,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -436,7 +436,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -467,7 +467,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -509,7 +509,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -540,7 +540,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -571,7 +571,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -602,7 +602,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
"text": "巨怪导师"
@@ -633,10 +633,10 @@
"Level_type": 1,
"layer_num": 10,
"tab": 2,
- "tabIcon": "tx_jx_13001",
+ "tabIcon": "tx_jz_13001",
"tabTitle": {
"key": "pagoda2",
- "text": "训练高手"
+ "text": "巨怪导师"
},
"BattleReadyID": 10204001,
"monster_id": [
@@ -676,7 +676,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -707,7 +707,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -738,7 +738,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -769,7 +769,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -800,7 +800,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -842,7 +842,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -873,7 +873,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -904,7 +904,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -935,7 +935,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -966,7 +966,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 3,
- "tabIcon": "tx_jx_43001",
+ "tabIcon": "tx_jz_45003",
"tabTitle": {
"key": "pagoda3",
"text": "新兴武痴"
@@ -1009,7 +1009,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1040,7 +1040,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1071,7 +1071,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1102,7 +1102,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1133,7 +1133,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1175,7 +1175,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1206,7 +1206,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1237,7 +1237,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1268,7 +1268,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1299,7 +1299,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 4,
- "tabIcon": "tx_jx_24005",
+ "tabIcon": "tx_jz_24005",
"tabTitle": {
"key": "pagoda4",
"text": "顽谐武者"
@@ -1342,7 +1342,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1373,7 +1373,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1404,7 +1404,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1435,7 +1435,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1466,7 +1466,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1508,7 +1508,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1539,7 +1539,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1570,7 +1570,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1601,7 +1601,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1632,7 +1632,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 5,
- "tabIcon": "tx_jx_14005",
+ "tabIcon": "tx_jz_14005",
"tabTitle": {
"key": "pagoda5",
"text": "九天侠客"
@@ -1675,7 +1675,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1706,7 +1706,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1737,7 +1737,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1768,7 +1768,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1799,7 +1799,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1841,7 +1841,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1872,7 +1872,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1903,7 +1903,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1934,7 +1934,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -1965,7 +1965,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 6,
- "tabIcon": "tx_jx_44006",
+ "tabIcon": "tx_jz_44006",
"tabTitle": {
"key": "pagoda6",
"text": "铁掌慧心"
@@ -2008,7 +2008,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2039,7 +2039,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2070,7 +2070,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2101,7 +2101,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2132,7 +2132,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2174,7 +2174,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2205,7 +2205,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2236,7 +2236,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2267,7 +2267,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2298,7 +2298,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 7,
- "tabIcon": "tx_jx_35001",
+ "tabIcon": "tx_jz_35001",
"tabTitle": {
"key": "pagoda7",
"text": "功夫大师"
@@ -2341,7 +2341,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2372,7 +2372,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2403,7 +2403,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2434,7 +2434,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2465,7 +2465,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2507,7 +2507,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2538,7 +2538,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2569,7 +2569,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2600,7 +2600,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2631,7 +2631,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 8,
- "tabIcon": "tx_jx_44002",
+ "tabIcon": "tx_jz_44002",
"tabTitle": {
"key": "pagoda8",
"text": "逃脱专家"
@@ -2674,7 +2674,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2705,7 +2705,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2736,7 +2736,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2767,7 +2767,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2798,7 +2798,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2840,7 +2840,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2871,7 +2871,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2902,7 +2902,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2933,7 +2933,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -2964,7 +2964,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 9,
- "tabIcon": "tx_jx_35002",
+ "tabIcon": "tx_jz_35002",
"tabTitle": {
"key": "pagoda9",
"text": "驯龙高手"
@@ -3007,7 +3007,7 @@
"Level_type": 1,
"layer_num": 1,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3038,7 +3038,7 @@
"Level_type": 1,
"layer_num": 2,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3069,7 +3069,7 @@
"Level_type": 1,
"layer_num": 3,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3100,7 +3100,7 @@
"Level_type": 1,
"layer_num": 4,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3131,7 +3131,7 @@
"Level_type": 1,
"layer_num": 5,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3173,7 +3173,7 @@
"Level_type": 1,
"layer_num": 6,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3204,7 +3204,7 @@
"Level_type": 1,
"layer_num": 7,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3235,7 +3235,7 @@
"Level_type": 1,
"layer_num": 8,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3266,7 +3266,7 @@
"Level_type": 1,
"layer_num": 9,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
@@ -3297,7 +3297,7 @@
"Level_type": 1,
"layer_num": 10,
"tab": 10,
- "tabIcon": "tx_jx_45004",
+ "tabIcon": "tx_jz_45004",
"tabTitle": {
"key": "pagoda10",
"text": "独行剑客"
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index bae25b7ad..603591451 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -1,516 +1,751 @@
[
{
+ "key": 1,
"id": 10001,
"title": {
"key": "ruledesc_ruledesc_title_1",
"text": "羁绊说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_1",
"text": "这里可以查看各种羁绊并解锁羁绊提升守护者属性。"
}
},
{
+ "key": 2,
"id": 10002,
"title": {
"key": "ruledesc_ruledesc_title_2",
"text": "羁绊详细说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_2",
"text": "这里可以查看羁绊所需守护者，解锁羁绊后可以根据好感度提升羁绊等级。"
}
},
{
+ "key": 3,
"id": 10003,
"title": {
"key": "ruledesc_ruledesc_title_3",
"text": "好感度说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_3",
"text": "这里可以查看与各个守护者们的好感度。
点击守护者可以进入守护者送礼界面。"
}
},
{
+ "key": 4,
"id": 10004,
"title": {
"key": "ruledesc_ruledesc_title_4",
"text": "好感度详细说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_4",
"text": "这里可以给守护者送礼，提升与守护者的好感度。
每个守护者每日最多送礼9次，且每次赠送会随着饱腹度的增加而减少好感度的增加。
每日赠送1-3次，为100%的食物好感度。
每日赠送4-6次，为80%的食物好感度。
每日赠送7-9次，为50%的好感度。
每个守护者有喜欢的食物与讨厌的食物，赠送喜欢的食物增加的好感度为1.5倍，且对话也有所不同。"
}
},
{
+ "key": 5,
"id": 10005,
"title": {
"key": "ruledesc_ruledesc_title_5",
"text": "功夫陪练说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_5",
"text": "这里可以查看各种功夫陪练，完成陪练可以获得高额奖励。
完成4/8/12次的陪练还有额外奖励可以领取。"
}
},
{
+ "key": 6,
"id": 10006,
"title": {
"key": "ruledesc_ruledesc_title_6",
"text": "陪练详细说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_6",
"text": "这里可以选择守护者去完成陪练任务，每个陪练任务有不同的等级与阵容要求，满足额外需求还可以获得额外的道具奖励，完成任务可以获得高额奖励。"
}
},
{
+ "key": 7,
"id": 10007,
"title": {
"key": "ruledesc_ruledesc_title_7",
"text": "魔药说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_7",
"text": "目前功能删除。"
}
},
{
+ "key": 8,
"id": 10008,
"title": {
"key": "ruledesc_ruledesc_title_8",
"text": "竞技场说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_8",
"text": "这里可以与其他玩家的阵容进行对决，也可以挑战电脑阵容来获取奖励。
挑战电脑阵容难度随等级解锁，挑战需要消耗竞技场挑战券。
竞技场挑战券随时间恢复，每144分钟回复一张。
可以使用月光原石直接购买竞技场挑战券。每日购买上限最多为10张。每次购买消耗的月光原石逐级递增。
挑战玩家也需消耗竞技场挑战券，战胜玩家获得积分，在每周结算时根据积分排名来获得奖励。
积分排名逻辑：
黑铁：0—799，竞技胜利获胜奖励为竞技币10个。
青铜：800-1299，竞技胜利获胜奖励为竞技币12个。
白银：1300-1599，竞技胜利获胜奖励为竞技币14个。
黄金：1600-2199，竞技胜利获胜奖励为竞技币16个。
铂金：2200-2799，竞技胜利获胜奖励为竞技币18个。
月光原石:2800-3699,竞技胜利获胜奖励为竞技币20个。
大师：3700-4599，竞技胜利获胜奖励为竞技币22个。
王者：4600以上，竞技胜利获胜奖励为竞技币22个。
积分排名奖励具体查看排名中的奖励预览。"
}
},
{
+ "key": 9,
"id": 10009,
"title": {
"key": "ruledesc_ruledesc_title_9",
"text": "背包说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_9",
"text": "这里装着你获得的所有物品。"
}
},
{
+ "key": 10,
"id": 10010,
"title": {
"key": "ruledesc_ruledesc_title_10",
"text": "战斗说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_10",
"text": "设置中可以查看守护者技能和克制关系。"
}
},
{
+ "key": 11,
"id": 10011,
"title": {
"key": "ruledesc_ruledesc_title_11",
"text": "属性加成说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_11",
"text": "属性约束关系
当时用有利属性惊喜攻击时，额外高处15%的概率触发暴击，额外50概率触发会心。
当时用不利属性进行攻击时，额外高处50%概率触发失手。"
}
},
{
+ "key": 12,
"id": 10012,
"title": {
"key": "ruledesc_ruledesc_title_12",
"text": "公告说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_12",
"text": "这里可以查看公告。"
}
},
{
+ "key": 13,
"id": 10013,
"title": {
"key": "ruledesc_ruledesc_title_13",
"text": "冒险之旅说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_13",
"text": "这里可以挑战冒险之旅。
体验传承者在各个世界经历的传奇故事。"
}
},
{
+ "key": 14,
"id": 10014,
"title": {
"key": "ruledesc_ruledesc_title_14",
"text": "任务界面说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_14",
"text": "这里可以查看并选择任务，完成任务可获得任务奖励。"
}
},
{
+ "key": 15,
"id": 10015,
"title": {
"key": "ruledesc_ruledesc_title_15",
"text": "守护者说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_15",
"text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。
在强化界面，可以有各种方式强化守护者。
守护者等级强化：
点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。
守护者星级强化：
当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级，6星60级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星。荣耀徽章可以通过合成或分解操作，进行不同星级之间的转换。
守护者技能等级强化：
点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。技能等级提升为随机提升该守护者未满级的技能等级。
守护者觉醒：
可以在觉醒界面使用守护之心强化你的守护者。觉醒道具守护之心主要在招募重复守护者获得。
守护者回响：
可以在回响界面使用回响强化道具强化你的守护者。回响强化道具可以在猎魂与宝箱中获得。"
}
},
{
+ "key": 16,
"id": 10016,
"title": {
"key": "ruledesc_ruledesc_title_16",
"text": "守护者装备说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_16",
"text": "这里可以查看你拥有的所有装备，并且可以给守护者们装备上，一键穿戴会默认选择你最好的装备穿戴给当前守护者（已穿戴装备除外）。
点击装备可以打开装备强化界面，强化装备需要金币。每次强化到一定等级可以解锁装备副词条。
不同稀有度的装备等级上限不同，可解锁的副词条数量也不同。
强化装备有概率失败，装备强化等级越高，失败的概率也越高，失败到一定次数下次一定强化成功。"
}
},
{
+ "key": 17,
"id": 10017,
"title": {
"key": "ruledesc_ruledesc_title_17",
"text": "守护者攻略说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_17",
"text": "这里可以完成特殊的考核任务，熟悉守护者的特色机制。"
}
},
{
+ "key": 18,
"id": 10018,
"title": {
"key": "ruledesc_ruledesc_title_18",
"text": "招募概率公示"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_18",
"text": "【圣桃招募】
这里可以使用圣桃枝招募新的守护者们。
（圣桃枝可以用200月光原石购买一个）
招募概率公示：
史诗守护者获得概率：1.2%
完美守护者获得概率：10.8%
稀有守护者获得概率：88%
【限定招募】
这里可以选择自己喜欢的守护者，招募到一定次数后必出该守护者。
限定招募都有时间限制，时间结束后保底重置。
【阵营招募】
阵营招募可以使用特定的圣桃枝去招募特定阵容的守护者。
【许愿招募】
当玩家进行圣桃招募时，获得四星守护者可以获得一个圣桃。
获得五星守护者时能获得三十个圣桃。
消耗圣桃可以选择一个五星守护者固定招募出来。每个守护者需要的圣桃数量不同。"
}
},
{
+ "key": 19,
"id": 10019,
"title": {
"key": "ruledesc_ruledesc_title_19",
"text": "维京远征说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_19",
"text": "这里可以挑战泰坦们获得打造材料。
泰坦共有三种，挑战不同的泰坦都会有不同类别的装备打造材料。
挑战高难度泰坦获得的材料奖励越多。"
}
},
{
+ "key": 20,
"id": 10020,
"title": {
"key": "ruledesc_ruledesc_title_20",
"text": "猎魂说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_20",
"text": "这里可以猎魂各种敌人获得回响材料。
猎魂挑战随时间开放不同的猎魂头目，掉落的回响材料可用于阵容也会有所不同。
挑战难度越高的猎魂头目，获得的材料数量与稀有度越高。"
}
},
{
+ "key": 21,
"id": 10021,
"title": {
"key": "ruledesc_ruledesc_title_21",
"text": "俱乐部申请说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_21",
"text": "这里可以加入其他人的俱乐部。"
}
},
{
+ "key": 22,
"id": 10022,
"title": {
"key": "ruledesc_ruledesc_title_22",
"text": "俱乐部创建说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_22",
"text": "这里可以创建属于自己的俱乐部。"
}
},
{
+ "key": 23,
"id": 10023,
"title": {
"key": "ruledesc_ruledesc_title_23",
"text": "副本挑战说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_23",
"text": "这里可以打败敌人获取稀有道具，打败等级越高获取道具的稀有度越高。"
}
},
{
+ "key": 24,
"id": 10024,
"title": {
"key": "ruledesc_ruledesc_title_24",
"text": "战斗信息说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_24",
"text": "这里可以查看关卡星完成条件。
积累一定的关卡星可以获得额外的道具奖励。"
}
},
{
+ "key": 25,
"id": 10025,
"title": {
"key": "ruledesc_ruledesc_title_25",
"text": "回响说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_25",
"text": "这里可以使用回响强化道具强化你的守护者。
回响强化道具可在猎魂与宝箱中获得。"
}
},
{
+ "key": 26,
"id": 10026,
"title": {
"key": "ruledesc_ruledesc_title_26",
"text": "技能强化说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_26",
"text": "这里可以使用技能强化道具强化你的守护者的技能。"
}
},
{
+ "key": 27,
"id": 10027,
"title": {
"key": "ruledesc_ruledesc_title_27",
"text": "觉醒说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_27",
"text": "这里可以使用守护之心强化你的守护者。
觉醒道具守护之心主要为招募重复守护者获得。"
}
},
{
+ "key": 28,
"id": 10028,
"title": {
"key": "ruledesc_ruledesc_title_28",
"text": "铁匠铺锻造说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_28",
"text": "这里可以消耗锻造材料打造出各种装备。
打造增长熟练度，熟练度足够后会解锁下一级图纸。
打造越高级的图纸获得更好的装备概率越高。"
}
},
{
+ "key": 29,
"id": 10029,
"title": {
"key": "ruledesc_ruledesc_title_29",
"text": "铁匠铺火炉说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_29",
"text": "这里可以查看炉温。
炉温是打造时的消耗品，随时间自动回复，也可以使用道具回复。
提升炉温等级可以提升炉温上限与炉温恢复速度。"
}
},
{
+ "key": 30,
"id": 10030,
"title": {
"key": "ruledesc_ruledesc_title_30",
"text": "装备手册说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_30",
"text": "这里可以使用装备手册的各个技能强化锻造炉。
技能包括：
销售精英：
可以提升装备的售价。
节能环保：
可以减少打造所消耗的炉温。
推广引流：
可以提升顾客数量。
倾销货物：
可以提升顾客购买装备数量的上限。
制作大师：
打造高品质装备时满星的概率提升1%。"
}
},
{
+ "key": 31,
"id": 10031,
"title": {
"key": "ruledesc_ruledesc_title_31",
"text": "炼金塔挑战说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_31",
"text": "这里可以挑战炼金塔，每次挑战胜利都可以获得奖励，每挑战胜利10层可以获得相应教习。（炼金塔挑战不需要消耗物品）。"
}
},
{
+ "key": 32,
"id": 10032,
"title": {
"key": "ruledesc_ruledesc_title_32",
"text": "炼金塔挑战说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_32",
"text": "这里可以查看炼金塔每层挑战成功获得的奖励与敌人配置。"
}
},
{
+ "key": 33,
"id": 10033,
"title": {
"key": "ruledesc_ruledesc_title_33",
"text": "每日一练说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_33",
"text": "这里可以挑战每日一练获取特殊的战斗增益加成。"
}
},
{
+ "key": 34,
"id": 10034,
"title": {
"key": "ruledesc_ruledesc_title_34",
"text": "每日一练说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_34",
"text": "这里可以开始每日一练，可以在左下角查看每日一练动作要领。"
}
},
{
+ "key": 35,
"id": 10035,
"title": {
"key": "ruledesc_ruledesc_title_35",
"text": "武馆登记说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_35",
"text": "这里可以登记不同职业类别。
登记类别提升后，该类别的守护者可以获得额外的木桩锻炼经验加成。"
}
},
{
+ "key": 36,
"id": 10036,
"title": {
"key": "ruledesc_ruledesc_title_36",
"text": "拼图说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_36",
"text": "这里是使用左右两侧的积木，通过在木板上组合积木形状，只空出相应日期的益智游戏。
挑战日期为当月所有日期，完成可以获得奖励，每个月后重置。
每次重置前可以挑战当月的所有日期。完成后有额外奖励。"
}
},
{
+ "key": 37,
"id": 10037,
"title": {
"key": "ruledesc_ruledesc_title_37",
"text": "商队功能界面说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_37",
"text": "这里可以进入商队功能的不同界面。"
}
},
{
+ "key": 38,
"id": 10038,
"title": {
"key": "ruledesc_ruledesc_title_38",
"text": "商队大世界说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_38",
"text": "这里可以使用虚拟货币购买不同城市的货物。
在需求不同的城市中卖出来赚取更多的虚拟币，最后会根据玩家虚拟币的排名获取奖励。"
}
},
{
+ "key": 39,
"id": 10039,
"title": {
"key": "ruledesc_ruledesc_title_39",
"text": "商队购买说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_39",
"text": "这里可以在该城市购买与卖出各种货物。"
}
},
{
+ "key": 40,
"id": 10040,
"title": {
"key": "ruledesc_ruledesc_title_40",
"text": "拍照界面说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_40",
"text": "这里可以利用当前背景与人物角色，利用滤镜与各种动作拍出好看的照片。"
}
},
{
+ "key": 41,
"id": 10041,
"title": {
"key": "ruledesc_ruledesc_title_41",
"text": "星图系统说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_41",
"text": "这里可以查看四种属性的守护者们，并且使用星图币强化这一属性的全部守护者们。"
}
},
{
+ "key": 42,
"id": 10042,
"title": {
"key": "ruledesc_ruledesc_title_42",
"text": "星图系统说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_42",
"text": "这里可以可以使用星图币强化某个属性的全部守护者们。
强化属性会在战斗中生效，不会在属性中显示。
星图币在玩家升级时获得。"
}
},
{
+ "key": 43,
"id": 10100,
"title": {
"key": "ruledesc_ruledesc_title_43",
"text": "测试帮助信息"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_43",
"text": "帮忙测试这个界面是否有帮助信息。"
}
},
{
+ "key": 44,
"id": 10044,
"title": {
"key": "ruledesc_ruledesc_title_44",
"text": "传承者界面说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_44",
"text": "这里可以查看传承者游戏进度。
可以修改名称与个性签名（名称最多12字符，汉字算2字符）。
还能修改并查看自己的阵容展示。"
}
},
{
+ "key": 45,
"id": 10045,
"title": {
"key": "ruledesc_ruledesc_title_45",
"text": "烹饪说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_45",
"text": "这里可以使用食材烹饪出各种各样的食物。
食材组合的不同，烹饪出来的食物也完全不同。
添加的食物越多，能煮出好食物的概率越高。
只有正确的食材组合才能烹饪出美味佳肴。"
}
},
{
+ "key": 46,
"id": 10046,
"title": {
"key": "ruledesc_ruledesc_title_46",
"text": "月光护符说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_46",
"text": "这里可以使用传承者月光与水晶的力量，迅速提升守护者的等级。
水晶会挑选你等级最高的5位守护者为核心，在右侧上阵守护者将会把等级提升至五位最高的守护者中等级最低的那一位。
上阵守护者槽位由传承者等级解锁，每一个槽位只能上阵相应品质的守护者。
卸下守护者后槽位会进入不稳定状态，稳定槽位需要等待24小时或者200月光原石迅速稳定。"
}
},
{
+ "key": 47,
"id": 10047,
"title": {
"key": "ruledesc_ruledesc_title_47",
"text": "商店说明"
},
+ "titlecontent": {
+ "key": "",
+ "text": ""
+ },
"content": {
"key": "ruledesc_ruledesc_content_47",
"text": "金币商店
在金币商店内，可以使用金币购买所需物资。
金币商店每隔8小时刷新，也可以手动刷新，手动刷新需要消耗钻石，每天最多可以刷新8次。
等级越高，金币商店中刷出高品质装备的概率越大。
月光商店
在月光商店内，可以使用月光原石购买所需物资。
月光商店每天刷新一次，不可手动刷新。
友情专柜
在友情专柜内，可以使用友情点购买所需物资。
竞技专柜每天刷新一次，不可手动刷新。
竞技专柜
在竞技专柜内，可以使用竞技币购买所需物资。
竞技专柜每七天刷新一次，不可手动刷新。
聚乐专柜
在聚乐专柜内，可以使用月光原石购买所需物资。
聚乐专柜每七天刷新一次，不可手动刷新。
守护专柜
在守护专柜内，可以使用幸运星购买所需物资。
守护专柜每二十一天刷新一次，不可手动刷新。
冒险商店
这里面是通关冒险之旅章节后解锁的商店。
内部的商品是一次性的，通过冒险之旅获得相应的货币购买。"
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index c3154faec..6cc870044 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -13953,7 +13953,7 @@
"Argu": [
1,
1,
- 1,
+ 12,
1000
],
"FollowSK": [],
@@ -28629,7 +28629,7 @@
{
"Id": 245004312,
"EmitPR": 1000,
- "From": 3,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 1,
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 2ef2f6571..ad6f88a9b 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -57067,7 +57067,7 @@
"key": "skill_skill_atk_Name_151054111",
"text": "三连电击"
},
- "ico": "jn_51054_1",
+ "ico": "jn_53003_2",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
@@ -57100,7 +57100,7 @@
"key": "skill_skill_atk_Name_151054211",
"text": "电光笼罩"
},
- "ico": "jn_51054_2",
+ "ico": "jn_53003_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
@@ -59141,7 +59141,7 @@
"key": "skill_skill_atk_Name_151056111",
"text": "鼠眩"
},
- "ico": "",
+ "ico": "jn_24007_1",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
@@ -59174,7 +59174,7 @@
"key": "skill_skill_atk_Name_151056211",
"text": "加速鼠窜"
},
- "ico": "",
+ "ico": "jn_24007_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
@@ -59207,7 +59207,7 @@
"key": "skill_skill_atk_Name_151057111",
"text": "层层电刑"
},
- "ico": "",
+ "ico": "jn_51006_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
@@ -59240,7 +59240,7 @@
"key": "skill_skill_atk_Name_151057211",
"text": "百万伏特"
},
- "ico": "",
+ "ico": "jn_51006_3",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_3",
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 1bdbb2cbd..0a0456849 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -31,6 +31,8 @@
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -66,6 +68,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -101,6 +105,8 @@
"buffIcon": "ty_icon_buff_sdts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -136,6 +142,8 @@
"buffIcon": "ty_icon_buff_bjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -171,6 +179,8 @@
"buffIcon": "ty_icon_buff_bjdk",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -194,7 +204,8 @@
"CoexistCheckArgu": [],
"Effect": [
1,
- 6
+ 6,
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -206,6 +217,8 @@
"buffIcon": "ty_icon_buff_gjxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -229,7 +242,8 @@
"CoexistCheckArgu": [],
"Effect": [
1,
- 6
+ 6,
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -241,6 +255,8 @@
"buffIcon": "ty_icon_buff_fyxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -267,7 +283,8 @@
],
"Effect": [
1,
- 6
+ 6,
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -279,6 +296,8 @@
"buffIcon": "ty_icon_buff_sdxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -302,7 +321,8 @@
"CoexistCheckArgu": [],
"Effect": [
1,
- 6
+ 6,
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -314,6 +334,8 @@
"buffIcon": "ty_icon_buff_bjxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -337,7 +359,8 @@
"CoexistCheckArgu": [],
"Effect": [
1,
- 6
+ 6,
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -349,6 +372,8 @@
"buffIcon": "ty_icon_buff_smxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -384,6 +409,8 @@
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -419,6 +446,8 @@
"buffIcon": "ty_icon_buff_shts15",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -442,7 +471,8 @@
"CoexistCheckArgu": [],
"Effect": [
1,
- 6
+ 6,
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -454,6 +484,8 @@
"buffIcon": "ty_icon_buff_ly",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -477,7 +509,8 @@
"CoexistCheckArgu": [],
"Effect": [
1,
- 6
+ 6,
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -489,6 +522,8 @@
"buffIcon": "ty_icon_buff_sslts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -521,6 +556,8 @@
"buffIcon": "ty_icon_buff_wd",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -555,6 +592,8 @@
"buffIcon": "ty_icon_buff_dz",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -587,6 +626,8 @@
"buffIcon": "ty_icon_buff_xyun",
"buffeffect": "effect_debuff_yun",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -618,6 +659,8 @@
"buffIcon": "ty_icon_buff_bd",
"buffeffect": "effect_buff_bingdong",
"buffpos": "脚底",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -637,7 +680,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 1
+ 1,
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -649,6 +693,8 @@
"buffIcon": "ty_icon_buff_jl",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -681,6 +727,8 @@
"buffIcon": "ty_icon_buff_sh",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -702,6 +750,7 @@
"Effect": [
1,
5,
+ 12,
6
],
"AddEffect": false,
@@ -714,6 +763,8 @@
"buffIcon": "ty_icon_buff_cm",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -735,6 +786,7 @@
"Effect": [
1,
5,
+ 12,
6
],
"AddEffect": false,
@@ -747,6 +799,8 @@
"buffIcon": "ty_icon_buff_tx",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -779,6 +833,8 @@
"buffIcon": "ty_icon_buff_my",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -814,8 +870,10 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
- "buffeffect": "effect_hudun_1",
- "buffpos": "胸",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -847,6 +905,8 @@
"buffIcon": "ty_icon_buff_ts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -879,6 +939,8 @@
"buffIcon": "ty_icon_buff_bhss",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -899,7 +961,8 @@
"CoexistCheckArgu": [],
"Effect": [
1,
- 6
+ 6,
+ 12
],
"AddEffect": false,
"RemoveType": false,
@@ -911,6 +974,8 @@
"buffIcon": "ty_icon_buff_wfhdzy",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -943,6 +1008,8 @@
"buffIcon": "ty_icon_buff_mykzxg",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -977,6 +1044,8 @@
"buffIcon": "ty_icon_buff_mcsw",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1009,6 +1078,8 @@
"buffIcon": "ty_icon_buff_sm",
"buffeffect": "effect_debuff_sleep",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1041,6 +1112,8 @@
"buffIcon": "ty_icon_buff_q",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1073,6 +1146,8 @@
"buffIcon": "ty_icon_buff_j",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1105,6 +1180,8 @@
"buffIcon": "ty_icon_buff_f",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1140,8 +1217,10 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
- "buffeffect": "effect_hudun_1",
- "buffpos": "胸",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1177,8 +1256,10 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
- "buffeffect": "effect_hudun_1",
- "buffpos": "胸",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1211,6 +1292,8 @@
"buffIcon": "ty_icon_buff_wffh",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1247,7 +1330,9 @@
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
- "buffpos": "根节点",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1279,6 +1364,8 @@
"buffIcon": "ty_icon_buff_my",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1315,6 +1402,8 @@
"buffIcon": "ty_icon_buff_fs",
"buffeffect": "effect_34002_skill_1_hit_1",
"buffpos": "胸",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1347,6 +1436,8 @@
"buffIcon": "ty_icon_buff_yn",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1382,8 +1473,10 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
- "buffeffect": "effect_hudun_1",
- "buffpos": "胸",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1419,8 +1512,10 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
- "buffeffect": "effect_hudun_1",
- "buffpos": "胸",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1456,6 +1551,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1493,6 +1590,8 @@
"buffIcon": "ty_icon_buff_qzzn",
"buffeffect": "effect_14001_qiuzhangzhinu",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1525,6 +1624,8 @@
"buffIcon": "ty_icon_buff_mmws",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1560,6 +1661,8 @@
"buffIcon": "ty_icon_buff_ss",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1592,6 +1695,8 @@
"buffIcon": "ty_icon_buff_mmtl",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1624,6 +1729,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1659,6 +1766,8 @@
"buffIcon": "ty_icon_buff_xyu",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1691,6 +1800,8 @@
"buffIcon": "ty_icon_buff_xyu",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1726,6 +1837,8 @@
"buffIcon": "ty_icon_buff_xyzy",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1761,6 +1874,8 @@
"buffIcon": "ty_icon_buff_tz",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1795,6 +1910,8 @@
"buffIcon": "ty_icon_buff_myzj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1829,6 +1946,8 @@
"buffIcon": "ty_icon_buff_lj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1860,6 +1979,8 @@
"buffIcon": "ty_icon_buff_wfxd",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1894,6 +2015,8 @@
"buffIcon": "jn_buff_bbjs",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1929,6 +2052,8 @@
"buffIcon": "jn_buff_hkqz",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1962,6 +2087,8 @@
"buffIcon": "jn_buff_hkqz",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -1996,6 +2123,8 @@
"buffIcon": "ty_icon_buff_ss",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2030,6 +2159,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2064,6 +2195,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2098,6 +2231,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2132,6 +2267,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2166,6 +2303,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2200,6 +2339,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2234,6 +2375,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2268,6 +2411,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2302,6 +2447,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2336,6 +2483,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2370,6 +2519,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2404,6 +2555,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2438,6 +2591,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2472,6 +2627,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2506,6 +2663,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2540,6 +2699,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2574,6 +2735,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2608,6 +2771,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2642,6 +2807,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2676,6 +2843,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2710,6 +2879,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2744,6 +2915,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2778,6 +2951,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2812,6 +2987,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2846,6 +3023,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2880,6 +3059,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2914,6 +3095,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2941,6 +3124,7 @@
"Effect": [
1,
6,
+ 12,
10
],
"AddEffect": false,
@@ -2951,8 +3135,10 @@
"SameID": true,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_zd",
- "buffeffect": "effect_debuff_zhongdu",
- "buffpos": "Bip001",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_debuff_zhongdu",
+ "TriggerPos": "Bip001",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -2987,6 +3173,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3022,6 +3210,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3047,6 +3237,7 @@
"Effect": [
1,
6,
+ 12,
10
],
"AddEffect": false,
@@ -3059,6 +3250,8 @@
"buffIcon": "ty_icon_buff_lx",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3093,6 +3286,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3128,6 +3323,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3163,6 +3360,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3197,6 +3396,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3230,6 +3431,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3265,6 +3468,8 @@
"buffIcon": "ty_icon_buff_shts15",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3300,6 +3505,8 @@
"buffIcon": "ty_icon_buff_shts15",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3333,6 +3540,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3364,6 +3573,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3398,6 +3609,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3431,6 +3644,8 @@
"buffIcon": "ty_icon_buff_bsbs",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3464,6 +3679,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3499,6 +3716,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3532,6 +3751,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3567,8 +3788,10 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
- "buffeffect": "effect_hudun_1",
- "buffpos": "胸",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3600,6 +3823,8 @@
"buffIcon": "ty_icon_buff_fcyh",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3633,6 +3858,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3668,6 +3895,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3700,6 +3929,8 @@
"buffIcon": "ty_icon_buff_sl",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3735,6 +3966,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3769,6 +4002,8 @@
"buffIcon": "jn_buff_cs",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3802,6 +4037,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3836,6 +4073,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3867,6 +4106,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3892,7 +4133,7 @@
"Effect": [
1,
6,
- 11
+ 12
],
"AddEffect": false,
"RemoveType": true,
@@ -3904,6 +4145,8 @@
"buffIcon": "ty_icon_buff_lx",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3938,6 +4181,8 @@
"buffIcon": "ty_icon_buff_q",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -3952,7 +4197,9 @@
"text": "携带者受到伤害时，对攻击者反弹所受伤害60%的真实伤害;携带者回合开始时净化其1个减益。。"
},
"BuffType": 64,
- "EffectArgu": [],
+ "EffectArgu": [
+ 600
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -3970,6 +4217,8 @@
"buffIcon": "ty_icon_buff_mzmy",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4004,6 +4253,8 @@
"buffIcon": "ty_icon_buff_dy",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4039,8 +4290,10 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
- "buffeffect": "effect_hudun_1",
- "buffpos": "胸",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4075,6 +4328,8 @@
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4109,6 +4364,8 @@
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4143,6 +4400,8 @@
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4177,6 +4436,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4211,6 +4472,8 @@
"buffIcon": "ty_icon_buff_bjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4242,6 +4505,8 @@
"buffIcon": "ty_icon_buff_bjdk",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4264,7 +4529,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 1,
+ 3,
6
],
"AddEffect": false,
@@ -4277,6 +4542,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4299,7 +4566,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 1,
+ 3,
6
],
"AddEffect": false,
@@ -4312,6 +4579,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4346,6 +4615,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4381,6 +4652,8 @@
"buffIcon": "ty_icon_buff_zhby",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4413,6 +4686,8 @@
"buffIcon": "ty_icon_buff_wffh",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4447,6 +4722,8 @@
"buffIcon": "ty_icon_buff_shts15",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4478,6 +4755,8 @@
"buffIcon": "jn_buff_dy",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4509,6 +4788,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4543,6 +4824,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4577,6 +4860,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4611,6 +4896,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4642,6 +4929,8 @@
"buffIcon": "ty_icon_buff_xy",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4676,6 +4965,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4710,6 +5001,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4744,6 +5037,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4778,6 +5073,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4812,6 +5109,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4846,6 +5145,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4880,6 +5181,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4914,6 +5217,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4948,6 +5253,8 @@
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -4982,6 +5289,8 @@
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5016,6 +5325,8 @@
"buffIcon": "ty_icon_buff_bjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5050,6 +5361,8 @@
"buffIcon": "ty_icon_buff_bjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5084,6 +5397,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5118,6 +5433,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5152,6 +5469,8 @@
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5186,6 +5505,8 @@
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5220,6 +5541,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5253,6 +5576,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5287,6 +5612,8 @@
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5321,6 +5648,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5355,6 +5684,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5389,6 +5720,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5423,6 +5756,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5457,6 +5792,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5491,6 +5828,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5525,6 +5864,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5559,6 +5900,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5593,6 +5936,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5627,6 +5972,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5661,6 +6008,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5695,6 +6044,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5731,6 +6082,8 @@
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5767,6 +6120,8 @@
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5801,6 +6156,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5835,6 +6192,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5869,6 +6228,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5903,6 +6264,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5936,6 +6299,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -5970,6 +6335,8 @@
"buffIcon": "ty_icon_buff_sm",
"buffeffect": "effect_debuff_sleep",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6004,6 +6371,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6038,6 +6407,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6072,6 +6443,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6107,6 +6480,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6141,6 +6516,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6175,6 +6552,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6212,6 +6591,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6249,6 +6630,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6283,6 +6666,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6316,6 +6701,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6349,6 +6736,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6383,6 +6772,8 @@
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6417,6 +6808,8 @@
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6456,6 +6849,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6495,6 +6890,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6530,6 +6927,8 @@
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6568,6 +6967,8 @@
"buffIcon": "ty_icon_buff_hd",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6599,6 +7000,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6633,6 +7036,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6667,6 +7072,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6701,6 +7108,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6736,6 +7145,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6771,6 +7182,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6805,6 +7218,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6838,6 +7253,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6872,6 +7289,8 @@
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6906,6 +7325,8 @@
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6940,6 +7361,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -6974,6 +7397,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7008,6 +7433,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7042,6 +7469,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7076,6 +7505,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7110,6 +7541,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7143,6 +7576,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7177,6 +7612,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7208,6 +7645,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7242,6 +7681,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7276,6 +7717,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7307,6 +7750,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7341,6 +7786,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7375,6 +7822,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7409,6 +7858,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7440,6 +7891,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7476,6 +7929,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7512,6 +7967,8 @@
"buffIcon": "ty_icon_buff_fyts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7548,6 +8005,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7584,6 +8043,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7618,6 +8079,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7653,6 +8116,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7688,6 +8153,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7722,6 +8189,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7756,6 +8225,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7791,6 +8262,8 @@
"buffIcon": "ty_icon_buff_gjxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7826,6 +8299,8 @@
"buffIcon": "ty_icon_buff_gjxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7861,6 +8336,8 @@
"buffIcon": "ty_icon_buff_fyxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7896,6 +8373,8 @@
"buffIcon": "ty_icon_buff_fyxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7930,6 +8409,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7964,6 +8445,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -7999,6 +8482,8 @@
"buffIcon": "ty_icon_buff_sdxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8034,6 +8519,8 @@
"buffIcon": "ty_icon_buff_sdxj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8070,6 +8557,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8104,6 +8593,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8135,6 +8626,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8166,6 +8659,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8202,6 +8697,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8236,6 +8733,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8269,6 +8768,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8303,6 +8804,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8337,6 +8840,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8371,6 +8876,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8403,6 +8910,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8437,6 +8946,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8471,6 +8982,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8505,6 +9018,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8539,6 +9054,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8572,6 +9089,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8606,6 +9125,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8640,6 +9161,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8674,6 +9197,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8708,6 +9233,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8742,6 +9269,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8776,6 +9305,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8810,6 +9341,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8844,6 +9377,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8880,6 +9415,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8914,6 +9451,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8948,6 +9487,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -8982,6 +9523,8 @@
"buffIcon": "ty_icon_buff_shts15",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9017,6 +9560,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9051,6 +9596,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9085,6 +9632,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9119,6 +9668,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9153,6 +9704,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9186,6 +9739,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9220,6 +9775,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9254,6 +9811,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9289,6 +9848,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9323,6 +9884,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9357,6 +9920,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9391,6 +9956,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9425,6 +9992,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9459,6 +10028,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9493,6 +10064,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9527,6 +10100,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9561,6 +10136,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9595,6 +10172,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9629,6 +10208,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9664,6 +10245,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9699,6 +10282,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9734,6 +10319,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9769,6 +10356,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9803,6 +10392,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9837,6 +10428,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9871,6 +10464,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9905,6 +10500,8 @@
"buffIcon": "ty_icon_buff_shts10",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9939,6 +10536,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -9974,6 +10573,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10009,6 +10610,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10043,6 +10646,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10077,6 +10682,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10111,6 +10718,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10145,6 +10754,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10179,6 +10790,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10214,6 +10827,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10247,6 +10862,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10278,6 +10895,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10313,6 +10932,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10347,6 +10968,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10383,6 +11006,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10417,6 +11042,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10448,6 +11075,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10482,6 +11111,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10518,6 +11149,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10553,6 +11186,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10586,6 +11221,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10620,6 +11257,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10654,6 +11293,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10688,6 +11329,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10722,6 +11365,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10756,6 +11401,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10790,6 +11437,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10824,6 +11473,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10858,6 +11509,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10892,6 +11545,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10926,6 +11581,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10963,6 +11620,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -10997,6 +11656,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11031,6 +11692,8 @@
"buffIcon": "ty_icon_buff_wjzj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11071,6 +11734,8 @@
"buffIcon": "ty_icon_buff_wjzh",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11109,6 +11774,8 @@
"buffIcon": "ty_icon_buff_bj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11144,6 +11811,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11175,6 +11844,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11209,6 +11880,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11243,6 +11916,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11278,6 +11953,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11313,6 +11990,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11349,6 +12028,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11384,6 +12065,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11417,6 +12100,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11450,6 +12135,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11485,6 +12172,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11519,6 +12208,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11550,6 +12241,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11581,6 +12274,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11616,6 +12311,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11647,6 +12344,8 @@
"buffIcon": "ty_icon_buff_jg",
"buffeffect": "effect_buff_jingu",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11678,6 +12377,8 @@
"buffIcon": "ty_icon_buff_kh",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11712,6 +12413,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11746,6 +12449,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11778,6 +12483,8 @@
"buffIcon": "ty_icon_buff_ds",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11812,6 +12519,8 @@
"buffIcon": "ty_icon_buff_gd",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11844,6 +12553,8 @@
"buffIcon": "ty_icon_buff_dj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11875,6 +12586,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11906,6 +12619,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11937,6 +12652,8 @@
"buffIcon": "ty_icon_buff_myzj",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -11971,6 +12688,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12005,6 +12724,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12037,6 +12758,8 @@
"buffIcon": "ty_icon_buff_slzx",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12070,6 +12793,8 @@
"buffIcon": "ty_icon_buff_ygsh",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12102,6 +12827,8 @@
"buffIcon": "ty_icon_buff_jd",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12134,6 +12861,8 @@
"buffIcon": "ty_icon_buff_lrhez",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12166,6 +12895,8 @@
"buffIcon": "ty_icon_buff_slxt",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12200,8 +12931,10 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_hd",
- "buffeffect": "effect_hudun_1",
- "buffpos": "胸",
+ "buffeffect": "",
+ "buffpos": "",
+ "TriggerEffect": "effect_hudun_1",
+ "TriggerPos": "胸",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12233,6 +12966,8 @@
"buffIcon": "ty_icon_buff_zc",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12267,6 +13002,8 @@
"buffIcon": "ty_icon_buff_xm",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12301,6 +13038,8 @@
"buffIcon": "ty_icon_buff_zs",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12337,6 +13076,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12371,6 +13112,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12405,6 +13148,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12440,6 +13185,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12473,6 +13220,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12508,6 +13257,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12542,6 +13293,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12576,6 +13329,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12611,6 +13366,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12646,6 +13403,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12681,6 +13440,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12716,6 +13477,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12751,6 +13514,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12786,6 +13551,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12821,6 +13588,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12852,6 +13621,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12886,6 +13657,8 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@@ -12918,6 +13691,8 @@
"buffIcon": "ty_icon_buff_gjts",
"buffeffect": "",
"buffpos": "根节点",
+ "TriggerEffect": "",
+ "TriggerPos": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
}
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 00726cd6e..19bed25e7 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -2014,8 +2014,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 45003,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2077,8 +2077,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 34004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2140,8 +2140,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 34004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2203,8 +2203,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 13002,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2266,8 +2266,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 45003,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2329,8 +2329,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 45003,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2392,8 +2392,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 34004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2455,8 +2455,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 34004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2518,8 +2518,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 34004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2581,8 +2581,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 45003,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2645,7 +2645,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 45003,
"lock_add": 0,
"finish": [
2,
@@ -2677,22 +2677,22 @@
{
"a": "item",
"t": "15000101",
- "n": 4
+ "n": 15
},
{
"a": "item",
"t": "15000102",
- "n": 4
+ "n": 15
},
{
"a": "item",
"t": "15000103",
- "n": 4
+ "n": 15
},
{
"a": "item",
"t": "15000104",
- "n": 4
+ "n": 15
}
],
"module": []
@@ -2728,7 +2728,7 @@
],
"deliver_npc": 0,
"taskend_removeitem": [],
- "auto_accept": 1,
+ "auto_accept": 0,
"tasktips": 0,
"deliver_task": 0,
"deliver_task_npc": 0,
@@ -3052,7 +3052,7 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_54",
- "text": "堡垒风波"
+ "text": "监狱风波"
},
"task_details": {
"key": "worldtask_world_task_task_details_54",
@@ -3072,7 +3072,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
- "deliver_task": 2,
+ "deliver_task": 0,
"deliver_task_npc": 0,
"lock_add": 0,
"finish": [],
@@ -3135,8 +3135,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 24004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3198,8 +3198,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 24001,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3261,8 +3261,8 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
- "deliver_task": 2,
- "deliver_task_npc": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 24004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3325,7 +3325,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 43002,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3367,15 +3367,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_59",
- "text": "加入窝点"
+ "text": "小憩时光"
},
"task_details": {
"key": "worldtask_world_task_task_details_59",
- "text": "在坏蛋狼的倾情演说与介绍下，我觉得我应该也需要一个俱乐部，想必能认识很多志同道合的朋友。"
+ "text": "完成了护送月光原石的任务，沃尔夫等人迎来了难得的休息。据说他们创立了一个叫俱乐部的地方，快去找沃尔夫询问下详情吧！"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_59",
- "text": "找坏蛋狼聊聊"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3409,15 +3409,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_60",
- "text": "快速接龙"
+ "text": "扑克对决！"
},
"task_details": {
"key": "worldtask_world_task_task_details_60",
- "text": "一个有趣的小游戏，我就喜欢玩游戏，让我们一决胜负吧。"
+ "text": "俱乐部真是一个结交朋友的好地方！沃尔夫他们正在进行一个叫“扑克对决”的游戏，似乎很有趣的样子！"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_60",
- "text": "找坏蛋狼聊聊"
+ "text": "去公会看看"
},
"get_item": [],
"trigger": 0,
@@ -3451,22 +3451,20 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_61",
- "text": "通缉果酱教授"
+ "text": "果酱教授的下落"
},
"task_details": {
"key": "worldtask_world_task_task_details_61",
- "text": "瓦希尔指挥官发现可疑人员混入功夫塔，难道是被通缉的果酱教授？"
+ "text": "骇客蛛传来消息，他发现了果酱教授的下落，赶紧前往指挥部询问详情吧！"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_61",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
"npc": 10370,
- "completetask": [
- 12070450
- ],
+ "completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
@@ -3517,15 +3515,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_62",
- "text": "通关冒险之旅【4-1】"
+ "text": "前往童话王国"
},
"task_details": {
"key": "worldtask_world_task_task_details_62",
- "text": "通关冒险之旅【4-1】"
+ "text": "果酱教授实在是欺人太甚！竟明目张胆的想要在黑市拍卖能量魔方！听说黑市就在童话王国，我们一定要赶在拍卖会前阻止他！"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_62",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3536,9 +3534,9 @@
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 2,
- "tasktips": 0,
+ "tasktips": 1,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 43002,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3559,15 +3557,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_63",
- "text": "通关冒险之旅【4-2】"
+ "text": "靴猫剑客"
},
"task_details": {
"key": "worldtask_world_task_task_details_63",
- "text": "通关冒险之旅【4-2】"
+ "text": "没想到刚到童话王国就遭到埋伏，好在我们拳头硬。一番沟通后，名叫“穿靴猫”的剑客答应带我们前往毒苹果酒吧。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_63",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3580,7 +3578,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 45004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3601,15 +3599,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_64",
- "text": "通关冒险之旅【4-3】"
+ "text": "黑市的线索"
},
"task_details": {
"key": "worldtask_world_task_task_details_64",
- "text": "通关冒险之旅【4-3】"
+ "text": "据说这个地方是童话王国反派的聚集地，可以买到一切你想要的。不知能不能顺利获得黑市的线索……"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_64",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3622,7 +3620,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 45004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3643,15 +3641,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_65",
- "text": "通关冒险之旅【4-4】"
+ "text": "勇闯迷雾森林"
},
"task_details": {
"key": "worldtask_world_task_task_details_65",
- "text": "通关冒险之旅【4-4】"
+ "text": "前往匹诺曹住所时，意外闯入一片迷雾森林中。穿靴猫！邦尼兔！你们在哪？"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_65",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3664,7 +3662,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 44003,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3685,15 +3683,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_66",
- "text": "通关冒险之旅【4-5】"
+ "text": "匹诺曹的委托"
},
"task_details": {
"key": "worldtask_world_task_task_details_66",
- "text": "通关冒险之旅【4-5】"
+ "text": "匹诺曹答应为我们提供邀请函，但需要帮助他救出他的好朋友——姜饼人。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_66",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3706,7 +3704,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 44003,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3727,15 +3725,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_67",
- "text": "通关冒险之旅【4-6】"
+ "text": "残忍的法夸德勋爵"
},
"task_details": {
"key": "worldtask_world_task_task_details_67",
- "text": "通关冒险之旅【4-6】"
+ "text": "法夸德勋爵大肆通缉、抓捕童话人物，这到底是为什么？"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_67",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3748,7 +3746,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 13004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3769,15 +3767,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_68",
- "text": "通关冒险之旅【4-7】"
+ "text": "智取邀请函"
},
"task_details": {
"key": "worldtask_world_task_task_details_68",
- "text": "通关冒险之旅【4-7】"
+ "text": "最后一张邀请函在法夸德勋爵的手里，得想办法将它夺过来。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_68",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3790,7 +3788,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 13004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3811,15 +3809,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_69",
- "text": "通关冒险之旅【4-8】"
+ "text": "前往黑市"
},
"task_details": {
"key": "worldtask_world_task_task_details_69",
- "text": "通关冒险之旅【4-8】"
+ "text": "经过一番乔装打扮后，终于可以在邀请函的指引下朝黑市前去。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_69",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3832,7 +3830,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 13004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3853,15 +3851,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_70",
- "text": "通关冒险之旅【4-9】"
+ "text": "身份暴露"
},
"task_details": {
"key": "worldtask_world_task_task_details_70",
- "text": "通关冒险之旅【4-9】"
+ "text": "没想到真正的法夸德勋爵来了，身份暴露，只能靠武力突围了！"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_70",
- "text": "去找骇客蛛"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
@@ -3874,7 +3872,7 @@
"auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 13004,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3887,36 +3885,36 @@
"opencond": "",
"lock": 1,
"lockend": 999,
- "ontxe": 20370,
- "id_after": 20450,
- "group": 50,
+ "ontxe": 20379,
+ "id_after": 20441,
+ "group": 40,
"exgroup": 210,
"des": 2,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_71",
- "text": "通关冒险之旅【4-10】"
+ "text": "果酱教授的阴谋"
},
"task_details": {
"key": "worldtask_world_task_task_details_71",
- "text": "通关冒险之旅【4-10】"
+ "text": "这一切都是果酱教授的阴谋？！一定不能让这只豚鼠得逞。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_71",
- "text": "击退恐惧灵"
+ "text": "和骇客蛛聊聊"
},
"get_item": [],
"trigger": 0,
- "npc": 10440,
+ "npc": 10370,
"completetask": [
12070460
],
- "deliver_npc": 10448,
+ "deliver_npc": 0,
"taskend_removeitem": [],
- "auto_accept": 0,
+ "auto_accept": 2,
"tasktips": 0,
"deliver_task": 0,
- "deliver_task_npc": 0,
+ "deliver_task_npc": 43002,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3945,6 +3943,174 @@
],
"module": []
},
+ {
+ "key": 20441,
+ "opencond": "",
+ "lock": 1,
+ "lockend": 999,
+ "ontxe": 20440,
+ "id_after": 20442,
+ "group": 40,
+ "exgroup": 210,
+ "des": 2,
+ "icon": "25001",
+ "task_name": {
+ "key": "worldtask_world_task_task_name_72",
+ "text": "受困天坑监狱"
+ },
+ "task_details": {
+ "key": "worldtask_world_task_task_details_72",
+ "text": "天坑监狱极其寒冷，在这里遇到了一只神秘的企鹅似乎大有来头？可我们要怎么才能出去呢？"
+ },
+ "npctxt": {
+ "key": "worldtask_world_task_npctxt_72",
+ "text": "和骇客蛛聊聊"
+ },
+ "get_item": [],
+ "trigger": 0,
+ "npc": 10370,
+ "completetask": [
+ 12070461
+ ],
+ "deliver_npc": 0,
+ "taskend_removeitem": [],
+ "auto_accept": 2,
+ "tasktips": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 15002,
+ "lock_add": 0,
+ "finish": [],
+ "finishparameter": "",
+ "fnishipoint": [],
+ "reword": [],
+ "module": []
+ },
+ {
+ "key": 20442,
+ "opencond": "",
+ "lock": 1,
+ "lockend": 999,
+ "ontxe": 20441,
+ "id_after": 20443,
+ "group": 40,
+ "exgroup": 210,
+ "des": 2,
+ "icon": "25001",
+ "task_name": {
+ "key": "worldtask_world_task_task_name_73",
+ "text": "拍卖会风波"
+ },
+ "task_details": {
+ "key": "worldtask_world_task_task_details_73",
+ "text": "在匹诺曹和姜饼人的帮助下，成功逃离了天坑监狱，拍卖会即将开始，一定要阻止果酱教授夺回能量魔方！"
+ },
+ "npctxt": {
+ "key": "worldtask_world_task_npctxt_73",
+ "text": "和骇客蛛聊聊"
+ },
+ "get_item": [],
+ "trigger": 0,
+ "npc": 10370,
+ "completetask": [
+ 12070462
+ ],
+ "deliver_npc": 0,
+ "taskend_removeitem": [],
+ "auto_accept": 2,
+ "tasktips": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 44003,
+ "lock_add": 0,
+ "finish": [],
+ "finishparameter": "",
+ "fnishipoint": [],
+ "reword": [],
+ "module": []
+ },
+ {
+ "key": 20443,
+ "opencond": "",
+ "lock": 1,
+ "lockend": 999,
+ "ontxe": 20442,
+ "id_after": 20444,
+ "group": 40,
+ "exgroup": 210,
+ "des": 2,
+ "icon": "25001",
+ "task_name": {
+ "key": "worldtask_world_task_task_name_74",
+ "text": "火龙来袭"
+ },
+ "task_details": {
+ "key": "worldtask_world_task_task_details_74",
+ "text": "这种庞然大物真的应该出现在这个地方吗？不管怎么说，得先打倒它！"
+ },
+ "npctxt": {
+ "key": "worldtask_world_task_npctxt_74",
+ "text": "和骇客蛛聊聊"
+ },
+ "get_item": [],
+ "trigger": 0,
+ "npc": 10370,
+ "completetask": [
+ 12070463
+ ],
+ "deliver_npc": 0,
+ "taskend_removeitem": [],
+ "auto_accept": 2,
+ "tasktips": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 44003,
+ "lock_add": 0,
+ "finish": [],
+ "finishparameter": "",
+ "fnishipoint": [],
+ "reword": [],
+ "module": []
+ },
+ {
+ "key": 20444,
+ "opencond": "",
+ "lock": 1,
+ "lockend": 999,
+ "ontxe": 20443,
+ "id_after": 20450,
+ "group": 40,
+ "exgroup": 210,
+ "des": 2,
+ "icon": "25001",
+ "task_name": {
+ "key": "worldtask_world_task_task_name_75",
+ "text": "追击！逃亡！"
+ },
+ "task_details": {
+ "key": "worldtask_world_task_task_details_75",
+ "text": "果酱教授想跑？门都没有！"
+ },
+ "npctxt": {
+ "key": "worldtask_world_task_npctxt_75",
+ "text": "和骇客蛛聊聊"
+ },
+ "get_item": [],
+ "trigger": 0,
+ "npc": 10370,
+ "completetask": [
+ 12070464
+ ],
+ "deliver_npc": 0,
+ "taskend_removeitem": [],
+ "auto_accept": 2,
+ "tasktips": 0,
+ "deliver_task": 0,
+ "deliver_task_npc": 43002,
+ "lock_add": 0,
+ "finish": [],
+ "finishparameter": "",
+ "fnishipoint": [],
+ "reword": [],
+ "module": []
+ },
{
"key": 20450,
"opencond": "",
@@ -3957,15 +4123,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_72",
+ "key": "worldtask_world_task_task_name_77",
"text": "冰霜泰坦难度1"
},
"task_details": {
- "key": "worldtask_world_task_task_details_72",
+ "key": "worldtask_world_task_task_details_77",
"text": "冰霜泰坦难度1"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_72",
+ "key": "worldtask_world_task_npctxt_77",
"text": "冰霜泰坦难度1"
},
"get_item": [],
@@ -4015,15 +4181,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_73",
+ "key": "worldtask_world_task_task_name_78",
"text": "剧情"
},
"task_details": {
- "key": "worldtask_world_task_task_details_73",
+ "key": "worldtask_world_task_task_details_78",
"text": "剧情"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_73",
+ "key": "worldtask_world_task_npctxt_78",
"text": "剧情"
},
"get_item": [],
@@ -4076,15 +4242,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_74",
+ "key": "worldtask_world_task_task_name_79",
"text": "6件装备+6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_74",
+ "key": "worldtask_world_task_task_details_79",
"text": "6件装备+6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_74",
+ "key": "worldtask_world_task_npctxt_79",
"text": "6件装备+6"
},
"get_item": [],
@@ -4134,15 +4300,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_75",
+ "key": "worldtask_world_task_task_name_80",
"text": "冒险5-4通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_75",
+ "key": "worldtask_world_task_task_details_80",
"text": "冒险5-4通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_75",
+ "key": "worldtask_world_task_npctxt_80",
"text": "冒险5-4通关"
},
"get_item": [],
@@ -4197,15 +4363,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_76",
+ "key": "worldtask_world_task_task_name_81",
"text": "冰霜泰坦难度2"
},
"task_details": {
- "key": "worldtask_world_task_task_details_76",
+ "key": "worldtask_world_task_task_details_81",
"text": "冰霜泰坦难度2"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_76",
+ "key": "worldtask_world_task_npctxt_81",
"text": "冰霜泰坦难度2"
},
"get_item": [],
@@ -4255,15 +4421,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_77",
+ "key": "worldtask_world_task_task_name_82",
"text": "冒险5-8通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_77",
+ "key": "worldtask_world_task_task_details_82",
"text": "冒险5-8通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_77",
+ "key": "worldtask_world_task_npctxt_82",
"text": "冒险5-8通关"
},
"get_item": [],
@@ -4318,15 +4484,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_78",
+ "key": "worldtask_world_task_task_name_83",
"text": "剧情"
},
"task_details": {
- "key": "worldtask_world_task_task_details_78",
+ "key": "worldtask_world_task_task_details_83",
"text": "剧情"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_78",
+ "key": "worldtask_world_task_npctxt_83",
"text": "剧情"
},
"get_item": [],
@@ -4374,15 +4540,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_79",
+ "key": "worldtask_world_task_task_name_84",
"text": "剧情"
},
"task_details": {
- "key": "worldtask_world_task_task_details_79",
+ "key": "worldtask_world_task_task_details_84",
"text": "剧情"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_79",
+ "key": "worldtask_world_task_npctxt_84",
"text": "剧情"
},
"get_item": [],
@@ -4435,15 +4601,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_80",
+ "key": "worldtask_world_task_task_name_85",
"text": "炼金塔5层"
},
"task_details": {
- "key": "worldtask_world_task_task_details_80",
+ "key": "worldtask_world_task_task_details_85",
"text": "炼金塔5层"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_80",
+ "key": "worldtask_world_task_npctxt_85",
"text": "炼金塔5层"
},
"get_item": [],
@@ -4493,15 +4659,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_81",
+ "key": "worldtask_world_task_task_name_86",
"text": "击退恐惧灵"
},
"task_details": {
- "key": "worldtask_world_task_task_details_81",
+ "key": "worldtask_world_task_task_details_86",
"text": "击退恐惧灵"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_81",
+ "key": "worldtask_world_task_npctxt_86",
"text": "击退恐惧灵"
},
"get_item": [],
@@ -4556,15 +4722,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_82",
+ "key": "worldtask_world_task_task_name_87",
"text": "击退恐惧灵"
},
"task_details": {
- "key": "worldtask_world_task_task_details_82",
+ "key": "worldtask_world_task_task_details_87",
"text": "击退恐惧灵"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_82",
+ "key": "worldtask_world_task_npctxt_87",
"text": "击退恐惧灵"
},
"get_item": [],
@@ -4614,15 +4780,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_83",
+ "key": "worldtask_world_task_task_name_88",
"text": "击退恐惧灵"
},
"task_details": {
- "key": "worldtask_world_task_task_details_83",
+ "key": "worldtask_world_task_task_details_88",
"text": "击退恐惧灵"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_83",
+ "key": "worldtask_world_task_npctxt_88",
"text": "击退恐惧灵"
},
"get_item": [],
@@ -4677,15 +4843,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_84",
+ "key": "worldtask_world_task_task_name_89",
"text": "森林泰坦难度1"
},
"task_details": {
- "key": "worldtask_world_task_task_details_84",
+ "key": "worldtask_world_task_task_details_89",
"text": "森林泰坦难度1"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_84",
+ "key": "worldtask_world_task_npctxt_89",
"text": "森林泰坦难度1"
},
"get_item": [],
@@ -4735,15 +4901,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_85",
+ "key": "worldtask_world_task_task_name_90",
"text": "主角星座觉醒3次"
},
"task_details": {
- "key": "worldtask_world_task_task_details_85",
+ "key": "worldtask_world_task_task_details_90",
"text": "主角星座觉醒3次"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_85",
+ "key": "worldtask_world_task_npctxt_90",
"text": "主角星座觉醒3次"
},
"get_item": [],
@@ -4798,15 +4964,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_86",
+ "key": "worldtask_world_task_task_name_91",
"text": "9件装备强化+6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_86",
+ "key": "worldtask_world_task_task_details_91",
"text": "9件装备强化+6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_86",
+ "key": "worldtask_world_task_npctxt_91",
"text": "9件装备强化+6"
},
"get_item": [],
@@ -4856,15 +5022,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_87",
+ "key": "worldtask_world_task_task_name_92",
"text": "击退恐惧灵"
},
"task_details": {
- "key": "worldtask_world_task_task_details_87",
+ "key": "worldtask_world_task_task_details_92",
"text": "击退恐惧灵"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_87",
+ "key": "worldtask_world_task_npctxt_92",
"text": "击退恐惧灵"
},
"get_item": [],
@@ -4919,15 +5085,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_88",
+ "key": "worldtask_world_task_task_name_93",
"text": "击退恐惧灵"
},
"task_details": {
- "key": "worldtask_world_task_task_details_88",
+ "key": "worldtask_world_task_task_details_93",
"text": "击退恐惧灵"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_88",
+ "key": "worldtask_world_task_npctxt_93",
"text": "击退恐惧灵"
},
"get_item": [],
@@ -4977,15 +5143,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_89",
+ "key": "worldtask_world_task_task_name_94",
"text": "剧情"
},
"task_details": {
- "key": "worldtask_world_task_task_details_89",
+ "key": "worldtask_world_task_task_details_94",
"text": "剧情"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_89",
+ "key": "worldtask_world_task_npctxt_94",
"text": "剧情"
},
"get_item": [],
@@ -5038,15 +5204,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_90",
+ "key": "worldtask_world_task_task_name_95",
"text": "冒险6-8通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_90",
+ "key": "worldtask_world_task_task_details_95",
"text": "冒险6-8通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_90",
+ "key": "worldtask_world_task_npctxt_95",
"text": "冒险6-8通关"
},
"get_item": [],
@@ -5096,15 +5262,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_91",
+ "key": "worldtask_world_task_task_name_96",
"text": "森林泰坦难度2"
},
"task_details": {
- "key": "worldtask_world_task_task_details_91",
+ "key": "worldtask_world_task_task_details_96",
"text": "森林泰坦难度2"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_91",
+ "key": "worldtask_world_task_npctxt_96",
"text": "森林泰坦难度2"
},
"get_item": [],
@@ -5159,15 +5325,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_92",
+ "key": "worldtask_world_task_task_name_97",
"text": "12件装备强化+6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_92",
+ "key": "worldtask_world_task_task_details_97",
"text": "12件装备强化+6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_92",
+ "key": "worldtask_world_task_npctxt_97",
"text": "12件装备强化+6"
},
"get_item": [],
@@ -5217,15 +5383,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_93",
+ "key": "worldtask_world_task_task_name_98",
"text": "武馆木桩解锁3根"
},
"task_details": {
- "key": "worldtask_world_task_task_details_93",
+ "key": "worldtask_world_task_task_details_98",
"text": "武馆木桩解锁3根"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_93",
+ "key": "worldtask_world_task_npctxt_98",
"text": "武馆木桩解锁3根"
},
"get_item": [],
@@ -5280,15 +5446,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_94",
+ "key": "worldtask_world_task_task_name_99",
"text": "炼金塔10层"
},
"task_details": {
- "key": "worldtask_world_task_task_details_94",
+ "key": "worldtask_world_task_task_details_99",
"text": "炼金塔10层"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_94",
+ "key": "worldtask_world_task_npctxt_99",
"text": "炼金塔10层"
},
"get_item": [],
@@ -5338,15 +5504,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_95",
+ "key": "worldtask_world_task_task_name_100",
"text": "冒险7-8通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_95",
+ "key": "worldtask_world_task_task_details_100",
"text": "冒险7-8通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_95",
+ "key": "worldtask_world_task_npctxt_100",
"text": "冒险7-8通关"
},
"get_item": [],
@@ -5401,15 +5567,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_96",
+ "key": "worldtask_world_task_task_name_101",
"text": "击退恐惧灵"
},
"task_details": {
- "key": "worldtask_world_task_task_details_96",
+ "key": "worldtask_world_task_task_details_101",
"text": "击退恐惧灵"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_96",
+ "key": "worldtask_world_task_npctxt_101",
"text": "击退恐惧灵"
},
"get_item": [],
@@ -5459,15 +5625,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_97",
+ "key": "worldtask_world_task_task_name_102",
"text": "击退恐惧灵"
},
"task_details": {
- "key": "worldtask_world_task_task_details_97",
+ "key": "worldtask_world_task_task_details_102",
"text": "击退恐惧灵"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_97",
+ "key": "worldtask_world_task_npctxt_102",
"text": "击退恐惧灵"
},
"get_item": [],
@@ -5522,15 +5688,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_98",
+ "key": "worldtask_world_task_task_name_103",
"text": "穿+6的无极神功套装"
},
"task_details": {
- "key": "worldtask_world_task_task_details_98",
+ "key": "worldtask_world_task_task_details_103",
"text": "穿+6的无极神功套装"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_98",
+ "key": "worldtask_world_task_npctxt_103",
"text": "穿+6的无极神功套装"
},
"get_item": [],
@@ -5580,15 +5746,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_99",
+ "key": "worldtask_world_task_task_name_104",
"text": "加入任意俱乐部"
},
"task_details": {
- "key": "worldtask_world_task_task_details_99",
+ "key": "worldtask_world_task_task_details_104",
"text": "加入任意俱乐部"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_99",
+ "key": "worldtask_world_task_npctxt_104",
"text": "加入任意俱乐部"
},
"get_item": [],
@@ -5643,15 +5809,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_100",
+ "key": "worldtask_world_task_task_name_105",
"text": "森林泰坦难度3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_100",
+ "key": "worldtask_world_task_task_details_105",
"text": "森林泰坦难度3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_100",
+ "key": "worldtask_world_task_npctxt_105",
"text": "森林泰坦难度3"
},
"get_item": [],
@@ -5701,15 +5867,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_101",
+ "key": "worldtask_world_task_task_name_106",
"text": "森林泰坦难度4"
},
"task_details": {
- "key": "worldtask_world_task_task_details_101",
+ "key": "worldtask_world_task_task_details_106",
"text": "森林泰坦难度4"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_101",
+ "key": "worldtask_world_task_npctxt_106",
"text": "森林泰坦难度4"
},
"get_item": [],
@@ -5764,15 +5930,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_102",
+ "key": "worldtask_world_task_task_name_107",
"text": "守护者回响解锁次数10次"
},
"task_details": {
- "key": "worldtask_world_task_task_details_102",
+ "key": "worldtask_world_task_task_details_107",
"text": "守护者回响解锁次数10次"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_102",
+ "key": "worldtask_world_task_npctxt_107",
"text": "守护者回响解锁次数10次"
},
"get_item": [],
@@ -5822,15 +5988,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_103",
+ "key": "worldtask_world_task_task_name_108",
"text": "守护者回响解锁次数15次"
},
"task_details": {
- "key": "worldtask_world_task_task_details_103",
+ "key": "worldtask_world_task_task_details_108",
"text": "守护者回响解锁次数15次"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_103",
+ "key": "worldtask_world_task_npctxt_108",
"text": "守护者回响解锁次数15次"
},
"get_item": [],
@@ -5885,15 +6051,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_104",
+ "key": "worldtask_world_task_task_name_109",
"text": "冒险8-8通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_104",
+ "key": "worldtask_world_task_task_details_109",
"text": "冒险8-8通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_104",
+ "key": "worldtask_world_task_npctxt_109",
"text": "冒险8-8通关"
},
"get_item": [],
@@ -5943,15 +6109,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_105",
+ "key": "worldtask_world_task_task_name_110",
"text": "12件装备强化+9"
},
"task_details": {
- "key": "worldtask_world_task_task_details_105",
+ "key": "worldtask_world_task_task_details_110",
"text": "12件装备强化+9"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_105",
+ "key": "worldtask_world_task_npctxt_110",
"text": "12件装备强化+9"
},
"get_item": [],
@@ -6006,15 +6172,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_106",
+ "key": "worldtask_world_task_task_name_111",
"text": "竞技场3胜"
},
"task_details": {
- "key": "worldtask_world_task_task_details_106",
+ "key": "worldtask_world_task_task_details_111",
"text": "竞技场3胜"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_106",
+ "key": "worldtask_world_task_npctxt_111",
"text": "竞技场3胜"
},
"get_item": [],
@@ -6064,15 +6230,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_107",
+ "key": "worldtask_world_task_task_name_112",
"text": "森林泰坦难度5"
},
"task_details": {
- "key": "worldtask_world_task_task_details_107",
+ "key": "worldtask_world_task_task_details_112",
"text": "森林泰坦难度5"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_107",
+ "key": "worldtask_world_task_npctxt_112",
"text": "森林泰坦难度5"
},
"get_item": [],
@@ -6127,15 +6293,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_108",
+ "key": "worldtask_world_task_task_name_113",
"text": "守护者回响解锁解锁20次"
},
"task_details": {
- "key": "worldtask_world_task_task_details_108",
+ "key": "worldtask_world_task_task_details_113",
"text": "守护者回响解锁解锁20次"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_108",
+ "key": "worldtask_world_task_npctxt_113",
"text": "守护者回响解锁解锁20次"
},
"get_item": [],
@@ -6185,15 +6351,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_109",
+ "key": "worldtask_world_task_task_name_114",
"text": "冒险9-8通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_109",
+ "key": "worldtask_world_task_task_details_114",
"text": "冒险9-8通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_109",
+ "key": "worldtask_world_task_npctxt_114",
"text": "冒险9-8通关"
},
"get_item": [],
@@ -6248,15 +6414,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_110",
+ "key": "worldtask_world_task_task_name_115",
"text": "搜集12个4星装备"
},
"task_details": {
- "key": "worldtask_world_task_task_details_110",
+ "key": "worldtask_world_task_task_details_115",
"text": "搜集12个4星装备"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_110",
+ "key": "worldtask_world_task_npctxt_115",
"text": "搜集12个4星装备"
},
"get_item": [],
@@ -6306,15 +6472,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_111",
+ "key": "worldtask_world_task_task_name_116",
"text": "炼金塔20层"
},
"task_details": {
- "key": "worldtask_world_task_task_details_111",
+ "key": "worldtask_world_task_task_details_116",
"text": "炼金塔20层"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_111",
+ "key": "worldtask_world_task_npctxt_116",
"text": "炼金塔20层"
},
"get_item": [],
@@ -6369,15 +6535,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_112",
+ "key": "worldtask_world_task_task_name_117",
"text": "冒险10-8通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_112",
+ "key": "worldtask_world_task_task_details_117",
"text": "冒险10-8通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_112",
+ "key": "worldtask_world_task_npctxt_117",
"text": "冒险10-8通关"
},
"get_item": [],
@@ -6427,15 +6593,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_113",
+ "key": "worldtask_world_task_task_name_118",
"text": "森林泰坦难度6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_113",
+ "key": "worldtask_world_task_task_details_118",
"text": "森林泰坦难度6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_113",
+ "key": "worldtask_world_task_npctxt_118",
"text": "森林泰坦难度6"
},
"get_item": [],
@@ -6490,15 +6656,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_114",
+ "key": "worldtask_world_task_task_name_119",
"text": "18件强化+9"
},
"task_details": {
- "key": "worldtask_world_task_task_details_114",
+ "key": "worldtask_world_task_task_details_119",
"text": "18件强化+9"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_114",
+ "key": "worldtask_world_task_npctxt_119",
"text": "18件强化+9"
},
"get_item": [],
@@ -6548,15 +6714,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_115",
+ "key": "worldtask_world_task_task_name_120",
"text": "冒险11-8通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_115",
+ "key": "worldtask_world_task_task_details_120",
"text": "冒险11-8通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_115",
+ "key": "worldtask_world_task_npctxt_120",
"text": "冒险11-8通关"
},
"get_item": [],
@@ -6611,15 +6777,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_116",
+ "key": "worldtask_world_task_task_name_121",
"text": "守护者回响解锁25次"
},
"task_details": {
- "key": "worldtask_world_task_task_details_116",
+ "key": "worldtask_world_task_task_details_121",
"text": "守护者回响解锁25次"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_116",
+ "key": "worldtask_world_task_npctxt_121",
"text": "守护者回响解锁25次"
},
"get_item": [],
@@ -6669,15 +6835,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_117",
+ "key": "worldtask_world_task_task_name_122",
"text": "冒险12-3通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_117",
+ "key": "worldtask_world_task_task_details_122",
"text": "冒险12-3通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_117",
+ "key": "worldtask_world_task_npctxt_122",
"text": "冒险12-3通关"
},
"get_item": [],
@@ -6732,15 +6898,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_118",
+ "key": "worldtask_world_task_task_name_123",
"text": "森林泰坦难度7"
},
"task_details": {
- "key": "worldtask_world_task_task_details_118",
+ "key": "worldtask_world_task_task_details_123",
"text": "森林泰坦难度7"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_118",
+ "key": "worldtask_world_task_npctxt_123",
"text": "森林泰坦难度7"
},
"get_item": [],
@@ -6790,15 +6956,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_119",
+ "key": "worldtask_world_task_task_name_124",
"text": "8件任意装备强化+12"
},
"task_details": {
- "key": "worldtask_world_task_task_details_119",
+ "key": "worldtask_world_task_task_details_124",
"text": "8件任意装备强化+12"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_119",
+ "key": "worldtask_world_task_npctxt_124",
"text": "8件任意装备强化+12"
},
"get_item": [],
@@ -6853,15 +7019,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_120",
+ "key": "worldtask_world_task_task_name_125",
"text": "冒险12-6通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_120",
+ "key": "worldtask_world_task_task_details_125",
"text": "冒险12-6通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_120",
+ "key": "worldtask_world_task_npctxt_125",
"text": "冒险12-6通关"
},
"get_item": [],
@@ -6911,15 +7077,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_121",
+ "key": "worldtask_world_task_task_name_126",
"text": "竞技场获胜20次"
},
"task_details": {
- "key": "worldtask_world_task_task_details_121",
+ "key": "worldtask_world_task_task_details_126",
"text": "竞技场获胜20次"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_121",
+ "key": "worldtask_world_task_npctxt_126",
"text": "竞技场获胜20次"
},
"get_item": [],
@@ -6974,15 +7140,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_122",
+ "key": "worldtask_world_task_task_name_127",
"text": "冒险12-8通关"
},
"task_details": {
- "key": "worldtask_world_task_task_details_122",
+ "key": "worldtask_world_task_task_details_127",
"text": "冒险12-8通关"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_122",
+ "key": "worldtask_world_task_npctxt_127",
"text": "冒险12-8通关"
},
"get_item": [],
@@ -7032,15 +7198,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_123",
+ "key": "worldtask_world_task_task_name_128",
"text": "冒险关卡困难1-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_123",
+ "key": "worldtask_world_task_task_details_128",
"text": "冒险关卡困难1-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_123",
+ "key": "worldtask_world_task_npctxt_128",
"text": "冒险关卡困难1-3"
},
"get_item": [],
@@ -7090,15 +7256,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_124",
+ "key": "worldtask_world_task_task_name_129",
"text": "冒险关卡困难1-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_124",
+ "key": "worldtask_world_task_task_details_129",
"text": "冒险关卡困难1-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_124",
+ "key": "worldtask_world_task_npctxt_129",
"text": "冒险关卡困难1-6"
},
"get_item": [],
@@ -7153,15 +7319,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_125",
+ "key": "worldtask_world_task_task_name_130",
"text": "冒险关卡困难2-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_125",
+ "key": "worldtask_world_task_task_details_130",
"text": "冒险关卡困难2-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_125",
+ "key": "worldtask_world_task_npctxt_130",
"text": "冒险关卡困难2-3"
},
"get_item": [],
@@ -7211,15 +7377,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_126",
+ "key": "worldtask_world_task_task_name_131",
"text": "冒险关卡困难2-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_126",
+ "key": "worldtask_world_task_task_details_131",
"text": "冒险关卡困难2-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_126",
+ "key": "worldtask_world_task_npctxt_131",
"text": "冒险关卡困难2-6"
},
"get_item": [],
@@ -7274,15 +7440,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_127",
+ "key": "worldtask_world_task_task_name_132",
"text": "冒险关卡困难3-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_127",
+ "key": "worldtask_world_task_task_details_132",
"text": "冒险关卡困难3-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_127",
+ "key": "worldtask_world_task_npctxt_132",
"text": "冒险关卡困难3-3"
},
"get_item": [],
@@ -7332,15 +7498,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_128",
+ "key": "worldtask_world_task_task_name_133",
"text": "冒险关卡困难3-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_128",
+ "key": "worldtask_world_task_task_details_133",
"text": "冒险关卡困难3-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_128",
+ "key": "worldtask_world_task_npctxt_133",
"text": "冒险关卡困难3-6"
},
"get_item": [],
@@ -7395,15 +7561,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_129",
+ "key": "worldtask_world_task_task_name_134",
"text": "冒险关卡困难4-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_129",
+ "key": "worldtask_world_task_task_details_134",
"text": "冒险关卡困难4-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_129",
+ "key": "worldtask_world_task_npctxt_134",
"text": "冒险关卡困难4-3"
},
"get_item": [],
@@ -7443,15 +7609,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_130",
+ "key": "worldtask_world_task_task_name_135",
"text": "冒险关卡困难4-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_130",
+ "key": "worldtask_world_task_task_details_135",
"text": "冒险关卡困难4-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_130",
+ "key": "worldtask_world_task_npctxt_135",
"text": "冒险关卡困难4-6"
},
"get_item": [],
@@ -7491,15 +7657,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_131",
+ "key": "worldtask_world_task_task_name_136",
"text": "冒险关卡困难5-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_131",
+ "key": "worldtask_world_task_task_details_136",
"text": "冒险关卡困难5-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_131",
+ "key": "worldtask_world_task_npctxt_136",
"text": "冒险关卡困难5-3"
},
"get_item": [],
@@ -7539,15 +7705,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_132",
+ "key": "worldtask_world_task_task_name_137",
"text": "冒险关卡困难5-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_132",
+ "key": "worldtask_world_task_task_details_137",
"text": "冒险关卡困难5-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_132",
+ "key": "worldtask_world_task_npctxt_137",
"text": "冒险关卡困难5-6"
},
"get_item": [],
@@ -7587,15 +7753,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_133",
+ "key": "worldtask_world_task_task_name_138",
"text": "冒险关卡困难6-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_133",
+ "key": "worldtask_world_task_task_details_138",
"text": "冒险关卡困难6-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_133",
+ "key": "worldtask_world_task_npctxt_138",
"text": "冒险关卡困难6-3"
},
"get_item": [],
@@ -7635,15 +7801,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_134",
+ "key": "worldtask_world_task_task_name_139",
"text": "冒险关卡困难6-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_134",
+ "key": "worldtask_world_task_task_details_139",
"text": "冒险关卡困难6-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_134",
+ "key": "worldtask_world_task_npctxt_139",
"text": "冒险关卡困难6-6"
},
"get_item": [],
@@ -7683,15 +7849,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_135",
+ "key": "worldtask_world_task_task_name_140",
"text": "冒险关卡困难7-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_135",
+ "key": "worldtask_world_task_task_details_140",
"text": "冒险关卡困难7-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_135",
+ "key": "worldtask_world_task_npctxt_140",
"text": "冒险关卡困难7-3"
},
"get_item": [],
@@ -7731,15 +7897,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_136",
+ "key": "worldtask_world_task_task_name_141",
"text": "冒险关卡困难7-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_136",
+ "key": "worldtask_world_task_task_details_141",
"text": "冒险关卡困难7-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_136",
+ "key": "worldtask_world_task_npctxt_141",
"text": "冒险关卡困难7-6"
},
"get_item": [],
@@ -7779,15 +7945,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_137",
+ "key": "worldtask_world_task_task_name_142",
"text": "冒险关卡困难8-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_137",
+ "key": "worldtask_world_task_task_details_142",
"text": "冒险关卡困难8-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_137",
+ "key": "worldtask_world_task_npctxt_142",
"text": "冒险关卡困难8-3"
},
"get_item": [],
@@ -7827,15 +7993,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_138",
+ "key": "worldtask_world_task_task_name_143",
"text": "冒险关卡困难8-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_138",
+ "key": "worldtask_world_task_task_details_143",
"text": "冒险关卡困难8-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_138",
+ "key": "worldtask_world_task_npctxt_143",
"text": "冒险关卡困难8-6"
},
"get_item": [],
@@ -7875,15 +8041,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_139",
+ "key": "worldtask_world_task_task_name_144",
"text": "冒险关卡困难9-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_139",
+ "key": "worldtask_world_task_task_details_144",
"text": "冒险关卡困难9-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_139",
+ "key": "worldtask_world_task_npctxt_144",
"text": "冒险关卡困难9-3"
},
"get_item": [],
@@ -7923,15 +8089,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_140",
+ "key": "worldtask_world_task_task_name_145",
"text": "冒险关卡困难9-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_140",
+ "key": "worldtask_world_task_task_details_145",
"text": "冒险关卡困难9-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_140",
+ "key": "worldtask_world_task_npctxt_145",
"text": "冒险关卡困难9-6"
},
"get_item": [],
@@ -7971,15 +8137,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_141",
+ "key": "worldtask_world_task_task_name_146",
"text": "冒险关卡困难10-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_141",
+ "key": "worldtask_world_task_task_details_146",
"text": "冒险关卡困难10-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_141",
+ "key": "worldtask_world_task_npctxt_146",
"text": "冒险关卡困难10-3"
},
"get_item": [],
@@ -8019,15 +8185,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_142",
+ "key": "worldtask_world_task_task_name_147",
"text": "冒险关卡困难10-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_142",
+ "key": "worldtask_world_task_task_details_147",
"text": "冒险关卡困难10-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_142",
+ "key": "worldtask_world_task_npctxt_147",
"text": "冒险关卡困难10-6"
},
"get_item": [],
@@ -8067,15 +8233,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_143",
+ "key": "worldtask_world_task_task_name_148",
"text": "冒险关卡困难11-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_143",
+ "key": "worldtask_world_task_task_details_148",
"text": "冒险关卡困难11-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_143",
+ "key": "worldtask_world_task_npctxt_148",
"text": "冒险关卡困难11-3"
},
"get_item": [],
@@ -8115,15 +8281,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_144",
+ "key": "worldtask_world_task_task_name_149",
"text": "冒险关卡困难11-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_144",
+ "key": "worldtask_world_task_task_details_149",
"text": "冒险关卡困难11-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_144",
+ "key": "worldtask_world_task_npctxt_149",
"text": "冒险关卡困难11-6"
},
"get_item": [],
@@ -8163,15 +8329,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_145",
+ "key": "worldtask_world_task_task_name_150",
"text": "冒险关卡困难12-3"
},
"task_details": {
- "key": "worldtask_world_task_task_details_145",
+ "key": "worldtask_world_task_task_details_150",
"text": "冒险关卡困难12-3"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_145",
+ "key": "worldtask_world_task_npctxt_150",
"text": "冒险关卡困难12-3"
},
"get_item": [],
@@ -8211,15 +8377,15 @@
"des": 2,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_146",
+ "key": "worldtask_world_task_task_name_151",
"text": "冒险关卡困难12-6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_146",
+ "key": "worldtask_world_task_task_details_151",
"text": "冒险关卡困难12-6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_146",
+ "key": "worldtask_world_task_npctxt_151",
"text": "冒险关卡困难12-6"
},
"get_item": [],
@@ -8259,15 +8425,15 @@
"des": 5,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_147",
+ "key": "worldtask_world_task_task_name_152",
"text": "兄弟,带一程"
},
"task_details": {
- "key": "worldtask_world_task_task_details_147",
+ "key": "worldtask_world_task_task_details_152",
"text": "途中偶遇的守护者，期望我们带他前往某个城市。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_147",
+ "key": "worldtask_world_task_npctxt_152",
"text": "兄弟,带一程"
},
"get_item": [],
@@ -8319,15 +8485,15 @@
"des": 5,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_148",
+ "key": "worldtask_world_task_task_name_153",
"text": "特产不嫌多"
},
"task_details": {
- "key": "worldtask_world_task_task_details_148",
+ "key": "worldtask_world_task_task_details_153",
"text": "一名守护者希望我们帮他购买一些特产，并承诺会用其他东西作为报酬。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_148",
+ "key": "worldtask_world_task_npctxt_153",
"text": "特产不嫌多"
},
"get_item": [],
@@ -8379,15 +8545,15 @@
"des": 5,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_149",
+ "key": "worldtask_world_task_task_name_154",
"text": "资助城市"
},
"task_details": {
- "key": "worldtask_world_task_task_details_149",
+ "key": "worldtask_world_task_task_details_154",
"text": "如今我们稍有资产,守护者希望我们能资助一些城市,当地人会给予一些报酬。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_149",
+ "key": "worldtask_world_task_npctxt_154",
"text": "资助城市"
},
"get_item": [],
@@ -8439,15 +8605,15 @@
"des": 5,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_150",
+ "key": "worldtask_world_task_task_name_155",
"text": "雪中送炭"
},
"task_details": {
- "key": "worldtask_world_task_task_details_150",
+ "key": "worldtask_world_task_task_details_155",
"text": "一些城市急需某些道具度过难关，我们或许应当帮助他们运转一下。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_150",
+ "key": "worldtask_world_task_npctxt_155",
"text": "雪中送炭"
},
"get_item": [],
@@ -8499,15 +8665,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_151",
+ "key": "worldtask_world_task_task_name_156",
"text": "悍娇虎逸闻一"
},
"task_details": {
- "key": "worldtask_world_task_task_details_151",
+ "key": "worldtask_world_task_task_details_156",
"text": "悍娇虎独自一人站在武馆，看上去似乎很生气。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_151",
+ "key": "worldtask_world_task_npctxt_156",
"text": "和悍娇虎聊聊"
},
"get_item": [],
@@ -8545,15 +8711,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_152",
+ "key": "worldtask_world_task_task_name_157",
"text": "悍娇虎逸闻二"
},
"task_details": {
- "key": "worldtask_world_task_task_details_152",
+ "key": "worldtask_world_task_task_details_157",
"text": "阿宝在哪儿呢，要在悍娇虎更生气之前找到才行。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_152",
+ "key": "worldtask_world_task_npctxt_157",
"text": "找阿宝聊聊"
},
"get_item": [],
@@ -8591,15 +8757,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_153",
+ "key": "worldtask_world_task_task_name_158",
"text": "悍娇虎逸闻三"
},
"task_details": {
- "key": "worldtask_world_task_task_details_153",
+ "key": "worldtask_world_task_task_details_158",
"text": "找到阿宝，并把阿宝带回武馆吧。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_153",
+ "key": "worldtask_world_task_npctxt_158",
"text": "找到阿宝"
},
"get_item": [],
@@ -8639,15 +8805,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_154",
+ "key": "worldtask_world_task_task_name_159",
"text": "平先生的焦急"
},
"task_details": {
- "key": "worldtask_world_task_task_details_154",
+ "key": "worldtask_world_task_task_details_159",
"text": "平先生焦急的看向武馆的方向，看上去像是遇到了什么棘手的事。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_154",
+ "key": "worldtask_world_task_npctxt_159",
"text": "找平先生聊聊"
},
"get_item": [],
@@ -8685,15 +8851,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_155",
+ "key": "worldtask_world_task_task_name_160",
"text": "队伍的集体提升"
},
"task_details": {
- "key": "worldtask_world_task_task_details_155",
+ "key": "worldtask_world_task_task_details_160",
"text": "博克岛的发展有点超出预期，伙伴们需要一些特殊的帮助来快速提升实力,去武馆请教下师傅吧。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_155",
+ "key": "worldtask_world_task_npctxt_160",
"text": "找师傅聊聊"
},
"get_item": [],
@@ -8733,15 +8899,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_156",
+ "key": "worldtask_world_task_task_name_161",
"text": "驯龙小队的一天一"
},
"task_details": {
- "key": "worldtask_world_task_task_details_156",
+ "key": "worldtask_world_task_task_details_161",
"text": "希卡普约着他的伙伴们一起做龙鞍，快帮他们收集制作材料吧。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_156",
+ "key": "worldtask_world_task_npctxt_161",
"text": "和希卡普聊聊"
},
"get_item": [
@@ -8787,15 +8953,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_157",
+ "key": "worldtask_world_task_task_name_162",
"text": "驯龙小队的一天二"
},
"task_details": {
- "key": "worldtask_world_task_task_details_157",
+ "key": "worldtask_world_task_task_details_162",
"text": "原本好好制作龙鞍的鼻涕粗突然和亚丝翠吵了起来，得上前阻止他们。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_157",
+ "key": "worldtask_world_task_npctxt_162",
"text": "阻止鼻涕粗"
},
"get_item": [],
@@ -8835,15 +9001,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_158",
+ "key": "worldtask_world_task_task_name_163",
"text": "驯龙小队的一天三"
},
"task_details": {
- "key": "worldtask_world_task_task_details_158",
+ "key": "worldtask_world_task_task_details_163",
"text": "亚丝翠情绪激动，你不能让他们互相伤害。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_158",
+ "key": "worldtask_world_task_npctxt_163",
"text": "阻止亚丝翠"
},
"get_item": [],
@@ -8883,15 +9049,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_159",
+ "key": "worldtask_world_task_task_name_164",
"text": "驯龙小队的一天四"
},
"task_details": {
- "key": "worldtask_world_task_task_details_159",
+ "key": "worldtask_world_task_task_details_164",
"text": "希卡普看上去很生气。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_159",
+ "key": "worldtask_world_task_npctxt_164",
"text": "和希卡普聊聊"
},
"get_item": [],
@@ -8929,15 +9095,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_160",
+ "key": "worldtask_world_task_task_name_165",
"text": "驯龙小队的一天五"
},
"task_details": {
- "key": "worldtask_world_task_task_details_160",
+ "key": "worldtask_world_task_task_details_165",
"text": "和鼻涕粗沟通，让他知道问题出在哪。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_160",
+ "key": "worldtask_world_task_npctxt_165",
"text": "找到鼻涕粗"
},
"get_item": [],
@@ -8975,15 +9141,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_161",
+ "key": "worldtask_world_task_task_name_166",
"text": "驯龙小队的一天终"
},
"task_details": {
- "key": "worldtask_world_task_task_details_161",
+ "key": "worldtask_world_task_task_details_166",
"text": "为了让驯龙小队重归于好，你准备去找鼻涕粗聊聊。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_161",
+ "key": "worldtask_world_task_npctxt_166",
"text": "让他们和好如初"
},
"get_item": [],
@@ -9021,15 +9187,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_162",
+ "key": "worldtask_world_task_task_name_167",
"text": "赛龙的故事"
},
"task_details": {
- "key": "worldtask_world_task_task_details_162",
+ "key": "worldtask_world_task_task_details_167",
"text": "暴芙那特和悍夫那特好像又在斗嘴了。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_162",
+ "key": "worldtask_world_task_npctxt_167",
"text": "去找双胞胎"
},
"get_item": [],
@@ -9067,15 +9233,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_163",
+ "key": "worldtask_world_task_task_name_168",
"text": "设备升级"
},
"task_details": {
- "key": "worldtask_world_task_task_details_163",
+ "key": "worldtask_world_task_task_details_168",
"text": "变强的方法有很多种，冒险即将开始，铁匠铺的戈伯发来讯息有要事找我们，听说会给我们一份礼物。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_163",
+ "key": "worldtask_world_task_npctxt_168",
"text": "和戈伯聊聊"
},
"get_item": [
@@ -9121,15 +9287,15 @@
"des": 3,
"icon": "25002",
"task_name": {
- "key": "worldtask_world_task_task_name_164",
+ "key": "worldtask_world_task_task_name_169",
"text": "精心打造"
},
"task_details": {
- "key": "worldtask_world_task_task_details_164",
+ "key": "worldtask_world_task_task_details_169",
"text": "戈伯的意思是，我们已经在锻造这一途上入门了，不过听说他有一种快捷的升级装备的路子，我们或许应该过去听听。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_164",
+ "key": "worldtask_world_task_npctxt_169",
"text": "和戈伯聊聊"
},
"get_item": [],
@@ -9169,15 +9335,15 @@
"des": 3,
"icon": "25003",
"task_name": {
- "key": "worldtask_world_task_task_name_165",
+ "key": "worldtask_world_task_task_name_170",
"text": "精心打造"
},
"task_details": {
- "key": "worldtask_world_task_task_details_165",
+ "key": "worldtask_world_task_task_details_170",
"text": "锻造一途深不见底，又是全新的考验，戈伯希望我加强训练，早日熟悉这种升级方式。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_165",
+ "key": "worldtask_world_task_npctxt_170",
"text": "和戈伯聊聊"
},
"get_item": [],
@@ -9217,15 +9383,15 @@
"des": 3,
"icon": "25004",
"task_name": {
- "key": "worldtask_world_task_task_name_166",
+ "key": "worldtask_world_task_task_name_171",
"text": "大组织,大买卖"
},
"task_details": {
- "key": "worldtask_world_task_task_details_166",
+ "key": "worldtask_world_task_task_details_171",
"text": "知道吗，沃尔夫和他的那位传奇血红爪搭档来到了中轴城，而且还有笔买卖找我们谈谈，或许该抽个时间去和他勾兑勾兑。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_166",
+ "key": "worldtask_world_task_npctxt_171",
"text": "和沃尔夫聊聊"
},
"get_item": [
@@ -9271,15 +9437,15 @@
"des": 3,
"icon": "14003",
"task_name": {
- "key": "worldtask_world_task_task_name_167",
+ "key": "worldtask_world_task_task_name_172",
"text": "提升等级"
},
"task_details": {
- "key": "worldtask_world_task_task_details_167",
+ "key": "worldtask_world_task_task_details_172",
"text": "提升等级"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_167",
+ "key": "worldtask_world_task_npctxt_172",
"text": "提升等级"
},
"get_item": [],
@@ -9313,15 +9479,15 @@
"des": 3,
"icon": "14003",
"task_name": {
- "key": "worldtask_world_task_task_name_168",
+ "key": "worldtask_world_task_task_name_173",
"text": "突破英雄"
},
"task_details": {
- "key": "worldtask_world_task_task_details_168",
+ "key": "worldtask_world_task_task_details_173",
"text": "突破英雄"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_168",
+ "key": "worldtask_world_task_npctxt_173",
"text": "突破英雄"
},
"get_item": [],
@@ -9355,15 +9521,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_169",
+ "key": "worldtask_world_task_task_name_174",
"text": "梦中世界"
},
"task_details": {
- "key": "worldtask_world_task_task_details_169",
+ "key": "worldtask_world_task_task_details_174",
"text": "邦尼兔在沙人那里，看上去十分焦急，快去看看吧。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_169",
+ "key": "worldtask_world_task_npctxt_174",
"text": "找到邦尼兔"
},
"get_item": [],
@@ -9403,15 +9569,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_170",
+ "key": "worldtask_world_task_task_name_175",
"text": "挑战与狩猎"
},
"task_details": {
- "key": "worldtask_world_task_task_details_170",
+ "key": "worldtask_world_task_task_details_175",
"text": "挑战与狩猎"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_170",
+ "key": "worldtask_world_task_npctxt_175",
"text": "找到沃尔特"
},
"get_item": [],
@@ -9451,15 +9617,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_171",
+ "key": "worldtask_world_task_task_name_176",
"text": "公会与伙伴"
},
"task_details": {
- "key": "worldtask_world_task_task_details_171",
+ "key": "worldtask_world_task_task_details_176",
"text": "公会与伙伴"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_171",
+ "key": "worldtask_world_task_npctxt_176",
"text": "找到沃尔夫"
},
"get_item": [],
@@ -9497,15 +9663,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_172",
+ "key": "worldtask_world_task_task_name_177",
"text": "新的挑战之路"
},
"task_details": {
- "key": "worldtask_world_task_task_details_172",
+ "key": "worldtask_world_task_task_details_177",
"text": "新的挑战之路"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_172",
+ "key": "worldtask_world_task_npctxt_177",
"text": "找到浣熊师傅"
},
"get_item": [],
@@ -9543,15 +9709,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_173",
+ "key": "worldtask_world_task_task_name_178",
"text": "巨大的怪物们"
},
"task_details": {
- "key": "worldtask_world_task_task_details_173",
+ "key": "worldtask_world_task_task_details_178",
"text": "巨大的怪物们"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_173",
+ "key": "worldtask_world_task_npctxt_178",
"text": "找到戈伯"
},
"get_item": [],
@@ -9589,15 +9755,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_174",
+ "key": "worldtask_world_task_task_name_179",
"text": "敲打与炉火"
},
"task_details": {
- "key": "worldtask_world_task_task_details_174",
+ "key": "worldtask_world_task_task_details_179",
"text": "敲打与炉火"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_174",
+ "key": "worldtask_world_task_npctxt_179",
"text": "找到戈伯"
},
"get_item": [],
@@ -9637,15 +9803,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_175",
+ "key": "worldtask_world_task_task_name_180",
"text": "穿戴尝试"
},
"task_details": {
- "key": "worldtask_world_task_task_details_175",
+ "key": "worldtask_world_task_task_details_180",
"text": "穿戴尝试"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_175",
+ "key": "worldtask_world_task_npctxt_180",
"text": "穿戴尝试"
},
"get_item": [],
@@ -9685,15 +9851,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_176",
+ "key": "worldtask_world_task_task_name_181",
"text": "秘境开启"
},
"task_details": {
- "key": "worldtask_world_task_task_details_176",
+ "key": "worldtask_world_task_task_details_181",
"text": "秘境开启"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_176",
+ "key": "worldtask_world_task_npctxt_181",
"text": "找到小伊"
},
"get_item": [],
@@ -9733,15 +9899,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_177",
+ "key": "worldtask_world_task_task_name_182",
"text": "汤水与包子"
},
"task_details": {
- "key": "worldtask_world_task_task_details_177",
+ "key": "worldtask_world_task_task_details_182",
"text": "汤水与包子"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_177",
+ "key": "worldtask_world_task_npctxt_182",
"text": "找到平先生"
},
"get_item": [],
@@ -9779,15 +9945,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_178",
+ "key": "worldtask_world_task_task_name_183",
"text": "伙伴需要互相理解"
},
"task_details": {
- "key": "worldtask_world_task_task_details_178",
+ "key": "worldtask_world_task_task_details_183",
"text": "伙伴需要互相理解"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_178",
+ "key": "worldtask_world_task_npctxt_183",
"text": "找到大大"
},
"get_item": [],
@@ -9825,15 +9991,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_179",
+ "key": "worldtask_world_task_task_name_184",
"text": "邻里帮助"
},
"task_details": {
- "key": "worldtask_world_task_task_details_179",
+ "key": "worldtask_world_task_task_details_184",
"text": "邻里帮助"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_179",
+ "key": "worldtask_world_task_npctxt_184",
"text": "找到悍娇虎"
},
"get_item": [],
@@ -9871,15 +10037,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_180",
+ "key": "worldtask_world_task_task_name_185",
"text": "一较高下"
},
"task_details": {
- "key": "worldtask_world_task_task_details_180",
+ "key": "worldtask_world_task_task_details_185",
"text": "一较高下"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_180",
+ "key": "worldtask_world_task_npctxt_185",
"text": "找到穿靴猫"
},
"get_item": [],
@@ -9917,15 +10083,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_181",
+ "key": "worldtask_world_task_task_name_186",
"text": "波比的奖励"
},
"task_details": {
- "key": "worldtask_world_task_task_details_181",
+ "key": "worldtask_world_task_task_details_186",
"text": "波比的奖励"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_181",
+ "key": "worldtask_world_task_npctxt_186",
"text": "找到波比"
},
"get_item": [],
@@ -9963,15 +10129,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_182",
+ "key": "worldtask_world_task_task_name_187",
"text": "资金周转"
},
"task_details": {
- "key": "worldtask_world_task_task_details_182",
+ "key": "worldtask_world_task_task_details_187",
"text": "资金周转"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_182",
+ "key": "worldtask_world_task_npctxt_187",
"text": "找到骇客蛛"
},
"get_item": [],
@@ -10009,15 +10175,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_183",
+ "key": "worldtask_world_task_task_name_188",
"text": "商队起航"
},
"task_details": {
- "key": "worldtask_world_task_task_details_183",
+ "key": "worldtask_world_task_task_details_188",
"text": "商队起航"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_183",
+ "key": "worldtask_world_task_npctxt_188",
"text": "商队起航"
},
"get_item": [],
@@ -10055,15 +10221,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_184",
+ "key": "worldtask_world_task_task_name_189",
"text": "挖掘潜能"
},
"task_details": {
- "key": "worldtask_world_task_task_details_184",
+ "key": "worldtask_world_task_task_details_189",
"text": "挖掘潜能"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_184",
+ "key": "worldtask_world_task_npctxt_189",
"text": "找到希沙窦斯"
},
"get_item": [],
@@ -10101,15 +10267,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_185",
+ "key": "worldtask_world_task_task_name_190",
"text": "守护者的训练"
},
"task_details": {
- "key": "worldtask_world_task_task_details_185",
+ "key": "worldtask_world_task_task_details_190",
"text": "守护者的训练"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_185",
+ "key": "worldtask_world_task_npctxt_190",
"text": "找到浣熊师傅"
},
"get_item": [],
@@ -10147,15 +10313,15 @@
"des": 3,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_186",
+ "key": "worldtask_world_task_task_name_191",
"text": "师傅的教诲"
},
"task_details": {
- "key": "worldtask_world_task_task_details_186",
+ "key": "worldtask_world_task_task_details_191",
"text": "师傅的教诲"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_186",
+ "key": "worldtask_world_task_npctxt_191",
"text": "师傅的教诲"
},
"get_item": [],
@@ -10195,15 +10361,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_187",
+ "key": "worldtask_world_task_task_name_192",
"text": "乌龟大师的试炼"
},
"task_details": {
- "key": "worldtask_world_task_task_details_187",
+ "key": "worldtask_world_task_task_details_192",
"text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_187",
+ "key": "worldtask_world_task_npctxt_192",
"text": "有人在找你"
},
"get_item": [],
@@ -10258,15 +10424,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_188",
+ "key": "worldtask_world_task_task_name_193",
"text": "乌龟大师的试炼"
},
"task_details": {
- "key": "worldtask_world_task_task_details_188",
+ "key": "worldtask_world_task_task_details_193",
"text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_188",
+ "key": "worldtask_world_task_npctxt_193",
"text": "有人在找你"
},
"get_item": [],
@@ -10321,15 +10487,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_189",
+ "key": "worldtask_world_task_task_name_194",
"text": "乌龟大师的试炼"
},
"task_details": {
- "key": "worldtask_world_task_task_details_189",
+ "key": "worldtask_world_task_task_details_194",
"text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_189",
+ "key": "worldtask_world_task_npctxt_194",
"text": "有人在找你"
},
"get_item": [],
@@ -10384,15 +10550,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_190",
+ "key": "worldtask_world_task_task_name_195",
"text": "乌龟大师的试炼"
},
"task_details": {
- "key": "worldtask_world_task_task_details_190",
+ "key": "worldtask_world_task_task_details_195",
"text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_190",
+ "key": "worldtask_world_task_npctxt_195",
"text": "有人在找你"
},
"get_item": [],
@@ -10447,15 +10613,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_191",
+ "key": "worldtask_world_task_task_name_196",
"text": "乌龟大师的试炼"
},
"task_details": {
- "key": "worldtask_world_task_task_details_191",
+ "key": "worldtask_world_task_task_details_196",
"text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_191",
+ "key": "worldtask_world_task_npctxt_196",
"text": "有人在找你"
},
"get_item": [],
@@ -10510,15 +10676,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_192",
+ "key": "worldtask_world_task_task_name_197",
"text": "乌龟大师的试炼"
},
"task_details": {
- "key": "worldtask_world_task_task_details_192",
+ "key": "worldtask_world_task_task_details_197",
"text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_192",
+ "key": "worldtask_world_task_npctxt_197",
"text": "有人在找你"
},
"get_item": [],
@@ -10573,15 +10739,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_193",
+ "key": "worldtask_world_task_task_name_198",
"text": "住嘴吧驴子"
},
"task_details": {
- "key": "worldtask_world_task_task_details_193",
+ "key": "worldtask_world_task_task_details_198",
"text": "贫嘴驴喋喋不休几小时了，赶快做道菜让他闭嘴，让世界清净一会。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_193",
+ "key": "worldtask_world_task_npctxt_198",
"text": "贫嘴驴的烦恼"
},
"get_item": [],
@@ -10636,15 +10802,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_194",
+ "key": "worldtask_world_task_task_name_199",
"text": "亚丝翠要下厨了"
},
"task_details": {
- "key": "worldtask_world_task_task_details_194",
+ "key": "worldtask_world_task_task_details_199",
"text": "亚丝翠似乎想给风里飞做吃的……考虑到亚丝翠的厨艺，你决定伸出援手。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_194",
+ "key": "worldtask_world_task_npctxt_199",
"text": "亚丝翠的烦恼"
},
"get_item": [],
@@ -10699,15 +10865,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_195",
+ "key": "worldtask_world_task_task_name_200",
"text": "姜饼人的救赎"
},
"task_details": {
- "key": "worldtask_world_task_task_details_195",
+ "key": "worldtask_world_task_task_details_200",
"text": "姜饼人看起来非常忧伤，也许他需要一位守护者的帮助。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_195",
+ "key": "worldtask_world_task_npctxt_200",
"text": "姜饼人的烦恼"
},
"get_item": [],
@@ -10762,15 +10928,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_196",
+ "key": "worldtask_world_task_task_name_201",
"text": "特快加急订单"
},
"task_details": {
- "key": "worldtask_world_task_task_details_196",
+ "key": "worldtask_world_task_task_details_201",
"text": "翡翠宫突发大批订单！平先生一个鹅忙得喘不上气，他需要帮手！"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_196",
+ "key": "worldtask_world_task_npctxt_201",
"text": "平先生的烦恼"
},
"get_item": [],
@@ -10825,15 +10991,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_197",
+ "key": "worldtask_world_task_task_name_202",
"text": "匹诺曹的谎言"
},
"task_details": {
- "key": "worldtask_world_task_task_details_197",
+ "key": "worldtask_world_task_task_details_202",
"text": "匹诺曹吹牛自己厨艺高超，不料惹上了麻烦，身为守护者的你自然不能坐视不管。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_197",
+ "key": "worldtask_world_task_npctxt_202",
"text": "匹诺曹的烦恼"
},
"get_item": [],
@@ -10888,15 +11054,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_198",
+ "key": "worldtask_world_task_task_name_203",
"text": "冒失的波比"
},
"task_details": {
- "key": "worldtask_world_task_task_details_198",
+ "key": "worldtask_world_task_task_details_203",
"text": "波比又一次把琴给丢了，又一次求助你，你又一次要帮她找琴。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_198",
+ "key": "worldtask_world_task_npctxt_203",
"text": "波比的失物找回"
},
"get_item": [],
@@ -10951,15 +11117,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_199",
+ "key": "worldtask_world_task_task_name_204",
"text": "贪玩一时爽"
},
"task_details": {
- "key": "worldtask_world_task_task_details_199",
+ "key": "worldtask_world_task_task_details_204",
"text": "希卡普很焦急的向你求助，他刚丢失了一件很重要的东西。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_199",
+ "key": "worldtask_world_task_npctxt_204",
"text": "希卡普的失物找回"
},
"get_item": [],
@@ -11014,15 +11180,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_200",
+ "key": "worldtask_world_task_task_name_205",
"text": "和谐之书"
},
"task_details": {
- "key": "worldtask_world_task_task_details_200",
+ "key": "worldtask_world_task_task_details_205",
"text": "菲奥娜搞丢了一本魔药书，她思来想去只能求助你，这是本什么书呢？"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_200",
+ "key": "worldtask_world_task_npctxt_205",
"text": "菲欧娜的失物找回"
},
"get_item": [],
@@ -11077,15 +11243,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_201",
+ "key": "worldtask_world_task_task_name_206",
"text": "请假的理由"
},
"task_details": {
- "key": "worldtask_world_task_task_details_201",
+ "key": "worldtask_world_task_task_details_206",
"text": "戈伯丢了东西，但他看起来十分开心，这是怎么回事？"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_201",
+ "key": "worldtask_world_task_npctxt_206",
"text": "戈伯的失物找回"
},
"get_item": [],
@@ -11140,15 +11306,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_202",
+ "key": "worldtask_world_task_task_name_207",
"text": "消失的马鞍"
},
"task_details": {
- "key": "worldtask_world_task_task_details_202",
+ "key": "worldtask_world_task_task_details_207",
"text": "阿比盖尔的失物找回"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_202",
+ "key": "worldtask_world_task_npctxt_207",
"text": "阿比盖尔的失物找回"
},
"get_item": [],
@@ -11203,15 +11369,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_203",
+ "key": "worldtask_world_task_task_name_208",
"text": "岌岌可危的魔药"
},
"task_details": {
- "key": "worldtask_world_task_task_details_203",
+ "key": "worldtask_world_task_task_details_208",
"text": "骇客蛛感受到了异样的气息，她需要你的帮助。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_203",
+ "key": "worldtask_world_task_npctxt_208",
"text": "骇客蛛的紧急委托"
},
"get_item": [],
@@ -11266,15 +11432,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_204",
+ "key": "worldtask_world_task_task_name_209",
"text": "躁动的羊群"
},
"task_details": {
- "key": "worldtask_world_task_task_details_204",
+ "key": "worldtask_world_task_task_details_209",
"text": "不知为何，羊群近日愈发躁动，或许你能帮助希卡普摆平这件事情。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_204",
+ "key": "worldtask_world_task_npctxt_209",
"text": "希卡普的紧急委托"
},
"get_item": [],
@@ -11329,15 +11495,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_205",
+ "key": "worldtask_world_task_task_name_210",
"text": "和邦尼兔联手"
},
"task_details": {
- "key": "worldtask_world_task_task_details_205",
+ "key": "worldtask_world_task_task_details_210",
"text": "豺狼们再次聚集了起来，在他们壮大之前必须先行捣毁。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_205",
+ "key": "worldtask_world_task_npctxt_210",
"text": "邦尼兔的紧急委托"
},
"get_item": [],
@@ -11392,15 +11558,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_206",
+ "key": "worldtask_world_task_task_name_211",
"text": "捣乱鼠窝"
},
"task_details": {
- "key": "worldtask_world_task_task_details_206",
+ "key": "worldtask_world_task_task_details_211",
"text": "森林传来的低吼，或是豺狼们潜入了进来。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_206",
+ "key": "worldtask_world_task_npctxt_211",
"text": "骇客蛛的委托"
},
"get_item": [],
@@ -11455,15 +11621,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_207",
+ "key": "worldtask_world_task_task_name_212",
"text": "狂妄之徒"
},
"task_details": {
- "key": "worldtask_world_task_task_details_207",
+ "key": "worldtask_world_task_task_details_212",
"text": "埃雷特的手下近日行为有些异常，或许是该敲打一番了。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_207",
+ "key": "worldtask_world_task_npctxt_212",
"text": "希卡普的发现"
},
"get_item": [],
@@ -11518,15 +11684,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_208",
+ "key": "worldtask_world_task_task_name_213",
"text": "清理所有怪物6"
},
"task_details": {
- "key": "worldtask_world_task_task_details_208",
+ "key": "worldtask_world_task_task_details_213",
"text": "清理所有怪物6"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_208",
+ "key": "worldtask_world_task_npctxt_213",
"text": "清理所有怪物6"
},
"get_item": [],
@@ -11581,15 +11747,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_209",
+ "key": "worldtask_world_task_task_name_214",
"text": "神秘的身影"
},
"task_details": {
- "key": "worldtask_world_task_task_details_209",
+ "key": "worldtask_world_task_task_details_214",
"text": "最近城中出现了一些陌生面孔，鬼鬼祟祟，邦尼兔要你前去调查。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_209",
+ "key": "worldtask_world_task_npctxt_214",
"text": "邦尼兔的请求"
},
"get_item": [],
@@ -11646,15 +11812,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_210",
+ "key": "worldtask_world_task_task_name_215",
"text": "不翼而飞的药材"
},
"task_details": {
- "key": "worldtask_world_task_task_details_210",
+ "key": "worldtask_world_task_task_details_215",
"text": "菲欧娜的一些药材不翼而飞了，她请求你帮助查清真相。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_210",
+ "key": "worldtask_world_task_npctxt_215",
"text": "菲欧娜的请求"
},
"get_item": [],
@@ -11711,15 +11877,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_211",
+ "key": "worldtask_world_task_task_name_216",
"text": "被偷走的铁块"
},
"task_details": {
- "key": "worldtask_world_task_task_details_211",
+ "key": "worldtask_world_task_task_details_216",
"text": "戈伯正在借酒浇愁，他的铁块不见了。他寻求你的帮助。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_211",
+ "key": "worldtask_world_task_npctxt_216",
"text": "戈伯的请求"
},
"get_item": [],
@@ -11776,15 +11942,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_212",
+ "key": "worldtask_world_task_task_name_217",
"text": "林中小蘑菇"
},
"task_details": {
- "key": "worldtask_world_task_task_details_212",
+ "key": "worldtask_world_task_task_details_217",
"text": "平先生想要研发一道新的配方，为此需要找到传说中的一种蘑菇。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_212",
+ "key": "worldtask_world_task_npctxt_217",
"text": "平先生的请求"
},
"get_item": [],
@@ -11841,15 +12007,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_213",
+ "key": "worldtask_world_task_task_name_218",
"text": "闪光之宝"
},
"task_details": {
- "key": "worldtask_world_task_task_details_213",
+ "key": "worldtask_world_task_task_details_218",
"text": "骇客蛛发现城内突然出现了一些怪异的光芒，遂派你前去调查。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_213",
+ "key": "worldtask_world_task_npctxt_218",
"text": "骇客蛛的请求"
},
"get_item": [],
@@ -11906,15 +12072,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_214",
+ "key": "worldtask_world_task_task_name_219",
"text": "慰问的包子"
},
"task_details": {
- "key": "worldtask_world_task_task_details_214",
+ "key": "worldtask_world_task_task_details_219",
"text": "阿宝委托平先生做了一批包子慰问警卫人员，但阿宝临时有事无法送去。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_214",
+ "key": "worldtask_world_task_npctxt_219",
"text": "阿宝的心事"
},
"get_item": [],
@@ -11967,15 +12133,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_215",
+ "key": "worldtask_world_task_task_name_220",
"text": "寻找平先生"
},
"task_details": {
- "key": "worldtask_world_task_task_details_215",
+ "key": "worldtask_world_task_task_details_220",
"text": "平先生已经把包子做好了，就等人来送了。好香啊！"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_215",
+ "key": "worldtask_world_task_npctxt_220",
"text": "寻找平先生"
},
"get_item": [],
@@ -12030,15 +12196,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_216",
+ "key": "worldtask_world_task_task_name_221",
"text": "特殊的卷轴"
},
"task_details": {
- "key": "worldtask_world_task_task_details_216",
+ "key": "worldtask_world_task_task_details_221",
"text": "悍娇虎委托金猴去找一份卷轴，但金猴却突然失踪了。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_216",
+ "key": "worldtask_world_task_npctxt_221",
"text": "阿宝的想法"
},
"get_item": [],
@@ -12091,15 +12257,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_217",
+ "key": "worldtask_world_task_task_name_222",
"text": "寻找金猴"
},
"task_details": {
- "key": "worldtask_world_task_task_details_217",
+ "key": "worldtask_world_task_task_details_222",
"text": "金猴似乎就在不远处，但他看起来很生气。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_217",
+ "key": "worldtask_world_task_npctxt_222",
"text": "寻找金猴"
},
"get_item": [],
@@ -12154,15 +12320,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_218",
+ "key": "worldtask_world_task_task_name_223",
"text": "特别的生日蛋糕"
},
"task_details": {
- "key": "worldtask_world_task_task_details_218",
+ "key": "worldtask_world_task_task_details_223",
"text": "菲欧娜委托姜饼人给匹诺曹做了个特别的蛋糕，需要你帮忙拿一下。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_218",
+ "key": "worldtask_world_task_npctxt_223",
"text": "菲欧娜的心事"
},
"get_item": [],
@@ -12215,15 +12381,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_219",
+ "key": "worldtask_world_task_task_name_224",
"text": "寻找姜饼人"
},
"task_details": {
- "key": "worldtask_world_task_task_details_219",
+ "key": "worldtask_world_task_task_details_224",
"text": "姜饼人正在疯狂擀着面团，不知道为啥那些面团里有些裙子珠串之类的东西。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_219",
+ "key": "worldtask_world_task_npctxt_224",
"text": "寻找姜饼人"
},
"get_item": [],
@@ -12278,15 +12444,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_220",
+ "key": "worldtask_world_task_task_name_225",
"text": "狐狸，狼，警长"
},
"task_details": {
- "key": "worldtask_world_task_task_details_220",
+ "key": "worldtask_world_task_task_details_225",
"text": "沃尔夫想要你给戴安狐送信……尽管他俩近在咫尺。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_220",
+ "key": "worldtask_world_task_npctxt_225",
"text": "黛安狐的心事"
},
"get_item": [],
@@ -12341,15 +12507,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_221",
+ "key": "worldtask_world_task_task_name_226",
"text": "神秘药剂配方"
},
"task_details": {
- "key": "worldtask_world_task_task_details_221",
+ "key": "worldtask_world_task_task_details_226",
"text": "菲欧娜正在研发一种新型的神秘药剂，但现在还缺少一种药材：猫的胡子。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_221",
+ "key": "worldtask_world_task_npctxt_226",
"text": "菲欧娜有事相求"
},
"get_item": [],
@@ -12402,15 +12568,15 @@
"des": 1,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_222",
+ "key": "worldtask_world_task_task_name_227",
"text": "靴猫的胡子"
},
"task_details": {
- "key": "worldtask_world_task_task_details_222",
+ "key": "worldtask_world_task_task_details_227",
"text": "去找靴子猫，他会给出什么样的胡子呢？"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_222",
+ "key": "worldtask_world_task_npctxt_227",
"text": "去看看靴子猫"
},
"get_item": [],
@@ -12465,15 +12631,15 @@
"des": 6,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_223",
+ "key": "worldtask_world_task_task_name_228",
"text": "希卡普的礼物"
},
"task_details": {
- "key": "worldtask_world_task_task_details_223",
+ "key": "worldtask_world_task_task_details_228",
"text": "铁匠铺发现一个非常奇怪的礼盒，戈伯让我交给希卡普，我们可以看看希卡普怎么说"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_223",
+ "key": "worldtask_world_task_npctxt_228",
"text": "铁匠铺逛逛"
},
"get_item": [],
@@ -12513,15 +12679,15 @@
"des": 6,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_224",
+ "key": "worldtask_world_task_task_name_229",
"text": "奇妙玩偶"
},
"task_details": {
- "key": "worldtask_world_task_task_details_224",
+ "key": "worldtask_world_task_task_details_229",
"text": "在武馆发现了一个长得像螳螂的玩偶，或许还有其他跟多的玩偶，他们都在哪儿呢？"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_224",
+ "key": "worldtask_world_task_npctxt_229",
"text": "武馆的角落内？"
},
"get_item": [],
@@ -12564,15 +12730,15 @@
"des": 6,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_225",
+ "key": "worldtask_world_task_task_name_230",
"text": "花盆下的秘密"
},
"task_details": {
- "key": "worldtask_world_task_task_details_225",
+ "key": "worldtask_world_task_task_details_230",
"text": "无意间在花盆下找到一封满是思念的信封,里面包含着师傅部分的往事，或许我可以问一下师傅。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_225",
+ "key": "worldtask_world_task_npctxt_230",
"text": "翻找花盆"
},
"get_item": [],
@@ -12612,15 +12778,15 @@
"des": 6,
"icon": "25001",
"task_name": {
- "key": "worldtask_world_task_task_name_226",
+ "key": "worldtask_world_task_task_name_231",
"text": "往日追忆"
},
"task_details": {
- "key": "worldtask_world_task_task_details_226",
+ "key": "worldtask_world_task_task_details_231",
"text": "无人的时候，希卡普会一个人静静看着海洋，看上去是如此的落寞，我或许可以和他聊聊。"
},
"npctxt": {
- "key": "worldtask_world_task_npctxt_226",
+ "key": "worldtask_world_task_npctxt_231",
"text": "和希卡普聊聊"
},
"get_item": [],
diff --git a/comm/imodule.go b/comm/imodule.go
index 5054c79f1..2ed95cc0b 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -234,7 +234,7 @@ type (
//创建装备
NewEquipment(uid, cid string) (errdata *pb.ErrorData, equip *pb.DB_Equipment)
//添加装备
- AddEquipment(session IUserSession, equip *pb.DB_Equipment) (errdata *pb.ErrorData)
+ AddEquipment(session IUserSession, equip ...*pb.DB_Equipment) (errdata *pb.ErrorData)
//出售装备
SellEquipments(session IUserSession, equs []string) (errdata *pb.ErrorData, atno []*pb.UserAtno)
//回收装备接口
diff --git a/modules/chat/module.go b/modules/chat/module.go
index 82b8538b0..4ceb94eab 100644
--- a/modules/chat/module.go
+++ b/modules/chat/module.go
@@ -351,7 +351,7 @@ func (this *Chat) pushChatToUnion(msg *pb.DBChat) (errdata *pb.ErrorData) {
users := make([]string, 0, len(members))
for _, v := range members {
if v.OfflineTime == 0 { //离线时间为0 表示在线
- users = append(users, v.Uid)
+ users = append(users, v.Uinfo.Uid)
}
}
this.SendMsgToUsers(string(this.GetType()), "message", &pb.ChatMessagePush{Chat: msg}, users...)
diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go
index d393cee47..35c2a44e5 100644
--- a/modules/equipment/modelEquipment.go
+++ b/modules/equipment/modelEquipment.go
@@ -198,13 +198,13 @@ func (this *modelEquipmentComp) addEquipments(uid string, equips []*pb.DB_Equipm
if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
this.module.Errorln(err)
} else {
- if err = model.AddLists(uid, &equipsMap); err != nil {
+ if err = model.AddLists(uid, equipsMap); err != nil {
this.module.Errorf("err:%v", err)
return
}
}
} else {
- if err = model.AddLists(uid, &equipsMap); err != nil {
+ if err = this.AddLists(uid, equipsMap); err != nil {
this.module.Errorf("err:%v", err)
return
}
diff --git a/modules/equipment/module.go b/modules/equipment/module.go
index 61dc79778..fe2e04c0c 100644
--- a/modules/equipment/module.go
+++ b/modules/equipment/module.go
@@ -671,6 +671,7 @@ func (this *Equipment) NewMaxQualityEquipment(session comm.IUserSession, cid []s
}
}
}
+
return
}
diff --git a/modules/friend/api_cross_addblack.go b/modules/friend/api_cross_addblack.go
index 96d4e22ad..61f1a482e 100644
--- a/modules/friend/api_cross_addblack.go
+++ b/modules/friend/api_cross_addblack.go
@@ -112,10 +112,15 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackR
return
}
+ // 判断对方是不是好友
+ if _, ok := utils.Findx(target.FriendIds, self.Uid); ok {
+ target.FriendIds = utils.Deletex(target.FriendIds, self.Uid)
+ }
target.Beblackids = append(target.Beblackids, session.GetUserId())
//更新
err = this.module.modelFriend.Change(target.Uid, map[string]interface{}{
"beblackids": target.Beblackids,
+ "friendIds": target.FriendIds,
})
if err != nil {
errdata = &pb.ErrorData{
diff --git a/modules/friend/api_cross_getassist.go b/modules/friend/api_cross_getassist.go
index 20d467378..95b10674f 100644
--- a/modules/friend/api_cross_getassist.go
+++ b/modules/friend/api_cross_getassist.go
@@ -54,8 +54,10 @@ func (this *apiComp) GetAssistHero(session comm.IUserSession, req *pb.FriendGetA
for cur.Next(context.TODO()) {
tmp := &pb.DBFriend{}
if err = cur.Decode(tmp); err == nil {
- list.Data[tmp.Uid] = tmp.Info.Name
- heros = append(heros, tmp.Hero)
+ if session.GetUserId() != tmp.Uid {
+ list.Data[tmp.Uid] = tmp.Info.Name
+ heros = append(heros, tmp.Hero)
+ }
}
}
err = this.module.modelAssist.Add(session.GetUserId(), list)
@@ -83,8 +85,10 @@ func (this *apiComp) GetAssistHero(session comm.IUserSession, req *pb.FriendGetA
for cur.Next(context.TODO()) {
tmp := &pb.DBFriend{}
if err = cur.Decode(tmp); err == nil {
- list.Data[tmp.Uid] = tmp.Info.Name
- heros = append(heros, tmp.Hero)
+ if session.GetUserId() != tmp.Uid {
+ list.Data[tmp.Uid] = tmp.Info.Name
+ heros = append(heros, tmp.Hero)
+ }
}
}
@@ -93,7 +97,9 @@ func (this *apiComp) GetAssistHero(session comm.IUserSession, req *pb.FriendGetA
})
} else {
for k := range list.Data {
- uids = append(uids, k)
+ if session.GetUserId() != k {
+ uids = append(uids, k)
+ }
}
// 批量查
friends, err = this.module.modelFriend.GetFriends(uids)
@@ -105,7 +111,9 @@ func (this *apiComp) GetAssistHero(session comm.IUserSession, req *pb.FriendGetA
return
}
for _, v := range friends {
- heros = append(heros, v.Hero)
+ if v.Hero != nil {
+ heros = append(heros, v.Hero)
+ }
}
}
diff --git a/modules/friend/api_cross_refresh.go b/modules/friend/api_cross_refresh.go
index da02c2dc5..e7a485a45 100644
--- a/modules/friend/api_cross_refresh.go
+++ b/modules/friend/api_cross_refresh.go
@@ -79,15 +79,17 @@ func (this *apiComp) RefreshAssistHero(session comm.IUserSession, req *pb.Friend
list.Data[key] = names[pos]
ahero = append(ahero, heros[pos])
}
-
- localNum, _ := this.module.modelFriend.DB.CountDocuments(core.SqlTable(this.module.modelFriend.TableName), bson.M{})
- randomIndex := comm.GetRandNum(0, int32(localNum))
- cur, err := this.module.modelFriend.DB.Find(core.SqlTable(this.module.modelFriend.TableName), bson.M{"assistHeroId": bson.M{"$ne": ""}}, options.Find().SetSkip(int64(randomIndex)).SetLimit(int64(strangerCount)))
+ list.Data = make(map[string]string)
+ //localNum, _ := this.module.modelFriend.DB.CountDocuments(core.SqlTable(this.module.modelFriend.TableName), bson.M{})
+ //randomIndex := comm.GetRandNum(0, int32(localNum))
+ cur, err := this.module.modelFriend.DB.Find(core.SqlTable(this.module.modelFriend.TableName), bson.M{"assistHeroId": bson.M{"$ne": ""}}, options.Find().SetSkip(0).SetLimit(int64(strangerCount)))
for cur.Next(context.TODO()) {
tmp := &pb.DBFriend{}
if err = cur.Decode(tmp); err == nil {
- ahero = append(ahero, tmp.Hero)
- list.Data[tmp.Uid] = tmp.Info.Name
+ if session.GetUserId() != tmp.Uid {
+ ahero = append(ahero, tmp.Hero)
+ list.Data[tmp.Uid] = tmp.Info.Name
+ }
}
}
if err = this.module.modelAssist.Change(session.GetUserId(), map[string]interface{}{
diff --git a/modules/friend/model_friend.go b/modules/friend/model_friend.go
index 0ea7cecdf..4b1d9e2c6 100644
--- a/modules/friend/model_friend.go
+++ b/modules/friend/model_friend.go
@@ -63,29 +63,9 @@ func (this *ModelFriend) GetFriend(uid string) (info *pb.DBFriend, err error) {
func (this *ModelFriend) GetFriends(uids []string) (friends []*pb.DBFriend, err error) {
friends = make([]*pb.DBFriend, 0)
- var onfound []string
- if onfound, err = this.Gets(uids, &friends); err != nil {
+ if _, err = this.GetByUids(uids, &friends); err != nil {
this.moduole.Errorln(err)
}
- for _, v := range onfound {
- var user *pb.DBUser
- if user, err = this.moduole.ModuleUser.GetUser(v); err != nil {
- this.moduole.Errorln(err)
- return
- }
- info := &pb.DBFriend{
- Id: primitive.NewObjectID().Hex(),
- Uid: v,
- Info: comm.GetUserBaseInfo(user),
- FriendIds: make([]string, 0),
- ApplyIds: make([]string, 0),
- BlackIds: make([]string, 0),
- GetZandIds: make([]string, 0),
- Record: make([]*pb.AssistRecord, 0),
- Beblackids: make([]string, 0),
- }
- err = this.Add(v, info)
- friends = append(friends, info)
- }
+
return
}
diff --git a/modules/guildgve/modelUnionRoulette.go b/modules/guildgve/modelUnionRoulette.go
index b66374600..2b0e62c29 100644
--- a/modules/guildgve/modelUnionRoulette.go
+++ b/modules/guildgve/modelUnionRoulette.go
@@ -79,7 +79,7 @@ func (this *ModelUnionroulette) roulettechangePush(unionid string, uid, uname st
return
}
for _, v := range members {
- users = append(users, v.Uid)
+ users = append(users, v.Uinfo.Uid)
}
lock, _ := this.userlock(unionid)
diff --git a/modules/guildgve/modelUniongve.go b/modules/guildgve/modelUniongve.go
index ebd61f506..b428c3598 100644
--- a/modules/guildgve/modelUniongve.go
+++ b/modules/guildgve/modelUniongve.go
@@ -196,7 +196,7 @@ func (this *ModelUniongve) booshpchangepush(unionid string, info *pb.DBGuildGve)
return
}
for _, v := range members {
- users = append(users, v.Uid)
+ users = append(users, v.Uinfo.Uid)
}
this.module.SendMsgToUsers(string(this.module.GetType()), "booschange", &pb.GuildGveBoosChangePush{
@@ -222,7 +222,7 @@ func (this *ModelUniongve) booskill(unionid string, boosid int32, info *pb.DBGui
return
}
for _, v := range members {
- users = append(users, v.Uid)
+ users = append(users, v.Uinfo.Uid)
}
@@ -274,7 +274,7 @@ func (this *ModelUniongve) infochangepush(unionid string, info *pb.DBGuildGve) {
return
}
for _, v := range members {
- users = append(users, v.Uid)
+ users = append(users, v.Uinfo.Uid)
}
this.module.SendMsgToUsers(string(this.module.GetType()), "infochange", &pb.GuildGveInfoChangePush{
diff --git a/modules/guildgve/modelrank.go b/modules/guildgve/modelrank.go
index 4262d1199..a78bf1739 100644
--- a/modules/guildgve/modelrank.go
+++ b/modules/guildgve/modelrank.go
@@ -131,7 +131,7 @@ func (this *modelRank) rankRewardPush(unionid string, reward []*cfg.Gameatn) {
}
for _, v := range members {
- users = append(users, v.Uid)
+ users = append(users, v.Uinfo.Uid)
}
this.module.mail.SendMailToUsers(users, "Guild_Boss", reward, nil)
}
diff --git a/modules/guildgve/module.go b/modules/guildgve/module.go
index fd2eefdbe..845f4abe1 100644
--- a/modules/guildgve/module.go
+++ b/modules/guildgve/module.go
@@ -164,7 +164,7 @@ func (this *GuildGve) ModifyBooslv(session comm.IUserSession, lv int32) (errdata
return
}
for _, v := range members {
- users = append(users, v.Uid)
+ users = append(users, v.Uinfo.Uid)
}
this.SendMsgToUsers(string(this.GetType()), "stagechange", &pb.GuildGveStageChangePush{
Info: info,
diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go
index d56eb0496..d82391c97 100644
--- a/modules/hunting/api_challengeover.go
+++ b/modules/hunting/api_challengeover.go
@@ -100,9 +100,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
res = append(res, cfgHunting.Firstprize...)
for _, v := range cfgHunting.Firstprize {
- if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil {
- if _conf.Usetype == comm.UseType8 {
- tasks = append(tasks, comm.GetBuriedParam(comm.Rtype154, v.N))
+ if v.A == "item" {
+ if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil {
+ if _conf.Usetype == comm.UseType8 {
+ tasks = append(tasks, comm.GetBuriedParam(comm.Rtype154, v.N))
+ }
}
}
}
@@ -111,7 +113,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
if hunting.BossTime[key] == 0 || hunting.BossTime[key] > req.Report.Costtime {
hunting.BossTime[key] = req.Report.Costtime
mapData["bossTime"] = hunting.BossTime // 更新时间
- this.module.CheckRank(session.GetUserId(), req.BossType, req.Difficulty, req.Report)
+
}
// 发放通关随机奖励
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
@@ -181,18 +183,38 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
Sell: del,
Heroexp: changExp,
})
+ szLine := make([]*pb.LineUp, 0)
+ var Leadpos int32
+ if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
+ Leadpos = req.Report.Info.Redflist[0].Leadpos
+ for _, v := range req.Report.Info.Redflist[0].Team {
+ if v != nil {
+ szLine = append(szLine, &pb.LineUp{
+ Cid: v.HeroID,
+ Star: v.Star,
+ Lv: v.Lv,
+ })
+ }
+ }
+ }
+ go func() {
+ line := &pb.LineData{
+ Leadpos: Leadpos,
+ Line: szLine,
+ }
+ this.module.modulerank.CheckRank(session.GetUserId(), req.BossType, req.Difficulty, line, req.Report.Costtime)
+ }()
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype80, 1, req.BossType, req.Difficulty))
// 随机任务统计
- // this.module.ModuleRtask.SendToRtask(session, comm.Rtype81, req.Difficulty, req.BossType)
- // this.module.ModuleRtask.SendToRtask(session, comm.Rtype82, req.BossType)
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype81, req.Difficulty, req.BossType))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype82, 1, req.BossType))
// 狩猎副本掉落觉醒材料
for _, v := range reward {
- if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil {
- if _conf.Usetype == comm.UseType8 {
- // this.module.ModuleRtask.SendToRtask(session, comm.Rtype154, v.N)
- tasks = append(tasks, comm.GetBuriedParam(comm.Rtype154, v.N))
+ if v.A == "item" {
+ if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil {
+ if _conf.Usetype == comm.UseType8 {
+ tasks = append(tasks, comm.GetBuriedParam(comm.Rtype154, v.N))
+ }
}
}
}
diff --git a/modules/hunting/api_ranklist.go b/modules/hunting/api_ranklist.go
index 6a4905803..4b897731d 100644
--- a/modules/hunting/api_ranklist.go
+++ b/modules/hunting/api_ranklist.go
@@ -1,60 +1,61 @@
package hunting
import (
- "context"
"go_dreamfactory/comm"
- "go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/pb"
- "go_dreamfactory/sys/db"
- "strconv"
-
- "github.com/go-redis/redis/v8"
)
//参数校验
func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.HuntingRankListReq) (errdata *pb.ErrorData) {
-
+ if req.BoosType == 0 {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ }
+ }
return
}
func (this *apiComp) RankList(session comm.IUserSession, req *pb.HuntingRankListReq) (errdata *pb.ErrorData) {
var (
- szRank []*pb.DBHuntingRank
- rd *redis.StringSliceCmd
+ fRank []*pb.DBHuntingRank
+ uids []string
+ err error
+ ranks []*pb.DBHuntingRecord
+ players []*pb.DBHuntingRank
)
if errdata = this.RankListCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}
- conn, _ := db.Local()
- dbModel := db.NewDBModelByExpired(comm.TableHuntingRank, conn)
- if !req.Friend {
- var (
- pipe *pipe.RedisPipe = conn.Redis.RedisPipe(context.TODO())
- )
- rd = pipe.ZRevRange("huntingRank"+strconv.Itoa(int(req.BoosType)), 0, comm.MaxRankList)
-
- if _, err := pipe.Exec(); err != nil {
- this.module.Errorln(err)
- return
+ if uids, err = this.module.modulerank.querySRankUser(int(req.BoosType)); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
}
- _dataList := rd.Val()
- for _, v := range _dataList {
- result := &pb.DBHuntingRank{}
-
- if err := dbModel.Redis.HGetAll(v, result); err == nil {
- szRank = append(szRank, result)
- }
+ return
+ }
+ if ranks, err = this.module.modulerank.queryPlayers(uids); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
}
- } else {
- uids := this.friend.GetFriendList(session.GetUserId())
- for _, id := range uids {
- rankData := this.module.modulerank.getHuntingRankListByBossType(id, req.BoosType)
- if rankData != nil {
- szRank = append(szRank, rankData)
- }
+ return
+ }
+ players = make([]*pb.DBHuntingRank, len(ranks))
+ for i, v := range ranks {
+ players[i] = &pb.DBHuntingRank{
+ Uinfo: v.Uinfo,
+ Line: v.Data[req.BoosType].Line[v.Data[req.BoosType].Maxnandu],
+ Difficulty: v.Data[req.BoosType].Maxnandu,
+ Bosstype: req.BoosType,
+ Costtime: v.Data[req.BoosType].Costime[v.Data[req.BoosType].Maxnandu],
}
}
-
- session.SendMsg(string(this.module.GetType()), HuntingRankListResp, &pb.HuntingRankListResp{Ranks: szRank})
+ session.SendMsg(string(this.module.GetType()), HuntingRankListResp, &pb.HuntingRankListResp{
+ Ranks: players,
+ Franks: fRank,
+ })
return
}
diff --git a/modules/hunting/model_rank.go b/modules/hunting/model_rank.go
index 82e7b106e..4ffe418c1 100644
--- a/modules/hunting/model_rank.go
+++ b/modules/hunting/model_rank.go
@@ -4,94 +4,184 @@ import (
"context"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/db"
+ "strconv"
"github.com/go-redis/redis/v8"
+ "go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx"
)
type ModelRank struct {
modules.MCompModel
+
moduleHunting *Hunting
}
func (this *ModelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
- this.TableName = comm.TableHuntingRecord // 挑战记录
+ this.TableName = comm.TableHuntingRank
err = this.MCompModel.Init(service, module, comp, options)
this.moduleHunting = module.(*Hunting)
- this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+ //创建uid索引
+ this.DB.CreateIndex(core.SqlTable(comm.TableHuntingRank), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
})
return
}
-func (this *ModelRank) getHuntingRankList(uid string) []*pb.DBHuntingRank {
- ranks := make([]*pb.DBHuntingRank, 0)
- err := this.GetList(uid, &ranks)
- if err != nil {
- return nil
- }
- return ranks
-}
-
-func (this *ModelRank) getHuntingRankListByBossType(uid string, bossType int32) *pb.DBHuntingRank {
- ranks := make([]*pb.DBHuntingRank, 0)
- if db.IsCross() {
- err := this.GetList(uid, &ranks)
- if err != nil {
- return nil
- }
- for _, v := range ranks {
- if v.Bosstype == bossType {
- return v
- }
- }
- } else {
- conn, err := db.Cross()
- if err != nil {
- return nil
- }
- model := db.NewDBModelByExpired(comm.TableHuntingRank, conn)
-
- err = model.GetList(uid, &ranks)
- if err != nil {
- return nil
- }
- for _, v := range ranks {
- if v.Bosstype == bossType {
- return v
- }
- }
- }
- return nil
-}
-
-// 排行数据写跨服
-func (this *ModelRank) SetRankListData(tableName string, score int64, uid string) {
+// 获取排行榜数据
+func (this *ModelRank) getHuntingRank(uid string) *pb.DBHuntingRecord {
+ data := &pb.DBHuntingRecord{}
if !db.IsCross() {
- if conn, err := db.Cross(); err == nil {
- var (
- pipe *pipe.RedisPipe = conn.Redis.RedisPipe(context.TODO())
- menbers *redis.Z
- )
+ if conn_, err := db.Cross(); err == nil {
+ model := db.NewDBModelByExpired(comm.TableHuntingRank, conn_)
- menbers = &redis.Z{Score: float64(score), Member: uid}
+ if err := model.Get(uid, data); err != nil {
+ return data
+ }
+ }
- if cmd := pipe.ZAdd(tableName, menbers); cmd != nil {
+ }
- dock, err1 := cmd.Result()
- if err1 != nil {
- this.moduleHunting.Errorln(dock, err1)
+ return data
+}
+
+// 获取排行榜前50的用户名单
+func (this *ModelRank) querySRankUser(bossid int) (ranks []string, err error) {
+ var (
+ result []string
+ )
+
+ tableName := this.TableName + strconv.Itoa(int(bossid))
+ if result, err = this.Redis.ZRevRange(tableName, 0, comm.MinRankList).Result(); err != nil {
+ //this.module.Errorln(err)
+ return
+ }
+ ranks = make([]string, 0)
+ for i := 0; i < len(result); i += 1 {
+ ranks = append(ranks, result[i])
+ }
+ return
+}
+
+func (this *ModelRank) queryPlayers(uIds []string) (result []*pb.DBHuntingRecord, err error) {
+ result = make([]*pb.DBHuntingRecord, 0)
+ if _, err = this.GetByUids(uIds, &result); err != nil && err != mgo.MongodbNil {
+ //this.module.Errorln(err)
+ return
+ }
+ return
+}
+
+// 记录数据存在跨服
+func (this *ModelRank) CheckRank(uid string, boosID int32, difficulty int32, line *pb.LineData, costTime int32) {
+ conn_, err := db.Cross() // 获取跨服数据库对象
+ if err != nil {
+ return
+ }
+ user, err := this.moduleHunting.ModuleUser.GetUser(uid)
+ if err != nil {
+ return
+ }
+ model := db.NewDBModelByExpired(comm.TableHuntingRank, conn_)
+
+ // 写入排行榜
+ record := &pb.DBHuntingRecord{
+ Data: map[int32]*pb.HuntingData{},
+ }
+ if err = model.Get(uid, record); err == mgo.MongodbNil {
+ record.Id = primitive.NewObjectID().Hex()
+ record.Data = make(map[int32]*pb.HuntingData, 0)
+ record.Uid = uid
+ record.Uinfo = &pb.BaseUserInfo{
+ Uid: uid,
+ Sid: user.Sid,
+ Name: user.Name,
+ Gender: user.Gender,
+ Skin: user.CurSkin,
+ Aframe: user.Curaframe,
+ Title: user.Curtitle,
+ Lv: user.Lv,
+ }
+ mpLine := make(map[int32]*pb.LineData, 0)
+ mpLine[difficulty] = line
+ tmp := make(map[int32]int32, 0)
+ tmp[difficulty] = costTime
+
+ if _, ok := record.Data[boosID]; !ok {
+ record.Data[boosID] = &pb.HuntingData{
+ Costime: tmp,
+ Maxnandu: difficulty,
+ Line: mpLine,
+ }
+ } else {
+ if record.Data[boosID].Maxnandu < difficulty {
+ record.Data[boosID].Maxnandu = difficulty
+ }
+ }
+
+ model.Add(uid, record)
+ } else if err == nil {
+ record.Uinfo = &pb.BaseUserInfo{
+ Uid: uid,
+ Sid: user.Sid,
+ Name: user.Name,
+ Gender: user.Gender,
+ Skin: user.CurSkin,
+ Aframe: user.Curaframe,
+ Title: user.Curtitle,
+ Lv: user.Lv,
+ }
+ update := make(map[string]interface{}, 0)
+ update["uinfo"] = record.Uinfo
+
+ if _, ok := record.Data[boosID]; !ok {
+ tmp := make(map[int32]int32, 0)
+ tmp[difficulty] = costTime
+ mpLine := make(map[int32]*pb.LineData, 0)
+ mpLine[difficulty] = line
+ record.Data[boosID] = &pb.HuntingData{
+ Costime: tmp,
+ Maxnandu: difficulty,
+ Line: mpLine,
+ }
+ } else {
+ if record.Data[boosID].Maxnandu < difficulty {
+ record.Data[boosID].Maxnandu = difficulty
+ } else {
+ if record.Data[boosID].Costime[difficulty] > costTime { // 不是新记录不写
+ return
}
}
- if _, err := pipe.Exec(); err != nil {
- this.moduleHunting.Errorln(err)
- return
- }
+ }
+
+ record.Data[boosID].Costime[difficulty] = costTime
+ record.Data[boosID].Line[difficulty] = line
+ update["data"] = record.Data
+ model.Change(uid, update)
+ }
+ var (
+ pipe *pipe.RedisPipe = conn_.Redis.RedisPipe(context.TODO())
+ menbers *redis.Z
+ tableName string
+ score int32
+ )
+ score = difficulty*10000 + (10000 - costTime)
+ tableName = this.TableName + strconv.Itoa(int(boosID))
+ menbers = &redis.Z{Score: float64(score), Member: uid}
+
+ if cmd := pipe.ZAdd(tableName, menbers); cmd != nil {
+ if _, err = cmd.Result(); err != nil {
+ this.moduleHunting.Errorln(err)
}
}
+ if _, err := pipe.Exec(); err != nil {
+ this.moduleHunting.Errorln(err)
+ return
+ }
}
diff --git a/modules/hunting/module.go b/modules/hunting/module.go
index 23cd20910..f0790e6bd 100644
--- a/modules/hunting/module.go
+++ b/modules/hunting/module.go
@@ -1,18 +1,10 @@
package hunting
import (
- "context"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
- "go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
- "go_dreamfactory/sys/db"
- "math"
- "strconv"
-
- "github.com/go-redis/redis/v8"
- "go.mongodb.org/mongo-driver/bson/primitive"
)
type Hunting struct {
@@ -76,104 +68,20 @@ func (this *Hunting) ModifyHuntingData(uid string, data map[string]interface{})
}
func (this *Hunting) CheckUserBaseHuntingInfo(uid string) (data []*pb.DBHuntingRank) {
- list, err := this.modelHunting.getHuntingList(uid)
- if err == nil {
- for k := range list.Boss {
- _d := this.modulerank.getHuntingRankListByBossType(uid, k)
- if _d != nil {
- data = append(data, _d)
- }
+
+ if d := this.modulerank.getHuntingRank(uid); d.Id != "" {
+ for k, v := range d.Data {
+ data = append(data, &pb.DBHuntingRank{
+ Uinfo: d.Uinfo,
+ Line: v.Line[v.Maxnandu],
+ Difficulty: v.Maxnandu,
+ Bosstype: k,
+ Costtime: v.Costime[v.Maxnandu],
+ })
}
}
return
}
-func (this *Hunting) CheckRank(uid string, boosID int32, difficulty int32, report *pb.BattleReport) {
- conn_, _ := db.Cross() // 获取跨服数据库对象
- userinfo, err := this.ModuleUser.GetUser(uid)
- if err != nil {
- return
- }
- model := db.NewDBModel(comm.TableHuntingRank, conn_)
-
- costTime := report.Costtime
- szLine := make([]*pb.LineUp, len(report.Info.Redflist[0].Team))
- Leadpos := 0
- if report != nil && report.Info != nil && len(report.Info.Redflist) > 0 {
- costTime = report.Costtime
- Leadpos = int(report.Info.Redflist[0].Leadpos)
- for i, v := range report.Info.Redflist[0].Team {
- if v != nil {
- szLine[i] = &pb.LineUp{
- Cid: v.HeroID,
- Star: v.Star,
- Lv: v.Lv,
- }
- }
- }
- }
- // 写入排行榜
- objID := ""
- bFind := false
- ranks := make([]*pb.DBHuntingRank, 0)
- model.GetList(uid, &ranks)
- for _, v := range ranks {
- if v.Bosstype == boosID {
- mapRankData := make(map[string]interface{}, 0)
- mapRankData["difficulty"] = difficulty
- mapRankData["bosstype"] = boosID
- mapRankData["Leadpos"] = Leadpos
- mapRankData["line"] = szLine
- mapRankData["costTime"] = costTime
-
- model.ChangeList(uid, v.Id, mapRankData)
- objID = v.Id
- bFind = true
- break
- }
- }
- if !bFind {
-
- new := &pb.DBHuntingRank{
- Id: primitive.NewObjectID().Hex(),
- Uid: uid,
- Difficulty: difficulty,
- Bosstype: boosID,
- Nickname: userinfo.Name,
- Skin: userinfo.CurSkin,
- Lv: userinfo.Lv,
- Leadpos: int32(Leadpos),
- Line: szLine,
- CostTime: costTime,
- Sex: userinfo.Gender,
- Title: userinfo.Curtitle,
- }
- objID = new.Id
- model.AddList(uid, new.Id, new)
- }
-
- var (
- pipe *pipe.RedisPipe = conn_.Redis.RedisPipe(context.TODO())
- menbers *redis.Z
- tableName string
- score int64
- )
- score = int64(difficulty)<<31 + int64(math.MaxInt32-costTime)
- tableName = "huntingRank" + strconv.Itoa(int(boosID))
- strKey := "huntingRank:" + uid + "-" + objID
- menbers = &redis.Z{Score: float64(score), Member: strKey}
-
- if cmd := pipe.ZAdd(tableName, menbers); cmd != nil {
-
- dock, err1 := cmd.Result()
- if err1 != nil {
- this.Errorln(dock, err1)
- }
- }
- if _, err := pipe.Exec(); err != nil {
- this.Errorln(err)
- return
- }
-}
//红点查询
func (this *Hunting) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (reddot map[comm.ReddotType]*pb.ReddotItem) {
diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go
index acc1b83c2..8f0106c5d 100644
--- a/modules/sociaty/api_cross_mine.go
+++ b/modules/sociaty/api_cross_mine.go
@@ -79,7 +79,7 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er
// 获取会长
if master != nil {
- if master.Uid == session.GetUserId() { //自己是会长
+ if master.Uinfo.Uid == session.GetUserId() { //自己是会长
sociaty.AccuseTime = 0
update := map[string]interface{}{
"accuseTime": 0,
@@ -88,7 +88,7 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er
} else {
now := configure.Now().Unix()
if now > sociaty.AccuseTime { // 重新选择会长
- if err := this.module.modelSociaty.extendJob(master.Uid, sociaty); err != nil {
+ if err := this.module.modelSociaty.extendJob(master.Uinfo.Uid, sociaty); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
diff --git a/modules/sociaty/model_sociaty.go b/modules/sociaty/model_sociaty.go
index d71af61f6..ed8debd9e 100644
--- a/modules/sociaty/model_sociaty.go
+++ b/modules/sociaty/model_sociaty.go
@@ -317,10 +317,7 @@ func (this *ModelSociaty) applyList(sociaty *pb.DBSociaty) (list []*pb.SociatyMe
}
list = append(list, &pb.SociatyMemberInfo{
- Uid: user.Uid,
- Name: user.Name,
- Avatar: user.Avatar,
- Lv: user.Lv,
+ Uinfo: comm.GetUserBaseInfo(user),
})
}
return
@@ -476,10 +473,7 @@ func (this *ModelSociaty) members(sociaty *pb.DBSociaty) (list []*pb.SociatyMemb
continue
}
list = append(list, &pb.SociatyMemberInfo{
- Uid: user.Uid,
- Name: user.Name,
- Avatar: user.Avatar,
- Lv: user.Lv,
+ Uinfo: comm.GetUserBaseInfo(user),
Job: m.Job,
OfflineTime: user.Offlinetime,
})
@@ -611,10 +605,7 @@ func (this *ModelSociaty) getMasterInfo(sociaty *pb.DBSociaty) *pb.SociatyMember
continue
}
return &pb.SociatyMemberInfo{
- Uid: user.Uid,
- Name: user.Name,
- Lv: user.Lv,
- Avatar: user.Avatar,
+ Uinfo: comm.GetUserBaseInfo(user),
OfflineTime: user.Offlinetime,
}
}
@@ -629,7 +620,7 @@ func (this *ModelSociaty) accuse(sociaty *pb.DBSociaty) error {
return comm.NewCustomError(pb.ErrorCode_SociatyNoMaster)
}
- user, err := this.module.ModuleUser.GetUser(master.Uid)
+ user, err := this.module.ModuleUser.GetUser(master.Uinfo.Uid)
if err != nil {
return comm.NewCustomError(pb.ErrorCode_UserSessionNobeing)
}
diff --git a/modules/user/model_user.go b/modules/user/model_user.go
index 2d94c0d80..1f64a9f36 100644
--- a/modules/user/model_user.go
+++ b/modules/user/model_user.go
@@ -287,12 +287,10 @@ func (this *ModelUser) computeLevel(change *pb.UserResChangedPush) (lvchange boo
return
}
-func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64, name string, rewards []*cfg.Gameatn) {
+func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64, name string) {
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
var (
- atno []*pb.UserAtno
- errdata *pb.ErrorData
- tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
+ tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
)
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeLvChangedPush,
&pb.UserLvChangedPush{Uid: session.GetUserId(), Exp: exp, Lv: lv}); err != nil {
@@ -302,17 +300,11 @@ func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64,
log.Field{Key: "lv", Value: lv},
)
}
- if errdata, atno = this.module.DispenseAtno(session, rewards, true); errdata != nil {
- this.module.Error("资源发放",
- log.Field{Key: "uid", Value: session.GetUserId()},
- log.Field{Key: "rewards", Value: rewards},
- )
- }
+
this.module.chat.SendSysChatToUser(session, comm.ChatSystem12, lv, 0, name)
this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypePlatlv, lv)
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype20, lv))
this.module.ModuleBuried.TriggerBuried(session, tasks...)
- this.module.WriteUserLog(session.GetUserId(), fmt.Sprintf(" lv :%d, exp %d, name %s", lv, exp, name), comm.GMResAddType, "changelv", atno)
})
}
diff --git a/modules/user/module.go b/modules/user/module.go
index 503d060c3..9be69ec32 100644
--- a/modules/user/module.go
+++ b/modules/user/module.go
@@ -574,7 +574,18 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn
}
change.Exp += int64(add)
if lvchange, loseexp, rewards = this.modelUser.computeLevel(change); lvchange {
- this.modelUser.changelv(session, change.Lv, change.Exp, user.Name, rewards)
+ this.modelUser.changelv(session, change.Lv, change.Exp, user.Name)
+ defer func() {
+ go func() {
+ if err, res := this.DispenseAtno(session, rewards, true); err == nil {
+ this.WriteUserLog(session.GetUserId(), fmt.Sprintf("userlv change"), comm.GMResAddType, "changelv", res)
+ } else {
+ this.Errorf("err:%v", err)
+ }
+
+ }()
+ }()
+
}
temp.N = temp.N - loseexp
case comm.VipExp:
diff --git a/modules/viking/api_ranklist.go b/modules/viking/api_ranklist.go
index d9d8c385f..c87101e63 100644
--- a/modules/viking/api_ranklist.go
+++ b/modules/viking/api_ranklist.go
@@ -53,6 +53,27 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListR
Costtime: v.Data[req.BoosType].Costime[v.Data[req.BoosType].Maxnandu],
}
}
+
+ // 获取好友数据
+ uids = this.module.ModuleFriend.GetFriendList(session.GetUserId())
+ if ranks, err = this.module.modulerank.queryPlayers(uids); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ fRank = make([]*pb.DBVikingRank, len(ranks))
+ for i, v := range ranks {
+ fRank[i] = &pb.DBVikingRank{
+ Uinfo: v.Uinfo,
+ Line: v.Data[req.BoosType].Line[v.Data[req.BoosType].Maxnandu],
+ Difficulty: v.Data[req.BoosType].Maxnandu,
+ Bosstype: req.BoosType,
+ Costtime: v.Data[req.BoosType].Costime[v.Data[req.BoosType].Maxnandu],
+ }
+ }
session.SendMsg(string(this.module.GetType()), VikingRankListResp, &pb.VikingRankListResp{
Ranks: players,
Franks: fRank,
diff --git a/modules/viking/model_rank.go b/modules/viking/model_rank.go
index ae3d881ee..1895d7161 100644
--- a/modules/viking/model_rank.go
+++ b/modules/viking/model_rank.go
@@ -71,7 +71,7 @@ func (this *ModelRank) querySRankUser(bossid int) (ranks []string, err error) {
func (this *ModelRank) queryPlayers(uIds []string) (result []*pb.DBVikingRecord, err error) {
result = make([]*pb.DBVikingRecord, 0)
- if _, err = this.Gets(uIds, &result); err != nil && err != mgo.MongodbNil {
+ if _, err = this.GetByUids(uIds, &result); err != nil && err != mgo.MongodbNil {
//this.module.Errorln(err)
return
}
diff --git a/modules/viking/model_srank.go b/modules/viking/model_srank.go
index 46e38f908..354aa8a14 100644
--- a/modules/viking/model_srank.go
+++ b/modules/viking/model_srank.go
@@ -42,7 +42,7 @@ func (this *ModelSRank) Init(service core.IService, module core.IModule, comp co
func (this *ModelSRank) queryPlayers(uIds []string, conn_ *db.DBConn) (result []*pb.DBVSeasonRecord, err error) {
result = make([]*pb.DBVSeasonRecord, 0)
model := db.NewDBModelByExpired(comm.TableVikingSRank, conn_)
- if _, err = model.Gets(uIds, &result); err != nil && err != mgo.MongodbNil {
+ if _, err = model.GetByUids(uIds, &result); err != nil && err != mgo.MongodbNil {
//this.module.Errorln(err)
return
}
diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go
index c453d1c7c..a6cd82acb 100644
--- a/pb/battle_msg.pb.go
+++ b/pb/battle_msg.pb.go
@@ -21,6 +21,61 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
+type LineData struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Leadpos int32 `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
+ Line []*LineUp `protobuf:"bytes,2,rep,name=line,proto3" json:"line"` // 阵容数据
+}
+
+func (x *LineData) Reset() {
+ *x = LineData{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_battle_battle_msg_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *LineData) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LineData) ProtoMessage() {}
+
+func (x *LineData) ProtoReflect() protoreflect.Message {
+ mi := &file_battle_battle_msg_proto_msgTypes[0]
+ 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 LineData.ProtoReflect.Descriptor instead.
+func (*LineData) Descriptor() ([]byte, []int) {
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *LineData) GetLeadpos() int32 {
+ if x != nil {
+ return x.Leadpos
+ }
+ return 0
+}
+
+func (x *LineData) GetLine() []*LineUp {
+ if x != nil {
+ return x.Line
+ }
+ return nil
+}
+
type LineUp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -34,7 +89,7 @@ type LineUp struct {
func (x *LineUp) Reset() {
*x = LineUp{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[0]
+ mi := &file_battle_battle_msg_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -47,7 +102,7 @@ func (x *LineUp) String() string {
func (*LineUp) ProtoMessage() {}
func (x *LineUp) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[0]
+ mi := &file_battle_battle_msg_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -60,7 +115,7 @@ func (x *LineUp) ProtoReflect() protoreflect.Message {
// Deprecated: Use LineUp.ProtoReflect.Descriptor instead.
func (*LineUp) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{0}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{1}
}
func (x *LineUp) GetCid() string {
@@ -98,7 +153,7 @@ type BattleFormation struct {
func (x *BattleFormation) Reset() {
*x = BattleFormation{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[1]
+ mi := &file_battle_battle_msg_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -111,7 +166,7 @@ func (x *BattleFormation) String() string {
func (*BattleFormation) ProtoMessage() {}
func (x *BattleFormation) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[1]
+ mi := &file_battle_battle_msg_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -124,7 +179,7 @@ func (x *BattleFormation) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleFormation.ProtoReflect.Descriptor instead.
func (*BattleFormation) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{1}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{2}
}
func (x *BattleFormation) GetLeadpos() int32 {
@@ -166,7 +221,7 @@ type BattleEVEReq struct {
func (x *BattleEVEReq) Reset() {
*x = BattleEVEReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[2]
+ mi := &file_battle_battle_msg_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -179,7 +234,7 @@ func (x *BattleEVEReq) String() string {
func (*BattleEVEReq) ProtoMessage() {}
func (x *BattleEVEReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[2]
+ mi := &file_battle_battle_msg_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -192,7 +247,7 @@ func (x *BattleEVEReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleEVEReq.ProtoReflect.Descriptor instead.
func (*BattleEVEReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{2}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{3}
}
func (x *BattleEVEReq) GetPtype() PlayType {
@@ -260,7 +315,7 @@ type BattlePVEReq struct {
func (x *BattlePVEReq) Reset() {
*x = BattlePVEReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[3]
+ mi := &file_battle_battle_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -273,7 +328,7 @@ func (x *BattlePVEReq) String() string {
func (*BattlePVEReq) ProtoMessage() {}
func (x *BattlePVEReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[3]
+ mi := &file_battle_battle_msg_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -286,7 +341,7 @@ func (x *BattlePVEReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattlePVEReq.ProtoReflect.Descriptor instead.
func (*BattlePVEReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{3}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{4}
}
func (x *BattlePVEReq) GetPtype() PlayType {
@@ -340,7 +395,7 @@ type BattleHeroPVEReq struct {
func (x *BattleHeroPVEReq) Reset() {
*x = BattleHeroPVEReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[4]
+ mi := &file_battle_battle_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -353,7 +408,7 @@ func (x *BattleHeroPVEReq) String() string {
func (*BattleHeroPVEReq) ProtoMessage() {}
func (x *BattleHeroPVEReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[4]
+ mi := &file_battle_battle_msg_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -366,7 +421,7 @@ func (x *BattleHeroPVEReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleHeroPVEReq.ProtoReflect.Descriptor instead.
func (*BattleHeroPVEReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{4}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{5}
}
func (x *BattleHeroPVEReq) GetPtype() PlayType {
@@ -418,7 +473,7 @@ type PVPFormation struct {
func (x *PVPFormation) Reset() {
*x = PVPFormation{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[5]
+ mi := &file_battle_battle_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -431,7 +486,7 @@ func (x *PVPFormation) String() string {
func (*PVPFormation) ProtoMessage() {}
func (x *PVPFormation) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[5]
+ mi := &file_battle_battle_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -444,7 +499,7 @@ func (x *PVPFormation) ProtoReflect() protoreflect.Message {
// Deprecated: Use PVPFormation.ProtoReflect.Descriptor instead.
func (*PVPFormation) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{5}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{6}
}
func (x *PVPFormation) GetUid() string {
@@ -484,7 +539,7 @@ type BattlePVPReq struct {
func (x *BattlePVPReq) Reset() {
*x = BattlePVPReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[6]
+ mi := &file_battle_battle_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -497,7 +552,7 @@ func (x *BattlePVPReq) String() string {
func (*BattlePVPReq) ProtoMessage() {}
func (x *BattlePVPReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[6]
+ mi := &file_battle_battle_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -510,7 +565,7 @@ func (x *BattlePVPReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattlePVPReq.ProtoReflect.Descriptor instead.
func (*BattlePVPReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{6}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{7}
}
func (x *BattlePVPReq) GetPtype() PlayType {
@@ -566,7 +621,7 @@ type BattleRTPVPReq struct {
func (x *BattleRTPVPReq) Reset() {
*x = BattleRTPVPReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[7]
+ mi := &file_battle_battle_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -579,7 +634,7 @@ func (x *BattleRTPVPReq) String() string {
func (*BattleRTPVPReq) ProtoMessage() {}
func (x *BattleRTPVPReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[7]
+ mi := &file_battle_battle_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -592,7 +647,7 @@ func (x *BattleRTPVPReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleRTPVPReq.ProtoReflect.Descriptor instead.
func (*BattleRTPVPReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{7}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{8}
}
func (x *BattleRTPVPReq) GetPtype() PlayType {
@@ -662,7 +717,7 @@ type BattleLPVEReq struct {
func (x *BattleLPVEReq) Reset() {
*x = BattleLPVEReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[8]
+ mi := &file_battle_battle_msg_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -675,7 +730,7 @@ func (x *BattleLPVEReq) String() string {
func (*BattleLPVEReq) ProtoMessage() {}
func (x *BattleLPVEReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[8]
+ mi := &file_battle_battle_msg_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -688,7 +743,7 @@ func (x *BattleLPVEReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleLPVEReq.ProtoReflect.Descriptor instead.
func (*BattleLPVEReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{8}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{9}
}
func (x *BattleLPVEReq) GetPtype() PlayType {
@@ -756,7 +811,7 @@ type BattlePVBReq struct {
func (x *BattlePVBReq) Reset() {
*x = BattlePVBReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[9]
+ mi := &file_battle_battle_msg_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -769,7 +824,7 @@ func (x *BattlePVBReq) String() string {
func (*BattlePVBReq) ProtoMessage() {}
func (x *BattlePVBReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[9]
+ mi := &file_battle_battle_msg_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -782,7 +837,7 @@ func (x *BattlePVBReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattlePVBReq.ProtoReflect.Descriptor instead.
func (*BattlePVBReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{9}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{10}
}
func (x *BattlePVBReq) GetPtype() PlayType {
@@ -842,7 +897,7 @@ type BattleInfo struct {
func (x *BattleInfo) Reset() {
*x = BattleInfo{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[10]
+ mi := &file_battle_battle_msg_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -855,7 +910,7 @@ func (x *BattleInfo) String() string {
func (*BattleInfo) ProtoMessage() {}
func (x *BattleInfo) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[10]
+ mi := &file_battle_battle_msg_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -868,7 +923,7 @@ func (x *BattleInfo) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleInfo.ProtoReflect.Descriptor instead.
func (*BattleInfo) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{10}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{11}
}
func (x *BattleInfo) GetId() string {
@@ -961,7 +1016,7 @@ type BattleCmd struct {
func (x *BattleCmd) Reset() {
*x = BattleCmd{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[11]
+ mi := &file_battle_battle_msg_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -974,7 +1029,7 @@ func (x *BattleCmd) String() string {
func (*BattleCmd) ProtoMessage() {}
func (x *BattleCmd) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[11]
+ mi := &file_battle_battle_msg_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -987,7 +1042,7 @@ func (x *BattleCmd) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleCmd.ProtoReflect.Descriptor instead.
func (*BattleCmd) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{11}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{12}
}
func (x *BattleCmd) GetCmdtype() string {
@@ -1033,7 +1088,7 @@ type BattleReport struct {
func (x *BattleReport) Reset() {
*x = BattleReport{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[12]
+ mi := &file_battle_battle_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1046,7 +1101,7 @@ func (x *BattleReport) String() string {
func (*BattleReport) ProtoMessage() {}
func (x *BattleReport) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[12]
+ mi := &file_battle_battle_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1059,7 +1114,7 @@ func (x *BattleReport) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleReport.ProtoReflect.Descriptor instead.
func (*BattleReport) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{12}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{13}
}
func (x *BattleReport) GetInfo() *BattleInfo {
@@ -1153,7 +1208,7 @@ type BattleRpcMessage struct {
func (x *BattleRpcMessage) Reset() {
*x = BattleRpcMessage{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[13]
+ mi := &file_battle_battle_msg_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1166,7 +1221,7 @@ func (x *BattleRpcMessage) String() string {
func (*BattleRpcMessage) ProtoMessage() {}
func (x *BattleRpcMessage) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[13]
+ mi := &file_battle_battle_msg_proto_msgTypes[14]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1179,7 +1234,7 @@ func (x *BattleRpcMessage) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleRpcMessage.ProtoReflect.Descriptor instead.
func (*BattleRpcMessage) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{13}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{14}
}
func (x *BattleRpcMessage) GetRid() uint64 {
@@ -1215,7 +1270,7 @@ type BattleCheckResults struct {
func (x *BattleCheckResults) Reset() {
*x = BattleCheckResults{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[14]
+ mi := &file_battle_battle_msg_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1228,7 +1283,7 @@ func (x *BattleCheckResults) String() string {
func (*BattleCheckResults) ProtoMessage() {}
func (x *BattleCheckResults) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[14]
+ mi := &file_battle_battle_msg_proto_msgTypes[15]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1241,7 +1296,7 @@ func (x *BattleCheckResults) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleCheckResults.ProtoReflect.Descriptor instead.
func (*BattleCheckResults) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{14}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{15}
}
func (x *BattleCheckResults) GetIscheck() bool {
@@ -1263,7 +1318,7 @@ type BattleGetInfoReq struct {
func (x *BattleGetInfoReq) Reset() {
*x = BattleGetInfoReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[15]
+ mi := &file_battle_battle_msg_proto_msgTypes[16]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1276,7 +1331,7 @@ func (x *BattleGetInfoReq) String() string {
func (*BattleGetInfoReq) ProtoMessage() {}
func (x *BattleGetInfoReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[15]
+ mi := &file_battle_battle_msg_proto_msgTypes[16]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1289,7 +1344,7 @@ func (x *BattleGetInfoReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleGetInfoReq.ProtoReflect.Descriptor instead.
func (*BattleGetInfoReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{15}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{16}
}
func (x *BattleGetInfoReq) GetBattleid() string {
@@ -1312,7 +1367,7 @@ type BattleGetInfoResp struct {
func (x *BattleGetInfoResp) Reset() {
*x = BattleGetInfoResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[16]
+ mi := &file_battle_battle_msg_proto_msgTypes[17]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1325,7 +1380,7 @@ func (x *BattleGetInfoResp) String() string {
func (*BattleGetInfoResp) ProtoMessage() {}
func (x *BattleGetInfoResp) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[16]
+ mi := &file_battle_battle_msg_proto_msgTypes[17]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1338,7 +1393,7 @@ func (x *BattleGetInfoResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleGetInfoResp.ProtoReflect.Descriptor instead.
func (*BattleGetInfoResp) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{16}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{17}
}
func (x *BattleGetInfoResp) GetBattleid() string {
@@ -1367,7 +1422,7 @@ type BattleCreateServerReq struct {
func (x *BattleCreateServerReq) Reset() {
*x = BattleCreateServerReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[17]
+ mi := &file_battle_battle_msg_proto_msgTypes[18]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1380,7 +1435,7 @@ func (x *BattleCreateServerReq) String() string {
func (*BattleCreateServerReq) ProtoMessage() {}
func (x *BattleCreateServerReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[17]
+ mi := &file_battle_battle_msg_proto_msgTypes[18]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1393,7 +1448,7 @@ func (x *BattleCreateServerReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleCreateServerReq.ProtoReflect.Descriptor instead.
func (*BattleCreateServerReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{17}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{18}
}
func (x *BattleCreateServerReq) GetInfo() *BattleInfo {
@@ -1415,7 +1470,7 @@ type BattleCreateServerResp struct {
func (x *BattleCreateServerResp) Reset() {
*x = BattleCreateServerResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[18]
+ mi := &file_battle_battle_msg_proto_msgTypes[19]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1428,7 +1483,7 @@ func (x *BattleCreateServerResp) String() string {
func (*BattleCreateServerResp) ProtoMessage() {}
func (x *BattleCreateServerResp) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[18]
+ mi := &file_battle_battle_msg_proto_msgTypes[19]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1441,7 +1496,7 @@ func (x *BattleCreateServerResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleCreateServerResp.ProtoReflect.Descriptor instead.
func (*BattleCreateServerResp) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{18}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{19}
}
func (x *BattleCreateServerResp) GetIssucc() bool {
@@ -1465,7 +1520,7 @@ type BattleInCmdReq struct {
func (x *BattleInCmdReq) Reset() {
*x = BattleInCmdReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[19]
+ mi := &file_battle_battle_msg_proto_msgTypes[20]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1478,7 +1533,7 @@ func (x *BattleInCmdReq) String() string {
func (*BattleInCmdReq) ProtoMessage() {}
func (x *BattleInCmdReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[19]
+ mi := &file_battle_battle_msg_proto_msgTypes[20]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1491,7 +1546,7 @@ func (x *BattleInCmdReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleInCmdReq.ProtoReflect.Descriptor instead.
func (*BattleInCmdReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{19}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{20}
}
func (x *BattleInCmdReq) GetBattleid() string {
@@ -1529,7 +1584,7 @@ type BattleInCmdResp struct {
func (x *BattleInCmdResp) Reset() {
*x = BattleInCmdResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[20]
+ mi := &file_battle_battle_msg_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1542,7 +1597,7 @@ func (x *BattleInCmdResp) String() string {
func (*BattleInCmdResp) ProtoMessage() {}
func (x *BattleInCmdResp) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[20]
+ mi := &file_battle_battle_msg_proto_msgTypes[21]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1555,7 +1610,7 @@ func (x *BattleInCmdResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleInCmdResp.ProtoReflect.Descriptor instead.
func (*BattleInCmdResp) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{20}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{21}
}
func (x *BattleInCmdResp) GetBattleid() string {
@@ -1592,7 +1647,7 @@ type BattleOutCmdPush struct {
func (x *BattleOutCmdPush) Reset() {
*x = BattleOutCmdPush{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[21]
+ mi := &file_battle_battle_msg_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1605,7 +1660,7 @@ func (x *BattleOutCmdPush) String() string {
func (*BattleOutCmdPush) ProtoMessage() {}
func (x *BattleOutCmdPush) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[21]
+ mi := &file_battle_battle_msg_proto_msgTypes[22]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1618,7 +1673,7 @@ func (x *BattleOutCmdPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleOutCmdPush.ProtoReflect.Descriptor instead.
func (*BattleOutCmdPush) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{21}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{22}
}
func (x *BattleOutCmdPush) GetBattleid() string {
@@ -1648,7 +1703,7 @@ type BattleFinishPush struct {
func (x *BattleFinishPush) Reset() {
*x = BattleFinishPush{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[22]
+ mi := &file_battle_battle_msg_proto_msgTypes[23]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1661,7 +1716,7 @@ func (x *BattleFinishPush) String() string {
func (*BattleFinishPush) ProtoMessage() {}
func (x *BattleFinishPush) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[22]
+ mi := &file_battle_battle_msg_proto_msgTypes[23]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1674,7 +1729,7 @@ func (x *BattleFinishPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleFinishPush.ProtoReflect.Descriptor instead.
func (*BattleFinishPush) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{22}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{23}
}
func (x *BattleFinishPush) GetBattleid() string {
@@ -1704,7 +1759,7 @@ type BattleConcedeReq struct {
func (x *BattleConcedeReq) Reset() {
*x = BattleConcedeReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[23]
+ mi := &file_battle_battle_msg_proto_msgTypes[24]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1717,7 +1772,7 @@ func (x *BattleConcedeReq) String() string {
func (*BattleConcedeReq) ProtoMessage() {}
func (x *BattleConcedeReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[23]
+ mi := &file_battle_battle_msg_proto_msgTypes[24]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1730,7 +1785,7 @@ func (x *BattleConcedeReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleConcedeReq.ProtoReflect.Descriptor instead.
func (*BattleConcedeReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{23}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{24}
}
func (x *BattleConcedeReq) GetBattleid() string {
@@ -1759,7 +1814,7 @@ type BattleConcedeResp struct {
func (x *BattleConcedeResp) Reset() {
*x = BattleConcedeResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[24]
+ mi := &file_battle_battle_msg_proto_msgTypes[25]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1772,7 +1827,7 @@ func (x *BattleConcedeResp) String() string {
func (*BattleConcedeResp) ProtoMessage() {}
func (x *BattleConcedeResp) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[24]
+ mi := &file_battle_battle_msg_proto_msgTypes[25]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1785,7 +1840,7 @@ func (x *BattleConcedeResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleConcedeResp.ProtoReflect.Descriptor instead.
func (*BattleConcedeResp) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{24}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{25}
}
func (x *BattleConcedeResp) GetIssucc() bool {
@@ -1809,7 +1864,7 @@ type BattleStateInfo struct {
func (x *BattleStateInfo) Reset() {
*x = BattleStateInfo{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[25]
+ mi := &file_battle_battle_msg_proto_msgTypes[26]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1822,7 +1877,7 @@ func (x *BattleStateInfo) String() string {
func (*BattleStateInfo) ProtoMessage() {}
func (x *BattleStateInfo) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[25]
+ mi := &file_battle_battle_msg_proto_msgTypes[26]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1835,7 +1890,7 @@ func (x *BattleStateInfo) ProtoReflect() protoreflect.Message {
// Deprecated: Use BattleStateInfo.ProtoReflect.Descriptor instead.
func (*BattleStateInfo) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{25}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{26}
}
func (x *BattleStateInfo) GetInfo() *BattleInfo {
@@ -1876,7 +1931,7 @@ type StroneBattleReq struct {
func (x *StroneBattleReq) Reset() {
*x = StroneBattleReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_battle_battle_msg_proto_msgTypes[26]
+ mi := &file_battle_battle_msg_proto_msgTypes[27]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1889,7 +1944,7 @@ func (x *StroneBattleReq) String() string {
func (*StroneBattleReq) ProtoMessage() {}
func (x *StroneBattleReq) ProtoReflect() protoreflect.Message {
- mi := &file_battle_battle_msg_proto_msgTypes[26]
+ mi := &file_battle_battle_msg_proto_msgTypes[27]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1902,7 +1957,7 @@ func (x *StroneBattleReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use StroneBattleReq.ProtoReflect.Descriptor instead.
func (*StroneBattleReq) Descriptor() ([]byte, []int) {
- return file_battle_battle_msg_proto_rawDescGZIP(), []int{26}
+ return file_battle_battle_msg_proto_rawDescGZIP(), []int{27}
}
func (x *StroneBattleReq) GetDiBuff() []*DySkillData {
@@ -1963,238 +2018,242 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x22, 0x3e, 0x0a, 0x06, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
- 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72,
- 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
- 0x22, 0x67, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x16, 0x0a,
- 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x66,
- 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x66,
- 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x66, 0x72, 0x69,
- 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xeb, 0x01, 0x0a, 0x0c, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x45, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74,
- 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79,
- 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74,
- 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c,
- 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66,
- 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66,
- 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x79, 0x73, 0x66, 0x6f, 0x72, 0x6d,
- 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x73, 0x79, 0x73, 0x66, 0x6f, 0x72,
- 0x6d, 0x61, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x66, 0x6f, 0x72,
- 0x6d, 0x61, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x75,
- 0x70, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66,
- 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x75, 0x6c,
- 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xa3, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x50, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70,
- 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79,
- 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
- 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
- 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72,
- 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72,
- 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05,
- 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xaa, 0x01,
- 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x56, 0x45, 0x52,
- 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74,
- 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c,
- 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65,
- 0x73, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d,
- 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28,
- 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x5b, 0x0a, 0x0c, 0x50, 0x56,
- 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07,
- 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c,
- 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52,
- 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xbb, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x50, 0x56, 0x50, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70,
- 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79,
- 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
- 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
- 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x64,
- 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50,
- 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x64,
- 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2d, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f,
- 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50,
- 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66,
- 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x83, 0x02, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x52, 0x54, 0x50, 0x56, 0x50, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70,
- 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79,
- 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
- 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
- 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64,
- 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65,
- 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f,
- 0x72, 0x6d, 0x61, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65,
- 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43,
- 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75,
- 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x0b, 0x62, 0x75, 0x6c, 0x65, 0x66,
- 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b,
- 0x62, 0x75, 0x6c, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xf1, 0x01, 0x0a, 0x0d,
- 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4c, 0x50, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a,
+ 0x22, 0x41, 0x0a, 0x08, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07,
+ 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c,
+ 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c,
+ 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x0a, 0x06, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x12, 0x10, 0x0a,
+ 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12,
+ 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73,
+ 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x02, 0x6c, 0x76, 0x22, 0x67, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
+ 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f,
+ 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
+ 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
+ 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x69, 0x65,
+ 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c,
+ 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xeb, 0x01, 0x0a,
+ 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a,
0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50,
0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14,
0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74,
0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x14,
- 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73,
- 0x63, 0x65, 0x6e, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
- 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x26,
- 0x0a, 0x0e, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
- 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x6c,
- 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x27, 0x0a, 0x08, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65,
- 0x72, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x08, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x73, 0x22,
- 0xa3, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x42, 0x52, 0x65, 0x71,
+ 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28,
+ 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+ 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+ 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x79, 0x73, 0x66,
+ 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x73, 0x79, 0x73,
+ 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70,
+ 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61,
+ 0x63, 0x6b, 0x75, 0x70, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75,
+ 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a,
+ 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xa3, 0x01, 0x0a, 0x0c, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70,
+ 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61,
+ 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
+ 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74,
+ 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06,
+ 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
+ 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+ 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+ 0x22, 0xaa, 0x01, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x50,
+ 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52,
+ 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07,
+ 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72,
+ 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72,
+ 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46,
+ 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72,
+ 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05,
+ 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x5b, 0x0a,
+ 0x0c, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a,
+ 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
+ 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x06, 0x66, 0x6f, 0x72,
+ 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65,
+ 0x72, 0x6f, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xbb, 0x01, 0x0a, 0x0c, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x50, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70,
+ 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61,
+ 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
+ 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74,
+ 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x09,
+ 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09,
+ 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2d, 0x0a, 0x0a, 0x62, 0x75, 0x6c,
+ 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+ 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x62, 0x75,
+ 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x83, 0x02, 0x0a, 0x0e, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x52, 0x54, 0x50, 0x56, 0x50, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70,
+ 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61,
+ 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
+ 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74,
+ 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
+ 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x09, 0x72, 0x65,
+ 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+ 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c,
+ 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+ 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x0b, 0x62, 0x75,
+ 0x6c, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
+ 0x6e, 0x52, 0x0b, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xf1,
+ 0x01, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4c, 0x50, 0x56, 0x45, 0x52, 0x65, 0x71,
0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70,
0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73,
0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69,
- 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d,
- 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66,
- 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xd6, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20,
+ 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+ 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+ 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x6c, 0x65, 0x61, 0x64,
+ 0x70, 0x6f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x6d, 0x6f, 0x6e, 0x73, 0x74,
+ 0x65, 0x72, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x27, 0x0a, 0x08, 0x6d, 0x6f, 0x6e,
+ 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x08, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65,
+ 0x72, 0x73, 0x22, 0xa3, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x42,
+ 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70,
+ 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75,
0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c,
- 0x65, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65,
- 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65,
- 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70,
- 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43,
- 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64,
- 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69,
- 0x73, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69,
- 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64,
- 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70,
- 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18,
- 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74,
- 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05, 0x52,
- 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73,
- 0x18, 0x0b, 0x20, 0x03, 0x28, 0x02, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x51,
- 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63,
- 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d,
- 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
- 0x65, 0x22, 0xc8, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f,
- 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
- 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12,
- 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e, 0x63,
- 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06, 0x6f,
- 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x12,
- 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18,
- 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74,
- 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75,
- 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12,
- 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68,
- 0x61, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x6c, 0x69,
- 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22, 0x66, 0x0a, 0x10,
- 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
- 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72,
- 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
- 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04,
- 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68,
- 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73,
- 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63,
- 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65,
- 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65,
- 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74,
- 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65,
- 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
- 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
- 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
- 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
- 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
- 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
- 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e,
- 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
- 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08,
- 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
- 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18,
- 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
- 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64,
- 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65,
- 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64,
- 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
- 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
- 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
- 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
- 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
- 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74,
- 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
+ 0x65, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
+ 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18,
+ 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52,
+ 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xd6, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a,
+ 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+ 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65,
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54,
+ 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74,
+ 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79,
+ 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72,
+ 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+ 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64,
+ 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64,
+ 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d,
+ 0x70, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43,
+ 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69,
+ 0x73, 0x74, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c,
+ 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03,
+ 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
+ 0x61, 0x6d, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x02, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x73, 0x22, 0x51, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x12, 0x18,
+ 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65,
+ 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14,
+ 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x22, 0xc8, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
+ 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
- 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64,
- 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09,
- 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70,
- 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e,
- 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69,
- 0x42, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53,
- 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66,
- 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05,
- 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65,
- 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
- 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61,
- 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64,
- 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01,
- 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52,
- 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18,
- 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65,
- 0x52, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
- 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69,
+ 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69,
+ 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x05,
+ 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22,
+ 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a,
+ 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63,
+ 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61,
+ 0x73, 0x6b, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
+ 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x18,
+ 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05,
+ 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75,
+ 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18,
+ 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x21, 0x0a, 0x05,
+ 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22,
+ 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73,
+ 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04,
+ 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a,
+ 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e,
+ 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a,
+ 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
+ 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08,
+ 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+ 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53,
+ 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38,
+ 0x0a, 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65,
+ 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
+ 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74,
+ 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
+ 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+ 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02,
+ 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74,
+ 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52,
+ 0x02, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12,
+ 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63,
+ 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a,
+ 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e,
+ 0x53, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53,
+ 0x69, 0x64, 0x65, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e,
+ 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06,
+ 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73,
+ 0x73, 0x75, 0x63, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53,
+ 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
+ 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74,
+ 0x43, 0x6d, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12,
+ 0x28, 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09,
+ 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74,
+ 0x72, 0x6f, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a,
+ 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
+ 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42,
+ 0x75, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20,
+ 0x03, 0x28, 0x05, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72,
+ 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
+ 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07,
+ 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c,
+ 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18,
+ 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79,
+ 0x70, 0x65, 0x52, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79,
+ 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54,
+ 0x79, 0x70, 0x65, 0x52, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x06,
+ 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -2209,88 +2268,90 @@ func file_battle_battle_msg_proto_rawDescGZIP() []byte {
return file_battle_battle_msg_proto_rawDescData
}
-var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
+var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
var file_battle_battle_msg_proto_goTypes = []interface{}{
- (*LineUp)(nil), // 0: LineUp
- (*BattleFormation)(nil), // 1: BattleFormation
- (*BattleEVEReq)(nil), // 2: BattleEVEReq
- (*BattlePVEReq)(nil), // 3: BattlePVEReq
- (*BattleHeroPVEReq)(nil), // 4: BattleHeroPVEReq
- (*PVPFormation)(nil), // 5: PVPFormation
- (*BattlePVPReq)(nil), // 6: BattlePVPReq
- (*BattleRTPVPReq)(nil), // 7: BattleRTPVPReq
- (*BattleLPVEReq)(nil), // 8: BattleLPVEReq
- (*BattlePVBReq)(nil), // 9: BattlePVBReq
- (*BattleInfo)(nil), // 10: BattleInfo
- (*BattleCmd)(nil), // 11: BattleCmd
- (*BattleReport)(nil), // 12: BattleReport
- (*BattleRpcMessage)(nil), // 13: BattleRpcMessage
- (*BattleCheckResults)(nil), // 14: BattleCheckResults
- (*BattleGetInfoReq)(nil), // 15: BattleGetInfoReq
- (*BattleGetInfoResp)(nil), // 16: BattleGetInfoResp
- (*BattleCreateServerReq)(nil), // 17: BattleCreateServerReq
- (*BattleCreateServerResp)(nil), // 18: BattleCreateServerResp
- (*BattleInCmdReq)(nil), // 19: BattleInCmdReq
- (*BattleInCmdResp)(nil), // 20: BattleInCmdResp
- (*BattleOutCmdPush)(nil), // 21: BattleOutCmdPush
- (*BattleFinishPush)(nil), // 22: BattleFinishPush
- (*BattleConcedeReq)(nil), // 23: BattleConcedeReq
- (*BattleConcedeResp)(nil), // 24: BattleConcedeResp
- (*BattleStateInfo)(nil), // 25: BattleStateInfo
- (*StroneBattleReq)(nil), // 26: StroneBattleReq
- (PlayType)(0), // 27: PlayType
- (*DBHero)(nil), // 28: DBHero
- (*BattleRole)(nil), // 29: BattleRole
- (BattleType)(0), // 30: BattleType
- (*DBBattleFormt)(nil), // 31: DBBattleFormt
- (*anypb.Any)(nil), // 32: google.protobuf.Any
- (*DySkillData)(nil), // 33: DySkillData
+ (*LineData)(nil), // 0: LineData
+ (*LineUp)(nil), // 1: LineUp
+ (*BattleFormation)(nil), // 2: BattleFormation
+ (*BattleEVEReq)(nil), // 3: BattleEVEReq
+ (*BattlePVEReq)(nil), // 4: BattlePVEReq
+ (*BattleHeroPVEReq)(nil), // 5: BattleHeroPVEReq
+ (*PVPFormation)(nil), // 6: PVPFormation
+ (*BattlePVPReq)(nil), // 7: BattlePVPReq
+ (*BattleRTPVPReq)(nil), // 8: BattleRTPVPReq
+ (*BattleLPVEReq)(nil), // 9: BattleLPVEReq
+ (*BattlePVBReq)(nil), // 10: BattlePVBReq
+ (*BattleInfo)(nil), // 11: BattleInfo
+ (*BattleCmd)(nil), // 12: BattleCmd
+ (*BattleReport)(nil), // 13: BattleReport
+ (*BattleRpcMessage)(nil), // 14: BattleRpcMessage
+ (*BattleCheckResults)(nil), // 15: BattleCheckResults
+ (*BattleGetInfoReq)(nil), // 16: BattleGetInfoReq
+ (*BattleGetInfoResp)(nil), // 17: BattleGetInfoResp
+ (*BattleCreateServerReq)(nil), // 18: BattleCreateServerReq
+ (*BattleCreateServerResp)(nil), // 19: BattleCreateServerResp
+ (*BattleInCmdReq)(nil), // 20: BattleInCmdReq
+ (*BattleInCmdResp)(nil), // 21: BattleInCmdResp
+ (*BattleOutCmdPush)(nil), // 22: BattleOutCmdPush
+ (*BattleFinishPush)(nil), // 23: BattleFinishPush
+ (*BattleConcedeReq)(nil), // 24: BattleConcedeReq
+ (*BattleConcedeResp)(nil), // 25: BattleConcedeResp
+ (*BattleStateInfo)(nil), // 26: BattleStateInfo
+ (*StroneBattleReq)(nil), // 27: StroneBattleReq
+ (PlayType)(0), // 28: PlayType
+ (*DBHero)(nil), // 29: DBHero
+ (*BattleRole)(nil), // 30: BattleRole
+ (BattleType)(0), // 31: BattleType
+ (*DBBattleFormt)(nil), // 32: DBBattleFormt
+ (*anypb.Any)(nil), // 33: google.protobuf.Any
+ (*DySkillData)(nil), // 34: DySkillData
}
var file_battle_battle_msg_proto_depIdxs = []int32{
- 27, // 0: BattleEVEReq.ptype:type_name -> PlayType
- 1, // 1: BattleEVEReq.format:type_name -> BattleFormation
- 27, // 2: BattlePVEReq.ptype:type_name -> PlayType
- 1, // 3: BattlePVEReq.format:type_name -> BattleFormation
- 27, // 4: BattleHeroPVEReq.ptype:type_name -> PlayType
- 5, // 5: BattleHeroPVEReq.redformat:type_name -> PVPFormation
- 28, // 6: PVPFormation.format:type_name -> DBHero
- 27, // 7: BattlePVPReq.ptype:type_name -> PlayType
- 5, // 8: BattlePVPReq.redformat:type_name -> PVPFormation
- 5, // 9: BattlePVPReq.buleformat:type_name -> PVPFormation
- 27, // 10: BattleRTPVPReq.ptype:type_name -> PlayType
- 1, // 11: BattleRTPVPReq.redformat:type_name -> BattleFormation
- 1, // 12: BattleRTPVPReq.bulefformat:type_name -> BattleFormation
- 27, // 13: BattleLPVEReq.ptype:type_name -> PlayType
- 1, // 14: BattleLPVEReq.format:type_name -> BattleFormation
- 29, // 15: BattleLPVEReq.monsters:type_name -> BattleRole
- 27, // 16: BattlePVBReq.ptype:type_name -> PlayType
- 1, // 17: BattlePVBReq.format:type_name -> BattleFormation
- 30, // 18: BattleInfo.btype:type_name -> BattleType
- 27, // 19: BattleInfo.ptype:type_name -> PlayType
- 31, // 20: BattleInfo.redflist:type_name -> DBBattleFormt
- 31, // 21: BattleInfo.buleflist:type_name -> DBBattleFormt
- 10, // 22: BattleReport.info:type_name -> BattleInfo
- 11, // 23: BattleReport.incmd:type_name -> BattleCmd
- 11, // 24: BattleReport.outcmd:type_name -> BattleCmd
- 29, // 25: BattleReport.alive:type_name -> BattleRole
- 32, // 26: BattleRpcMessage.data:type_name -> google.protobuf.Any
- 25, // 27: BattleGetInfoResp.info:type_name -> BattleStateInfo
- 10, // 28: BattleCreateServerReq.info:type_name -> BattleInfo
- 11, // 29: BattleInCmdReq.in:type_name -> BattleCmd
- 11, // 30: BattleInCmdResp.in:type_name -> BattleCmd
- 11, // 31: BattleOutCmdPush.cmd:type_name -> BattleCmd
- 10, // 32: BattleStateInfo.info:type_name -> BattleInfo
- 11, // 33: BattleStateInfo.outCmds:type_name -> BattleCmd
- 11, // 34: BattleStateInfo.inputCmds:type_name -> BattleCmd
- 33, // 35: StroneBattleReq.diBuff:type_name -> DySkillData
- 29, // 36: StroneBattleReq.role:type_name -> BattleRole
- 30, // 37: StroneBattleReq.Btype:type_name -> BattleType
- 27, // 38: StroneBattleReq.Ptype:type_name -> PlayType
- 39, // [39:39] is the sub-list for method output_type
- 39, // [39:39] is the sub-list for method input_type
- 39, // [39:39] is the sub-list for extension type_name
- 39, // [39:39] is the sub-list for extension extendee
- 0, // [0:39] is the sub-list for field type_name
+ 1, // 0: LineData.line:type_name -> LineUp
+ 28, // 1: BattleEVEReq.ptype:type_name -> PlayType
+ 2, // 2: BattleEVEReq.format:type_name -> BattleFormation
+ 28, // 3: BattlePVEReq.ptype:type_name -> PlayType
+ 2, // 4: BattlePVEReq.format:type_name -> BattleFormation
+ 28, // 5: BattleHeroPVEReq.ptype:type_name -> PlayType
+ 6, // 6: BattleHeroPVEReq.redformat:type_name -> PVPFormation
+ 29, // 7: PVPFormation.format:type_name -> DBHero
+ 28, // 8: BattlePVPReq.ptype:type_name -> PlayType
+ 6, // 9: BattlePVPReq.redformat:type_name -> PVPFormation
+ 6, // 10: BattlePVPReq.buleformat:type_name -> PVPFormation
+ 28, // 11: BattleRTPVPReq.ptype:type_name -> PlayType
+ 2, // 12: BattleRTPVPReq.redformat:type_name -> BattleFormation
+ 2, // 13: BattleRTPVPReq.bulefformat:type_name -> BattleFormation
+ 28, // 14: BattleLPVEReq.ptype:type_name -> PlayType
+ 2, // 15: BattleLPVEReq.format:type_name -> BattleFormation
+ 30, // 16: BattleLPVEReq.monsters:type_name -> BattleRole
+ 28, // 17: BattlePVBReq.ptype:type_name -> PlayType
+ 2, // 18: BattlePVBReq.format:type_name -> BattleFormation
+ 31, // 19: BattleInfo.btype:type_name -> BattleType
+ 28, // 20: BattleInfo.ptype:type_name -> PlayType
+ 32, // 21: BattleInfo.redflist:type_name -> DBBattleFormt
+ 32, // 22: BattleInfo.buleflist:type_name -> DBBattleFormt
+ 11, // 23: BattleReport.info:type_name -> BattleInfo
+ 12, // 24: BattleReport.incmd:type_name -> BattleCmd
+ 12, // 25: BattleReport.outcmd:type_name -> BattleCmd
+ 30, // 26: BattleReport.alive:type_name -> BattleRole
+ 33, // 27: BattleRpcMessage.data:type_name -> google.protobuf.Any
+ 26, // 28: BattleGetInfoResp.info:type_name -> BattleStateInfo
+ 11, // 29: BattleCreateServerReq.info:type_name -> BattleInfo
+ 12, // 30: BattleInCmdReq.in:type_name -> BattleCmd
+ 12, // 31: BattleInCmdResp.in:type_name -> BattleCmd
+ 12, // 32: BattleOutCmdPush.cmd:type_name -> BattleCmd
+ 11, // 33: BattleStateInfo.info:type_name -> BattleInfo
+ 12, // 34: BattleStateInfo.outCmds:type_name -> BattleCmd
+ 12, // 35: BattleStateInfo.inputCmds:type_name -> BattleCmd
+ 34, // 36: StroneBattleReq.diBuff:type_name -> DySkillData
+ 30, // 37: StroneBattleReq.role:type_name -> BattleRole
+ 31, // 38: StroneBattleReq.Btype:type_name -> BattleType
+ 28, // 39: StroneBattleReq.Ptype:type_name -> PlayType
+ 40, // [40:40] is the sub-list for method output_type
+ 40, // [40:40] is the sub-list for method input_type
+ 40, // [40:40] is the sub-list for extension type_name
+ 40, // [40:40] is the sub-list for extension extendee
+ 0, // [0:40] is the sub-list for field type_name
}
func init() { file_battle_battle_msg_proto_init() }
@@ -2302,7 +2363,7 @@ func file_battle_battle_msg_proto_init() {
file_hero_hero_db_proto_init()
if !protoimpl.UnsafeEnabled {
file_battle_battle_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*LineUp); i {
+ switch v := v.(*LineData); i {
case 0:
return &v.state
case 1:
@@ -2314,7 +2375,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleFormation); i {
+ switch v := v.(*LineUp); i {
case 0:
return &v.state
case 1:
@@ -2326,7 +2387,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleEVEReq); i {
+ switch v := v.(*BattleFormation); i {
case 0:
return &v.state
case 1:
@@ -2338,7 +2399,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattlePVEReq); i {
+ switch v := v.(*BattleEVEReq); i {
case 0:
return &v.state
case 1:
@@ -2350,7 +2411,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleHeroPVEReq); i {
+ switch v := v.(*BattlePVEReq); i {
case 0:
return &v.state
case 1:
@@ -2362,7 +2423,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*PVPFormation); i {
+ switch v := v.(*BattleHeroPVEReq); i {
case 0:
return &v.state
case 1:
@@ -2374,7 +2435,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattlePVPReq); i {
+ switch v := v.(*PVPFormation); i {
case 0:
return &v.state
case 1:
@@ -2386,7 +2447,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleRTPVPReq); i {
+ switch v := v.(*BattlePVPReq); i {
case 0:
return &v.state
case 1:
@@ -2398,7 +2459,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleLPVEReq); i {
+ switch v := v.(*BattleRTPVPReq); i {
case 0:
return &v.state
case 1:
@@ -2410,7 +2471,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattlePVBReq); i {
+ switch v := v.(*BattleLPVEReq); i {
case 0:
return &v.state
case 1:
@@ -2422,7 +2483,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleInfo); i {
+ switch v := v.(*BattlePVBReq); i {
case 0:
return &v.state
case 1:
@@ -2434,7 +2495,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleCmd); i {
+ switch v := v.(*BattleInfo); i {
case 0:
return &v.state
case 1:
@@ -2446,7 +2507,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleReport); i {
+ switch v := v.(*BattleCmd); i {
case 0:
return &v.state
case 1:
@@ -2458,7 +2519,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleRpcMessage); i {
+ switch v := v.(*BattleReport); i {
case 0:
return &v.state
case 1:
@@ -2470,7 +2531,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleCheckResults); i {
+ switch v := v.(*BattleRpcMessage); i {
case 0:
return &v.state
case 1:
@@ -2482,7 +2543,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleGetInfoReq); i {
+ switch v := v.(*BattleCheckResults); i {
case 0:
return &v.state
case 1:
@@ -2494,7 +2555,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleGetInfoResp); i {
+ switch v := v.(*BattleGetInfoReq); i {
case 0:
return &v.state
case 1:
@@ -2506,7 +2567,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleCreateServerReq); i {
+ switch v := v.(*BattleGetInfoResp); i {
case 0:
return &v.state
case 1:
@@ -2518,7 +2579,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleCreateServerResp); i {
+ switch v := v.(*BattleCreateServerReq); i {
case 0:
return &v.state
case 1:
@@ -2530,7 +2591,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleInCmdReq); i {
+ switch v := v.(*BattleCreateServerResp); i {
case 0:
return &v.state
case 1:
@@ -2542,7 +2603,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleInCmdResp); i {
+ switch v := v.(*BattleInCmdReq); i {
case 0:
return &v.state
case 1:
@@ -2554,7 +2615,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleOutCmdPush); i {
+ switch v := v.(*BattleInCmdResp); i {
case 0:
return &v.state
case 1:
@@ -2566,7 +2627,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleFinishPush); i {
+ switch v := v.(*BattleOutCmdPush); i {
case 0:
return &v.state
case 1:
@@ -2578,7 +2639,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleConcedeReq); i {
+ switch v := v.(*BattleFinishPush); i {
case 0:
return &v.state
case 1:
@@ -2590,7 +2651,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleConcedeResp); i {
+ switch v := v.(*BattleConcedeReq); i {
case 0:
return &v.state
case 1:
@@ -2602,7 +2663,7 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*BattleStateInfo); i {
+ switch v := v.(*BattleConcedeResp); i {
case 0:
return &v.state
case 1:
@@ -2614,6 +2675,18 @@ func file_battle_battle_msg_proto_init() {
}
}
file_battle_battle_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*BattleStateInfo); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_battle_battle_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*StroneBattleReq); i {
case 0:
return &v.state
@@ -2632,7 +2705,7 @@ func file_battle_battle_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_battle_battle_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 27,
+ NumMessages: 28,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/hunting_db.pb.go b/pb/hunting_db.pb.go
index 8be894384..701665457 100644
--- a/pb/hunting_db.pb.go
+++ b/pb/hunting_db.pb.go
@@ -99,30 +99,94 @@ func (x *DBHunting) GetPs() map[int32]int32 {
return nil
}
-// 狩猎排行榜
+// 战斗数据
+type DBHuntingRecord struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
+ Uinfo *BaseUserInfo `protobuf:"bytes,3,opt,name=uinfo,proto3" json:"uinfo"` //用户基础
+ Data map[int32]*HuntingData `protobuf:"bytes,4,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key boss 类型
+}
+
+func (x *DBHuntingRecord) Reset() {
+ *x = DBHuntingRecord{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_hunting_hunting_db_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBHuntingRecord) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBHuntingRecord) ProtoMessage() {}
+
+func (x *DBHuntingRecord) ProtoReflect() protoreflect.Message {
+ mi := &file_hunting_hunting_db_proto_msgTypes[1]
+ 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 DBHuntingRecord.ProtoReflect.Descriptor instead.
+func (*DBHuntingRecord) Descriptor() ([]byte, []int) {
+ return file_hunting_hunting_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *DBHuntingRecord) GetId() string {
+ if x != nil {
+ return x.Id
+ }
+ return ""
+}
+
+func (x *DBHuntingRecord) GetUid() string {
+ if x != nil {
+ return x.Uid
+ }
+ return ""
+}
+
+func (x *DBHuntingRecord) GetUinfo() *BaseUserInfo {
+ if x != nil {
+ return x.Uinfo
+ }
+ return nil
+}
+
+func (x *DBHuntingRecord) GetData() map[int32]*HuntingData {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
type DBHuntingRank struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
- Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
- Difficulty int32 `protobuf:"varint,3,opt,name=difficulty,proto3" json:"difficulty"` // 难度
- Bosstype int32 `protobuf:"varint,4,opt,name=bosstype,proto3" json:"bosstype"` // boss类型塔类型
- Nickname string `protobuf:"bytes,5,opt,name=nickname,proto3" json:"nickname"` // 昵称
- Skin string `protobuf:"bytes,6,opt,name=skin,proto3" json:"skin"` // 玩家头像
- Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 玩家等级
- Leadpos int32 `protobuf:"varint,8,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
- Line []*LineUp `protobuf:"bytes,9,rep,name=line,proto3" json:"line"` // 阵容数据
- CostTime int32 `protobuf:"varint,10,opt,name=costTime,proto3" json:"costTime" bson:"costTime"` //闯关耗时 单位s
- Sex int32 `protobuf:"varint,11,opt,name=sex,proto3" json:"sex"`
- Title string `protobuf:"bytes,12,opt,name=title,proto3" json:"title"` //
+ Uinfo *BaseUserInfo `protobuf:"bytes,21,opt,name=uinfo,proto3" json:"uinfo"` //用户基础
+ Line *LineData `protobuf:"bytes,2,opt,name=line,proto3" json:"line"` // 阵容信息
+ Difficulty int32 `protobuf:"varint,3,opt,name=difficulty,proto3" json:"difficulty"` // 难度
+ Bosstype int32 `protobuf:"varint,4,opt,name=bosstype,proto3" json:"bosstype"` // boss类型塔类型
+ Costtime int32 `protobuf:"varint,5,opt,name=costtime,proto3" json:"costtime"` // 耗时
}
func (x *DBHuntingRank) Reset() {
*x = DBHuntingRank{}
if protoimpl.UnsafeEnabled {
- mi := &file_hunting_hunting_db_proto_msgTypes[1]
+ mi := &file_hunting_hunting_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -135,7 +199,7 @@ func (x *DBHuntingRank) String() string {
func (*DBHuntingRank) ProtoMessage() {}
func (x *DBHuntingRank) ProtoReflect() protoreflect.Message {
- mi := &file_hunting_hunting_db_proto_msgTypes[1]
+ mi := &file_hunting_hunting_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -148,21 +212,21 @@ func (x *DBHuntingRank) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBHuntingRank.ProtoReflect.Descriptor instead.
func (*DBHuntingRank) Descriptor() ([]byte, []int) {
- return file_hunting_hunting_db_proto_rawDescGZIP(), []int{1}
+ return file_hunting_hunting_db_proto_rawDescGZIP(), []int{2}
}
-func (x *DBHuntingRank) GetId() string {
+func (x *DBHuntingRank) GetUinfo() *BaseUserInfo {
if x != nil {
- return x.Id
+ return x.Uinfo
}
- return ""
+ return nil
}
-func (x *DBHuntingRank) GetUid() string {
+func (x *DBHuntingRank) GetLine() *LineData {
if x != nil {
- return x.Uid
+ return x.Line
}
- return ""
+ return nil
}
func (x *DBHuntingRank) GetDifficulty() int32 {
@@ -179,60 +243,74 @@ func (x *DBHuntingRank) GetBosstype() int32 {
return 0
}
-func (x *DBHuntingRank) GetNickname() string {
+func (x *DBHuntingRank) GetCosttime() int32 {
if x != nil {
- return x.Nickname
- }
- return ""
-}
-
-func (x *DBHuntingRank) GetSkin() string {
- if x != nil {
- return x.Skin
- }
- return ""
-}
-
-func (x *DBHuntingRank) GetLv() int32 {
- if x != nil {
- return x.Lv
+ return x.Costtime
}
return 0
}
-func (x *DBHuntingRank) GetLeadpos() int32 {
- if x != nil {
- return x.Leadpos
- }
- return 0
+type HuntingData struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Costime map[int32]int32 `protobuf:"bytes,1,rep,name=costime,proto3" json:"costime" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //key 难度 value 战斗时间
+ Maxnandu int32 `protobuf:"varint,2,opt,name=maxnandu,proto3" json:"maxnandu"` // 最高难度
+ Line map[int32]*LineData `protobuf:"bytes,3,rep,name=line,proto3" json:"line" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
}
-func (x *DBHuntingRank) GetLine() []*LineUp {
+func (x *HuntingData) Reset() {
+ *x = HuntingData{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_hunting_hunting_db_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *HuntingData) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HuntingData) ProtoMessage() {}
+
+func (x *HuntingData) ProtoReflect() protoreflect.Message {
+ mi := &file_hunting_hunting_db_proto_msgTypes[3]
+ 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 HuntingData.ProtoReflect.Descriptor instead.
+func (*HuntingData) Descriptor() ([]byte, []int) {
+ return file_hunting_hunting_db_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *HuntingData) GetCostime() map[int32]int32 {
if x != nil {
- return x.Line
+ return x.Costime
}
return nil
}
-func (x *DBHuntingRank) GetCostTime() int32 {
+func (x *HuntingData) GetMaxnandu() int32 {
if x != nil {
- return x.CostTime
+ return x.Maxnandu
}
return 0
}
-func (x *DBHuntingRank) GetSex() int32 {
+func (x *HuntingData) GetLine() map[int32]*LineData {
if x != nil {
- return x.Sex
+ return x.Line
}
- return 0
-}
-
-func (x *DBHuntingRank) GetTitle() string {
- if x != nil {
- return x.Title
- }
- return ""
+ return nil
}
var File_hunting_hunting_db_proto protoreflect.FileDescriptor
@@ -241,48 +319,71 @@ var file_hunting_hunting_db_proto_rawDesc = []byte{
0x0a, 0x18, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2f, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e,
0x67, 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, 0x22, 0xde, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e,
- 0x67, 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, 0x28, 0x0a, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f,
- 0x73, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x12, 0x34, 0x0a,
- 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x18, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73,
- 0x54, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54,
- 0x69, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x12, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x73, 0x45, 0x6e,
- 0x74, 0x72, 0x79, 0x52, 0x02, 0x70, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x42, 0x6f, 0x73, 0x73, 0x45,
+ 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
+ 0xde, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 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,
+ 0x28, 0x0a, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e,
+ 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x12, 0x34, 0x0a, 0x08, 0x62, 0x6f, 0x73,
+ 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42,
+ 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x12,
+ 0x22, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42,
+ 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+ 0x02, 0x70, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x42, 0x6f, 0x73, 0x73, 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, 0x3b, 0x0a, 0x0d,
+ 0x42, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 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, 0x35, 0x0a, 0x07, 0x50, 0x73, 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, 0x3b, 0x0a, 0x0d, 0x42, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 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, 0x35, 0x0a,
- 0x07, 0x50, 0x73, 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, 0xa8, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69,
- 0x6e, 0x67, 0x52, 0x61, 0x6e, 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, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66,
+ 0x22, 0xcf, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65,
+ 0x63, 0x6f, 0x72, 0x64, 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, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72,
+ 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2e, 0x0a, 0x04, 0x64,
+ 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48, 0x75,
+ 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x44, 0x61, 0x74, 0x61,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x45, 0x0a, 0x09, 0x44,
+ 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61,
+ 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x48, 0x75, 0x6e, 0x74,
+ 0x69, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+ 0x38, 0x01, 0x22, 0xab, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
+ 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x15, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
+ 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x6e,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61,
+ 0x74, 0x61, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66,
0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69,
0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73,
0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73,
- 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
- 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
- 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
- 0x73, 0x6b, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18,
- 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b,
- 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c,
- 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63,
- 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63,
- 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x0b,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
- 0x6c, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x42,
- 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65,
+ 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65,
+ 0x22, 0x8a, 0x02, 0x0a, 0x0b, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61,
+ 0x12, 0x33, 0x0a, 0x07, 0x63, 0x6f, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x19, 0x2e, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x2e,
+ 0x43, 0x6f, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x63, 0x6f,
+ 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64,
+ 0x75, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64,
+ 0x75, 0x12, 0x2a, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x16, 0x2e, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x69,
+ 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x1a, 0x3a, 0x0a,
+ 0x0c, 0x43, 0x6f, 0x73, 0x74, 0x69, 0x6d, 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, 0x05, 0x52, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x4c, 0x69, 0x6e,
+ 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, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61,
+ 0x74, 0x61, 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 (
@@ -297,25 +398,38 @@ func file_hunting_hunting_db_proto_rawDescGZIP() []byte {
return file_hunting_hunting_db_proto_rawDescData
}
-var file_hunting_hunting_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_hunting_hunting_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
var file_hunting_hunting_db_proto_goTypes = []interface{}{
- (*DBHunting)(nil), // 0: DBHunting
- (*DBHuntingRank)(nil), // 1: DBHuntingRank
- nil, // 2: DBHunting.BossEntry
- nil, // 3: DBHunting.BossTimeEntry
- nil, // 4: DBHunting.PsEntry
- (*LineUp)(nil), // 5: LineUp
+ (*DBHunting)(nil), // 0: DBHunting
+ (*DBHuntingRecord)(nil), // 1: DBHuntingRecord
+ (*DBHuntingRank)(nil), // 2: DBHuntingRank
+ (*HuntingData)(nil), // 3: HuntingData
+ nil, // 4: DBHunting.BossEntry
+ nil, // 5: DBHunting.BossTimeEntry
+ nil, // 6: DBHunting.PsEntry
+ nil, // 7: DBHuntingRecord.DataEntry
+ nil, // 8: HuntingData.CostimeEntry
+ nil, // 9: HuntingData.LineEntry
+ (*BaseUserInfo)(nil), // 10: BaseUserInfo
+ (*LineData)(nil), // 11: LineData
}
var file_hunting_hunting_db_proto_depIdxs = []int32{
- 2, // 0: DBHunting.boss:type_name -> DBHunting.BossEntry
- 3, // 1: DBHunting.bossTime:type_name -> DBHunting.BossTimeEntry
- 4, // 2: DBHunting.ps:type_name -> DBHunting.PsEntry
- 5, // 3: DBHuntingRank.line:type_name -> LineUp
- 4, // [4:4] is the sub-list for method output_type
- 4, // [4:4] is the sub-list for method input_type
- 4, // [4:4] is the sub-list for extension type_name
- 4, // [4:4] is the sub-list for extension extendee
- 0, // [0:4] is the sub-list for field type_name
+ 4, // 0: DBHunting.boss:type_name -> DBHunting.BossEntry
+ 5, // 1: DBHunting.bossTime:type_name -> DBHunting.BossTimeEntry
+ 6, // 2: DBHunting.ps:type_name -> DBHunting.PsEntry
+ 10, // 3: DBHuntingRecord.uinfo:type_name -> BaseUserInfo
+ 7, // 4: DBHuntingRecord.data:type_name -> DBHuntingRecord.DataEntry
+ 10, // 5: DBHuntingRank.uinfo:type_name -> BaseUserInfo
+ 11, // 6: DBHuntingRank.line:type_name -> LineData
+ 8, // 7: HuntingData.costime:type_name -> HuntingData.CostimeEntry
+ 9, // 8: HuntingData.line:type_name -> HuntingData.LineEntry
+ 3, // 9: DBHuntingRecord.DataEntry.value:type_name -> HuntingData
+ 11, // 10: HuntingData.LineEntry.value:type_name -> LineData
+ 11, // [11:11] is the sub-list for method output_type
+ 11, // [11:11] is the sub-list for method input_type
+ 11, // [11:11] is the sub-list for extension type_name
+ 11, // [11:11] is the sub-list for extension extendee
+ 0, // [0:11] is the sub-list for field type_name
}
func init() { file_hunting_hunting_db_proto_init() }
@@ -324,6 +438,7 @@ func file_hunting_hunting_db_proto_init() {
return
}
file_battle_battle_msg_proto_init()
+ file_comm_proto_init()
if !protoimpl.UnsafeEnabled {
file_hunting_hunting_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBHunting); i {
@@ -338,6 +453,18 @@ func file_hunting_hunting_db_proto_init() {
}
}
file_hunting_hunting_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBHuntingRecord); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_hunting_hunting_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBHuntingRank); i {
case 0:
return &v.state
@@ -349,6 +476,18 @@ func file_hunting_hunting_db_proto_init() {
return nil
}
}
+ file_hunting_hunting_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*HuntingData); 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{
@@ -356,7 +495,7 @@ func file_hunting_hunting_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_hunting_hunting_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 5,
+ NumMessages: 10,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/hunting_msg.pb.go b/pb/hunting_msg.pb.go
index a49d8d7be..dc55dcd9a 100644
--- a/pb/hunting_msg.pb.go
+++ b/pb/hunting_msg.pb.go
@@ -493,7 +493,6 @@ type HuntingRankListReq struct {
unknownFields protoimpl.UnknownFields
BoosType int32 `protobuf:"varint,1,opt,name=boosType,proto3" json:"boosType"` // boss 类型
- Friend bool `protobuf:"varint,2,opt,name=friend,proto3" json:"friend"` // 是否是好友榜
}
func (x *HuntingRankListReq) Reset() {
@@ -535,19 +534,13 @@ func (x *HuntingRankListReq) GetBoosType() int32 {
return 0
}
-func (x *HuntingRankListReq) GetFriend() bool {
- if x != nil {
- return x.Friend
- }
- return false
-}
-
type HuntingRankListResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Ranks []*DBHuntingRank `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"` // 排行数据 有序的 注意boss类型
+ Ranks []*DBHuntingRank `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"` // 排行数据 有序的 注意boss类型
+ Franks []*DBHuntingRank `protobuf:"bytes,2,rep,name=franks,proto3" json:"franks"` // 排行数据 吴序的 注意boss类型
}
func (x *HuntingRankListResp) Reset() {
@@ -589,6 +582,13 @@ func (x *HuntingRankListResp) GetRanks() []*DBHuntingRank {
return nil
}
+func (x *HuntingRankListResp) GetFranks() []*DBHuntingRank {
+ if x != nil {
+ return x.Franks
+ }
+ return nil
+}
+
var File_hunting_hunting_msg_proto protoreflect.FileDescriptor
var file_hunting_hunting_msg_proto_rawDesc = []byte{
@@ -650,15 +650,16 @@ var file_hunting_hunting_msg_proto_rawDesc = []byte{
0x22, 0x30, 0x0a, 0x0e, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65,
0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x22, 0x48, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e,
+ 0x74, 0x61, 0x22, 0x30, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e,
0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73,
0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73,
- 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x13,
- 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52,
- 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61,
- 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+ 0x54, 0x79, 0x70, 0x65, 0x22, 0x63, 0x0a, 0x13, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52,
+ 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x05, 0x72,
+ 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48,
+ 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b,
+ 0x73, 0x12, 0x26, 0x0a, 0x06, 0x66, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e,
+ 0x6b, 0x52, 0x06, 0x66, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
@@ -704,11 +705,12 @@ var file_hunting_hunting_msg_proto_depIdxs = []int32{
10, // 6: HuntingChallengeOverResp.heroexp:type_name -> HuntingChallengeOverResp.HeroexpEntry
11, // 7: HuntingBuyResp.data:type_name -> DBHunting
16, // 8: HuntingRankListResp.ranks:type_name -> DBHuntingRank
- 9, // [9:9] is the sub-list for method output_type
- 9, // [9:9] is the sub-list for method input_type
- 9, // [9:9] is the sub-list for extension type_name
- 9, // [9:9] is the sub-list for extension extendee
- 0, // [0:9] is the sub-list for field type_name
+ 16, // 9: HuntingRankListResp.franks:type_name -> DBHuntingRank
+ 10, // [10:10] is the sub-list for method output_type
+ 10, // [10:10] is the sub-list for method input_type
+ 10, // [10:10] is the sub-list for extension type_name
+ 10, // [10:10] is the sub-list for extension extendee
+ 0, // [0:10] is the sub-list for field type_name
}
func init() { file_hunting_hunting_msg_proto_init() }
diff --git a/pb/integral_db.pb.go b/pb/integral_db.pb.go
index 653e30ba0..d509f8ae7 100644
--- a/pb/integral_db.pb.go
+++ b/pb/integral_db.pb.go
@@ -187,61 +187,6 @@ func (x *DBIntegralBoss) GetLine() map[int32]*LineData {
return nil
}
-type LineData struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Leadpos int32 `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
- Line []*LineUp `protobuf:"bytes,2,rep,name=line,proto3" json:"line"` // 阵容数据
-}
-
-func (x *LineData) Reset() {
- *x = LineData{}
- if protoimpl.UnsafeEnabled {
- mi := &file_integral_integral_db_proto_msgTypes[1]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *LineData) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LineData) ProtoMessage() {}
-
-func (x *LineData) ProtoReflect() protoreflect.Message {
- mi := &file_integral_integral_db_proto_msgTypes[1]
- 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 LineData.ProtoReflect.Descriptor instead.
-func (*LineData) Descriptor() ([]byte, []int) {
- return file_integral_integral_db_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *LineData) GetLeadpos() int32 {
- if x != nil {
- return x.Leadpos
- }
- return 0
-}
-
-func (x *LineData) GetLine() []*LineUp {
- if x != nil {
- return x.Line
- }
- return nil
-}
-
// 积分boss 排行
type DBIntegralRank struct {
state protoimpl.MessageState
@@ -258,7 +203,7 @@ type DBIntegralRank struct {
func (x *DBIntegralRank) Reset() {
*x = DBIntegralRank{}
if protoimpl.UnsafeEnabled {
- mi := &file_integral_integral_db_proto_msgTypes[2]
+ mi := &file_integral_integral_db_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -271,7 +216,7 @@ func (x *DBIntegralRank) String() string {
func (*DBIntegralRank) ProtoMessage() {}
func (x *DBIntegralRank) ProtoReflect() protoreflect.Message {
- mi := &file_integral_integral_db_proto_msgTypes[2]
+ mi := &file_integral_integral_db_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -284,7 +229,7 @@ func (x *DBIntegralRank) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBIntegralRank.ProtoReflect.Descriptor instead.
func (*DBIntegralRank) Descriptor() ([]byte, []int) {
- return file_integral_integral_db_proto_rawDescGZIP(), []int{2}
+ return file_integral_integral_db_proto_rawDescGZIP(), []int{1}
}
func (x *DBIntegralRank) GetId() string {
@@ -370,21 +315,17 @@ var file_integral_integral_db_proto_rawDesc = []byte{
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c,
0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
- 0x38, 0x01, 0x22, 0x41, 0x0a, 0x08, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18,
- 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65,
- 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52,
- 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x90, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
- 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66,
- 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73,
- 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a,
- 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61,
- 0x6e, 0x64, 0x75, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x6e,
- 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61,
- 0x74, 0x61, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
- 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+ 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49,
+ 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61,
+ 0x6e, 0x64, 0x75, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75,
+ 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52,
+ 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -399,31 +340,29 @@ func file_integral_integral_db_proto_rawDescGZIP() []byte {
return file_integral_integral_db_proto_rawDescData
}
-var file_integral_integral_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_integral_integral_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
var file_integral_integral_db_proto_goTypes = []interface{}{
(*DBIntegralBoss)(nil), // 0: DBIntegralBoss
- (*LineData)(nil), // 1: LineData
- (*DBIntegralRank)(nil), // 2: DBIntegralRank
- nil, // 3: DBIntegralBoss.BuffEntry
- nil, // 4: DBIntegralBoss.ScoreEntry
- nil, // 5: DBIntegralBoss.LineEntry
- (*BaseUserInfo)(nil), // 6: BaseUserInfo
- (*LineUp)(nil), // 7: LineUp
+ (*DBIntegralRank)(nil), // 1: DBIntegralRank
+ nil, // 2: DBIntegralBoss.BuffEntry
+ nil, // 3: DBIntegralBoss.ScoreEntry
+ nil, // 4: DBIntegralBoss.LineEntry
+ (*BaseUserInfo)(nil), // 5: BaseUserInfo
+ (*LineData)(nil), // 6: LineData
}
var file_integral_integral_db_proto_depIdxs = []int32{
- 3, // 0: DBIntegralBoss.buff:type_name -> DBIntegralBoss.BuffEntry
- 4, // 1: DBIntegralBoss.score:type_name -> DBIntegralBoss.ScoreEntry
- 6, // 2: DBIntegralBoss.uinfo:type_name -> BaseUserInfo
- 5, // 3: DBIntegralBoss.line:type_name -> DBIntegralBoss.LineEntry
- 7, // 4: LineData.line:type_name -> LineUp
- 6, // 5: DBIntegralRank.uinfo:type_name -> BaseUserInfo
- 1, // 6: DBIntegralRank.line:type_name -> LineData
- 1, // 7: DBIntegralBoss.LineEntry.value:type_name -> LineData
- 8, // [8:8] is the sub-list for method output_type
- 8, // [8:8] is the sub-list for method input_type
- 8, // [8:8] is the sub-list for extension type_name
- 8, // [8:8] is the sub-list for extension extendee
- 0, // [0:8] is the sub-list for field type_name
+ 2, // 0: DBIntegralBoss.buff:type_name -> DBIntegralBoss.BuffEntry
+ 3, // 1: DBIntegralBoss.score:type_name -> DBIntegralBoss.ScoreEntry
+ 5, // 2: DBIntegralBoss.uinfo:type_name -> BaseUserInfo
+ 4, // 3: DBIntegralBoss.line:type_name -> DBIntegralBoss.LineEntry
+ 5, // 4: DBIntegralRank.uinfo:type_name -> BaseUserInfo
+ 6, // 5: DBIntegralRank.line:type_name -> LineData
+ 6, // 6: DBIntegralBoss.LineEntry.value:type_name -> LineData
+ 7, // [7:7] is the sub-list for method output_type
+ 7, // [7:7] is the sub-list for method input_type
+ 7, // [7:7] is the sub-list for extension type_name
+ 7, // [7:7] is the sub-list for extension extendee
+ 0, // [0:7] is the sub-list for field type_name
}
func init() { file_integral_integral_db_proto_init() }
@@ -447,18 +386,6 @@ func file_integral_integral_db_proto_init() {
}
}
file_integral_integral_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*LineData); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_integral_integral_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBIntegralRank); i {
case 0:
return &v.state
@@ -477,7 +404,7 @@ func file_integral_integral_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_integral_integral_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 6,
+ NumMessages: 5,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/sociaty_msg.pb.go b/pb/sociaty_msg.pb.go
index 93112ac0d..3b1133f8b 100644
--- a/pb/sociaty_msg.pb.go
+++ b/pb/sociaty_msg.pb.go
@@ -672,12 +672,9 @@ type SociatyMemberInfo struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
- Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //昵称
- Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar"` //头像
- Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` //等级
- Job SociatyJob `protobuf:"varint,5,opt,name=job,proto3,enum=SociatyJob" json:"job"` //职位
- OfflineTime int64 `protobuf:"varint,6,opt,name=offlineTime,proto3" json:"offlineTime"` //离线时间
+ Uinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=uinfo,proto3" json:"uinfo"` //用户基础
+ Job SociatyJob `protobuf:"varint,2,opt,name=job,proto3,enum=SociatyJob" json:"job"` //职位
+ OfflineTime int64 `protobuf:"varint,3,opt,name=offlineTime,proto3" json:"offlineTime"` //离线时间
}
func (x *SociatyMemberInfo) Reset() {
@@ -712,32 +709,11 @@ func (*SociatyMemberInfo) Descriptor() ([]byte, []int) {
return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{11}
}
-func (x *SociatyMemberInfo) GetUid() string {
+func (x *SociatyMemberInfo) GetUinfo() *BaseUserInfo {
if x != nil {
- return x.Uid
+ return x.Uinfo
}
- return ""
-}
-
-func (x *SociatyMemberInfo) GetName() string {
- if x != nil {
- return x.Name
- }
- return ""
-}
-
-func (x *SociatyMemberInfo) GetAvatar() string {
- if x != nil {
- return x.Avatar
- }
- return ""
-}
-
-func (x *SociatyMemberInfo) GetLv() int32 {
- if x != nil {
- return x.Lv
- }
- return 0
+ return nil
}
func (x *SociatyMemberInfo) GetJob() SociatyJob {
@@ -3878,278 +3854,275 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x12,
0x2a, 0x0a, 0x06, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x12, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49,
- 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x22, 0xa2, 0x01, 0x0a, 0x11,
- 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66,
- 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
- 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61,
- 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12,
- 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12,
- 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x20,
- 0x0a, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20,
- 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65,
- 0x22, 0x33, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79,
- 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69,
- 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x3e, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a,
- 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52,
- 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
- 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
- 0x73, 0x63, 0x6f, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x09, 0x73, 0x63, 0x6f, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c,
- 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
- 0x64, 0x22, 0x48, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c,
- 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
- 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x0f, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10,
- 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
- 0x22, 0x42, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65,
- 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x49, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52,
- 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x43, 0x0a, 0x11, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
- 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
- 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22,
- 0x12, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c,
- 0x52, 0x65, 0x71, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x61,
- 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69,
- 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x0f, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
- 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
- 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x2d, 0x0a,
- 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x52,
- 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x22, 0x44, 0x0a, 0x12,
- 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
- 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d,
- 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a,
- 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52,
- 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72,
- 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72,
- 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67,
- 0x65, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67,
- 0x65, 0x74, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44,
- 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74,
- 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74,
- 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x50, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
- 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a,
- 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x14, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x52, 0x65,
- 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1d, 0x0a,
- 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x22, 0x70, 0x0a, 0x15,
- 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f,
- 0x62, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12,
- 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x22, 0x12,
- 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x52,
- 0x65, 0x71, 0x22, 0x51, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x63,
- 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69,
- 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x75, 0x73, 0x65, 0x54,
- 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x75, 0x73,
- 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x64, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+ 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x22, 0x79, 0x0a, 0x11, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
+ 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05,
+ 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52,
+ 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54,
+ 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69,
+ 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x33, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a,
+ 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x3e, 0x0a, 0x14, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65,
+ 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x0f, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1c,
+ 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x10,
+ 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+ 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x63, 0x6f, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x63, 0x6f, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
+ 0x22, 0x35, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79,
+ 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+ 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
+ 0x64, 0x22, 0x23, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65,
+ 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65,
- 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65,
- 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x0f, 0x0a,
- 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22, 0x31,
- 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70,
- 0x12, 0x1f, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
- 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x03, 0x6c, 0x6f,
- 0x67, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b,
- 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20,
- 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74,
- 0x22, 0x2b, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69,
- 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x6d, 0x0a,
- 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
- 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
- 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77,
- 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
- 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x18, 0x0a, 0x16,
- 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c,
- 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73,
- 0x70, 0x12, 0x24, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x10, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
- 0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2b, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
- 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x02, 0x69, 0x64, 0x22, 0x6d, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41,
- 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
+ 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x53, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10,
+ 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+ 0x22, 0x43, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73,
+ 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x10,
+ 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x52, 0x65, 0x71,
+ 0x22, 0x41, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69,
+ 0x73, 0x6d, 0x69, 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6d,
+ 0x69, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6d, 0x69,
+ 0x73, 0x73, 0x22, 0x44, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73,
+ 0x6d, 0x69, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a,
+ 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65,
+ 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x10, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12,
+ 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1a,
+ 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x53, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65,
+ 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22, 0x50, 0x0a,
+ 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x72, 0x67,
+ 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x22,
+ 0x51, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
+ 0x67, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
+ 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
+ 0x74, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
+ 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a,
+ 0x6f, 0x62, 0x22, 0x70, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74,
+ 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+ 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72,
+ 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72,
+ 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x52,
+ 0x03, 0x6a, 0x6f, 0x62, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41,
+ 0x63, 0x63, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x22, 0x51, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a,
+ 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61,
+ 0x63, 0x63, 0x75, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+ 0x0a, 0x61, 0x63, 0x63, 0x75, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x10, 0x0a, 0x0e, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x64, 0x0a,
+ 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77,
- 0x61, 0x72, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61,
- 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70,
- 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70,
- 0x65, 0x22, 0x35, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b,
- 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61,
- 0x6e, 0x6b, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x33, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69,
- 0x61, 0x74, 0x79, 0x50, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12,
- 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x43, 0x0a,
- 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50, 0x41, 0x67, 0x72, 0x65, 0x65, 0x50, 0x75,
- 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
- 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x49, 0x64, 0x22, 0x47, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50, 0x44, 0x69,
- 0x73, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
- 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xf8,
- 0x02, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52,
- 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69,
- 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
- 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65,
- 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12,
- 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
- 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x73, 0x65, 0x74,
- 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x03, 0x52, 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d,
- 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
- 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x67, 0x68, 0x49,
- 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d,
- 0x68, 0x69, 0x67, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x12, 0x28, 0x0a,
- 0x0f, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67,
- 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c,
- 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52,
- 0x0e, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x1a,
- 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
- 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
- 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
- 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x14, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
- 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
- 0x12, 0x36, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x20, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72,
- 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d,
- 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
- 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
- 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
- 0x38, 0x01, 0x22, 0x47, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f,
- 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
- 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x39, 0x0a, 0x19, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
- 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
+ 0x61, 0x72, 0x64, 0x22, 0x0f, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f,
+ 0x67, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c,
+ 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c,
+ 0x6f, 0x67, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a,
+ 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74,
+ 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b,
+ 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2b, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74,
+ 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73,
+ 0x6b, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65,
+ 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73,
+ 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
+ 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12,
+ 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61,
+ 0x72, 0x64, 0x22, 0x18, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74,
+ 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x17,
+ 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c,
+ 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41,
+ 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2b, 0x0a,
+ 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
+ 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x6d, 0x0a, 0x1a, 0x53, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63,
+ 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
+ 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
+ 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x72,
+ 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72,
+ 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x35, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x72, 0x61,
+ 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x33,
+ 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73,
+ 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50, 0x41,
+ 0x67, 0x72, 0x65, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x50, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73,
+ 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+ 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
+ 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69,
+ 0x6e, 0x52, 0x65, 0x71, 0x22, 0xf8, 0x02, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x05, 0x74, 0x65, 0x61,
+ 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d,
+ 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x16, 0x0a,
+ 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74,
+ 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12,
+ 0x26, 0x0a, 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d,
+ 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d,
+ 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c,
+ 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x24, 0x0a,
+ 0x0d, 0x68, 0x69, 0x67, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x18, 0x06,
+ 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d, 0x68, 0x69, 0x67, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
+ 0x61, 0x6c, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x52,
+ 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x70, 0x65,
+ 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a,
+ 0x0e, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18,
+ 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61,
+ 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
+ 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+ 0xb6, 0x01, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d,
+ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x4c, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74,
- 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x03, 0x75, 0x69, 0x64, 0x22, 0x64, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
- 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
- 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74,
- 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 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, 0x39, 0x0a, 0x1b, 0x53, 0x6f,
+ 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x36, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18,
+ 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
+ 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x2e, 0x54, 0x65, 0x61,
+ 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48,
+ 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+ 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24,
+ 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+ 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12,
+ 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+ 0x64, 0x22, 0x39, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61,
+ 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c,
+ 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x4c, 0x0a, 0x1a,
+ 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+ 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x64, 0x0a, 0x1a, 0x53, 0x6f,
0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46,
- 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74,
- 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74,
- 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x29, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04,
- 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x61, 0x74, 0x65,
- 0x22, 0x98, 0x01, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f,
- 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, 0x0a, 0x05, 0x74, 0x65, 0x61,
- 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61,
- 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e,
- 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d,
- 0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
- 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
- 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d,
- 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2c, 0x0a, 0x12, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65,
- 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x4b, 0x0a, 0x13, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70,
- 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x16,
- 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
- 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x6e,
- 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x61, 0x6e,
- 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
- 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a,
- 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x61,
- 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c,
- 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65,
- 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e,
- 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x05,
- 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x1a, 0x0a,
- 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52,
- 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x38, 0x0a, 0x10, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a,
- 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x72,
- 0x61, 0x6e, 0x6b, 0x22, 0x46, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x75,
- 0x79, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03,
- 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x22, 0x0a, 0x0e, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
- 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x2a,
- 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69,
- 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a,
- 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50,
- 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e,
- 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x33,
+ 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70,
+ 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79,
+ 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70,
+ 0x6f, 0x72, 0x74, 0x18, 0x02, 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, 0x39, 0x0a, 0x1b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c,
+ 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12,
+ 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x29, 0x0a, 0x13, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52,
+ 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x04, 0x63, 0x61, 0x74, 0x65, 0x22, 0x98, 0x01, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
+ 0x36, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20,
+ 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
+ 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+ 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+ 0x01, 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63,
+ 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22,
+ 0x4b, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63, 0x65, 0x69,
+ 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x0f,
+ 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12,
+ 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0f,
+ 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+ 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+ 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x61, 0x6e,
+ 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x61, 0x6e, 0x6b,
+ 0x69, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18,
+ 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22,
+ 0x38, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49,
+ 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x46, 0x0a, 0x0d, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74,
+ 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73,
+ 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79,
+ 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75,
+ 0x6d, 0x22, 0x22, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x03, 0x75, 0x69, 0x64, 0x2a, 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c,
+ 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x10, 0x01, 0x12, 0x0b,
+ 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x41,
+ 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+ 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -4244,16 +4217,17 @@ var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{
nil, // 74: SociatyBFormationReq.TeamsEntry
nil, // 75: SociatyRecommendResp.TeamsEntry
(*DBSociaty)(nil), // 76: DBSociaty
- (SociatyJob)(0), // 77: SociatyJob
- (*UserAtno)(nil), // 78: UserAtno
- (*DBSociatyLog)(nil), // 79: DBSociatyLog
- (*SociatyTask)(nil), // 80: SociatyTask
- (*SociatyActivity)(nil), // 81: SociatyActivity
- (*DBSociatyRank)(nil), // 82: DBSociatyRank
- (PlayType)(0), // 83: PlayType
- (*BattleReport)(nil), // 84: BattleReport
- (*UserAssets)(nil), // 85: UserAssets
- (*ChallengeTeam)(nil), // 86: ChallengeTeam
+ (*BaseUserInfo)(nil), // 77: BaseUserInfo
+ (SociatyJob)(0), // 78: SociatyJob
+ (*UserAtno)(nil), // 79: UserAtno
+ (*DBSociatyLog)(nil), // 80: DBSociatyLog
+ (*SociatyTask)(nil), // 81: SociatyTask
+ (*SociatyActivity)(nil), // 82: SociatyActivity
+ (*DBSociatyRank)(nil), // 83: DBSociatyRank
+ (PlayType)(0), // 84: PlayType
+ (*BattleReport)(nil), // 85: BattleReport
+ (*UserAssets)(nil), // 86: UserAssets
+ (*ChallengeTeam)(nil), // 87: ChallengeTeam
}
var file_sociaty_sociaty_msg_proto_depIdxs = []int32{
76, // 0: SociatyInfo.dbSociaty:type_name -> DBSociaty
@@ -4263,33 +4237,34 @@ var file_sociaty_sociaty_msg_proto_depIdxs = []int32{
76, // 4: SociatySearchResp.list:type_name -> DBSociaty
76, // 5: SociatyMineResp.sociaty:type_name -> DBSociaty
12, // 6: SociatyMineResp.master:type_name -> SociatyMemberInfo
- 77, // 7: SociatyMemberInfo.job:type_name -> SociatyJob
- 12, // 8: SociatyApplyListResp.list:type_name -> SociatyMemberInfo
- 12, // 9: SociatyMembersResp.list:type_name -> SociatyMemberInfo
- 77, // 10: SociatySettingJobReq.job:type_name -> SociatyJob
- 77, // 11: SociatySettingJobResp.job:type_name -> SociatyJob
- 78, // 12: SociatySignResp.reward:type_name -> UserAtno
- 79, // 13: SociatyLogResp.log:type_name -> DBSociatyLog
- 80, // 14: SociatyTaskListResp.list:type_name -> SociatyTask
- 78, // 15: SociatyReceiveResp.reward:type_name -> UserAtno
- 81, // 16: SociatyActivityListResp.list:type_name -> SociatyActivity
- 78, // 17: SociatyActivityReceiveResp.reward:type_name -> UserAtno
- 82, // 18: SociatyRankResp.rank:type_name -> DBSociatyRank
- 73, // 19: SociatyBMainResp.teams:type_name -> SociatyBMainResp.TeamsEntry
- 74, // 20: SociatyBFormationReq.teams:type_name -> SociatyBFormationReq.TeamsEntry
- 83, // 21: SociatyBChallengeFinishReq.ptype:type_name -> PlayType
- 84, // 22: SociatyBChallengeFinishReq.report:type_name -> BattleReport
- 75, // 23: SociatyRecommendResp.teams:type_name -> SociatyRecommendResp.TeamsEntry
- 69, // 24: SociatyBRankResp.rank:type_name -> SociatyRankInfo
- 85, // 25: SociatyBuyReq.atn:type_name -> UserAssets
- 86, // 26: SociatyBMainResp.TeamsEntry.value:type_name -> ChallengeTeam
- 86, // 27: SociatyBFormationReq.TeamsEntry.value:type_name -> ChallengeTeam
- 86, // 28: SociatyRecommendResp.TeamsEntry.value:type_name -> ChallengeTeam
- 29, // [29:29] is the sub-list for method output_type
- 29, // [29:29] is the sub-list for method input_type
- 29, // [29:29] is the sub-list for extension type_name
- 29, // [29:29] is the sub-list for extension extendee
- 0, // [0:29] is the sub-list for field type_name
+ 77, // 7: SociatyMemberInfo.uinfo:type_name -> BaseUserInfo
+ 78, // 8: SociatyMemberInfo.job:type_name -> SociatyJob
+ 12, // 9: SociatyApplyListResp.list:type_name -> SociatyMemberInfo
+ 12, // 10: SociatyMembersResp.list:type_name -> SociatyMemberInfo
+ 78, // 11: SociatySettingJobReq.job:type_name -> SociatyJob
+ 78, // 12: SociatySettingJobResp.job:type_name -> SociatyJob
+ 79, // 13: SociatySignResp.reward:type_name -> UserAtno
+ 80, // 14: SociatyLogResp.log:type_name -> DBSociatyLog
+ 81, // 15: SociatyTaskListResp.list:type_name -> SociatyTask
+ 79, // 16: SociatyReceiveResp.reward:type_name -> UserAtno
+ 82, // 17: SociatyActivityListResp.list:type_name -> SociatyActivity
+ 79, // 18: SociatyActivityReceiveResp.reward:type_name -> UserAtno
+ 83, // 19: SociatyRankResp.rank:type_name -> DBSociatyRank
+ 73, // 20: SociatyBMainResp.teams:type_name -> SociatyBMainResp.TeamsEntry
+ 74, // 21: SociatyBFormationReq.teams:type_name -> SociatyBFormationReq.TeamsEntry
+ 84, // 22: SociatyBChallengeFinishReq.ptype:type_name -> PlayType
+ 85, // 23: SociatyBChallengeFinishReq.report:type_name -> BattleReport
+ 75, // 24: SociatyRecommendResp.teams:type_name -> SociatyRecommendResp.TeamsEntry
+ 69, // 25: SociatyBRankResp.rank:type_name -> SociatyRankInfo
+ 86, // 26: SociatyBuyReq.atn:type_name -> UserAssets
+ 87, // 27: SociatyBMainResp.TeamsEntry.value:type_name -> ChallengeTeam
+ 87, // 28: SociatyBFormationReq.TeamsEntry.value:type_name -> ChallengeTeam
+ 87, // 29: SociatyRecommendResp.TeamsEntry.value:type_name -> ChallengeTeam
+ 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_sociaty_sociaty_msg_proto_init() }
diff --git a/pb/viking_db.pb.go b/pb/viking_db.pb.go
index 78c46e61b..ceaf441c4 100644
--- a/pb/viking_db.pb.go
+++ b/pb/viking_db.pb.go
@@ -548,118 +548,118 @@ var File_viking_viking_db_proto protoreflect.FileDescriptor
var file_viking_viking_db_proto_rawDesc = []byte{
0x0a, 0x16, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x5f,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2f, 0x69,
- 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x22, 0xc0, 0x03, 0x0a, 0x08, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 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,
- 0x27, 0x0a, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e,
- 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x45, 0x6e, 0x74,
- 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x12, 0x33, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73,
- 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x56,
- 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x6e,
- 0x74, 0x72, 0x79, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x21, 0x0a,
- 0x02, 0x70, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x56, 0x69,
- 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x02, 0x70, 0x73,
- 0x12, 0x2a, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x14, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x52, 0x6f, 0x75, 0x6e, 0x64,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x1a, 0x37, 0x0a, 0x09,
- 0x42, 0x6f, 0x73, 0x73, 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, 0x3b, 0x0a, 0x0d, 0x42, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d,
- 0x65, 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,
+ 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, 0x22, 0xc0, 0x03,
+ 0x0a, 0x08, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 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, 0x27, 0x0a, 0x04,
+ 0x62, 0x6f, 0x73, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x56,
+ 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+ 0x04, 0x62, 0x6f, 0x73, 0x73, 0x12, 0x33, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d,
+ 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69,
+ 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x02, 0x70, 0x73,
+ 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e,
+ 0x67, 0x2e, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x02, 0x70, 0x73, 0x12, 0x2a, 0x0a,
+ 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44,
+ 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x42, 0x6f, 0x73,
+ 0x73, 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, 0x35, 0x0a, 0x07, 0x50, 0x73, 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, 0x38, 0x0a, 0x0a, 0x52, 0x6f, 0x75,
- 0x6e, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
- 0x02, 0x38, 0x01, 0x22, 0xcb, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67,
+ 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x42, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 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,
+ 0x35, 0x0a, 0x07, 0x50, 0x73, 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, 0x38, 0x0a, 0x0a, 0x52, 0x6f, 0x75, 0x6e, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+ 0x22, 0xcb, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63,
+ 0x6f, 0x72, 0x64, 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, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49,
+ 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x04, 0x64, 0x61,
+ 0x74, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b,
+ 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x43, 0x0a, 0x09, 0x44, 0x61, 0x74,
+ 0x61, 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, 0x63, 0x6f, 0x72, 0x65, 0x44,
+ 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xaa,
+ 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x12,
+ 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+ 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75,
+ 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x6c,
+ 0x69, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
+ 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
+ 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18,
+ 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, 0x12,
+ 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x84, 0x02, 0x0a, 0x09,
+ 0x53, 0x63, 0x6f, 0x72, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x07, 0x63, 0x6f, 0x73,
+ 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x53, 0x63, 0x6f,
+ 0x72, 0x65, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x52, 0x07, 0x63, 0x6f, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08,
+ 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+ 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x28, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65,
+ 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x44, 0x61,
+ 0x74, 0x61, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6c, 0x69,
+ 0x6e, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x43, 0x6f, 0x73, 0x74, 0x69, 0x6d, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42,
+ 0x0a, 0x09, 0x4c, 0x69, 0x6e, 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, 0x1f, 0x0a,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c,
+ 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+ 0x38, 0x01, 0x22, 0xcd, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e,
0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66,
0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73,
- 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a,
- 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42,
- 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x44, 0x61, 0x74,
- 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x43, 0x0a, 0x09,
- 0x44, 0x61, 0x74, 0x61, 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, 0x63, 0x6f,
- 0x72, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
- 0x01, 0x22, 0xaa, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61,
- 0x6e, 0x6b, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x15, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
- 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61,
- 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63,
- 0x75, 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66,
- 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79,
- 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79,
- 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x84,
- 0x02, 0x0a, 0x09, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x07,
- 0x63, 0x6f, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e,
- 0x53, 0x63, 0x6f, 0x72, 0x65, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x69, 0x6d,
- 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x63, 0x6f, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12,
- 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x28, 0x0a, 0x04, 0x6c,
- 0x69, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x53, 0x63, 0x6f, 0x72,
- 0x65, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
- 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x43, 0x6f, 0x73, 0x74, 0x69, 0x6d, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
- 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x4c, 0x69, 0x6e, 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, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
- 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xcd, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61,
- 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x23, 0x0a, 0x05, 0x75,
- 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73,
- 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f,
- 0x12, 0x2e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a,
- 0x2e, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
- 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
- 0x1a, 0x43, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 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, 0x48, 0x75, 0x69, 0x68, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
- 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xfc, 0x01, 0x0a, 0x09, 0x48, 0x75, 0x69, 0x68, 0x65, 0x44,
- 0x61, 0x74, 0x61, 0x12, 0x2b, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x18, 0x01, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x48, 0x75, 0x69, 0x68, 0x65, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x48,
- 0x75, 0x69, 0x68, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65,
- 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x28, 0x0a, 0x04,
- 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x48, 0x75, 0x69,
- 0x68, 0x65, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
- 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x48, 0x75, 0x69, 0x68, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
- 0x1a, 0x42, 0x0a, 0x09, 0x4c, 0x69, 0x6e, 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,
- 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09,
- 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
- 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb5, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e,
- 0x67, 0x53, 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72,
- 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x6c,
- 0x69, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65,
- 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69,
- 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
- 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f,
- 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f,
- 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x18,
- 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x42, 0x06, 0x5a, 0x04,
- 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2e, 0x0a,
+ 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42,
+ 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x44, 0x61,
+ 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x43, 0x0a,
+ 0x09, 0x44, 0x61, 0x74, 0x61, 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, 0x48, 0x75,
+ 0x69, 0x68, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+ 0x38, 0x01, 0x22, 0xfc, 0x01, 0x0a, 0x09, 0x48, 0x75, 0x69, 0x68, 0x65, 0x44, 0x61, 0x74, 0x61,
+ 0x12, 0x2b, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x15, 0x2e, 0x48, 0x75, 0x69, 0x68, 0x65, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x48, 0x75, 0x69, 0x68,
+ 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x12, 0x1a, 0x0a,
+ 0x08, 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x08, 0x6d, 0x61, 0x78, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x28, 0x0a, 0x04, 0x6c, 0x69, 0x6e,
+ 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x48, 0x75, 0x69, 0x68, 0x65, 0x44,
+ 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6c,
+ 0x69, 0x6e, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x48, 0x75, 0x69, 0x68, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a,
+ 0x09, 0x4c, 0x69, 0x6e, 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, 0x1f, 0x0a, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69,
+ 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+ 0x01, 0x22, 0xb5, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x52,
+ 0x61, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66,
+ 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74,
+ 0x61, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69,
+ 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66,
+ 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74,
+ 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74,
+ 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x18, 0x06, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+ 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -730,7 +730,7 @@ func file_viking_viking_db_proto_init() {
return
}
file_comm_proto_init()
- file_integral_integral_db_proto_init()
+ file_battle_battle_msg_proto_init()
if !protoimpl.UnsafeEnabled {
file_viking_viking_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBViking); i {
diff --git a/sys/configure/structs/Game.BuffEffectType.go b/sys/configure/structs/Game.BuffEffectType.go
index 7a9749e29..2051a210f 100644
--- a/sys/configure/structs/Game.BuffEffectType.go
+++ b/sys/configure/structs/Game.BuffEffectType.go
@@ -21,4 +21,5 @@ const (
GameBuffEffectType_Shifu = 9
GameBuffEffectType_Dot = 10
GameBuffEffectType_CanRollBuff = 11
+ GameBuffEffectType_CanRollDeBuff = 12
)
diff --git a/sys/configure/structs/Game.MainStageData.go b/sys/configure/structs/Game.MainStageData.go
index 52b97750f..ba8254565 100644
--- a/sys/configure/structs/Game.MainStageData.go
+++ b/sys/configure/structs/Game.MainStageData.go
@@ -48,6 +48,7 @@ type GameMainStageData struct {
Frontstoryid int32
Afterstoryid int32
MaingroupName string
+ MaingroupIcon string
MainlineName string
Title string
Desc string
@@ -177,6 +178,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["frontstoryid"].(float64); !_ok_ { err = errors.New("frontstoryid error"); return }; _v.Frontstoryid = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["afterstoryid"].(float64); !_ok_ { err = errors.New("afterstoryid error"); return }; _v.Afterstoryid = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["maingroupName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MaingroupName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MaingroupName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.MaingroupIcon, _ok_ = _buf["maingroupIcon"].(string); !_ok_ { err = errors.New("maingroupIcon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["mainlineName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MainlineName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MainlineName, _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["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _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["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
diff --git a/sys/configure/structs/Game.RuleDesc.go b/sys/configure/structs/Game.RuleDesc.go
index e20cd0a85..63c15fb5d 100644
--- a/sys/configure/structs/Game.RuleDesc.go
+++ b/sys/configure/structs/Game.RuleDesc.go
@@ -21,7 +21,7 @@ func NewGameRuleDesc(_buf []map[string]interface{}) (*GameRuleDesc, error) {
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Id] = _v
+ dataMap[_v.Key] = _v
}
}
return &GameRuleDesc{_dataList:_dataList, _dataMap:dataMap}, nil
diff --git a/sys/configure/structs/Game.RuleDescData.go b/sys/configure/structs/Game.RuleDescData.go
index cc7222190..4ff8f9b5c 100644
--- a/sys/configure/structs/Game.RuleDescData.go
+++ b/sys/configure/structs/Game.RuleDescData.go
@@ -11,8 +11,10 @@ package cfg
import "errors"
type GameRuleDescData struct {
+ Key int32
Id int32
Title string
+ Titlecontent string
Content string
}
@@ -23,8 +25,10 @@ func (*GameRuleDescData) GetTypeId() int32 {
}
func (_v *GameRuleDescData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _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["titlecontent"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Titlecontent error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Titlecontent, _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["content"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Content error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Content, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
diff --git a/sys/configure/structs/Game.SearchitemBoxData.go b/sys/configure/structs/Game.SearchitemBoxData.go
index 1333d9efa..941ebfdb2 100644
--- a/sys/configure/structs/Game.SearchitemBoxData.go
+++ b/sys/configure/structs/Game.SearchitemBoxData.go
@@ -12,6 +12,7 @@ import "errors"
type GameSearchitemBoxData struct {
Id int32
+ Type int32
Name []string
Drown int32
Pointweight int32
@@ -25,6 +26,7 @@ func (*GameSearchitemBoxData) GetTypeId() int32 {
func (_v *GameSearchitemBoxData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/game.skillBuffData.go b/sys/configure/structs/game.skillBuffData.go
index de9e3cb96..1e51ab196 100644
--- a/sys/configure/structs/game.skillBuffData.go
+++ b/sys/configure/structs/game.skillBuffData.go
@@ -30,6 +30,8 @@ type GameSkillBuffData struct {
BuffIcon string
Buffeffect string
Buffpos string
+ TriggerEffect string
+ TriggerPos string
ForbidFloat int32
ReplaceBuffID int32
}
@@ -112,6 +114,8 @@ func (_v *GameSkillBuffData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["buffIcon"].(string); !_ok_ { err = errors.New("buffIcon error"); return } }
{ var _ok_ bool; if _v.Buffeffect, _ok_ = _buf["buffeffect"].(string); !_ok_ { err = errors.New("buffeffect error"); return } }
{ var _ok_ bool; if _v.Buffpos, _ok_ = _buf["buffpos"].(string); !_ok_ { err = errors.New("buffpos error"); return } }
+ { var _ok_ bool; if _v.TriggerEffect, _ok_ = _buf["TriggerEffect"].(string); !_ok_ { err = errors.New("TriggerEffect error"); return } }
+ { var _ok_ bool; if _v.TriggerPos, _ok_ = _buf["TriggerPos"].(string); !_ok_ { err = errors.New("TriggerPos error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["forbidFloat"].(float64); !_ok_ { err = errors.New("forbidFloat error"); return }; _v.ForbidFloat = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ReplaceBuffID"].(float64); !_ok_ { err = errors.New("ReplaceBuffID error"); return }; _v.ReplaceBuffID = int32(_tempNum_) }
return