diff --git a/bin/json/game_block.json b/bin/json/game_block.json index 9eff05549..d3b098ce6 100644 --- a/bin/json/game_block.json +++ b/bin/json/game_block.json @@ -7,6 +7,7 @@ "belongto": 1, "open": 1, "icon": "sx_fk_dhs", + "icon2": "sx_fk_ls", "weight": 1500, "score": 1, "type": 0, @@ -20,6 +21,7 @@ "belongto": 1, "open": 1, "icon": "sx_fk_ls", + "icon2": "sx_fk_dhs", "weight": 1500, "score": 1, "type": 0, @@ -33,6 +35,7 @@ "belongto": 1, "open": 1, "icon": "sx_fk_lvs", + "icon2": "sx_fk_lvs", "weight": 1500, "score": 1, "type": 0, @@ -46,6 +49,7 @@ "belongto": 1, "open": 1, "icon": "sx_fk_zs", + "icon2": "sx_fk_zs", "weight": 1500, "score": 1, "type": 0, @@ -59,6 +63,7 @@ "belongto": 1, "open": 1, "icon": "sx_fk_hs", + "icon2": "sx_fk_hs", "weight": 1500, "score": 1, "type": 0, @@ -72,6 +77,7 @@ "belongto": 1, "open": 1, "icon": "sx_fk_fhs", + "icon2": "sx_fk_fhs", "weight": 1500, "score": 1, "type": 0, @@ -87,7 +93,8 @@ ], "belongto": 1, "open": 2, - "icon": "", + "icon": "sx_sjt_dhs", + "icon2": "sx_sjt_ls", "weight": 840, "score": 1, "type": 1, @@ -103,7 +110,8 @@ ], "belongto": 1, "open": 3, - "icon": "", + "icon": "sx_hjt_dhs", + "icon2": "sx_hjt_ls", "weight": 840, "score": 1, "type": 2, @@ -119,7 +127,8 @@ ], "belongto": 1, "open": 4, - "icon": "", + "icon": "sx_sjt_ls", + "icon2": "sx_sjt_dhs", "weight": 840, "score": 1, "type": 1, @@ -135,7 +144,8 @@ ], "belongto": 1, "open": 5, - "icon": "", + "icon": "sx_hjt_ls", + "icon2": "sx_hjt_dhs", "weight": 840, "score": 1, "type": 2, @@ -151,7 +161,8 @@ ], "belongto": 1, "open": 6, - "icon": "", + "icon": "sx_sjt_lvs", + "icon2": "sx_sjt_lvs", "weight": 840, "score": 1, "type": 1, @@ -167,7 +178,8 @@ ], "belongto": 1, "open": 7, - "icon": "", + "icon": "sx_hjt_lvs", + "icon2": "sx_hjt_lvs", "weight": 840, "score": 1, "type": 2, @@ -183,7 +195,8 @@ ], "belongto": 1, "open": 8, - "icon": "", + "icon": "sx_sjt_zs", + "icon2": "sx_sjt_zs", "weight": 840, "score": 1, "type": 1, @@ -199,7 +212,8 @@ ], "belongto": 1, "open": 9, - "icon": "", + "icon": "sx_hjt_zs", + "icon2": "sx_hjt_zs", "weight": 840, "score": 1, "type": 2, @@ -215,7 +229,8 @@ ], "belongto": 1, "open": 10, - "icon": "", + "icon": "sx_sjt_hs", + "icon2": "sx_sjt_hs", "weight": 840, "score": 1, "type": 1, @@ -231,7 +246,8 @@ ], "belongto": 1, "open": 11, - "icon": "", + "icon": "sx_hjt_hs", + "icon2": "sx_hjt_hs", "weight": 840, "score": 1, "type": 2, @@ -247,7 +263,8 @@ ], "belongto": 1, "open": 12, - "icon": "", + "icon": "sx_sjt_fhs", + "icon2": "sx_sjt_fhs", "weight": 840, "score": 1, "type": 1, @@ -263,7 +280,8 @@ ], "belongto": 1, "open": 13, - "icon": "", + "icon": "sx_hjt_fhs", + "icon2": "sx_hjt_fhs", "weight": 840, "score": 1, "type": 2, @@ -276,7 +294,8 @@ "direction": [], "belongto": 1, "open": 14, - "icon": "", + "icon": "sx_sd_dhs", + "icon2": "sx_sd_ls", "weight": 1000, "score": 1, "type": 3, @@ -289,7 +308,8 @@ "direction": [], "belongto": 1, "open": 15, - "icon": "", + "icon": "sx_sd_ls", + "icon2": "sx_sd_dhs", "weight": 1000, "score": 1, "type": 3, @@ -302,7 +322,8 @@ "direction": [], "belongto": 1, "open": 16, - "icon": "", + "icon": "sx_sd_lvs", + "icon2": "sx_sd_lvs", "weight": 1500, "score": 1, "type": 3, @@ -315,7 +336,8 @@ "direction": [], "belongto": 1, "open": 17, - "icon": "", + "icon": "sx_sd_zs", + "icon2": "sx_sd_zs", "weight": 1500, "score": 1, "type": 3, @@ -328,7 +350,8 @@ "direction": [], "belongto": 1, "open": 18, - "icon": "", + "icon": "sx_sd_hs", + "icon2": "sx_sd_hs", "weight": 2500, "score": 1, "type": 3, @@ -341,7 +364,8 @@ "direction": [], "belongto": 1, "open": 19, - "icon": "", + "icon": "sx_sd_fhs", + "icon2": "sx_sd_fhs", "weight": 2500, "score": 1, "type": 3, @@ -355,6 +379,7 @@ "belongto": 2, "open": 1, "icon": "", + "icon2": "", "weight": 1000, "score": 3, "type": 0, @@ -367,7 +392,8 @@ "direction": [], "belongto": 3, "open": 1, - "icon": "", + "icon": "sx_zd_dhs", + "icon2": "sx_zd_ls", "weight": 1000, "score": 1, "type": 4, @@ -380,7 +406,8 @@ "direction": [], "belongto": 3, "open": 1, - "icon": "", + "icon": "sx_zd_ls", + "icon2": "sx_zd_dhs", "weight": 1000, "score": 1, "type": 4, @@ -393,7 +420,8 @@ "direction": [], "belongto": 3, "open": 1, - "icon": "", + "icon": "sx_zd_lvs", + "icon2": "sx_zd_lvs", "weight": 1000, "score": 1, "type": 4, @@ -406,7 +434,8 @@ "direction": [], "belongto": 3, "open": 1, - "icon": "", + "icon": "sx_zd_zs", + "icon2": "sx_zd_zs", "weight": 1000, "score": 1, "type": 4, @@ -419,7 +448,8 @@ "direction": [], "belongto": 3, "open": 1, - "icon": "", + "icon": "sx_zd_hs", + "icon2": "sx_zd_hs", "weight": 1000, "score": 1, "type": 4, @@ -432,7 +462,8 @@ "direction": [], "belongto": 3, "open": 1, - "icon": "", + "icon": "sx_zd_fhs", + "icon2": "sx_zd_fhs", "weight": 1000, "score": 1, "type": 4, @@ -447,7 +478,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_syh_dhs", + "icon2": "sx_syh_ls", "weight": 1000, "score": 1, "type": 5, @@ -462,7 +494,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_xyh_dhs", + "icon2": "sx_xyh_ls", "weight": 1000, "score": 1, "type": 6, @@ -477,7 +510,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_zyh_dhs", + "icon2": "sx_zyh_ls", "weight": 1000, "score": 1, "type": 7, @@ -492,7 +526,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_yyh_dhs", + "icon2": "sx_yyh_ls", "weight": 1000, "score": 1, "type": 8, @@ -507,7 +542,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_syh_ls", + "icon2": "sx_syh_dhs", "weight": 1000, "score": 1, "type": 5, @@ -522,7 +558,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_xyh_ls", + "icon2": "sx_xyh_dhs", "weight": 1000, "score": 1, "type": 6, @@ -537,7 +574,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_zyh_ls", + "icon2": "sx_zyh_dhs", "weight": 1000, "score": 1, "type": 7, @@ -552,7 +590,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_yyh_ls", + "icon2": "sx_yyh_dhs", "weight": 1000, "score": 1, "type": 8, @@ -567,7 +606,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_syh_lvs", + "icon2": "sx_syh_lvs", "weight": 1000, "score": 1, "type": 5, @@ -582,7 +622,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_xyh_lvs", + "icon2": "sx_xyh_lvs", "weight": 1000, "score": 1, "type": 6, @@ -597,7 +638,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_zyh_lvs", + "icon2": "sx_zyh_lvs", "weight": 1000, "score": 1, "type": 7, @@ -612,7 +654,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_yyh_lvs", + "icon2": "sx_yyh_lvs", "weight": 1000, "score": 1, "type": 8, @@ -627,7 +670,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_syh_zs", + "icon2": "sx_syh_zs", "weight": 1000, "score": 1, "type": 5, @@ -642,7 +686,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_xyh_zs", + "icon2": "sx_xyh_zs", "weight": 1000, "score": 1, "type": 6, @@ -657,7 +702,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_zyh_zs", + "icon2": "sx_zyh_zs", "weight": 1000, "score": 1, "type": 7, @@ -672,7 +718,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_yyh_zs", + "icon2": "sx_yyh_zs", "weight": 1000, "score": 1, "type": 8, @@ -687,7 +734,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_syh_hs", + "icon2": "sx_syh_hs", "weight": 1000, "score": 1, "type": 5, @@ -702,7 +750,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_xyh_hs", + "icon2": "sx_xyh_hs", "weight": 1000, "score": 1, "type": 6, @@ -717,7 +766,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_zyh_hs", + "icon2": "sx_zyh_hs", "weight": 1000, "score": 1, "type": 7, @@ -732,7 +782,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_yyh_hs", + "icon2": "sx_yyh_hs", "weight": 1000, "score": 1, "type": 8, @@ -747,7 +798,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_syh_fhs", + "icon2": "sx_syh_fhs", "weight": 1000, "score": 1, "type": 5, @@ -762,7 +814,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_xyh_fhs", + "icon2": "sx_xyh_fhs", "weight": 1000, "score": 1, "type": 6, @@ -777,7 +830,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_zyh_fhs", + "icon2": "sx_zyh_fhs", "weight": 1000, "score": 1, "type": 7, @@ -792,7 +846,8 @@ ], "belongto": 4, "open": 1, - "icon": "", + "icon": "sx_yyh_fhs", + "icon2": "sx_yyh_fhs", "weight": 1000, "score": 1, "type": 8, diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index cbaed80b9..bfc0f366c 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -30992,7 +30992,7 @@ }, "Npc_event_type": 0, "NPC": 0, - "value": 0, + "value": 1, "filter": [ 1101010 ], @@ -31019,7 +31019,7 @@ }, "Npc_event_type": 0, "NPC": 0, - "value": 0, + "value": 1, "filter": [ 1101020 ], @@ -31046,7 +31046,7 @@ }, "Npc_event_type": 0, "NPC": 0, - "value": 0, + "value": 1, "filter": [ 1101029 ], @@ -31073,7 +31073,7 @@ }, "Npc_event_type": 0, "NPC": 0, - "value": 0, + "value": 1, "filter": [ 1101042 ], @@ -31100,7 +31100,7 @@ }, "Npc_event_type": 0, "NPC": 0, - "value": 0, + "value": 1, "filter": [ 1101051 ], @@ -31127,7 +31127,7 @@ }, "Npc_event_type": 0, "NPC": 0, - "value": 0, + "value": 1, "filter": [ 1101059 ], @@ -31154,10 +31154,8 @@ }, "Npc_event_type": 0, "NPC": 0, - "value": 0, - "filter": [ - 3 - ], + "value": 3, + "filter": [], "filter2": [] }, { @@ -31183,8 +31181,7 @@ "NPC": 0, "value": 10, "filter": [ - 10010, - 10 + 10010 ], "filter2": [] }, @@ -31209,7 +31206,7 @@ }, "Npc_event_type": 0, "NPC": 0, - "value": 0, + "value": 1, "filter": [ 1101087 ], diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 120a395a2..6361a9abf 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1364,25 +1364,26 @@ }, { "id": 234, - "insert": 1, - "filter": [ - "eq" - ] + "insert": 2, + "filter": [] }, { "id": 235, - "insert": 3, + "insert": 1, "filter": [ - "eq", - "gte" + "eq" ] }, { "id": 236, - "insert": 1, + "insert": 2, "filter": [ - "eq", "eq" ] + }, + { + "id": 237, + "insert": 1, + "filter": [] } ] \ No newline at end of file diff --git a/bin/json/game_celebration.json b/bin/json/game_celebration.json index 5914c044a..080052c20 100644 --- a/bin/json/game_celebration.json +++ b/bin/json/game_celebration.json @@ -48,7 +48,7 @@ "days": 10, "tipstxt": { "key": "celebration_celebration_tipstxt_3", - "text": "每日前[color=#AAFF00]{0}[/color]次挑战维京远征，可以获得[color=#AAFF00]双倍奖励[/color]，每名boss每日分别只能挑战[color=#AAFF00]{1}[/color]次" + "text": "每日前[color=#AAFF00]{0}[/color]次挑战维京远征，可以获得[color=#AAFF00]双倍奖励[/color]，每名boss每日只有前[color=#AAFF00]{1}[/color]次挑战为双倍，后续为正常奖励" } } ] \ No newline at end of file diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json index 94eee4e50..7ce4c8f4c 100644 --- a/bin/json/game_consumehero.json +++ b/bin/json/game_consumehero.json @@ -2,6 +2,14 @@ { "key": "27000001", "type": 1, + "skillname": { + "key": "consume_consume_hero_skillname_01", + "text": "大消除" + }, + "skilltxt": { + "key": "consume_consume_hero_skilltxt_01", + "text": "随机消除7个方块" + }, "hero": 44004, "consume": [ { @@ -18,6 +26,14 @@ { "key": "27000002", "type": 2, + "skillname": { + "key": "consume_consume_hero_skillname_02", + "text": "技能名字1" + }, + "skilltxt": { + "key": "consume_consume_hero_skilltxt_02", + "text": "技能描述2" + }, "hero": 25001, "consume": [ { diff --git a/bin/json/game_consumeintegral.json b/bin/json/game_consumeintegral.json new file mode 100644 index 000000000..793f44b94 --- /dev/null +++ b/bin/json/game_consumeintegral.json @@ -0,0 +1,884 @@ +[ + { + "key": 0, + "type": 1, + "onereward": [], + "rewards": [], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "consume_consume_integral_name_01", + "text": "S1:卧龙凤雏" + } + }, + { + "key": 100, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 8000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 200, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 9000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 300, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 400, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 11000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 500, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 12000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 600, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 13000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 700, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 14000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 800, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 15000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 900, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 16000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1000, + "type": 1, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 17000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1100, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 18000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 20 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 100 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1200, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 19000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1300, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1400, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 21000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1500, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 22000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1600, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 23000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1700, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 24000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1800, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 25000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1900, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 26000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2000, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 27000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2100, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 28000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2200, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 29000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2300, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2400, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 31000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2500, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 32000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2600, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 33000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2700, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 34000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2800, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 35000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2900, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 36000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 3000, + "type": 2, + "onereward": [ + { + "a": "attr", + "t": "gold", + "n": 37000 + } + ], + "rewards": [ + { + "a": "attr", + "t": "consumeexp", + "n": 50 + }, + { + "a": "attr", + "t": "consumemoney", + "n": 200 + } + ], + "boxid": 0, + "deductrewards": [], + "name": { + "key": "", + "text": "" + } + } +] \ No newline at end of file diff --git a/bin/json/game_heroupstorybattle.json b/bin/json/game_heroupstorybattle.json index f721c9c4c..75f1c2cf0 100644 --- a/bin/json/game_heroupstorybattle.json +++ b/bin/json/game_heroupstorybattle.json @@ -4,7 +4,7 @@ "FormatList": [ 101011 ], - "BattleReadyID": 126, + "BattleReadyID": 10103001, "EventList": [], "playexp": { "a": "attr", @@ -16,9 +16,9 @@ { "id": 102, "FormatList": [ - 101021 + 101011 ], - "BattleReadyID": 126, + "BattleReadyID": 10103001, "EventList": [], "playexp": { "a": "attr", @@ -30,9 +30,9 @@ { "id": 103, "FormatList": [ - 101031 + 101011 ], - "BattleReadyID": 126, + "BattleReadyID": 10103001, "EventList": [], "playexp": { "a": "attr", @@ -44,9 +44,9 @@ { "id": 104, "FormatList": [ - 101041 + 101011 ], - "BattleReadyID": 126, + "BattleReadyID": 10103001, "EventList": [], "playexp": { "a": "attr", @@ -58,9 +58,9 @@ { "id": 105, "FormatList": [ - 101051 + 101011 ], - "BattleReadyID": 126, + "BattleReadyID": 10103001, "EventList": [], "playexp": { "a": "attr", @@ -72,9 +72,9 @@ { "id": 106, "FormatList": [ - 101061 + 101011 ], - "BattleReadyID": 126, + "BattleReadyID": 10103001, "EventList": [], "playexp": { "a": "attr", diff --git a/bin/json/game_integral.json b/bin/json/game_integral.json index fb9c0813f..793f44b94 100644 --- a/bin/json/game_integral.json +++ b/bin/json/game_integral.json @@ -2,13 +2,7 @@ { "key": 0, "type": 1, - "onereward": [ - { - "a": "attr", - "t": "gold", - "n": 7000 - } - ], + "onereward": [], "rewards": [], "boxid": 0, "deductrewards": [], diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 958816458..9bdb062b6 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -20680,10 +20680,10 @@ "id": "27000001", "name": { "key": "item_item_name_417", - "text": "骇客蛛" + "text": "豺狼小怪" }, "usetype": 1, - "color": 3, + "color": 2, "bagtype": 0, "index": 1, "special_type": 0, @@ -20701,18 +20701,18 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "tx_js_44004", + "img": "tx_js_51004", "intr": { "key": "item_item_intr_412", - "text": "骇客蛛的三消英雄卡，运用黑客的智慧在这里嘎嘎乱杀" + "text": "豺狼小怪的三消英雄卡。" }, "describe": { "key": "item_item_describe_412", - "text": "电脑专业户，脚本编写大师，有扎实的三消基础，但运气不怎么好。" + "text": "豺狼小怪怎么叫？" }, "dialogue": { "key": "item_item_dialogue_410", - "text": "【脚本，启动！】" + "text": "【启动！】" }, "sale": [], "gm": 0 @@ -20721,10 +20721,10 @@ "id": "27000002", "name": { "key": "item_item_name_418", - "text": "阿宝" + "text": "小猴子" }, "usetype": 1, - "color": 4, + "color": 2, "bagtype": 0, "index": 1, "special_type": 0, @@ -20742,14 +20742,14 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "tx_js_25001", + "img": "tx_js_51012", "intr": { "key": "item_item_intr_413", - "text": "阿宝的三消英雄卡，运用功夫的力量在这里嘎嘎乱杀" + "text": "小猴子的三消英雄卡。" }, "describe": { "key": "item_item_describe_413", - "text": "2步专业户，三消可能对他有点难度,但架不住运气好。" + "text": "小猴子怎么叫？" }, "dialogue": { "key": "item_item_dialogue_411", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index c7d8a6836..8b8268303 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -5,6 +5,8 @@ "group_id": 100100, "previous_group_id": [], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 0, "stage_param": 0, @@ -80,6 +82,8 @@ "group_id": 100101, "previous_group_id": [], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -195,6 +199,8 @@ 100101 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -272,6 +278,8 @@ 100102 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -349,6 +357,8 @@ 100103 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -438,6 +448,8 @@ 100103 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -553,6 +565,8 @@ 100103 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -644,6 +658,8 @@ 100106 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -733,6 +749,8 @@ 100107 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -855,6 +873,8 @@ 100108 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 20001, @@ -932,6 +952,8 @@ 100109 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -1021,6 +1043,8 @@ 100110 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -1098,6 +1122,8 @@ 100111 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -1177,6 +1203,8 @@ 100112 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -1294,6 +1322,8 @@ 1001121 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -1411,6 +1441,8 @@ 1001121 ], "previoustage": 1101014, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -1528,6 +1560,8 @@ 1001121 ], "previoustage": 1101015, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -1641,6 +1675,8 @@ 100113 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -1718,6 +1754,8 @@ 100114 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 6, "stage_param": 10045, @@ -1793,6 +1831,8 @@ 100115 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -1868,6 +1908,8 @@ 100116 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -1943,6 +1985,8 @@ 100117 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -2022,6 +2066,8 @@ 100118 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10001, @@ -2099,6 +2145,8 @@ 100119 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -2172,6 +2220,8 @@ 100120 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -2283,6 +2333,8 @@ 100121 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -2360,6 +2412,8 @@ 100122 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -2471,6 +2525,8 @@ 100123 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 2, "stage_param": 1, @@ -2544,6 +2600,8 @@ 100124 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -2617,6 +2675,8 @@ 100125 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -2730,6 +2790,8 @@ 100126 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -2807,6 +2869,8 @@ 100127 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -2880,6 +2944,8 @@ 100128 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 6, "stage_param": 10042, @@ -2953,6 +3019,8 @@ 100129 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -3024,6 +3092,8 @@ "group_id": 100131, "previous_group_id": [], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 9, "stage_param": 0, @@ -3135,6 +3205,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -3208,6 +3280,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -3329,6 +3403,8 @@ 100130 ], "previoustage": 1101036, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -3450,6 +3526,8 @@ 100130 ], "previoustage": 1101037, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -3571,6 +3649,8 @@ 100130 ], "previoustage": 1101038, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -3692,6 +3772,8 @@ 100130 ], "previoustage": 1101039, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -3813,6 +3895,8 @@ 100130 ], "previoustage": 1101040, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -3934,6 +4018,8 @@ 100130 ], "previoustage": 1101041, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -4055,6 +4141,8 @@ 100130 ], "previoustage": 1101042, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -4176,6 +4264,8 @@ 100133 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -4297,6 +4387,8 @@ 100133 ], "previoustage": 1101044, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -4418,6 +4510,8 @@ 100133 ], "previoustage": 1101045, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -4539,6 +4633,8 @@ 100133 ], "previoustage": 1101046, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -4660,6 +4756,8 @@ 100133 ], "previoustage": 1101047, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -4781,6 +4879,8 @@ 100133 ], "previoustage": 1101048, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -4902,6 +5002,8 @@ 100133 ], "previoustage": 1101049, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5023,6 +5125,8 @@ 100133 ], "previoustage": 1101050, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5144,6 +5248,8 @@ 100134 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5265,6 +5371,8 @@ 100134 ], "previoustage": 1101052, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5386,6 +5494,8 @@ 100134 ], "previoustage": 1101053, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5507,6 +5617,8 @@ 100134 ], "previoustage": 1101054, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5628,6 +5740,8 @@ 100134 ], "previoustage": 1101055, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5749,6 +5863,8 @@ 100134 ], "previoustage": 1101056, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5870,6 +5986,8 @@ 100134 ], "previoustage": 1101057, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -5991,6 +6109,8 @@ 100134 ], "previoustage": 1101058, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -6112,6 +6232,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [ 1, 1 @@ -6188,6 +6310,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [ 1, 1 @@ -6264,6 +6388,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [ 1, 1 @@ -6340,6 +6466,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [ 1, 2 @@ -6416,6 +6544,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [ 1, 2 @@ -6492,6 +6622,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [ 1, 2 @@ -6568,6 +6700,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10002, @@ -6653,6 +6787,8 @@ 100142 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10003, @@ -6738,6 +6874,8 @@ 100142 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10004, @@ -6823,6 +6961,8 @@ 100142 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10005, @@ -6908,6 +7048,8 @@ 100142 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10006, @@ -6993,6 +7135,8 @@ 100142 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10007, @@ -7078,6 +7222,8 @@ 100142 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10008, @@ -7163,6 +7309,8 @@ 100142 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10009, @@ -7251,6 +7399,8 @@ 100146 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10010, @@ -7336,6 +7486,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -7457,6 +7609,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -7542,6 +7696,8 @@ 100152 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -7627,6 +7783,8 @@ 100153 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -7712,6 +7870,8 @@ 100154 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -7823,6 +7983,8 @@ 100151 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -7913,6 +8075,8 @@ 100151 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -8003,6 +8167,8 @@ 100151 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -8095,6 +8261,8 @@ 100156 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -8211,6 +8379,8 @@ 100130 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -8290,6 +8460,8 @@ 1001591 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -8369,6 +8541,8 @@ 1001591 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -8451,6 +8625,8 @@ 100133 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -8546,6 +8722,8 @@ 100128 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 0, "stage_param": 0, @@ -8619,6 +8797,8 @@ 100128 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -8733,6 +8913,8 @@ 100201 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -8849,6 +9031,8 @@ 100202 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -8965,6 +9149,8 @@ 100203 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -9086,6 +9272,8 @@ 100204 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -9168,6 +9356,8 @@ 100204 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -9284,6 +9474,8 @@ 100206 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -9357,6 +9549,8 @@ 100207 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -9436,6 +9630,8 @@ 100208 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -9515,6 +9711,8 @@ 100209 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -9594,6 +9792,8 @@ 100210 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -9669,6 +9869,8 @@ 100211 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -9744,6 +9946,8 @@ 100212 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -9860,6 +10064,8 @@ 100212 ], "previoustage": 1102013, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -9976,6 +10182,8 @@ 100212 ], "previoustage": 1102014, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -10092,6 +10300,8 @@ 100213 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -10208,6 +10418,8 @@ 100213 ], "previoustage": 1102016, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -10324,6 +10536,8 @@ 100213 ], "previoustage": 1102017, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -10438,6 +10652,8 @@ 100214 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -10511,6 +10727,8 @@ 100215 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -10595,6 +10813,8 @@ 100215 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -10680,6 +10900,8 @@ 100216 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -10753,6 +10975,8 @@ 100218 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -10872,6 +11096,8 @@ 100219 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -10951,6 +11177,8 @@ 100220 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -11072,6 +11300,8 @@ 100220 ], "previoustage": 1102025, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -11193,6 +11423,8 @@ 100220 ], "previoustage": 1102026, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -11314,6 +11546,8 @@ 100220 ], "previoustage": 1102027, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -11435,6 +11669,8 @@ 100220 ], "previoustage": 1102028, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -11556,6 +11792,8 @@ 100220 ], "previoustage": 1102029, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -11677,6 +11915,8 @@ 100220 ], "previoustage": 1102030, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -11798,6 +12038,8 @@ 100220 ], "previoustage": 1102031, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -11919,6 +12161,8 @@ 100221 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -12040,6 +12284,8 @@ 100221 ], "previoustage": 1102033, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -12161,6 +12407,8 @@ 100221 ], "previoustage": 1102034, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -12282,6 +12530,8 @@ 100221 ], "previoustage": 1102035, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -12403,6 +12653,8 @@ 100221 ], "previoustage": 1102036, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -12524,6 +12776,8 @@ 100221 ], "previoustage": 1102037, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -12645,6 +12899,8 @@ 100221 ], "previoustage": 1102038, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -12766,6 +13022,8 @@ 100221 ], "previoustage": 1102039, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -12887,6 +13145,8 @@ 100222 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -13008,6 +13268,8 @@ 100222 ], "previoustage": 1102041, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -13129,6 +13391,8 @@ 100222 ], "previoustage": 1102042, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -13250,6 +13514,8 @@ 100222 ], "previoustage": 1102043, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -13371,6 +13637,8 @@ 100222 ], "previoustage": 1102044, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -13492,6 +13760,8 @@ 100222 ], "previoustage": 1102045, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -13613,6 +13883,8 @@ 100222 ], "previoustage": 1102046, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -13734,6 +14006,8 @@ 100222 ], "previoustage": 1102047, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 8, "stage_param": 0, @@ -13855,6 +14129,8 @@ 100220 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -13976,6 +14252,8 @@ 100224 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -14055,6 +14333,8 @@ 100225 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -14134,6 +14414,8 @@ 100225 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -14214,6 +14496,8 @@ 100226 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -14293,6 +14577,8 @@ 100228 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -14372,6 +14658,8 @@ 100229 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 2, "stage_param": 0, @@ -14445,6 +14733,8 @@ 100229 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -14524,6 +14814,8 @@ 100229 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -14603,6 +14895,8 @@ 100229 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 0, @@ -14676,6 +14970,8 @@ 100229 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -14797,6 +15093,8 @@ 100229 ], "previoustage": 1102059, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -14918,6 +15216,8 @@ 100229 ], "previoustage": 1102060, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -15039,6 +15339,8 @@ 100229 ], "previoustage": 1102061, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -15160,6 +15462,8 @@ 100229 ], "previoustage": 1102062, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -15281,6 +15585,8 @@ 100229 ], "previoustage": 1102063, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -15402,6 +15708,8 @@ 100229 ], "previoustage": 1102064, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 4, "stage_param": 0, @@ -15523,6 +15831,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -15602,6 +15912,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -15681,6 +15993,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -15762,6 +16076,8 @@ 100235 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -15841,6 +16157,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -15920,6 +16238,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -15999,6 +16319,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16080,6 +16402,8 @@ 100239 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16159,6 +16483,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16238,6 +16564,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16317,6 +16645,8 @@ 100234 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16398,6 +16728,8 @@ 100244 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16479,6 +16811,8 @@ 100238 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -16600,6 +16934,8 @@ 100247 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16679,6 +17015,8 @@ 100248 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16758,6 +17096,8 @@ 100249 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -16837,6 +17177,8 @@ 100250 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -16958,6 +17300,8 @@ 100251 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -17041,6 +17385,8 @@ "group_id": 100253, "previous_group_id": [], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 9, "stage_param": 0, @@ -17126,6 +17472,8 @@ 100220 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 0, "stage_param": 0, @@ -17199,6 +17547,8 @@ 100220 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -17320,6 +17670,8 @@ 100301 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 5, "stage_param": 10001, @@ -17393,6 +17745,8 @@ 1003011 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -17514,6 +17868,8 @@ 100302 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -17635,6 +17991,8 @@ 100303 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -17756,6 +18114,8 @@ 100304 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -17835,6 +18195,8 @@ 100305 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -17914,6 +18276,8 @@ 100306 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -18035,6 +18399,8 @@ 100307 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -18156,6 +18522,8 @@ 100308 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -18235,6 +18603,8 @@ 100309 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -18356,6 +18726,8 @@ 100310 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -18477,6 +18849,8 @@ 100311 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -18556,6 +18930,8 @@ 100312 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 0, "stage_param": 0, @@ -18629,6 +19005,8 @@ 100312 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -18702,6 +19080,8 @@ 100401 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -18823,6 +19203,8 @@ 100402 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -18944,6 +19326,8 @@ 100403 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -19017,6 +19401,8 @@ 100404 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -19138,6 +19524,8 @@ 100405 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -19259,6 +19647,8 @@ 100406 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -19380,6 +19770,8 @@ 100407 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -19453,6 +19845,8 @@ 100408 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -19526,6 +19920,8 @@ 100409 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -19647,6 +20043,8 @@ 100410 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -19720,6 +20118,8 @@ 100411 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -19841,6 +20241,8 @@ 100412 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 3, "stage_param": 0, @@ -19914,6 +20316,8 @@ 100500 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 0, "stage_param": 0, @@ -20035,6 +20439,8 @@ 100500 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -20156,6 +20562,8 @@ 100500 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -20277,6 +20685,8 @@ 100502 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -20398,6 +20808,8 @@ 100503 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -20519,6 +20931,8 @@ 100504 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -20640,6 +21054,8 @@ 100505 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -20761,6 +21177,8 @@ 100506 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -20882,6 +21300,8 @@ 100507 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21003,6 +21423,8 @@ 100508 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21124,6 +21546,8 @@ 100509 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21245,6 +21669,8 @@ 100510 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21366,6 +21792,8 @@ 100511 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21487,6 +21915,8 @@ 100512 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21608,6 +22038,8 @@ 100513 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21729,6 +22161,8 @@ 100514 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21850,6 +22284,8 @@ 100515 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -21971,6 +22407,8 @@ 100516 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -22092,6 +22530,8 @@ 100517 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -22213,6 +22653,8 @@ 100518 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -22334,6 +22776,8 @@ 100519 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -22455,6 +22899,8 @@ 100520 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -22576,6 +23022,8 @@ 100521 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -22697,6 +23145,8 @@ 100522 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -22818,6 +23268,8 @@ 100523 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -22939,6 +23391,8 @@ 100524 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -23060,6 +23514,8 @@ 100525 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -23181,6 +23637,8 @@ 100526 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -23302,6 +23760,8 @@ 100527 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -23423,6 +23883,8 @@ 100528 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -23544,6 +24006,8 @@ 100529 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -23665,6 +24129,8 @@ 100530 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -23786,6 +24252,8 @@ 100531 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -23907,6 +24375,8 @@ 100532 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24028,6 +24498,8 @@ 100533 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24149,6 +24621,8 @@ 100534 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24270,6 +24744,8 @@ 100535 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24391,6 +24867,8 @@ 100536 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24512,6 +24990,8 @@ 100537 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24633,6 +25113,8 @@ 100538 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24754,6 +25236,8 @@ 100539 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24875,6 +25359,8 @@ 100540 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -24996,6 +25482,8 @@ 100541 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -25117,6 +25605,8 @@ 100542 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -25238,6 +25728,8 @@ 100543 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -25359,6 +25851,8 @@ 100544 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -25480,6 +25974,8 @@ 100545 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -25601,6 +26097,8 @@ 100546 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, @@ -25722,6 +26220,8 @@ 100547 ], "previoustage": 0, + "buried_type": 0, + "buried": 0, "grouptype": [], "Episodetype": 1, "stage_param": 0, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 8a65105af..167848c8a 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -5412,13 +5412,13 @@ "equip": [], "newskill": [], "lv": 9, - "hppro": 0, - "atkpro": 0, - "defpro": 0, + "hppro": 1.01, + "atkpro": 1.16, + "defpro": 0.72, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 0, + "speed": 66, "modelsize": 1 }, { diff --git a/bin/json/game_treasuremap.json b/bin/json/game_treasuremap.json new file mode 100644 index 000000000..0faeafee8 --- /dev/null +++ b/bin/json/game_treasuremap.json @@ -0,0 +1,52 @@ +[ + { + "id": 1, + "pic": "cbt_sp01_00", + "unlock": [ + { + "a": "item", + "t": "24010001", + "n": 1 + }, + { + "a": "item", + "t": "24010002", + "n": 1 + }, + { + "a": "item", + "t": "24010003", + "n": 1 + } + ], + "name": { + "key": "treasuremap_map_name_1", + "text": "" + }, + "explain": { + "key": "treasuremap_map_explain_1", + "text": "" + }, + "describe": { + "key": "treasuremap_map_desribe_1", + "text": "" + } + }, + { + "id": 2, + "pic": "cbt_sp01_00", + "unlock": [], + "name": { + "key": "treasuremap_map_name_2", + "text": "" + }, + "explain": { + "key": "treasuremap_map_explain_2", + "text": "" + }, + "describe": { + "key": "treasuremap_map_desribe_2", + "text": "" + } + } +] \ No newline at end of file diff --git a/modules/entertainment/api_ready.go b/modules/entertainment/api_ready.go index 8d7ca02fb..3fea5f832 100644 --- a/modules/entertainment/api_ready.go +++ b/modules/entertainment/api_ready.go @@ -18,9 +18,10 @@ func (this *apiComp) ReadyCheck(session comm.IUserSession, req *pb.EntertainRead func (this *apiComp) Ready(session comm.IUserSession, req *pb.EntertainReadyReq) (errdata *pb.ErrorData) { - this.module.gameMgr.RoomDistribute(req.Roomid, session, "ready", req) - session.SendMsg(string(this.module.GetType()), "ready", &pb.EntertainReadyResp{ - Ready: true, - }) + if errdata = this.module.gameMgr.RoomDistribute(req.Roomid, session, "ready", req); errdata == nil { + session.SendMsg(string(this.module.GetType()), "ready", &pb.EntertainReadyResp{ + Ready: true, + }) + } return } diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go index 3e18b2c92..16e04005b 100644 --- a/modules/entertainment/room.go +++ b/modules/entertainment/room.go @@ -413,6 +413,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr this.curPower = this.player1.Uid this.player1.Ps = MaxPs this.player2.Ps = 0 + this.module.Debugf("match ai") if err := this.module.SendMsgSyncToSession(string(this.module.GetType()), "startgame", &pb.EntertainStartGamePush{ User1: this.player1, User2: this.player2, @@ -430,6 +431,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr } else if this.player2.Uid == session.GetUserId() { this.rd2 = true } + this.module.Debugf("match user1ready:%v,ready2:%v", this.rd1, this.rd2) if this.rd1 && this.rd2 { // 两个玩家都准备好了 那么就开始游戏 this.NexPower = this.player1.Uid this.curPower = this.player1.Uid @@ -490,22 +492,15 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) { bReward = false } } + if bReward { // 发奖 + if user, err := this.module.ModuleUser.GetUser(winner); err == nil { + if conf, err := this.module.configure.GetGameConsumeintegral(user.Consumeexp); err == nil { + res = append(res, conf.Onereward...) + res = append(res, conf.Rewards...) - if conf, err := this.module.configure.GetGameConsumeintegral(this.player1.Score); err == nil { - res = append(res, conf.Onereward...) - res = append(res, conf.Rewards...) - if bReward { // 发奖 - if errdata, atno = this.module.DispenseAtno(this.szSession[winindex], res, true); errdata != nil { - return - } - } else { // AI 不发将 构建一个atno对象 - for _, v := range res { - atno = append(atno, &pb.UserAtno{ - A: v.A, - T: v.T, - N: v.N, - O: "", - }) + if errdata, atno = this.module.DispenseAtno(this.szSession[winindex], res, true); errdata != nil { + return + } } } } diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go index bf75b7f3c..8e3d865ca 100644 --- a/modules/entertainment/xxlPlat.go +++ b/modules/entertainment/xxlPlat.go @@ -90,8 +90,8 @@ func (this *MapData) SetMap() { 2, 1, 1, 3, 6, 4, 1, 4, 1, 1, 4, 3, 6, 3, 4, 3, 4, 5, 1, 6, 1, - 5, 4, 2, 5, 1, 3, 1, - 4, 1, 5, 1, 2, 1, 4, + 5, 4, 2, 5, 3, 3, 1, + 4, 1, 5, 3, 2, 3, 4, } var pos int for index := Width - 1; index >= 0; index-- { @@ -297,7 +297,7 @@ func (this *MapData) Check4X(color int32) (bEliminate bool, score int32, count i break } } - if newElem != 0 { + if newElem == 0 { newElem = k + 2*Width // 给个默认值 } @@ -581,10 +581,58 @@ func (this *MapData) SkillUp(skillid int32, value int32) (szMap []*pb.MapData) { } // 随机生成 不可消除的 地图 -// func (this *MapData) CheckInitPlat() { -// this.Plat = make([]*pb.GirdeData, Width*Height) -// for i := 0; i < Width*Height; i++ { -// this.Plat[i] = this.CreateGride(int32(i)) +func (this *MapData) CheckInitPlat() { + this.Plat = make([]*pb.GirdeData, Width*Height) + for i := 0; i < Width*Height; i++ { + this.Plat[i] = this.CreateGride(int32(i)) + } +} + +// 1, 1, 2, 5, 1, 5, 2, +// 3, 2, 3, 1, 2, 4, 4, +// 2, 1, 1, 3, 6, 4, 1, +// 4, 1, 1, 4, 3, 6, 3, +// 4, 3, 4, 5, 1, 6, 1, +// 5, 4, 2, 5, 3, 3, 1, +// 4, 1, 5, 3, 2, 3, 4, + +// 校验当前地图 有没有能消除的 +// func (this *MapData) CheckAndRefreshPlat() { +// bEliminate := false +// for k, v := range this.Plat { +// if v.Color == 0 { +// continue +// } +// x := int32(k % Height) // x +// y := int32(k / Height) // y +// if x+1 < Height { +// k1 := this.Plat[k].Color +// k2 := this.Plat[k+1].Color +// if k1 == k2 { +// if x > 0 { + +// } +// } + +// k3 := this.Plat[k+2].Color +// // 找k+3的 上 左 又 +// if k1 == k2 && k2 == k3 { +// bEliminate = true +// } +// } + +// if k+2*Width < Total { +// k1 := this.Plat[k].Color +// k2 := this.Plat[k+Width].Color +// k3 := this.Plat[k+2*Width].Color + +// if k1 == k2 && k2 == k3 { +// bEliminate = true +// } +// } +// } +// if bEliminate { +// this.CheckInitPlat() // } // } diff --git a/pb/entertain_db.pb.go b/pb/entertain_db.pb.go index 25f3a3011..827b98dd1 100644 --- a/pb/entertain_db.pb.go +++ b/pb/entertain_db.pb.go @@ -257,8 +257,9 @@ type DBXXLMatch struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"` - Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID + Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"` + Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID + Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` // } func (x *DBXXLMatch) Reset() { @@ -307,6 +308,13 @@ func (x *DBXXLMatch) GetCardid() string { return "" } +func (x *DBXXLMatch) GetConsumeexp() int32 { + if x != nil { + return x.Consumeexp + } + return 0 +} + var File_entertain_entertain_db_proto protoreflect.FileDescriptor var file_entertain_entertain_db_proto_rawDesc = []byte{ @@ -335,12 +343,14 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{ 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, - 0x79, 0x22, 0x4f, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, + 0x79, 0x22, 0x6f, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x29, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, - 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, + 0x78, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/pb/entertain_msg.pb.go b/pb/entertain_msg.pb.go index 01f4b41d8..a1af51566 100644 --- a/pb/entertain_msg.pb.go +++ b/pb/entertain_msg.pb.go @@ -161,7 +161,7 @@ type EntertainCancelMatchResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Maych bool `protobuf:"varint,1,opt,name=maych,proto3" json:"maych"` // 匹配成功 + Maych bool `protobuf:"varint,1,opt,name=maych,proto3" json:"maych"` // 取消匹配成功 } func (x *EntertainCancelMatchResp) Reset() { @@ -944,6 +944,148 @@ func (x *EntertainReconnectResp) GetUser2() *PlayerData { return nil } +type EntertainRefreshPlatReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` +} + +func (x *EntertainRefreshPlatReq) Reset() { + *x = EntertainRefreshPlatReq{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainRefreshPlatReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainRefreshPlatReq) ProtoMessage() {} + +func (x *EntertainRefreshPlatReq) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[14] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use EntertainRefreshPlatReq.ProtoReflect.Descriptor instead. +func (*EntertainRefreshPlatReq) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{14} +} + +func (x *EntertainRefreshPlatReq) GetRoomid() string { + if x != nil { + return x.Roomid + } + return "" +} + +type EntertainRefreshPlatResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Mpadata *MapData `protobuf:"bytes,1,opt,name=mpadata,proto3" json:"mpadata"` // 地图数据 +} + +func (x *EntertainRefreshPlatResp) Reset() { + *x = EntertainRefreshPlatResp{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainRefreshPlatResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainRefreshPlatResp) ProtoMessage() {} + +func (x *EntertainRefreshPlatResp) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use EntertainRefreshPlatResp.ProtoReflect.Descriptor instead. +func (*EntertainRefreshPlatResp) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{15} +} + +func (x *EntertainRefreshPlatResp) GetMpadata() *MapData { + if x != nil { + return x.Mpadata + } + return nil +} + +// 刷新地图推送 +type EntertainRefreshPush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Mpadata *MapData `protobuf:"bytes,1,opt,name=mpadata,proto3" json:"mpadata"` // 地图数据 +} + +func (x *EntertainRefreshPush) Reset() { + *x = EntertainRefreshPush{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainRefreshPush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainRefreshPush) ProtoMessage() {} + +func (x *EntertainRefreshPush) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[16] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use EntertainRefreshPush.ProtoReflect.Descriptor instead. +func (*EntertainRefreshPush) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{16} +} + +func (x *EntertainRefreshPush) GetMpadata() *MapData { + if x != nil { + return x.Mpadata + } + return nil +} + var File_entertain_entertain_msg_proto protoreflect.FileDescriptor var file_entertain_entertain_msg_proto_rawDesc = []byte{ @@ -1051,8 +1193,19 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{ 0x72, 0x31, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, - 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, + 0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, + 0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, + 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, + 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, + 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, + 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, + 0x74, 0x61, 0x22, 0x3a, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, + 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, + 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1067,7 +1220,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte { return file_entertain_entertain_msg_proto_rawDescData } -var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17) var file_entertain_entertain_msg_proto_goTypes = []interface{}{ (*EntertainMatchReq)(nil), // 0: EntertainMatchReq (*EntertainMatchResp)(nil), // 1: EntertainMatchResp @@ -1083,31 +1236,36 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{ (*EntertainEnterRoomPush)(nil), // 11: EntertainEnterRoomPush (*EntertainReconnectReq)(nil), // 12: EntertainReconnectReq (*EntertainReconnectResp)(nil), // 13: EntertainReconnectResp - (*PlayerData)(nil), // 14: PlayerData - (*MapData)(nil), // 15: MapData - (*UserAtno)(nil), // 16: UserAtno + (*EntertainRefreshPlatReq)(nil), // 14: EntertainRefreshPlatReq + (*EntertainRefreshPlatResp)(nil), // 15: EntertainRefreshPlatResp + (*EntertainRefreshPush)(nil), // 16: EntertainRefreshPush + (*PlayerData)(nil), // 17: PlayerData + (*MapData)(nil), // 18: MapData + (*UserAtno)(nil), // 19: UserAtno } var file_entertain_entertain_msg_proto_depIdxs = []int32{ - 14, // 0: EntertainStartGamePush.user1:type_name -> PlayerData - 14, // 1: EntertainStartGamePush.user2:type_name -> PlayerData - 15, // 2: EntertainStartGamePush.mpadata:type_name -> MapData - 15, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData - 14, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData - 14, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData - 14, // 6: EntertainGameOverPush.user1:type_name -> PlayerData - 14, // 7: EntertainGameOverPush.user2:type_name -> PlayerData - 15, // 8: EntertainGameOverPush.mpadata:type_name -> MapData - 16, // 9: EntertainGameOverPush.reward:type_name -> UserAtno - 14, // 10: EntertainEnterRoomPush.user1:type_name -> PlayerData - 14, // 11: EntertainEnterRoomPush.user2:type_name -> PlayerData - 15, // 12: EntertainReconnectResp.mpadata:type_name -> MapData - 14, // 13: EntertainReconnectResp.user1:type_name -> PlayerData - 14, // 14: EntertainReconnectResp.user2:type_name -> PlayerData - 15, // [15:15] is the sub-list for method output_type - 15, // [15:15] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 17, // 0: EntertainStartGamePush.user1:type_name -> PlayerData + 17, // 1: EntertainStartGamePush.user2:type_name -> PlayerData + 18, // 2: EntertainStartGamePush.mpadata:type_name -> MapData + 18, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData + 17, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData + 17, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData + 17, // 6: EntertainGameOverPush.user1:type_name -> PlayerData + 17, // 7: EntertainGameOverPush.user2:type_name -> PlayerData + 18, // 8: EntertainGameOverPush.mpadata:type_name -> MapData + 19, // 9: EntertainGameOverPush.reward:type_name -> UserAtno + 17, // 10: EntertainEnterRoomPush.user1:type_name -> PlayerData + 17, // 11: EntertainEnterRoomPush.user2:type_name -> PlayerData + 18, // 12: EntertainReconnectResp.mpadata:type_name -> MapData + 17, // 13: EntertainReconnectResp.user1:type_name -> PlayerData + 17, // 14: EntertainReconnectResp.user2:type_name -> PlayerData + 18, // 15: EntertainRefreshPlatResp.mpadata:type_name -> MapData + 18, // 16: EntertainRefreshPush.mpadata:type_name -> MapData + 17, // [17:17] is the sub-list for method output_type + 17, // [17:17] is the sub-list for method input_type + 17, // [17:17] is the sub-list for extension type_name + 17, // [17:17] is the sub-list for extension extendee + 0, // [0:17] is the sub-list for field type_name } func init() { file_entertain_entertain_msg_proto_init() } @@ -1286,6 +1444,42 @@ func file_entertain_entertain_msg_proto_init() { return nil } } + file_entertain_entertain_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainRefreshPlatReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_entertain_entertain_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainRefreshPlatResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_entertain_entertain_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainRefreshPush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1293,7 +1487,7 @@ func file_entertain_entertain_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_entertain_entertain_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 14, + NumMessages: 17, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.BlockData.go b/sys/configure/structs/Game.BlockData.go index dae61ae12..f0a77356c 100644 --- a/sys/configure/structs/Game.BlockData.go +++ b/sys/configure/structs/Game.BlockData.go @@ -18,6 +18,7 @@ type GameBlockData struct { Belongto int32 Open int32 Icon string + Icon2 string Weight int32 Score int32 Type int32 @@ -51,6 +52,7 @@ func (_v *GameBlockData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["belongto"].(float64); !_ok_ { err = errors.New("belongto error"); return }; _v.Belongto = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open"].(float64); !_ok_ { err = errors.New("open error"); return }; _v.Open = int32(_tempNum_) } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; if _v.Icon2, _ok_ = _buf["icon2"].(string); !_ok_ { err = errors.New("icon2 error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.ConsumeHeroData.go b/sys/configure/structs/Game.ConsumeHeroData.go index 58698bd4c..b4b1f11f6 100644 --- a/sys/configure/structs/Game.ConsumeHeroData.go +++ b/sys/configure/structs/Game.ConsumeHeroData.go @@ -13,6 +13,8 @@ import "errors" type GameConsumeHeroData struct { Key string Type int32 + Skillname string + Skilltxt string Hero int32 Consume []*Gameatn Skilltype int32 @@ -30,6 +32,8 @@ func (*GameConsumeHeroData) GetTypeId() int32 { func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skilltxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skilltxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skilltxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.ConsumeIntegral.go b/sys/configure/structs/Game.ConsumeIntegral.go new file mode 100644 index 000000000..116d1a148 --- /dev/null +++ b/sys/configure/structs/Game.ConsumeIntegral.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameConsumeIntegral struct { + _dataMap map[int32]*GameConsumeIntegralData + _dataList []*GameConsumeIntegralData +} + +func NewGameConsumeIntegral(_buf []map[string]interface{}) (*GameConsumeIntegral, error) { + _dataList := make([]*GameConsumeIntegralData, 0, len(_buf)) + dataMap := make(map[int32]*GameConsumeIntegralData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameConsumeIntegralData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GameConsumeIntegral{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameConsumeIntegral) GetDataMap() map[int32]*GameConsumeIntegralData { + return table._dataMap +} + +func (table *GameConsumeIntegral) GetDataList() []*GameConsumeIntegralData { + return table._dataList +} + +func (table *GameConsumeIntegral) Get(key int32) *GameConsumeIntegralData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.ConsumeIntegralData.go b/sys/configure/structs/Game.ConsumeIntegralData.go new file mode 100644 index 000000000..323f53c8d --- /dev/null +++ b/sys/configure/structs/Game.ConsumeIntegralData.go @@ -0,0 +1,86 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameConsumeIntegralData struct { + Key int32 + Type int32 + Onereward []*Gameatn + Rewards []*Gameatn + Boxid int32 + Deductrewards []*Gameatn + Name string +} + +const TypeId_GameConsumeIntegralData = -1538782826 + +func (*GameConsumeIntegralData) GetTypeId() int32 { + return -1538782826 +} + +func (_v *GameConsumeIntegralData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["onereward"].([]interface{}); !_ok_ { err = errors.New("onereward error"); return } + + _v.Onereward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Onereward = append(_v.Onereward, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["rewards"].([]interface{}); !_ok_ { err = errors.New("rewards error"); return } + + _v.Rewards = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Rewards = append(_v.Rewards, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boxid"].(float64); !_ok_ { err = errors.New("boxid error"); return }; _v.Boxid = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["deductrewards"].([]interface{}); !_ok_ { err = errors.New("deductrewards error"); return } + + _v.Deductrewards = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Deductrewards = append(_v.Deductrewards, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} + +func DeserializeGameConsumeIntegralData(_buf map[string]interface{}) (*GameConsumeIntegralData, error) { + v := &GameConsumeIntegralData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.MainStageData.go b/sys/configure/structs/Game.MainStageData.go index e65a04dd3..692f53287 100644 --- a/sys/configure/structs/Game.MainStageData.go +++ b/sys/configure/structs/Game.MainStageData.go @@ -16,6 +16,8 @@ type GameMainStageData struct { GroupId int32 PreviousGroupId []int32 Previoustage int32 + BuriedType int32 + Buried int32 Grouptype []int32 Episodetype int32 StageParam int32 @@ -89,6 +91,8 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buried_type"].(float64); !_ok_ { err = errors.New("buried_type error"); return }; _v.BuriedType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buried"].(float64); !_ok_ { err = errors.New("buried error"); return }; _v.Buried = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.TreasureMap.go b/sys/configure/structs/Game.TreasureMap.go new file mode 100644 index 000000000..19b63e5af --- /dev/null +++ b/sys/configure/structs/Game.TreasureMap.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameTreasureMap struct { + _dataMap map[int32]*GameTreasureMapData + _dataList []*GameTreasureMapData +} + +func NewGameTreasureMap(_buf []map[string]interface{}) (*GameTreasureMap, error) { + _dataList := make([]*GameTreasureMapData, 0, len(_buf)) + dataMap := make(map[int32]*GameTreasureMapData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameTreasureMapData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameTreasureMap{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameTreasureMap) GetDataMap() map[int32]*GameTreasureMapData { + return table._dataMap +} + +func (table *GameTreasureMap) GetDataList() []*GameTreasureMapData { + return table._dataList +} + +func (table *GameTreasureMap) Get(key int32) *GameTreasureMapData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.TreasureMapData.go b/sys/configure/structs/Game.TreasureMapData.go new file mode 100644 index 000000000..346028408 --- /dev/null +++ b/sys/configure/structs/Game.TreasureMapData.go @@ -0,0 +1,58 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameTreasureMapData struct { + Id int32 + Pic string + Unlock []*Gameatn + Name string + Explain string + Describe string +} + +const TypeId_GameTreasureMapData = 1832570747 + +func (*GameTreasureMapData) GetTypeId() int32 { + return 1832570747 +} + +func (_v *GameTreasureMapData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; if _v.Pic, _ok_ = _buf["pic"].(string); !_ok_ { err = errors.New("pic error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["unlock"].([]interface{}); !_ok_ { err = errors.New("unlock error"); return } + + _v.Unlock = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Unlock = append(_v.Unlock, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["explain"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Explain error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Explain, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} + +func DeserializeGameTreasureMapData(_buf map[string]interface{}) (*GameTreasureMapData, error) { + v := &GameTreasureMapData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 5940a9567..3f7ed78e2 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -277,6 +277,8 @@ type Tables struct { GColorGetfraction *GameGColorGetfraction GColorReward *GameGColorReward GColortTmedecay *GameGColortTmedecay + TreasureMap *GameTreasureMap + ConsumeIntegral *GameConsumeIntegral } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1880,5 +1882,17 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.GColortTmedecay, err = NewGameGColortTmedecay(buf) ; err != nil { return nil, err } + if buf, err = loader("game_treasuremap") ; err != nil { + return nil, err + } + if tables.TreasureMap, err = NewGameTreasureMap(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_consumeintegral") ; err != nil { + return nil, err + } + if tables.ConsumeIntegral, err = NewGameConsumeIntegral(buf) ; err != nil { + return nil, err + } return tables, nil }