diff --git a/bin/json/game_annulartaskall.json b/bin/json/game_annulartaskall.json
index 796f2e8c5..d2a498791 100644
--- a/bin/json/game_annulartaskall.json
+++ b/bin/json/game_annulartaskall.json
@@ -2,12 +2,6 @@
{
"taskgroup": 10010,
"taskdetail": [
- 60000010,
- 60000020,
- 60000030,
- 60000040,
- 60000050,
- 60000060,
60000070,
60000080,
60000090,
@@ -52,12 +46,6 @@
{
"taskgroup": 10020,
"taskdetail": [
- 60000010,
- 60000020,
- 60000030,
- 60000040,
- 60000050,
- 60000060,
60000070,
60000080,
60000090,
@@ -102,12 +90,6 @@
{
"taskgroup": 10030,
"taskdetail": [
- 60000010,
- 60000020,
- 60000030,
- 60000040,
- 60000050,
- 60000060,
60000070,
60000080,
60000090,
@@ -152,12 +134,6 @@
{
"taskgroup": 10040,
"taskdetail": [
- 60000010,
- 60000020,
- 60000030,
- 60000040,
- 60000050,
- 60000060,
60000070,
60000080,
60000090,
diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index ddcc21513..5e342b4ed 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -1064,8 +1064,8 @@
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
- "key": "battleready_battleready_RuleTips_1",
- "text": "只能上阵热情之火属性的守护者"
+ "key": "",
+ "text": ""
},
"BattleTips": {
"key": "",
@@ -1074,9 +1074,7 @@
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
- "ChoseCamp": [
- 1
- ],
+ "ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
@@ -1101,8 +1099,8 @@
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
- "key": "battleready_battleready_RuleTips_2",
- "text": "只能上阵感观之林属性的守护者"
+ "key": "",
+ "text": ""
},
"BattleTips": {
"key": "",
@@ -1111,9 +1109,7 @@
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
- "ChoseCamp": [
- 2
- ],
+ "ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
@@ -1138,8 +1134,8 @@
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
- "key": "battleready_battleready_RuleTips_3",
- "text": "只能上阵包容之水属性的守护者"
+ "key": "",
+ "text": ""
},
"BattleTips": {
"key": "",
@@ -1148,9 +1144,7 @@
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
- "ChoseCamp": [
- 3
- ],
+ "ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
@@ -1447,6 +1441,41 @@
"CanFriendHelp": false,
"Numrounds": 0
},
+ {
+ "id": 141,
+ "PlayType": 1,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_05",
+ "battleScenes": [
+ "scenesfight_13"
+ ],
+ "BGMusic": "",
+ "LoadingId": 0,
+ "HideAlienSpace": false,
+ "HideFightUI": false,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "BattleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [],
+ "ScoreGroupID": 0,
+ "disableAiCamera": false,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 0,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "RedAssistTeam": 0,
+ "BlueAssistTeam": 0,
+ "CanFriendHelp": false,
+ "Numrounds": 0
+ },
{
"id": 201,
"PlayType": 1,
@@ -2537,8 +2566,8 @@
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
- "key": "battleready_battleready_RuleTips_1",
- "text": "只能上阵热情之火属性的守护者"
+ "key": "",
+ "text": ""
},
"BattleTips": {
"key": "",
@@ -2547,9 +2576,7 @@
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
- "ChoseCamp": [
- 1
- ],
+ "ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
@@ -2574,8 +2601,8 @@
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
- "key": "battleready_battleready_RuleTips_2",
- "text": "只能上阵感观之林属性的守护者"
+ "key": "",
+ "text": ""
},
"BattleTips": {
"key": "",
@@ -2584,9 +2611,7 @@
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
- "ChoseCamp": [
- 2
- ],
+ "ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
@@ -2611,8 +2636,8 @@
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
- "key": "battleready_battleready_RuleTips_3",
- "text": "只能上阵包容之水属性的守护者"
+ "key": "",
+ "text": ""
},
"BattleTips": {
"key": "",
@@ -2621,9 +2646,7 @@
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
- "ChoseCamp": [
- 3
- ],
+ "ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 3d4fe363c..f96ff2957 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -5014,7 +5014,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_149",
- "text": "疯狂的原始人"
+ "text": "询问原始人一家"
},
"type": 61,
"valid": 0,
@@ -5048,7 +5048,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_150",
- "text": "家家有本难念的经"
+ "text": "帮瓜哥一家寻找食物"
},
"type": 61,
"valid": 0,
@@ -5077,7 +5077,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_151",
- "text": "瓜哥！暴走！"
+ "text": "看看瓜哥"
},
"type": 61,
"valid": 0,
@@ -5106,7 +5106,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_152",
- "text": "月光原石在哪里"
+ "text": "和食人鱼聊聊"
},
"type": 61,
"valid": 0,
@@ -5135,7 +5135,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_153",
- "text": "前往拳猴的领地"
+ "text": "跟随盖前进"
},
"type": 61,
"valid": 0,
@@ -5164,7 +5164,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_154",
- "text": "拳猴的奇特语言"
+ "text": "学习猴拳猴语"
},
"type": 61,
"valid": 0,
@@ -5193,7 +5193,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_155",
- "text": "潜藏在暗影中的威胁"
+ "text": "和神秘人聊聊"
},
"type": 61,
"valid": 0,
@@ -5222,7 +5222,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_156",
- "text": "探索石阵秘境"
+ "text": "通关石阵秘境"
},
"type": 61,
"valid": 0,
@@ -5251,7 +5251,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_157",
- "text": "阴影战士的阴谋"
+ "text": "击败阴影战士"
},
"type": 61,
"valid": 0,
@@ -5280,7 +5280,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_158",
- "text": "巨型猩猩怪来袭！"
+ "text": "击败巨型猩猩怪"
},
"type": 61,
"valid": 0,
@@ -5309,7 +5309,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_159",
- "text": "破除阴谋"
+ "text": "回收月光原石"
},
"type": 61,
"valid": 0,
@@ -5560,7 +5560,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_168",
- "text": "操控游艇上岸"
+ "text": "击败果酱教授"
},
"type": 61,
"valid": 0,
@@ -5652,7 +5652,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_171",
- "text": "前往卡梅洛特城堡"
+ "text": "与邦尼兔会合"
},
"type": 61,
"valid": 0,
@@ -22685,5 +22685,1049 @@
"value": 40,
"filter": [],
"filter2": []
+ },
+ {
+ "id": 19000005,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_752",
+ "text": "获得希卡普"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 35002
+ ],
+ "filter2": []
+ },
+ {
+ "id": 19000006,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_753",
+ "text": "希卡普达到20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 35002
+ ],
+ "filter2": []
+ },
+ {
+ "id": 19000007,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_754",
+ "text": "希卡普达到40级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 40,
+ "filter": [
+ 35002
+ ],
+ "filter2": []
+ },
+ {
+ "id": 19000008,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_755",
+ "text": "希卡普达到60级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 60,
+ "filter": [
+ 35002
+ ],
+ "filter2": []
+ },
+ {
+ "id": 19000009,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_756",
+ "text": "获得亚丝翠"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 14003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 19000010,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_757",
+ "text": "亚丝翠达到20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 14003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 19000011,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_758",
+ "text": "亚丝翠达到40级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 40,
+ "filter": [
+ 14003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 19000012,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_759",
+ "text": "亚丝翠达到60级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 60,
+ "filter": [
+ 14003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000001,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_760",
+ "text": "获得法夸德勋爵"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 13004
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000002,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_761",
+ "text": "获得大大"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 13005
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000003,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_762",
+ "text": "获得船长"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 15002
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000004,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_763",
+ "text": "获得警长"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 24001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000005,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_764",
+ "text": "获得阿宝"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 25001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000006,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_765",
+ "text": "获得师父"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 35001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000007,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_766",
+ "text": "获得骇客蛛"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 44004
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000008,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_767",
+ "text": "获得悍娇虎"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 44006
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000009,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_768",
+ "text": "获得盖"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 45003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000010,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_769",
+ "text": "获得菲奥娜"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 34007
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000011,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_770",
+ "text": "获得穿靴子的猫"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 45004
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000012,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_771",
+ "text": "获得乌龟大师"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 45001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000013,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_772",
+ "text": "获得冰霜杰克"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 34006
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000014,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_773",
+ "text": "获得漆黑"
+ },
+ "type": 1,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 1,
+ "filter": [
+ 35003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000015,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_774",
+ "text": "法夸德勋爵20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 13004
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000016,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_775",
+ "text": "大大20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 13005
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000017,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_776",
+ "text": "船长20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 15002
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000018,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_777",
+ "text": "警长20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 24001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000019,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_778",
+ "text": "阿宝20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 25001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000020,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_779",
+ "text": "师父20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 35001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000021,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_780",
+ "text": "骇客蛛20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 44004
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000022,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_781",
+ "text": "悍娇虎20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 44006
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000023,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_782",
+ "text": "盖20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 45003
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000024,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_783",
+ "text": "菲奥娜20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 34007
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000025,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_784",
+ "text": "穿靴子的猫20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 45004
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000026,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_785",
+ "text": "乌龟大师20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 45001
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000027,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_786",
+ "text": "冰霜杰克20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 34006
+ ],
+ "filter2": []
+ },
+ {
+ "id": 20000028,
+ "rtype": 1,
+ "ctype": 1,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_787",
+ "text": "漆黑20级"
+ },
+ "type": 4,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "Npc_event_type": 0,
+ "NPC": 0,
+ "tipstxt": {
+ "key": "",
+ "text": ""
+ },
+ "value": 20,
+ "filter": [
+ 35003
+ ],
+ "filter2": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index b06bb6c98..cc830724e 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1451,5 +1451,21 @@
"id": 249,
"insert": 1,
"filter": []
+ },
+ {
+ "id": 250,
+ "insert": 1,
+ "filter": [
+ "lte",
+ "gte"
+ ]
+ },
+ {
+ "id": 251,
+ "insert": 1,
+ "filter": [
+ "lte",
+ "gte"
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_buzkashicombo.json b/bin/json/game_buzkashicombo.json
index 83e9e7700..e7f61c2dc 100644
--- a/bin/json/game_buzkashicombo.json
+++ b/bin/json/game_buzkashicombo.json
@@ -2,25 +2,29 @@
{
"num": 1,
"ComboMin": 0,
- "ComboMax": 20,
- "value": 10
+ "ComboMax": 5,
+ "value": 10,
+ "valuetext": 1000
},
{
"num": 2,
- "ComboMin": 21,
- "ComboMax": 40,
- "value": 12
+ "ComboMin": 6,
+ "ComboMax": 30,
+ "value": 12,
+ "valuetext": 1200
},
{
"num": 3,
- "ComboMin": 41,
+ "ComboMin": 31,
"ComboMax": 60,
- "value": 14
+ "value": 14,
+ "valuetext": 1400
},
{
"num": 4,
"ComboMin": 61,
"ComboMax": -1,
- "value": 18
+ "value": 18,
+ "valuetext": 1800
}
]
\ No newline at end of file
diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json
index c6be690c0..d04fb1456 100644
--- a/bin/json/game_buzkashimount.json
+++ b/bin/json/game_buzkashimount.json
@@ -96,7 +96,7 @@
"csubtime": 10,
"energyrecover": 30,
"maxenergy": 100,
- "offsetspeed": 15
+ "offsetspeed": 25
},
{
"id": "20030002",
@@ -195,7 +195,7 @@
"csubtime": 0,
"energyrecover": 30,
"maxenergy": 100,
- "offsetspeed": 15
+ "offsetspeed": 20
},
{
"id": "20030003",
diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json
index 7214ad867..25ca250ad 100644
--- a/bin/json/game_consumehero.json
+++ b/bin/json/game_consumehero.json
@@ -42,6 +42,7 @@
"bigskillname": "sx_wz_sgyk",
"bigskillhero": "sx_img_33003",
"bigskillcolor": 0,
+ "bigskilleffect": "effect_sx_skill_green",
"get": 107,
"consume": [],
"skilltype": 1,
@@ -101,6 +102,7 @@
"bigskillname": "sx_wz_hhlp",
"bigskillhero": "sx_img_44003",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [],
"skilltype": 1,
@@ -160,6 +162,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [],
"skilltype": 1,
@@ -219,6 +222,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -284,6 +288,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -349,6 +354,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -414,6 +420,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -479,6 +486,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -544,6 +552,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -609,6 +618,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -674,6 +684,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -739,6 +750,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -804,6 +816,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -869,6 +882,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -934,6 +948,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -999,6 +1014,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
@@ -1064,6 +1080,7 @@
"bigskillname": "sx_wz_ddxc",
"bigskillhero": "sx_img_43004",
"bigskillcolor": 1,
+ "bigskilleffect": "effect_sx_skill_yellow",
"get": 107,
"consume": [
{
diff --git a/bin/json/game_consumeintegral.json b/bin/json/game_consumeintegral.json
index bda0cedc5..71738a766 100644
--- a/bin/json/game_consumeintegral.json
+++ b/bin/json/game_consumeintegral.json
@@ -31,7 +31,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -42,7 +42,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -66,7 +66,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -77,7 +77,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -101,7 +101,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -112,7 +112,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -136,7 +136,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -147,7 +147,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -171,7 +171,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -182,7 +182,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -206,7 +206,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -217,7 +217,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -241,7 +241,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -252,7 +252,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -276,7 +276,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -287,7 +287,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -311,7 +311,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -322,7 +322,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -346,7 +346,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -357,7 +357,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -381,7 +381,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -392,7 +392,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
diff --git a/bin/json/game_dragonlvitem.json b/bin/json/game_dragonlvitem.json
index c4407d0b6..8567a0d41 100644
--- a/bin/json/game_dragonlvitem.json
+++ b/bin/json/game_dragonlvitem.json
@@ -111,7 +111,7 @@
"lv": 1,
"num": [],
"item": [],
- "uplv": 19000001
+ "uplv": 19000005
},
{
"key": 7,
@@ -132,7 +132,7 @@
2
],
"item": [],
- "uplv": 19000002
+ "uplv": 19000006
},
{
"key": 8,
@@ -153,7 +153,7 @@
4
],
"item": [],
- "uplv": 19000003
+ "uplv": 19000007
},
{
"key": 9,
@@ -174,7 +174,7 @@
6
],
"item": [],
- "uplv": 19000004
+ "uplv": 19000008
},
{
"key": 10,
@@ -210,7 +210,7 @@
"lv": 1,
"num": [],
"item": [],
- "uplv": 19000001
+ "uplv": 19000009
},
{
"key": 12,
@@ -231,7 +231,7 @@
2
],
"item": [],
- "uplv": 19000002
+ "uplv": 19000010
},
{
"key": 13,
@@ -252,7 +252,7 @@
4
],
"item": [],
- "uplv": 19000003
+ "uplv": 19000011
},
{
"key": 14,
@@ -273,7 +273,7 @@
6
],
"item": [],
- "uplv": 19000004
+ "uplv": 19000012
},
{
"key": 15,
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index bb61756f5..c49b66b6b 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -119,7 +119,7 @@
"guild_AcceptApplyMax": 100,
"guild_ViceAllianceLeader_MaxNum": 3,
"guild_administrators_MaxNum": 5,
- "guild_InitiateImpeachmentTime": 1,
+ "guild_InitiateImpeachmentTime": 48,
"guild_TaskNum": 4,
"guild_ImpeachmentCountDown": 1,
"guild_DissolutionCountDown_cd": 1,
@@ -678,7 +678,7 @@
"t": "10000035",
"n": 0
},
- "passlvmax": 50,
+ "passlvmax": 60,
"guildboss_roulette": {
"a": "item",
"t": "22100001",
@@ -784,6 +784,7 @@
"n": 1
},
"td_dailystage_challenge_num": 2,
- "td_dailystage_challenge_num_max": 2
+ "td_dailystage_challenge_num_max": 2,
+ "guild_sign_in": 10
}
]
\ No newline at end of file
diff --git a/bin/json/game_integral.json b/bin/json/game_integral.json
index bda0cedc5..71738a766 100644
--- a/bin/json/game_integral.json
+++ b/bin/json/game_integral.json
@@ -31,7 +31,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -42,7 +42,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -66,7 +66,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -77,7 +77,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -101,7 +101,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -112,7 +112,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -136,7 +136,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -147,7 +147,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -171,7 +171,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -182,7 +182,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -206,7 +206,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -217,7 +217,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -241,7 +241,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -252,7 +252,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -276,7 +276,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -287,7 +287,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -311,7 +311,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -322,7 +322,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -346,7 +346,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -357,7 +357,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
@@ -381,7 +381,7 @@
{
"a": "attr",
"t": "consumeexp",
- "n": 20
+ "n": 50
},
{
"a": "attr",
@@ -392,7 +392,7 @@
"boxid": 0,
"deductrewards": [],
"reducewards": 0,
- "addwards": 20,
+ "addwards": 50,
"name": {
"key": "",
"text": ""
diff --git a/bin/json/game_integralcondition.json b/bin/json/game_integralcondition.json
index 1a45f8878..fae37cf91 100644
--- a/bin/json/game_integralcondition.json
+++ b/bin/json/game_integralcondition.json
@@ -7,7 +7,7 @@
},
"TaskId": 17100001,
"iType": 1,
- "jumpto": 166,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_01",
"text": "[敌方]暴击伤害降低10%"
@@ -22,7 +22,7 @@
},
"TaskId": 17100002,
"iType": 1,
- "jumpto": 166,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_02",
"text": "[敌方]防御降低10%"
@@ -37,7 +37,7 @@
},
"TaskId": 17100003,
"iType": 1,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_03",
"text": "[敌方]攻击降低10%"
@@ -52,7 +52,7 @@
},
"TaskId": 17100004,
"iType": 1,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_04",
"text": "[敌方]速度降低10%"
@@ -67,7 +67,7 @@
},
"TaskId": 17100005,
"iType": 1,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_05",
"text": "[敌方]命中降低10%"
@@ -82,7 +82,7 @@
},
"TaskId": 17100006,
"iType": 1,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_06",
"text": "[敌方]暴击降低10%"
@@ -97,7 +97,7 @@
},
"TaskId": 17100007,
"iType": 1,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_07",
"text": "[敌方]受到增益效果持续回合数-1"
@@ -112,7 +112,7 @@
},
"TaskId": 17100008,
"iType": 1,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_08",
"text": "[敌方]所有减益效果持续回合数+1"
@@ -127,7 +127,7 @@
},
"TaskId": 17100009,
"iType": 1,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_09",
"text": "[敌方]受到持续伤害增加50%"
@@ -142,7 +142,7 @@
},
"TaskId": 17100010,
"iType": 1,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_10",
"text": "[敌方]无法触发会心"
@@ -157,7 +157,7 @@
},
"TaskId": 0,
"iType": 2,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_11",
"text": "[敌方]所有技能冷却回合+1"
@@ -172,7 +172,7 @@
},
"TaskId": 0,
"iType": 2,
- "jumpto": 0,
+ "jumpto": 150,
"des": {
"key": "IntegralBoss_Integralcondition_des_12",
"text": "[敌方]身上每有一个减益效果受到伤害增加5%"
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 0399bbc8c..d4f2c5326 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -19526,7 +19526,7 @@
"img": "item_50013001",
"intr": {
"key": "item_item_intr_24012012",
- "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。"
+ "text": "隐藏于博客岛的藏宝图，只是其中的一个碎片。"
},
"describe": {
"key": "item_item_describe_24012012",
@@ -19573,7 +19573,7 @@
"img": "item_50013001",
"intr": {
"key": "item_item_intr_24012013",
- "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。"
+ "text": "隐藏于博客岛的藏宝图，只是其中的一个碎片。"
},
"describe": {
"key": "item_item_describe_24012013",
@@ -19620,7 +19620,7 @@
"img": "item_50013001",
"intr": {
"key": "item_item_intr_24012014",
- "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。"
+ "text": "隐藏于博客岛的藏宝图，只是其中的一个碎片。"
},
"describe": {
"key": "item_item_describe_24012014",
@@ -19639,6 +19639,293 @@
],
"gm": 0
},
+ {
+ "id": "24012015",
+ "name": {
+ "key": "item_item_name_24012015",
+ "text": "石阵旁的藏宝图"
+ },
+ "usetype": 1,
+ "color": 2,
+ "bagtype": 0,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_50013001",
+ "intr": {
+ "key": "item_item_intr_24012015",
+ "text": "隐藏于博客岛的藏宝图，已经是一个完整宝藏示意图。"
+ },
+ "describe": {
+ "key": "item_item_describe_24012015",
+ "text": "在山的那边，海的那边，有一张……藏宝图？"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_24012015",
+ "text": "【雕像之间的小秘密~】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "24012101",
+ "name": {
+ "key": "item_item_name_24012101",
+ "text": "巅峰之下的藏宝图"
+ },
+ "usetype": 1,
+ "color": 2,
+ "bagtype": 0,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_50013001",
+ "intr": {
+ "key": "item_item_intr_24012101",
+ "text": "隐藏于博客岛的藏宝图，已经是一个完整宝藏示意图。"
+ },
+ "describe": {
+ "key": "item_item_describe_24012101",
+ "text": "位于最高之巅的宝藏！"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_24012101",
+ "text": "【我立于巅峰之上！呃，好像，也没那么高】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "24012102",
+ "name": {
+ "key": "item_item_name_24012102",
+ "text": "藏宝图钥匙碎片1"
+ },
+ "usetype": 1,
+ "color": 2,
+ "bagtype": 0,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_50013001",
+ "intr": {
+ "key": "item_item_intr_24012102",
+ "text": "隐藏于博客岛的藏宝图，与其说是藏宝图，不如说是一个钥匙碎片。"
+ },
+ "describe": {
+ "key": "item_item_describe_24012102",
+ "text": "这个藏宝图上有着奇怪的裂痕，是动物咬出来的？"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_24012102",
+ "text": "【我知道！夹板之下一定会有的宝藏的！】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "24012103",
+ "name": {
+ "key": "item_item_name_24012103",
+ "text": "藏宝图钥匙碎片2"
+ },
+ "usetype": 1,
+ "color": 2,
+ "bagtype": 0,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_50013001",
+ "intr": {
+ "key": "item_item_intr_24012103",
+ "text": "隐藏于博客岛的藏宝图，与其说是藏宝图，不如说是一个钥匙碎片。"
+ },
+ "describe": {
+ "key": "item_item_describe_24012103",
+ "text": "这个藏宝图上有着奇怪的裂痕，是动物咬出来的？"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_24012103",
+ "text": "【我知道！夹板之下一定会有的宝藏的！】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "24012104",
+ "name": {
+ "key": "item_item_name_24012104",
+ "text": "奇怪的符文1"
+ },
+ "usetype": 1,
+ "color": 2,
+ "bagtype": 0,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_50013001",
+ "intr": {
+ "key": "item_item_intr_24012104",
+ "text": "隐藏于博客岛的藏宝图，上面画着奇怪的符文。"
+ },
+ "describe": {
+ "key": "item_item_describe_24012104",
+ "text": "奇怪符文，他到底在哪出现过？"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_24012104",
+ "text": "【说实在的，这看着像是什么邪恶仪式】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "24012105",
+ "name": {
+ "key": "item_item_name_24012105",
+ "text": "奇怪的符文2"
+ },
+ "usetype": 1,
+ "color": 2,
+ "bagtype": 0,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_50013001",
+ "intr": {
+ "key": "item_item_intr_24012105",
+ "text": "隐藏于博客岛的藏宝图，上面画着奇怪的符文。"
+ },
+ "describe": {
+ "key": "item_item_describe_24012105",
+ "text": "奇怪符文，他到底在哪出现过？"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_24012105",
+ "text": "【说实在的，这看着像是什么邪恶仪式】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "24012106",
+ "name": {
+ "key": "item_item_name_24012106",
+ "text": "奇怪的符文3"
+ },
+ "usetype": 1,
+ "color": 2,
+ "bagtype": 0,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [],
+ "use_skip": 0,
+ "upper_limit": 0,
+ "img": "item_50013001",
+ "intr": {
+ "key": "item_item_intr_24012106",
+ "text": "隐藏于博客岛的藏宝图，上面画着奇怪的符文。"
+ },
+ "describe": {
+ "key": "item_item_describe_24012106",
+ "text": "奇怪符文，他到底在哪出现过？"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_24012106",
+ "text": "【说实在的，这看着像是什么邪恶仪式】"
+ },
+ "sale": [],
+ "gm": 0
+ },
{
"id": "24012016",
"name": {
@@ -20606,47 +20893,6 @@
"sale": [],
"gm": 0
},
- {
- "id": "24012015",
- "name": {
- "key": "item_item_name_24012015",
- "text": "石阵旁的藏宝图"
- },
- "usetype": 0,
- "color": 1,
- "bagtype": 0,
- "index": 0,
- "special_type": 0,
- "hold": 0,
- "time": 0,
- "reddottype": 0,
- "effects": "",
- "modelName": "",
- "box_id": 0,
- "synthetize_num": 0,
- "synthetize_deplete": [],
- "synthetize_get": [],
- "decompose_deplete": [],
- "decompose_get": [],
- "access": [],
- "use_skip": 0,
- "upper_limit": 0,
- "img": "item_50013001",
- "intr": {
- "key": "item_item_intr_24012015",
- "text": "隐藏于博客岛的藏宝图，已经是一个完整宝藏示意图。"
- },
- "describe": {
- "key": "item_item_describe_24012015",
- "text": "在山的那边，海的那边，有一张……藏宝图？"
- },
- "dialogue": {
- "key": "item_item_dialogue_24012015",
- "text": "【雕像之间的小秘密~】"
- },
- "sale": [],
- "gm": 0
- },
{
"id": "24022003",
"name": {
@@ -20727,7 +20973,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19010002",
@@ -20768,7 +21014,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19010003",
@@ -20809,7 +21055,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19010004",
@@ -20850,7 +21096,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020001",
@@ -20891,7 +21137,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020002",
@@ -20932,7 +21178,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020003",
@@ -20973,7 +21219,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020004",
@@ -21014,7 +21260,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020005",
@@ -21055,7 +21301,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020006",
@@ -21096,7 +21342,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020007",
@@ -21137,7 +21383,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020008",
@@ -21178,7 +21424,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020009",
@@ -21219,7 +21465,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020010",
@@ -21260,7 +21506,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020011",
@@ -21301,7 +21547,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020012",
@@ -21342,7 +21588,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020013",
@@ -21383,7 +21629,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020014",
@@ -21424,7 +21670,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020015",
@@ -21465,7 +21711,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020016",
@@ -21506,7 +21752,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020017",
@@ -21547,7 +21793,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19020018",
@@ -21588,7 +21834,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030101",
@@ -21629,7 +21875,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030102",
@@ -21670,7 +21916,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030103",
@@ -21711,7 +21957,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030104",
@@ -21752,7 +21998,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030105",
@@ -21793,7 +22039,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030106",
@@ -21834,7 +22080,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030107",
@@ -21875,7 +22121,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030201",
@@ -21916,7 +22162,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030202",
@@ -21957,7 +22203,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030203",
@@ -21998,7 +22244,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030204",
@@ -22039,7 +22285,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030205",
@@ -22080,7 +22326,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030206",
@@ -22121,7 +22367,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030207",
@@ -22162,7 +22408,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030301",
@@ -22203,7 +22449,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030302",
@@ -22244,7 +22490,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030303",
@@ -22285,7 +22531,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030304",
@@ -22326,7 +22572,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030305",
@@ -22367,7 +22613,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030306",
@@ -22408,7 +22654,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030307",
@@ -22449,7 +22695,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030401",
@@ -22490,7 +22736,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030402",
@@ -22531,7 +22777,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030403",
@@ -22572,7 +22818,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030404",
@@ -22613,7 +22859,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030405",
@@ -22654,7 +22900,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030406",
@@ -22695,7 +22941,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19030407",
@@ -22736,7 +22982,7 @@
"text": ""
},
"sale": [],
- "gm": 0
+ "gm": 1
},
{
"id": "19140101",
@@ -22783,7 +23029,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140102",
@@ -22830,7 +23076,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140103",
@@ -22877,7 +23123,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140104",
@@ -22924,7 +23170,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140105",
@@ -22971,7 +23217,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140106",
@@ -23018,7 +23264,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140107",
@@ -23065,7 +23311,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140201",
@@ -23112,7 +23358,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140202",
@@ -23159,7 +23405,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140203",
@@ -23206,7 +23452,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140204",
@@ -23253,7 +23499,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140205",
@@ -23300,7 +23546,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140206",
@@ -23347,7 +23593,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140207",
@@ -23394,7 +23640,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140301",
@@ -23441,7 +23687,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140302",
@@ -23488,7 +23734,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140303",
@@ -23535,7 +23781,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140304",
@@ -23582,7 +23828,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140305",
@@ -23629,7 +23875,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140306",
@@ -23676,7 +23922,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140307",
@@ -23723,7 +23969,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140401",
@@ -23770,7 +24016,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140402",
@@ -23817,7 +24063,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140403",
@@ -23864,7 +24110,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140404",
@@ -23911,7 +24157,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140405",
@@ -23958,7 +24204,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140406",
@@ -24005,7 +24251,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140407",
@@ -24052,7 +24298,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140501",
@@ -24099,7 +24345,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140502",
@@ -24146,7 +24392,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140503",
@@ -24193,7 +24439,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140504",
@@ -24240,7 +24486,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140505",
@@ -24287,7 +24533,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140506",
@@ -24334,7 +24580,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140507",
@@ -24381,7 +24627,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140601",
@@ -24428,7 +24674,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140602",
@@ -24475,7 +24721,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140603",
@@ -24522,7 +24768,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140604",
@@ -24569,7 +24815,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140605",
@@ -24616,7 +24862,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140606",
@@ -24663,7 +24909,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140607",
@@ -24710,7 +24956,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140701",
@@ -24757,7 +25003,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140702",
@@ -24804,7 +25050,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140703",
@@ -24851,7 +25097,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140704",
@@ -24898,7 +25144,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140705",
@@ -24945,7 +25191,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140706",
@@ -24992,7 +25238,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140707",
@@ -25039,7 +25285,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140801",
@@ -25086,7 +25332,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140802",
@@ -25133,7 +25379,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140803",
@@ -25180,7 +25426,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140804",
@@ -25227,7 +25473,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140805",
@@ -25274,7 +25520,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140806",
@@ -25321,7 +25567,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140807",
@@ -25368,7 +25614,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140901",
@@ -25415,7 +25661,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140902",
@@ -25462,7 +25708,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140903",
@@ -25509,7 +25755,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140904",
@@ -25556,7 +25802,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140905",
@@ -25603,7 +25849,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140906",
@@ -25650,7 +25896,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19140907",
@@ -25697,7 +25943,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141001",
@@ -25744,7 +25990,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141002",
@@ -25791,7 +26037,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141003",
@@ -25838,7 +26084,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141004",
@@ -25885,7 +26131,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141005",
@@ -25932,7 +26178,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141006",
@@ -25979,7 +26225,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141007",
@@ -26026,7 +26272,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141101",
@@ -26073,7 +26319,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141102",
@@ -26120,7 +26366,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141103",
@@ -26167,7 +26413,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141104",
@@ -26214,7 +26460,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141105",
@@ -26261,7 +26507,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141106",
@@ -26308,7 +26554,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141107",
@@ -26355,7 +26601,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141201",
@@ -26402,7 +26648,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141202",
@@ -26449,7 +26695,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141203",
@@ -26496,7 +26742,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141204",
@@ -26543,7 +26789,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141205",
@@ -26590,7 +26836,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141206",
@@ -26637,7 +26883,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141207",
@@ -26684,7 +26930,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141301",
@@ -26731,7 +26977,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141302",
@@ -26778,7 +27024,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141303",
@@ -26825,7 +27071,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141304",
@@ -26872,7 +27118,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141305",
@@ -26919,7 +27165,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141306",
@@ -26966,7 +27212,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141307",
@@ -27013,7 +27259,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141401",
@@ -27060,7 +27306,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141402",
@@ -27107,7 +27353,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141403",
@@ -27154,7 +27400,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141404",
@@ -27201,7 +27447,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141405",
@@ -27248,7 +27494,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141406",
@@ -27295,7 +27541,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141407",
@@ -27342,7 +27588,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141501",
@@ -27389,7 +27635,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141502",
@@ -27436,7 +27682,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141503",
@@ -27483,7 +27729,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141504",
@@ -27530,7 +27776,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141505",
@@ -27577,7 +27823,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141506",
@@ -27624,7 +27870,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141507",
@@ -27671,7 +27917,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141601",
@@ -27718,7 +27964,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141602",
@@ -27765,7 +28011,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141603",
@@ -27812,7 +28058,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141604",
@@ -27859,7 +28105,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141605",
@@ -27906,7 +28152,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141606",
@@ -27953,7 +28199,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141607",
@@ -28000,7 +28246,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141701",
@@ -28047,7 +28293,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141702",
@@ -28094,7 +28340,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141703",
@@ -28141,7 +28387,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141704",
@@ -28188,7 +28434,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141705",
@@ -28235,7 +28481,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141706",
@@ -28282,7 +28528,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141707",
@@ -28329,7 +28575,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141801",
@@ -28376,7 +28622,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141802",
@@ -28423,7 +28669,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141803",
@@ -28470,7 +28716,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141804",
@@ -28517,7 +28763,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141805",
@@ -28564,7 +28810,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141806",
@@ -28611,7 +28857,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19141807",
@@ -28658,7 +28904,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240101",
@@ -28705,7 +28951,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240102",
@@ -28752,7 +28998,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240103",
@@ -28799,7 +29045,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240104",
@@ -28846,7 +29092,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240105",
@@ -28893,7 +29139,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240106",
@@ -28940,7 +29186,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240107",
@@ -28987,7 +29233,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240201",
@@ -29034,7 +29280,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240202",
@@ -29081,7 +29327,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240203",
@@ -29128,7 +29374,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240204",
@@ -29175,7 +29421,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240205",
@@ -29222,7 +29468,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240206",
@@ -29269,7 +29515,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240207",
@@ -29316,7 +29562,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240301",
@@ -29363,7 +29609,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240302",
@@ -29410,7 +29656,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240303",
@@ -29457,7 +29703,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240304",
@@ -29504,7 +29750,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240305",
@@ -29551,7 +29797,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240306",
@@ -29598,7 +29844,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240307",
@@ -29645,7 +29891,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240401",
@@ -29692,7 +29938,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240402",
@@ -29739,7 +29985,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240403",
@@ -29786,7 +30032,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240404",
@@ -29833,7 +30079,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240405",
@@ -29880,7 +30126,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240406",
@@ -29927,7 +30173,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240407",
@@ -29974,7 +30220,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240501",
@@ -30021,7 +30267,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240502",
@@ -30068,7 +30314,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240503",
@@ -30115,7 +30361,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240504",
@@ -30162,7 +30408,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240505",
@@ -30209,7 +30455,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240506",
@@ -30256,7 +30502,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240507",
@@ -30303,7 +30549,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240601",
@@ -30350,7 +30596,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240602",
@@ -30397,7 +30643,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240603",
@@ -30444,7 +30690,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240604",
@@ -30491,7 +30737,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240605",
@@ -30538,7 +30784,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240606",
@@ -30585,7 +30831,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240607",
@@ -30632,7 +30878,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240701",
@@ -30679,7 +30925,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240702",
@@ -30726,7 +30972,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240703",
@@ -30773,7 +31019,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240704",
@@ -30820,7 +31066,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240705",
@@ -30867,7 +31113,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240706",
@@ -30914,7 +31160,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240707",
@@ -30961,7 +31207,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240801",
@@ -31008,7 +31254,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240802",
@@ -31055,7 +31301,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240803",
@@ -31102,7 +31348,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240804",
@@ -31149,7 +31395,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240805",
@@ -31196,7 +31442,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240806",
@@ -31243,7 +31489,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240807",
@@ -31290,7 +31536,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240901",
@@ -31337,7 +31583,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240902",
@@ -31384,7 +31630,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240903",
@@ -31431,7 +31677,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240904",
@@ -31478,7 +31724,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240905",
@@ -31525,7 +31771,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240906",
@@ -31572,7 +31818,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19240907",
@@ -31619,7 +31865,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241001",
@@ -31666,7 +31912,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241002",
@@ -31713,7 +31959,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241003",
@@ -31760,7 +32006,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241004",
@@ -31807,7 +32053,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241005",
@@ -31854,7 +32100,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241006",
@@ -31901,7 +32147,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241007",
@@ -31948,7 +32194,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241101",
@@ -31995,7 +32241,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241102",
@@ -32042,7 +32288,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241103",
@@ -32089,7 +32335,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241104",
@@ -32136,7 +32382,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241105",
@@ -32183,7 +32429,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241106",
@@ -32230,7 +32476,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241107",
@@ -32277,7 +32523,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241201",
@@ -32324,7 +32570,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241202",
@@ -32371,7 +32617,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241203",
@@ -32418,7 +32664,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241204",
@@ -32465,7 +32711,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241205",
@@ -32512,7 +32758,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241206",
@@ -32559,7 +32805,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241207",
@@ -32606,7 +32852,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241301",
@@ -32653,7 +32899,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241302",
@@ -32700,7 +32946,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241303",
@@ -32747,7 +32993,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241304",
@@ -32794,7 +33040,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241305",
@@ -32841,7 +33087,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241306",
@@ -32888,7 +33134,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241307",
@@ -32935,7 +33181,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241401",
@@ -32982,7 +33228,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241402",
@@ -33029,7 +33275,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241403",
@@ -33076,7 +33322,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241404",
@@ -33123,7 +33369,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241405",
@@ -33170,7 +33416,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241406",
@@ -33217,7 +33463,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241407",
@@ -33264,7 +33510,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241501",
@@ -33311,7 +33557,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241502",
@@ -33358,7 +33604,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241503",
@@ -33405,7 +33651,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241504",
@@ -33452,7 +33698,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241505",
@@ -33499,7 +33745,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241506",
@@ -33546,7 +33792,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241507",
@@ -33593,7 +33839,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241601",
@@ -33640,7 +33886,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241602",
@@ -33687,7 +33933,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241603",
@@ -33734,7 +33980,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241604",
@@ -33781,7 +34027,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241605",
@@ -33828,7 +34074,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241606",
@@ -33875,7 +34121,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241607",
@@ -33922,7 +34168,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241701",
@@ -33969,7 +34215,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241702",
@@ -34016,7 +34262,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241703",
@@ -34063,7 +34309,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241704",
@@ -34110,7 +34356,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241705",
@@ -34157,7 +34403,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241706",
@@ -34204,7 +34450,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241707",
@@ -34251,7 +34497,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241801",
@@ -34298,7 +34544,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241802",
@@ -34345,7 +34591,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241803",
@@ -34392,7 +34638,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241804",
@@ -34439,7 +34685,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241805",
@@ -34486,7 +34732,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241806",
@@ -34533,7 +34779,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19241807",
@@ -34580,7 +34826,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340101",
@@ -34627,7 +34873,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340102",
@@ -34674,7 +34920,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340103",
@@ -34721,7 +34967,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340104",
@@ -34768,7 +35014,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340105",
@@ -34815,7 +35061,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340106",
@@ -34862,7 +35108,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340107",
@@ -34909,7 +35155,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340201",
@@ -34956,7 +35202,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340202",
@@ -35003,7 +35249,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340203",
@@ -35050,7 +35296,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340204",
@@ -35097,7 +35343,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340205",
@@ -35144,7 +35390,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340206",
@@ -35191,7 +35437,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340207",
@@ -35238,7 +35484,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340301",
@@ -35285,7 +35531,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340302",
@@ -35332,7 +35578,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340303",
@@ -35379,7 +35625,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340304",
@@ -35426,7 +35672,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340305",
@@ -35473,7 +35719,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340306",
@@ -35520,7 +35766,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340307",
@@ -35567,7 +35813,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340401",
@@ -35614,7 +35860,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340402",
@@ -35661,7 +35907,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340403",
@@ -35708,7 +35954,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340404",
@@ -35755,7 +36001,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340405",
@@ -35802,7 +36048,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340406",
@@ -35849,7 +36095,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340407",
@@ -35896,7 +36142,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340501",
@@ -35943,7 +36189,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340502",
@@ -35990,7 +36236,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340503",
@@ -36037,7 +36283,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340504",
@@ -36084,7 +36330,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340505",
@@ -36131,7 +36377,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340506",
@@ -36178,7 +36424,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340507",
@@ -36225,7 +36471,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340601",
@@ -36272,7 +36518,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340602",
@@ -36319,7 +36565,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340603",
@@ -36366,7 +36612,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340604",
@@ -36413,7 +36659,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340605",
@@ -36460,7 +36706,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340606",
@@ -36507,7 +36753,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340607",
@@ -36554,7 +36800,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340701",
@@ -36601,7 +36847,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340702",
@@ -36648,7 +36894,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340703",
@@ -36695,7 +36941,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340704",
@@ -36742,7 +36988,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340705",
@@ -36789,7 +37035,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340706",
@@ -36836,7 +37082,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340707",
@@ -36883,7 +37129,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340801",
@@ -36930,7 +37176,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340802",
@@ -36977,7 +37223,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340803",
@@ -37024,7 +37270,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340804",
@@ -37071,7 +37317,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340805",
@@ -37118,7 +37364,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340806",
@@ -37165,7 +37411,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340807",
@@ -37212,7 +37458,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340901",
@@ -37259,7 +37505,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340902",
@@ -37306,7 +37552,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340903",
@@ -37353,7 +37599,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340904",
@@ -37400,7 +37646,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340905",
@@ -37447,7 +37693,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340906",
@@ -37494,7 +37740,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19340907",
@@ -37541,7 +37787,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341001",
@@ -37588,7 +37834,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341002",
@@ -37635,7 +37881,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341003",
@@ -37682,7 +37928,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341004",
@@ -37729,7 +37975,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341005",
@@ -37776,7 +38022,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341006",
@@ -37823,7 +38069,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341007",
@@ -37870,7 +38116,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341101",
@@ -37917,7 +38163,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341102",
@@ -37964,7 +38210,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341103",
@@ -38011,7 +38257,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341104",
@@ -38058,7 +38304,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341105",
@@ -38105,7 +38351,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341106",
@@ -38152,7 +38398,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341107",
@@ -38199,7 +38445,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341201",
@@ -38246,7 +38492,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341202",
@@ -38293,7 +38539,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341203",
@@ -38340,7 +38586,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341204",
@@ -38387,7 +38633,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341205",
@@ -38434,7 +38680,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341206",
@@ -38481,7 +38727,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341207",
@@ -38528,7 +38774,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341301",
@@ -38575,7 +38821,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341302",
@@ -38622,7 +38868,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341303",
@@ -38669,7 +38915,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341304",
@@ -38716,7 +38962,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341305",
@@ -38763,7 +39009,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341306",
@@ -38810,7 +39056,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341307",
@@ -38857,7 +39103,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341401",
@@ -38904,7 +39150,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341402",
@@ -38951,7 +39197,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341403",
@@ -38998,7 +39244,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341404",
@@ -39045,7 +39291,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341405",
@@ -39092,7 +39338,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341406",
@@ -39139,7 +39385,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341407",
@@ -39186,7 +39432,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341501",
@@ -39233,7 +39479,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341502",
@@ -39280,7 +39526,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341503",
@@ -39327,7 +39573,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341504",
@@ -39374,7 +39620,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341505",
@@ -39421,7 +39667,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341506",
@@ -39468,7 +39714,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341507",
@@ -39515,7 +39761,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341601",
@@ -39562,7 +39808,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341602",
@@ -39609,7 +39855,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341603",
@@ -39656,7 +39902,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341604",
@@ -39703,7 +39949,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341605",
@@ -39750,7 +39996,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341606",
@@ -39797,7 +40043,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341607",
@@ -39844,7 +40090,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341701",
@@ -39891,7 +40137,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341702",
@@ -39938,7 +40184,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341703",
@@ -39985,7 +40231,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341704",
@@ -40032,7 +40278,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341705",
@@ -40079,7 +40325,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341706",
@@ -40126,7 +40372,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341707",
@@ -40173,7 +40419,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341801",
@@ -40220,7 +40466,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341802",
@@ -40267,7 +40513,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341803",
@@ -40314,7 +40560,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341804",
@@ -40361,7 +40607,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341805",
@@ -40408,7 +40654,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341806",
@@ -40455,7 +40701,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19341807",
@@ -40502,7 +40748,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440101",
@@ -40549,7 +40795,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440102",
@@ -40596,7 +40842,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440103",
@@ -40643,7 +40889,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440104",
@@ -40690,7 +40936,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440105",
@@ -40737,7 +40983,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440106",
@@ -40784,7 +41030,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440107",
@@ -40831,7 +41077,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440201",
@@ -40878,7 +41124,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440202",
@@ -40925,7 +41171,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440203",
@@ -40972,7 +41218,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440204",
@@ -41019,7 +41265,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440205",
@@ -41066,7 +41312,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440206",
@@ -41113,7 +41359,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440207",
@@ -41160,7 +41406,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440301",
@@ -41207,7 +41453,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440302",
@@ -41254,7 +41500,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440303",
@@ -41301,7 +41547,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440304",
@@ -41348,7 +41594,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440305",
@@ -41395,7 +41641,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440306",
@@ -41442,7 +41688,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440307",
@@ -41489,7 +41735,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440401",
@@ -41536,7 +41782,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440402",
@@ -41583,7 +41829,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440403",
@@ -41630,7 +41876,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440404",
@@ -41677,7 +41923,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440405",
@@ -41724,7 +41970,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440406",
@@ -41771,7 +42017,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440407",
@@ -41818,7 +42064,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440501",
@@ -41865,7 +42111,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440502",
@@ -41912,7 +42158,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440503",
@@ -41959,7 +42205,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440504",
@@ -42006,7 +42252,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440505",
@@ -42053,7 +42299,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440506",
@@ -42100,7 +42346,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440507",
@@ -42147,7 +42393,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440601",
@@ -42194,7 +42440,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440602",
@@ -42241,7 +42487,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440603",
@@ -42288,7 +42534,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440604",
@@ -42335,7 +42581,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440605",
@@ -42382,7 +42628,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440606",
@@ -42429,7 +42675,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440607",
@@ -42476,7 +42722,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440701",
@@ -42523,7 +42769,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440702",
@@ -42570,7 +42816,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440703",
@@ -42617,7 +42863,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440704",
@@ -42664,7 +42910,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440705",
@@ -42711,7 +42957,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440706",
@@ -42758,7 +43004,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440707",
@@ -42805,7 +43051,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440801",
@@ -42852,7 +43098,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440802",
@@ -42899,7 +43145,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440803",
@@ -42946,7 +43192,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440804",
@@ -42993,7 +43239,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440805",
@@ -43040,7 +43286,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440806",
@@ -43087,7 +43333,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440807",
@@ -43134,7 +43380,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440901",
@@ -43181,7 +43427,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440902",
@@ -43228,7 +43474,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440903",
@@ -43275,7 +43521,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440904",
@@ -43322,7 +43568,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440905",
@@ -43369,7 +43615,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440906",
@@ -43416,7 +43662,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19440907",
@@ -43463,7 +43709,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441001",
@@ -43510,7 +43756,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441002",
@@ -43557,7 +43803,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441003",
@@ -43604,7 +43850,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441004",
@@ -43651,7 +43897,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441005",
@@ -43698,7 +43944,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441006",
@@ -43745,7 +43991,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441007",
@@ -43792,7 +44038,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441101",
@@ -43839,7 +44085,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441102",
@@ -43886,7 +44132,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441103",
@@ -43933,7 +44179,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441104",
@@ -43980,7 +44226,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441105",
@@ -44027,7 +44273,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441106",
@@ -44074,7 +44320,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441107",
@@ -44121,7 +44367,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441201",
@@ -44168,7 +44414,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441202",
@@ -44215,7 +44461,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441203",
@@ -44262,7 +44508,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441204",
@@ -44309,7 +44555,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441205",
@@ -44356,7 +44602,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441206",
@@ -44403,7 +44649,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441207",
@@ -44450,7 +44696,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441301",
@@ -44497,7 +44743,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441302",
@@ -44544,7 +44790,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441303",
@@ -44591,7 +44837,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441304",
@@ -44638,7 +44884,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441305",
@@ -44685,7 +44931,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441306",
@@ -44732,7 +44978,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441307",
@@ -44779,7 +45025,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441401",
@@ -44826,7 +45072,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441402",
@@ -44873,7 +45119,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441403",
@@ -44920,7 +45166,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441404",
@@ -44967,7 +45213,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441405",
@@ -45014,7 +45260,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441406",
@@ -45061,7 +45307,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441407",
@@ -45108,7 +45354,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441501",
@@ -45155,7 +45401,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441502",
@@ -45202,7 +45448,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441503",
@@ -45249,7 +45495,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441504",
@@ -45296,7 +45542,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441505",
@@ -45343,7 +45589,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441506",
@@ -45390,7 +45636,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441507",
@@ -45437,7 +45683,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441601",
@@ -45484,7 +45730,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441602",
@@ -45531,7 +45777,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441603",
@@ -45578,7 +45824,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441604",
@@ -45625,7 +45871,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441605",
@@ -45672,7 +45918,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441606",
@@ -45719,7 +45965,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441607",
@@ -45766,7 +46012,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441701",
@@ -45813,7 +46059,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441702",
@@ -45860,7 +46106,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441703",
@@ -45907,7 +46153,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441704",
@@ -45954,7 +46200,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441705",
@@ -46001,7 +46247,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441706",
@@ -46048,7 +46294,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441707",
@@ -46095,7 +46341,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441801",
@@ -46142,7 +46388,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441802",
@@ -46189,7 +46435,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441803",
@@ -46236,7 +46482,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441804",
@@ -46283,7 +46529,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441805",
@@ -46330,7 +46576,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441806",
@@ -46377,7 +46623,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "19441807",
@@ -46424,7 +46670,7 @@
"n": 10000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "29000001",
@@ -46471,7 +46717,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "29000002",
@@ -46518,6 +46764,6 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
}
]
\ No newline at end of file
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 0d504c0de..1addb0c69 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -5125,6 +5125,11 @@
"a": "equi",
"t": "10134",
"n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012101",
+ "n": 1
}
],
"lotteryward": 17110110,
@@ -7124,7 +7129,7 @@
"timelineplayer": false,
"stroyshow": false,
"frontstoryid": 0,
- "afterstoryid": 0,
+ "afterstoryid": 200810,
"maingroupName": {
"key": "",
"text": ""
@@ -7151,6 +7156,11 @@
"a": "item",
"t": "24011001",
"n": 50
+ },
+ {
+ "a": "item",
+ "t": "24012105",
+ "n": 1
}
],
"lotteryward": 0,
@@ -7310,7 +7320,7 @@
"timelineplayer": false,
"stroyshow": false,
"frontstoryid": 0,
- "afterstoryid": 0,
+ "afterstoryid": 200810,
"maingroupName": {
"key": "",
"text": ""
@@ -7337,6 +7347,11 @@
"a": "item",
"t": "24011001",
"n": 50
+ },
+ {
+ "a": "item",
+ "t": "24012106",
+ "n": 1
}
],
"lotteryward": 0,
@@ -7526,6 +7541,11 @@
"a": "item",
"t": "24011001",
"n": 50
+ },
+ {
+ "a": "item",
+ "t": "24012104",
+ "n": 1
}
],
"lotteryward": 0,
@@ -8713,7 +8733,7 @@
"timelineplayer": false,
"stroyshow": false,
"frontstoryid": 0,
- "afterstoryid": 0,
+ "afterstoryid": 200790,
"maingroupName": {
"key": "",
"text": ""
@@ -8740,6 +8760,11 @@
"a": "item",
"t": "24011001",
"n": 50
+ },
+ {
+ "a": "item",
+ "t": "24012102",
+ "n": 1
}
],
"lotteryward": 0,
@@ -8838,18 +8863,7 @@
}
],
"lotteryward": 0,
- "commonaward": [
- {
- "a": "item",
- "t": "24011001",
- "n": 150
- },
- {
- "a": "item",
- "t": "10000001",
- "n": 10
- }
- ],
+ "commonaward": [],
"BattleReadyID": 0,
"FormatList": [],
"helphero": [],
@@ -9041,8 +9055,8 @@
100104
],
"previoustage": 0,
- "buried_type": 0,
- "buried": 0,
+ "buried_type": 2,
+ "buried": 2,
"grouptype": [],
"Episodetype": 7,
"stage_param": 0,
@@ -9212,7 +9226,7 @@
"chapterid": 11001,
"group_id": 100165,
"previous_group_id": [
- 100160
+ 100130
],
"previoustage": 0,
"buried_type": 0,
@@ -9304,7 +9318,7 @@
"chapterid": 11001,
"group_id": 100166,
"previous_group_id": [
- 100160
+ 100130
],
"previoustage": 0,
"buried_type": 0,
@@ -9396,7 +9410,7 @@
"chapterid": 11001,
"group_id": 100167,
"previous_group_id": [
- 100160
+ 100130
],
"previoustage": 0,
"buried_type": 0,
@@ -9488,7 +9502,7 @@
"chapterid": 11001,
"group_id": 100168,
"previous_group_id": [
- 100168
+ 100130
],
"previoustage": 0,
"buried_type": 0,
@@ -9572,8 +9586,8 @@
100168
],
"previoustage": 0,
- "buried_type": 0,
- "buried": 0,
+ "buried_type": 2,
+ "buried": 3,
"grouptype": [],
"Episodetype": 7,
"stage_param": 0,
@@ -9605,7 +9619,7 @@
"key": "",
"text": ""
},
- "hide": true,
+ "hide": false,
"destroy": true,
"progress": 0,
"timelineplayer": false,
@@ -9641,7 +9655,13 @@
}
],
"lotteryward": 0,
- "commonaward": [],
+ "commonaward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ }
+ ],
"BattleReadyID": 0,
"FormatList": [],
"helphero": [],
@@ -9732,6 +9752,719 @@
"star_value": [],
"challengeward": 0
},
+ {
+ "id": 1101096,
+ "chapterid": 11001,
+ "group_id": 100171,
+ "previous_group_id": [
+ 100130
+ ],
+ "previoustage": 0,
+ "buried_type": 2,
+ "buried": 4,
+ "grouptype": [],
+ "Episodetype": 7,
+ "stage_param": 0,
+ "inherit": true,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 2,
+ "heroimg": "zxgq_qp_icon_gth",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": true,
+ "destroy": true,
+ "progress": 0,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 200800,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 3
+ }
+ ],
+ "lotteryward": 0,
+ "commonaward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 3
+ }
+ ],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
+ {
+ "id": 1101097,
+ "chapterid": 11001,
+ "group_id": 100172,
+ "previous_group_id": [
+ 100130
+ ],
+ "previoustage": 0,
+ "buried_type": 2,
+ "buried": 5,
+ "grouptype": [],
+ "Episodetype": 7,
+ "stage_param": 0,
+ "inherit": true,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 2,
+ "heroimg": "zxgq_qp_icon_gth",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": true,
+ "destroy": true,
+ "progress": 0,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 200820,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 3
+ }
+ ],
+ "lotteryward": 0,
+ "commonaward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 3
+ }
+ ],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
+ {
+ "id": 1101098,
+ "chapterid": 11001,
+ "group_id": 100173,
+ "previous_group_id": [
+ 100130
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 7,
+ "stage_param": 0,
+ "inherit": true,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 2,
+ "heroimg": "zxgq_qp_icon_gth",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": true,
+ "destroy": true,
+ "progress": 0,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 200700,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [
+ {
+ "a": "item",
+ "t": "24011001",
+ "n": 50
+ }
+ ],
+ "lotteryward": 0,
+ "commonaward": [],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
+ {
+ "id": 1101099,
+ "chapterid": 11001,
+ "group_id": 100174,
+ "previous_group_id": [
+ 100130
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 7,
+ "stage_param": 0,
+ "inherit": true,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 2,
+ "heroimg": "zxgq_qp_icon_gth",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": true,
+ "destroy": true,
+ "progress": 0,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 200780,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [
+ {
+ "a": "item",
+ "t": "24011001",
+ "n": 50
+ },
+ {
+ "a": "item",
+ "t": "24012103",
+ "n": 1
+ }
+ ],
+ "lotteryward": 0,
+ "commonaward": [],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
+ {
+ "id": 1101100,
+ "chapterid": 11001,
+ "group_id": 100175,
+ "previous_group_id": [
+ 100130
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 7,
+ "stage_param": 0,
+ "inherit": true,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 2,
+ "heroimg": "zxgq_qp_icon_gth",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": true,
+ "destroy": true,
+ "progress": 0,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 200710,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [
+ {
+ "a": "item",
+ "t": "24011001",
+ "n": 50
+ }
+ ],
+ "lotteryward": 0,
+ "commonaward": [],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
+ {
+ "id": 1101101,
+ "chapterid": 11001,
+ "group_id": 100176,
+ "previous_group_id": [
+ 100130
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 7,
+ "stage_param": 0,
+ "inherit": true,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 2,
+ "heroimg": "zxgq_qp_icon_gth",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": false,
+ "destroy": true,
+ "progress": 0,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 0,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [
+ {
+ "a": "item",
+ "t": "24011001",
+ "n": 50
+ }
+ ],
+ "lotteryward": 0,
+ "commonaward": [],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
+ {
+ "id": 1101102,
+ "chapterid": 11001,
+ "group_id": 100177,
+ "previous_group_id": [
+ 100130
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 7,
+ "stage_param": 0,
+ "inherit": true,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 2,
+ "heroimg": "zxgq_qp_icon_gth",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": true,
+ "destroy": true,
+ "progress": 0,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 0,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [
+ {
+ "a": "item",
+ "t": "24011001",
+ "n": 50
+ }
+ ],
+ "lotteryward": 0,
+ "commonaward": [],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
+ {
+ "id": 1101103,
+ "chapterid": 11001,
+ "group_id": 100178,
+ "previous_group_id": [
+ 100130
+ ],
+ "previoustage": 0,
+ "buried_type": 0,
+ "buried": 0,
+ "grouptype": [],
+ "Episodetype": 7,
+ "stage_param": 0,
+ "inherit": true,
+ "battle_fail": false,
+ "venturemodelspeed": 0,
+ "venturemodelscale": 0,
+ "move_type": 0,
+ "venturemodel": "",
+ "bubbletalk": {
+ "key": "",
+ "text": ""
+ },
+ "venturetype": 0,
+ "ventureavatar": [],
+ "scene_effect": [],
+ "scene_effectfilter": "",
+ "is_near": false,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "herocolor": 2,
+ "heroimg": "zxgq_qp_icon_gth",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "prewarbubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "hide": false,
+ "destroy": true,
+ "progress": 0,
+ "timelineplayer": false,
+ "stroyshow": false,
+ "frontstoryid": 0,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "maingroupIcon": "",
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [
+ {
+ "a": "item",
+ "t": "24011001",
+ "n": 50
+ }
+ ],
+ "lotteryward": 0,
+ "commonaward": [],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
{
"id": 1102000,
"chapterid": 11002,
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 3bab407e0..4e1309648 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -12015,13 +12015,13 @@
"equip": [],
"newskill": [],
"lv": 13,
- "hppro": 1.93,
- "atkpro": 1.27,
- "defpro": 0.88,
+ "hppro": 10,
+ "atkpro": 2,
+ "defpro": 2,
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": 0,
+ "speed": 100,
"modelsize": 1
},
{
@@ -12035,13 +12035,13 @@
"equip": [],
"newskill": [],
"lv": 13,
- "hppro": 1,
+ "hppro": 2,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": -1,
+ "speed": 105,
"modelsize": 1
},
{
@@ -12055,13 +12055,13 @@
"equip": [],
"newskill": [],
"lv": 13,
- "hppro": 1,
+ "hppro": 2,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": -1,
+ "speed": 105,
"modelsize": 1
},
{
@@ -12075,13 +12075,13 @@
"equip": [],
"newskill": [],
"lv": 13,
- "hppro": 1,
+ "hppro": 2,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": -1,
+ "speed": 105,
"modelsize": 1
},
{
@@ -12095,13 +12095,13 @@
"equip": [],
"newskill": [],
"lv": 13,
- "hppro": 1,
+ "hppro": 2,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
- "speed": -1,
+ "speed": 105,
"modelsize": 1
},
{
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index 9d56ae926..0e5b7dea6 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -427,7 +427,6 @@
}
],
"shopitem": [
- 30001,
30004,
30005,
30006,
diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json
index d2d9d559f..d1ffb5fa0 100644
--- a/bin/json/game_shopitem.json
+++ b/bin/json/game_shopitem.json
@@ -30055,9 +30055,7 @@
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
- "unlock": [
- 12070011
- ]
+ "unlock": []
},
{
"key": 808,
@@ -30095,9 +30093,7 @@
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
- "unlock": [
- 12070011
- ]
+ "unlock": []
},
{
"key": 809,
@@ -30135,9 +30131,7 @@
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
- "unlock": [
- 12070011
- ]
+ "unlock": []
},
{
"key": 810,
@@ -30168,15 +30162,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000015
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000001
]
},
{
@@ -30208,15 +30204,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000016
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000002
]
},
{
@@ -30248,15 +30246,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000017
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000003
]
},
{
@@ -30288,15 +30288,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000018
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000004
]
},
{
@@ -30328,15 +30330,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000019
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000005
]
},
{
@@ -30368,15 +30372,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000020
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000006
]
},
{
@@ -30408,15 +30414,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000021
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000007
]
},
{
@@ -30448,15 +30456,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000022
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000008
]
},
{
@@ -30488,15 +30498,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000023
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000009
]
},
{
@@ -30528,15 +30540,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000024
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000010
]
},
{
@@ -30568,15 +30582,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000025
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000011
]
},
{
@@ -30608,15 +30624,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000026
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000012
]
},
{
@@ -30648,15 +30666,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000027
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000013
]
},
{
@@ -30688,15 +30708,17 @@
1000
],
"buyminnum": 1,
- "buymaxcond": [],
- "addminnum": 0,
+ "buymaxcond": [
+ 20000028
+ ],
+ "addminnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999,
"unlock": [
- 12070011
+ 20000014
]
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 50398b6f5..674e0c44a 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -33070,7 +33070,7 @@
"Type": 3,
"Argu": [
391000107,
- 500,
+ 1000,
1,
-1
],
@@ -40457,10 +40457,10 @@
-1,
1000
],
- "FollowSK": [
+ "FollowSK": [],
+ "SucFollowSK": [
225002313
],
- "SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@@ -40496,17 +40496,17 @@
{
"Id": 225002314,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 1,
+ "ExecuteCnt": 2,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
- 1200
+ 3000
],
"FollowSK": [],
"SucFollowSK": [
@@ -40522,17 +40522,17 @@
{
"Id": 225002315,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 1,
+ "ExecuteCnt": 2,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
- 1300
+ 3100
],
"FollowSK": [],
"SucFollowSK": [
@@ -40548,17 +40548,17 @@
{
"Id": 225002316,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 1,
+ "ExecuteCnt": 2,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
- 1400
+ 3200
],
"FollowSK": [],
"SucFollowSK": [
@@ -40574,17 +40574,17 @@
{
"Id": 225002317,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 1,
+ "ExecuteCnt": 2,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
- 1500
+ 3300
],
"FollowSK": [],
"SucFollowSK": [
@@ -40600,17 +40600,17 @@
{
"Id": 225002318,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 10,
- "ExecuteCnt": 1,
+ "ExecuteCnt": 2,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
- 1600
+ 3400
],
"FollowSK": [],
"SucFollowSK": [
@@ -40626,7 +40626,7 @@
{
"Id": 225002319,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 10,
@@ -67646,10 +67646,10 @@
{
"Id": 223011311,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 4,
"TriggerAnim": "",
"Type": 1,
@@ -67672,10 +67672,10 @@
{
"Id": 223011321,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 4,
"TriggerAnim": "",
"Type": 1,
@@ -67698,10 +67698,10 @@
{
"Id": 223011331,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 4,
"TriggerAnim": "",
"Type": 1,
@@ -67724,10 +67724,10 @@
{
"Id": 223011341,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 4,
"TriggerAnim": "",
"Type": 1,
@@ -67750,10 +67750,10 @@
{
"Id": 223011351,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 4,
"TriggerAnim": "",
"Type": 1,
@@ -67776,7 +67776,7 @@
{
"Id": 223011312,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 10,
@@ -67825,7 +67825,7 @@
{
"Id": 223011314,
"EmitPR": 1000,
- "From": 2,
+ "From": 12,
"Where": [],
"Order": "",
"Limit": 10,
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index c44589dbd..d200f4dda 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -26308,9 +26308,7 @@
243007211
]
},
- "passSkill": [
- 243007211
- ],
+ "passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143007211_1",
"text": "友方受到的【攻击提升】、【防御提升】、【速度提升】效果提升35%。"
@@ -26343,9 +26341,7 @@
243007211
]
},
- "passSkill": [
- 243007211
- ],
+ "passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143007211_2",
"text": "冷却回合减少1回合。"
@@ -26378,9 +26374,7 @@
243007211
]
},
- "passSkill": [
- 243007211
- ],
+ "passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143007211_3",
"text": "冷却回合减少1回合。"
@@ -32459,7 +32453,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_125002311_1",
- "text": "净化自身所有减益状态，同时驱散敌方全体所有增益状态，随后对敌方全体造成攻击力120%的伤害，共有50%概率附加2回合【防御下降】状态。若驱散成功，则有100%概率附加【防御下降】状态。"
+ "text": "净化自身所有减益状态，同时驱散敌方全体所有增益状态，随后对敌方造成攻击力120%的伤害，共有50%概率附加2回合【防御下降】状态。若驱散成功，则有100%概率附加【防御下降】状态。"
},
"buffid": [],
"map": ""
@@ -32486,8 +32480,8 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 225002315,
- 225002314
+ 225002311,
+ 225002315
]
},
"passSkill": [],
@@ -32520,8 +32514,8 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 225002316,
- 225002314
+ 225002311,
+ 225002316
]
},
"passSkill": [],
@@ -32554,8 +32548,8 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 225002317,
- 225002314
+ 225002311,
+ 225002317
]
},
"passSkill": [],
@@ -32588,8 +32582,8 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 225002318,
- 225002314
+ 225002311,
+ 225002318
]
},
"passSkill": [],
@@ -54552,7 +54546,7 @@
],
"Desc": {
"key": "skill_skill_atk_Desc_123011311_1",
- "text": "攻击敌方全体目标4次，每次对其造成攻击力120%的伤害，100%概率附加2回合【流血】，造成暴击后额外附加2回合【流血】"
+ "text": "攻击敌方目标4次，每次对其造成攻击力120%的伤害，100%概率附加2回合【流血】，造成暴击后额外附加2回合【流血】"
},
"buffid": [],
"map": ""
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 907e3957c..110e9a8e0 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -1750,10 +1750,10 @@
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_ss",
"buffeffect": "",
- "buffpos": "根节点",
+ "buffpos": "",
"AddTrigger": 0,
- "TriggerEffect": "",
- "TriggerPos": "",
+ "TriggerEffect": "effect_15002_skill_2",
+ "TriggerPos": "根节点",
"TriggerAnim": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
diff --git a/bin/json/game_treasuremap.json b/bin/json/game_treasuremap.json
index d10ec89d9..cd5ed1b6d 100644
--- a/bin/json/game_treasuremap.json
+++ b/bin/json/game_treasuremap.json
@@ -12,16 +12,211 @@
}
],
"name": {
- "key": "treasuremap_map_name_2",
+ "key": "treasuremap_map_name_1",
"text": "博克岛的藏宝图"
},
"explain": {
- "key": "treasuremap_map_explain_2",
+ "key": "treasuremap_map_explain_1",
"text": "雕像与雕像之间，好像藏着小秘密~要试着去找找吗？"
},
+ "describe": {
+ "key": "treasuremap_map_desribe_1",
+ "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
+ }
+ },
+ {
+ "id": 2,
+ "pic": "cbt_sp02_00",
+ "chapter": 11001,
+ "type": 2,
+ "unlock": [
+ {
+ "a": "item",
+ "t": "24012101",
+ "n": 1
+ }
+ ],
+ "name": {
+ "key": "treasuremap_map_name_2",
+ "text": "巅峰藏宝图"
+ },
+ "explain": {
+ "key": "treasuremap_map_explain_2",
+ "text": "它存在于最高之峰！稍微下一点点。"
+ },
"describe": {
"key": "treasuremap_map_desribe_2",
"text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
}
+ },
+ {
+ "id": 3,
+ "pic": "cbt_sp01_00",
+ "chapter": 11001,
+ "type": 0,
+ "unlock": [
+ {
+ "a": "item",
+ "t": "24012012",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012013",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012014",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012012",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012013",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012014",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012012",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012013",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012014",
+ "n": 1
+ }
+ ],
+ "name": {
+ "key": "treasuremap_map_name_3",
+ "text": "羊羊藏宝图"
+ },
+ "explain": {
+ "key": "treasuremap_map_explain_3",
+ "text": "他一定很爱羊羊吧。"
+ },
+ "describe": {
+ "key": "treasuremap_map_desribe_3",
+ "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
+ }
+ },
+ {
+ "id": 4,
+ "pic": "cbt_sp04_00",
+ "chapter": 11001,
+ "type": 1,
+ "unlock": [
+ {
+ "a": "item",
+ "t": "24012102",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012103",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012102",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012103",
+ "n": 1
+ }
+ ],
+ "name": {
+ "key": "treasuremap_map_name_4",
+ "text": "夹板藏宝图"
+ },
+ "explain": {
+ "key": "treasuremap_map_explain_4",
+ "text": "按照惯例，船上肯定有个藏东西的地方。"
+ },
+ "describe": {
+ "key": "treasuremap_map_desribe_4",
+ "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
+ }
+ },
+ {
+ "id": 5,
+ "pic": "cbt_sp05_00",
+ "chapter": 11001,
+ "type": 0,
+ "unlock": [
+ {
+ "a": "item",
+ "t": "24012104",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012105",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012106",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012104",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012105",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012106",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012104",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012105",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "24012106",
+ "n": 1
+ }
+ ],
+ "name": {
+ "key": "treasuremap_map_name_5",
+ "text": "符文藏宝图"
+ },
+ "explain": {
+ "key": "treasuremap_map_explain_5",
+ "text": "何等邪恶的符文！呃，大概很邪恶。"
+ },
+ "describe": {
+ "key": "treasuremap_map_desribe_5",
+ "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
+ }
}
]
\ No newline at end of file
diff --git a/bin/json/game_trendchose.json b/bin/json/game_trendchose.json
index bf70fec7c..c81c6a00d 100644
--- a/bin/json/game_trendchose.json
+++ b/bin/json/game_trendchose.json
@@ -253,7 +253,7 @@
"startstory": 10000351,
"constory": 10000352,
"get": [
- 1001
+ 1004
],
"aginstory": 0,
"lose": [],
@@ -278,7 +278,7 @@
"startstory": 10000371,
"constory": 10000372,
"get": [
- 1002
+ 1005
],
"aginstory": 0,
"lose": [],
diff --git a/lego/sys/event/v2/app.go b/lego/sys/event/v2/app.go
deleted file mode 100644
index 88827cc7c..000000000
--- a/lego/sys/event/v2/app.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package event_v2
-
-import (
- "go_dreamfactory/lego/core"
- "sync"
-)
-
-// 服务容器
-type App struct {
- //inject.Graph
- sync.RWMutex
- events map[core.Event_Key][]Listener // 事件
-}
-
-// 容器的目的是为了创建事件之后，为事件注入观察者，所以为了方便，直接全部解耦
-// 创建
-
-// 新建一个App，可以在其中注册事件
-func NewApp() *App {
- app := &App{}
- app.events = make(map[core.Event_Key][]Listener)
- return app
-}
-
-// 给容器绑定事件,传入 类型-> 观察者的绑定
-// 可以使用反射，传入类型的字符串
-// 否则bind时也可以放置包括通配符的
-func (app *App) Bind(t core.Event_Key, listeners []Listener) {
- for k := range listeners {
- app.Listen(t, listeners[k])
- }
-}
-
-// 监听[事件][监听器]，单独绑定一个监听器
-func (app *App) Listen(str core.Event_Key, listener Listener) {
- app.Lock()
- app.events[str] = append(app.events[str], listener)
- app.Unlock()
-}
-
-// 分发事件，传入各种事件，如果是
-func (app *App) Dispatch(key core.Event_Key, events ...interface{}) {
- // 容器分发数据
- for k := range events {
- // 如果实现了 事件接口 IEvent，则调用事件的观察者模式，得到所有的
- var observers []Listener
- if _, ok := events[k].(IEvent); ok {
- obs := events[k].(IEvent).Observers()
- observers = append(observers, obs...) // 将事件中自行添加的观察者，放在所有观察者之后
- }
-
- if obs, exist := app.events[key]; exist {
- observers = append(observers, obs...)
- }
-
- if len(observers) > 0 {
- // 得到了所有的观察者，这里通过pipeline来执行，通过next来控制什么时候调用这个观察者
- new(Pipeline).Send(events[k]).Through(observers).Then(func(context interface{}) {
-
- })
- }
-
- }
-
-}
diff --git a/lego/sys/event/v2/event.go b/lego/sys/event/v2/event.go
deleted file mode 100644
index 4ca1266c0..000000000
--- a/lego/sys/event/v2/event.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package event_v2
-
-// 事件接口
-type IEvent interface {
- Attach(listeners ...Listener) // 事件添加观察者
- Observers() []Listener // 获取所有的观察者
- //Detach(listener Listener)
- DetachIndexOf(index int)
-}
-
-type Event struct {
- listeners []Listener
-}
-
-func (e *Event) Attach(listeners ...Listener) {
- e.listeners = append(e.listeners, listeners...)
-}
-
-//func (e *Event) Detach(listener Listener) {
-// for k := range e.listeners {
-// if listener == e.listeners[k] {
-//
-// }
-// }
-//}
-
-// 移除某个监听器
-func (e *Event) DetachIndexOf(index int) {
- if len(e.listeners) > index && index > 0 {
- e.listeners = append(e.listeners[:index], e.listeners[index+1:]...)
- }
-}
-
-func (e *Event) Observers() []Listener {
- return e.listeners
-}
diff --git a/lego/sys/event/v2/listener.go b/lego/sys/event/v2/listener.go
deleted file mode 100644
index a3ace0452..000000000
--- a/lego/sys/event/v2/listener.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package event_v2
-
-// 监听器接口
-
-type Listener func(event interface{},next func(event interface{}))
diff --git a/lego/sys/event/v2/pipeline.go b/lego/sys/event/v2/pipeline.go
deleted file mode 100644
index 51d5c812c..000000000
--- a/lego/sys/event/v2/pipeline.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package event_v2
-
-type Pipeline struct {
- send interface{} // 穿过管道的上下文
- through []Listener // 中间件数组
- current int // 当前执行到第几个中间件
-}
-
-func (p *Pipeline) Send(context interface{}) *Pipeline {
- p.send = context
- return p
-}
-
-func (p *Pipeline) Through(middlewares []Listener) *Pipeline {
- p.through = middlewares
- return p
-}
-
-func (p *Pipeline) Exec() {
- if len(p.through) > p.current {
- m := p.through[p.current]
- p.current += 1
- m(p.send, func(c interface{}) {
- p.Exec()
- })
- }
-
-}
-
-// 这里是路由的最后一站
-func (p *Pipeline) Then(then func(context interface{})) {
- // 按照顺序执行
- // 将then作为最后一站的中间件
- var m Listener
- m = func(c interface{}, next func(c interface{})) {
- then(c)
- next(c)
- }
- p.through = append(p.through, m)
- p.Exec()
-}
diff --git a/modules/sociaty/api_cross_sign.go b/modules/sociaty/api_cross_sign.go
index 51f5ec76f..3864eb611 100644
--- a/modules/sociaty/api_cross_sign.go
+++ b/modules/sociaty/api_cross_sign.go
@@ -15,6 +15,8 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (er
var (
atnotemp []*pb.UserAtno
atno []*pb.UserAtno
+ changelv bool
+ err error
)
if errdata = this.SignCheck(session, req); errdata != nil {
@@ -69,46 +71,42 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (er
break
}
}
-
+ update := map[string]interface{}{}
if cfg, ok := this.module.sociatySignConf.GetDataMap()[signCfgId]; ok {
// 更新公会经验
if cfg.Exp.T == "guildexp" {
- update := map[string]interface{}{}
this.module.modelSociaty.updateSociatyExp(cfg.Exp.N, sociaty, update)
// 更新等级
- if changelv, err := this.module.modelSociaty.changeLv(sociaty, update); err != nil {
+ if changelv, err = this.module.modelSociaty.changeLv(sociaty, update); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- } else if changelv {
- this.module.modelSociaty.EventApp.Dispatch(comm.EventSociatyRankChanged, &SociatyListen{
- sociaty: sociaty,
- })
- go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
- this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeWorldtaskid, sociaty.Lv)
- })
- }
- if err := this.module.modelSociaty.updateSociaty(sociaty.Id, update); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_DBError,
- Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
}
}
-
+ sociaty.Activity += this.module.globalConf.GuildSignIn
+ update["activity"] = sociaty.Activity
+ if err = this.module.modelSociaty.updateSociaty(sociaty.Id, update); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Message: err.Error(),
+ }
+ return
+ }
rsp := &pb.SociatySignResp{
Uid: uid,
SociatyId: sociaty.Id,
Reward: atno,
+ Activity: sociaty.Activity,
}
session.SendMsg(string(this.module.GetType()), SociatySubTypeSign, rsp)
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
+ if changelv {
+ this.module.modelSociaty.rankDataChanged(sociaty)
+ }
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SociatySignReq", atno)
})
return
diff --git a/modules/sociaty/model_sociaty.go b/modules/sociaty/model_sociaty.go
index 251fa6655..cacc9ea9a 100644
--- a/modules/sociaty/model_sociaty.go
+++ b/modules/sociaty/model_sociaty.go
@@ -4,7 +4,6 @@ import (
"context"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
- event_v2 "go_dreamfactory/lego/sys/event/v2"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules"
@@ -35,14 +34,8 @@ const (
type ModelSociaty struct {
modules.MCompModel
- module *Sociaty
- service core.IService
- EventApp *event_v2.App
-}
-
-type SociatyListen struct {
- event_v2.App
- sociaty *pb.DBSociaty
+ module *Sociaty
+ service core.IService
}
func (this *ModelSociaty) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
@@ -56,8 +49,8 @@ func (this *ModelSociaty) Init(service core.IService, module core.IModule, comp
})
this.module = module.(*Sociaty)
this.service = service
- this.EventApp = event_v2.NewApp()
- this.EventApp.Listen(comm.EventSociatyRankChanged, this.rankDataChanged)
+ // this.EventApp = event_v2.NewApp()
+ // this.EventApp.Listen(comm.EventSociatyRankChanged, this.rankDataChanged)
return
}
@@ -811,31 +804,24 @@ func (this *ModelSociaty) sort(list []*pb.DBSociatyRank) []*pb.DBSociatyRank {
// 公会等级变化
// 更新排行榜
-func (this *ModelSociaty) rankDataChanged(event interface{}, next func(event interface{})) {
+func (this *ModelSociaty) rankDataChanged(sociaty *pb.DBSociaty) {
var list []*pb.DBSociatyRank
if err := this.GetList("", &list); err != nil {
log.Errorf("sociaty list err:%v", err)
return
}
- data := event.(*SociatyListen)
- if data.sociaty == nil {
- return
- }
-
newRank := &pb.DBSociatyRank{
- SociatyId: data.sociaty.Id,
- Name: data.sociaty.Name,
- Lv: data.sociaty.Lv,
- Activity: data.sociaty.Activity,
- Ctime: data.sociaty.Ctime,
+ SociatyId: sociaty.Id,
+ Name: sociaty.Name,
+ Lv: sociaty.Lv,
+ Activity: sociaty.Activity,
+ Ctime: sociaty.Ctime,
}
if len(list) == 0 || len(list) > 0 && len(list) < 20 {
- if data != nil {
- this.AddList("", data.sociaty.Id, newRank)
- }
+ this.AddList("", sociaty.Id, newRank)
} else {
- this.AddList("", data.sociaty.Id, newRank)
+ this.AddList("", sociaty.Id, newRank)
if err := this.GetList("", &list); err != nil {
log.Errorf("sociaty list err:%v", err)
return
@@ -885,13 +871,10 @@ func (this *ModelSociaty) changeLv(sociaty *pb.DBSociaty, update map[string]inte
var (
ggl *cfg.GameGuildLv
)
-
if ggl, err = this.module.configure.getSociatyLvCfg(); err != nil {
return
}
-
curLv := sociaty.Lv
-
lv := curLv + 1
if conf, ok := ggl.GetDataMap()[lv]; ok {
if sociaty.Exp > conf.Exp {
diff --git a/pb/sociaty_msg.pb.go b/pb/sociaty_msg.pb.go
index cf4957846..282c10ef5 100644
--- a/pb/sociaty_msg.pb.go
+++ b/pb/sociaty_msg.pb.go
@@ -2071,6 +2071,7 @@ type SociatySignResp struct {
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
SociatyId string `protobuf:"bytes,2,opt,name=sociatyId,proto3" json:"sociatyId"`
Reward []*UserAtno `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"`
+ Activity int32 `protobuf:"varint,4,opt,name=activity,proto3" json:"activity"`
}
func (x *SociatySignResp) Reset() {
@@ -2126,6 +2127,13 @@ func (x *SociatySignResp) GetReward() []*UserAtno {
return nil
}
+func (x *SociatySignResp) GetActivity() int32 {
+ if x != nil {
+ return x.Activity
+ }
+ return 0
+}
+
//日志列表
type SociatyLogReq struct {
state protoimpl.MessageState
@@ -3964,184 +3972,186 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
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, 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, 0x82, 0x01, 0x0a, 0x13,
- 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52,
- 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c,
+ 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x80, 0x01, 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, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 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, 0x82, 0x01, 0x0a, 0x13, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x32, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e,
+ 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74,
+ 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04,
+ 0x6c, 0x69, 0x73, 0x74, 0x1a, 0x37, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x74, 0x72,
+ 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+ 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 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, 0x8a, 0x01, 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,
+ 0x36, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e,
+ 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c,
0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x1a, 0x37, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
- 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,
+ 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, 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, 0x8a, 0x01, 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, 0x36, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x22, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
- 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45,
- 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x1a, 0x37, 0x0a, 0x09, 0x4c, 0x69,
- 0x73, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
- 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
- 0x02, 0x38, 0x01, 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,
+ 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, 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, 0x74, 0x79, 0x49,
+ 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, 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, 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,
+ 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, 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 (
diff --git a/sys/configure/structs/Game.BuzkashiComboData.go b/sys/configure/structs/Game.BuzkashiComboData.go
index 2a8ec296d..9059e7072 100644
--- a/sys/configure/structs/Game.BuzkashiComboData.go
+++ b/sys/configure/structs/Game.BuzkashiComboData.go
@@ -15,6 +15,7 @@ type GameBuzkashiComboData struct {
ComboMin int32
ComboMax int32
Value int32
+ Valuetext int32
}
const TypeId_GameBuzkashiComboData = -660484187
@@ -28,6 +29,7 @@ func (_v *GameBuzkashiComboData)Deserialize(_buf map[string]interface{}) (err er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ComboMin"].(float64); !_ok_ { err = errors.New("ComboMin error"); return }; _v.ComboMin = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ComboMax"].(float64); !_ok_ { err = errors.New("ComboMax error"); return }; _v.ComboMax = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["valuetext"].(float64); !_ok_ { err = errors.New("valuetext error"); return }; _v.Valuetext = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/Game.ConsumeHeroData.go b/sys/configure/structs/Game.ConsumeHeroData.go
index 4a262fdb8..76ff02bd7 100644
--- a/sys/configure/structs/Game.ConsumeHeroData.go
+++ b/sys/configure/structs/Game.ConsumeHeroData.go
@@ -29,6 +29,7 @@ type GameConsumeHeroData struct {
Bigskillname string
Bigskillhero string
Bigskillcolor int32
+ Bigskilleffect string
Get int32
Consume []*Gameatn
Skilltype int32
@@ -63,6 +64,7 @@ func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; if _v.Bigskillname, _ok_ = _buf["bigskillname"].(string); !_ok_ { err = errors.New("bigskillname error"); return } }
{ var _ok_ bool; if _v.Bigskillhero, _ok_ = _buf["bigskillhero"].(string); !_ok_ { err = errors.New("bigskillhero error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bigskillcolor"].(float64); !_ok_ { err = errors.New("bigskillcolor error"); return }; _v.Bigskillcolor = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Bigskilleffect, _ok_ = _buf["bigskilleffect"].(string); !_ok_ { err = errors.New("bigskilleffect error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["get"].(float64); !_ok_ { err = errors.New("get error"); return }; _v.Get = int32(_tempNum_) }
{
var _arr_ []interface{}
diff --git a/sys/configure/structs/Game.PassConditionType.go b/sys/configure/structs/Game.PassConditionType.go
new file mode 100644
index 000000000..63daaf31f
--- /dev/null
+++ b/sys/configure/structs/Game.PassConditionType.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+const (
+ GamePassConditionType_None = 0
+ GamePassConditionType_RaceFire = 1
+ GamePassConditionType_RaceForest = 2
+ GamePassConditionType_RaceWater = 3
+ GamePassConditionType_RaceLight = 4
+ GamePassConditionType_Victory = 5
+ GamePassConditionType_BloodVolume = 6
+ GamePassConditionType_Defeated = 7
+ GamePassConditionType_Round = 8
+ GamePassConditionType_JobOutput = 9
+ GamePassConditionType_JobDefense = 10
+ GamePassConditionType_JobAuxiliary = 11
+ GamePassConditionType_JobControl = 12
+ GamePassConditionType_Ip1 = 13
+ GamePassConditionType_Ip2 = 14
+ GamePassConditionType_Ip3 = 15
+ GamePassConditionType_Ip4 = 16
+ GamePassConditionType_Ip5 = 17
+ GamePassConditionType_Ip6 = 18
+ GamePassConditionType_Ip7 = 19
+ GamePassConditionType_Ip8 = 20
+ GamePassConditionType_Ip9 = 21
+ GamePassConditionType_Ip10 = 22
+ GamePassConditionType_Ip11 = 23
+ GamePassConditionType_Ip12 = 24
+ GamePassConditionType_ThreeStar = 25
+ GamePassConditionType_FourStar = 26
+ GamePassConditionType_FiveStar = 27
+ GamePassConditionType_Man = 28
+ GamePassConditionType_Female = 29
+)
diff --git a/sys/configure/structs/TEnum.EHeroIp.go b/sys/configure/structs/TEnum.EHeroIp.go
new file mode 100644
index 000000000..ed085c5b4
--- /dev/null
+++ b/sys/configure/structs/TEnum.EHeroIp.go
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+const (
+ TEnumEHeroIp_None = 0
+ TEnumEHeroIp_Ip1 = 1
+ TEnumEHeroIp_Ip2 = 2
+ TEnumEHeroIp_Ip3 = 3
+ TEnumEHeroIp_Ip4 = 4
+ TEnumEHeroIp_Ip5 = 5
+ TEnumEHeroIp_Ip6 = 6
+ TEnumEHeroIp_Ip7 = 7
+ TEnumEHeroIp_Ip8 = 8
+ TEnumEHeroIp_Ip9 = 9
+ TEnumEHeroIp_Ip10 = 10
+ TEnumEHeroIp_Ip11 = 11
+ TEnumEHeroIp_Ip12 = 12
+)
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 2a56194a4..ca3513946 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -278,6 +278,7 @@ type GameGlobalData struct {
TdMainstageChallengeItem *Gameatn
TdDailystageChallengeNum int32
TdDailystageChallengeNumMax int32
+ GuildSignIn int32
}
const TypeId_GameGlobalData = 477542761
@@ -1087,6 +1088,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["td_mainstage_challenge_item"].(map[string]interface{}); !_ok_ { err = errors.New("td_mainstage_challenge_item error"); return }; if _v.TdMainstageChallengeItem, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_dailystage_challenge_num"].(float64); !_ok_ { err = errors.New("td_dailystage_challenge_num error"); return }; _v.TdDailystageChallengeNum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_dailystage_challenge_num_max"].(float64); !_ok_ { err = errors.New("td_dailystage_challenge_num_max error"); return }; _v.TdDailystageChallengeNumMax = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_sign_in"].(float64); !_ok_ { err = errors.New("guild_sign_in error"); return }; _v.GuildSignIn = int32(_tempNum_) }
return
}