diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 7e6586928..5154867be 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,7 +8,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 61, + "tasktime": 63, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_1", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 137, + "tasktime": 162, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_2", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 166, + "tasktime": 95, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_3", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 85, + "tasktime": 173, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_4", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 118, + "tasktime": 168, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_5", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 114, + "tasktime": 162, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_6", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 72, + "tasktime": 119, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_7", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 61, + "tasktime": 149, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_8", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 103, + "tasktime": 121, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_9", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 145, + "tasktime": 131, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_10", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 178, + "tasktime": 86, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_11", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 75, + "tasktime": 63, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_12", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 172, + "tasktime": 73, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_13", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 76, + "tasktime": 170, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_14", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 146, + "tasktime": 169, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_15", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 72, + "tasktime": 158, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_16", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 118, + "tasktime": 75, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_17", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 104, + "tasktime": 139, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_18", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 60, + "tasktime": 178, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_19", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 113, + "tasktime": 69, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_20", "text": "这是属于师父的专属委托" @@ -968,7 +968,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 136, + "tasktime": 169, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_21", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 67, + "tasktime": 66, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_22", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 179, + "tasktime": 171, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_23", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 72, + "tasktime": 128, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_24", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 71, + "tasktime": 149, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_25", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 105, + "tasktime": 63, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_26", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 174, + "tasktime": 75, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_27", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 132, + "tasktime": 166, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_28", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 102, + "tasktime": 113, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_29", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 176, + "tasktime": 138, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_30", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 122, + "tasktime": 123, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_31", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 127, + "tasktime": 93, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_32", "text": "这是属于师父的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 83, + "tasktime": 143, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_35", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 173, + "tasktime": 67, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_36", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 177, + "tasktime": 155, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_37", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 171, + "tasktime": 96, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_38", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 94, + "tasktime": 65, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_39", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 78, + "tasktime": 64, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_40", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 171, + "tasktime": 131, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_41", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 173, + "tasktime": 139, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_42", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 168, + "tasktime": 156, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_43", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 168, + "tasktime": 104, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_44", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 165, + "tasktime": 154, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_45", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 135, + "tasktime": 120, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_46", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 123, + "tasktime": 100, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_47", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 114, + "tasktime": 159, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_48", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 141, + "tasktime": 169, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_49", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 113, + "tasktime": 97, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_50", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 135, + "tasktime": 122, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_51", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 85, + "tasktime": 153, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_52", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 176, + "tasktime": 127, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_53", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 150, + "tasktime": 71, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_54", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 178, + "tasktime": 120, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_55", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 140, + "tasktime": 154, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_56", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 65, + "tasktime": 99, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_57", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 112, + "tasktime": 166, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_58", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 74, + "tasktime": 60, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_59", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 120, + "tasktime": 96, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_60", "text": "这是属于师父的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 152, + "tasktime": 159, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_62", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 121, + "tasktime": 178, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_63", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 173, + "tasktime": 88, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_64", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 130, + "tasktime": 69, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_65", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 92, + "tasktime": 154, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_66", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 168, + "tasktime": 60, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_67", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 93, + "tasktime": 112, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_68", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 156, + "tasktime": 108, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_69", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 166, + "tasktime": 63, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_70", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 118, + "tasktime": 110, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_71", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 136, + "tasktime": 125, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_72", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 164, + "tasktime": 167, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_73", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 147, + "tasktime": 118, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_74", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_dreamlandtrigger.json b/bin/json/game_dreamlandtrigger.json index 40ae01665..2631a2283 100644 --- a/bin/json/game_dreamlandtrigger.json +++ b/bin/json/game_dreamlandtrigger.json @@ -2,26 +2,26 @@ { "id": 1, "dreamland_pro": 1000, - "open": true + "open": false }, { "id": 2, "dreamland_pro": 1000, - "open": true + "open": false }, { "id": 3, "dreamland_pro": 1000, - "open": true + "open": false }, { "id": 4, "dreamland_pro": 1000, - "open": true + "open": false }, { "id": 5, "dreamland_pro": 1000, - "open": true + "open": false } ] \ No newline at end of file diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index c3b550700..9e5f019fc 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -142,5 +142,14 @@ "key": "loading_Sheet1_prompt_16", "text": "打败森林泰坦就能获得打造辅助套装的材料。" } + }, + { + "id": 1017, + "scene": "GameFightScene", + "image": "ld_mh_bg_zd", + "prompt": { + "key": "loading_Sheet1_prompt_17", + "text": "打败森林泰坦就能获得打造辅助套装的材料。" + } } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index f14b2af9d..5975d55d1 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -47,11 +47,6 @@ "a": "attr", "t": "gold", "n": 1650 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -135,11 +130,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -223,11 +213,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -311,11 +296,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -399,11 +379,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -487,11 +462,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -575,11 +545,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -663,11 +628,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -751,11 +711,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -839,11 +794,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -927,11 +877,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1015,11 +960,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1103,11 +1043,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1191,11 +1126,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1279,11 +1209,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1367,11 +1292,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1455,11 +1375,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1543,11 +1458,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1631,11 +1541,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1719,11 +1624,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1807,11 +1707,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1895,11 +1790,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -1983,11 +1873,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2071,11 +1956,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2159,11 +2039,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2247,11 +2122,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2335,11 +2205,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2423,11 +2288,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2511,11 +2371,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2599,11 +2454,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2687,11 +2537,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2775,11 +2620,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2863,11 +2703,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -2951,11 +2786,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3039,11 +2869,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3127,11 +2952,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3215,11 +3035,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3303,11 +3118,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3391,11 +3201,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3479,11 +3284,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3567,11 +3367,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3655,11 +3450,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3743,11 +3533,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3831,11 +3616,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -3919,11 +3699,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4007,11 +3782,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4095,11 +3865,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4183,11 +3948,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4271,11 +4031,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4359,11 +4114,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4447,11 +4197,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4535,11 +4280,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4623,11 +4363,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4711,11 +4446,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4799,11 +4529,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4887,11 +4612,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -4975,11 +4695,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5063,11 +4778,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5151,11 +4861,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5239,11 +4944,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5327,11 +5027,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5415,11 +5110,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5503,11 +5193,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5591,11 +5276,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5679,11 +5359,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5767,11 +5442,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5855,11 +5525,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -5943,11 +5608,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6031,11 +5691,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6119,11 +5774,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6207,11 +5857,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6295,11 +5940,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6383,11 +6023,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6471,11 +6106,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6559,11 +6189,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6647,11 +6272,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6735,11 +6355,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6823,11 +6438,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6911,11 +6521,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -6999,11 +6604,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7087,11 +6687,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7175,11 +6770,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7263,11 +6853,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7351,11 +6936,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7439,11 +7019,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7527,11 +7102,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7615,11 +7185,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7703,11 +7268,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7791,11 +7351,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7879,11 +7434,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -7967,11 +7517,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8055,11 +7600,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8143,11 +7683,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8231,11 +7766,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8319,11 +7849,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8407,11 +7932,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8495,11 +8015,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8583,11 +8098,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8671,11 +8181,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8759,11 +8264,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8847,11 +8347,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -8935,11 +8430,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9023,11 +8513,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9111,11 +8596,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9199,11 +8679,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9287,11 +8762,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9375,11 +8845,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9463,11 +8928,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9551,11 +9011,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9639,11 +9094,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9727,11 +9177,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9815,11 +9260,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9903,11 +9343,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -9991,11 +9426,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10079,11 +9509,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10167,11 +9592,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10255,11 +9675,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10343,11 +9758,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10431,11 +9841,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10519,11 +9924,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10607,11 +10007,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10695,11 +10090,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10783,11 +10173,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10871,11 +10256,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -10959,11 +10339,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11047,11 +10422,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11135,11 +10505,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11223,11 +10588,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11311,11 +10671,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11399,11 +10754,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11487,11 +10837,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11575,11 +10920,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11663,11 +11003,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11751,11 +11086,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11839,11 +11169,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -11927,11 +11252,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12015,11 +11335,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12103,11 +11418,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12191,11 +11501,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12279,11 +11584,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12367,11 +11667,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12455,11 +11750,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12543,11 +11833,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12631,11 +11916,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12719,11 +11999,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12807,11 +12082,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12895,11 +12165,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -12983,11 +12248,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13071,11 +12331,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13159,11 +12414,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13247,11 +12497,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13335,11 +12580,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13423,11 +12663,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13511,11 +12746,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13599,11 +12829,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13687,11 +12912,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13775,11 +12995,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13863,11 +13078,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -13951,11 +13161,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14039,11 +13244,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14127,11 +13327,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14215,11 +13410,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14303,11 +13493,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14391,11 +13576,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14479,11 +13659,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14567,11 +13742,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14655,11 +13825,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14743,11 +13908,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14831,11 +13991,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -14919,11 +14074,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15007,11 +14157,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15095,11 +14240,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15183,11 +14323,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15271,11 +14406,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15359,11 +14489,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15447,11 +14572,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15535,11 +14655,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15623,11 +14738,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15711,11 +14821,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15799,11 +14904,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15887,11 +14987,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -15975,11 +15070,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16063,11 +15153,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16151,11 +15236,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16239,11 +15319,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16327,11 +15402,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16415,11 +15485,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16503,11 +15568,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16591,11 +15651,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16679,11 +15734,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16767,11 +15817,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16855,11 +15900,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -16943,11 +15983,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17031,11 +16066,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17119,11 +16149,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17207,11 +16232,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17295,11 +16315,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17383,11 +16398,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17471,11 +16481,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17559,11 +16564,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17647,11 +16647,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17735,11 +16730,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17823,11 +16813,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17911,11 +16896,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -17999,11 +16979,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18087,11 +17062,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18175,11 +17145,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18263,11 +17228,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18351,11 +17311,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18439,11 +17394,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18527,11 +17477,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18615,11 +17560,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18703,11 +17643,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18791,11 +17726,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18879,11 +17809,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -18967,11 +17892,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19055,11 +17975,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19143,11 +18058,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19231,11 +18141,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19319,11 +18224,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19407,11 +18307,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19495,11 +18390,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19583,11 +18473,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19671,11 +18556,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19759,11 +18639,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19847,11 +18722,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -19935,11 +18805,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20023,11 +18888,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20111,11 +18971,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20199,11 +19054,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20287,11 +19137,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20375,11 +19220,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20463,11 +19303,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20551,11 +19386,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20639,11 +19469,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20727,11 +19552,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20815,11 +19635,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20903,11 +19718,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -20991,11 +19801,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21079,11 +19884,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21167,11 +19967,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21255,11 +20050,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21343,11 +20133,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21431,11 +20216,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21519,11 +20299,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21607,11 +20382,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21695,11 +20465,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21783,11 +20548,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21871,11 +20631,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -21959,11 +20714,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22047,11 +20797,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22135,11 +20880,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22223,11 +20963,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22311,11 +21046,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22399,11 +21129,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22487,11 +21212,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22575,11 +21295,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22663,11 +21378,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22751,11 +21461,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22839,11 +21544,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -22927,11 +21627,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23015,11 +21710,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23103,11 +21793,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23191,11 +21876,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23279,11 +21959,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23367,11 +22042,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23455,11 +22125,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23543,11 +22208,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23631,11 +22291,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23719,11 +22374,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23807,11 +22457,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23895,11 +22540,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -23983,11 +22623,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24071,11 +22706,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24159,11 +22789,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24247,11 +22872,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24335,11 +22955,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24423,11 +23038,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24511,11 +23121,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24599,11 +23204,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24687,11 +23287,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24775,11 +23370,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24863,11 +23453,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -24951,11 +23536,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25039,11 +23619,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25127,11 +23702,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25215,11 +23785,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25303,11 +23868,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25391,11 +23951,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25479,11 +24034,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25567,11 +24117,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25655,11 +24200,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25743,11 +24283,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25831,11 +24366,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -25919,11 +24449,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26007,11 +24532,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26095,11 +24615,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26183,11 +24698,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26271,11 +24781,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26359,11 +24864,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26447,11 +24947,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26535,11 +25030,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26623,11 +25113,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26711,11 +25196,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26799,11 +25279,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26887,11 +25362,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -26975,11 +25445,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27063,11 +25528,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27151,11 +25611,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27239,11 +25694,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27327,11 +25777,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27415,11 +25860,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27503,11 +25943,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27591,11 +26026,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27679,11 +26109,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27767,11 +26192,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27855,11 +26275,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -27943,11 +26358,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28031,11 +26441,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28119,11 +26524,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28207,11 +26607,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28295,11 +26690,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28383,11 +26773,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28471,11 +26856,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28559,11 +26939,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28647,11 +27022,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28735,11 +27105,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28823,11 +27188,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28911,11 +27271,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -28999,11 +27354,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29087,11 +27437,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29175,11 +27520,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29263,11 +27603,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29351,11 +27686,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29439,11 +27769,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29527,11 +27852,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29615,11 +27935,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29703,11 +28018,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29791,11 +28101,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29879,11 +28184,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -29967,11 +28267,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30055,11 +28350,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30143,11 +28433,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30231,11 +28516,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30319,11 +28599,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30407,11 +28682,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30495,11 +28765,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30583,11 +28848,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30671,11 +28931,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30759,11 +29014,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30847,11 +29097,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -30935,11 +29180,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31023,11 +29263,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31111,11 +29346,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31199,11 +29429,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31287,11 +29512,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31375,11 +29595,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31463,11 +29678,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31551,11 +29761,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31639,11 +29844,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31727,11 +29927,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31815,11 +30010,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31903,11 +30093,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -31991,11 +30176,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32079,11 +30259,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32167,11 +30342,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32255,11 +30425,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32343,11 +30508,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32431,11 +30591,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32519,11 +30674,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32607,11 +30757,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32695,11 +30840,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32783,11 +30923,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32871,11 +31006,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -32959,11 +31089,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33047,11 +31172,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33135,11 +31255,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33223,11 +31338,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33311,11 +31421,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33399,11 +31504,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33487,11 +31587,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33575,11 +31670,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33663,11 +31753,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ @@ -33751,11 +31836,6 @@ "a": "item", "t": "10000010", "n": 1 - }, - { - "a": "attr", - "t": "exp", - "n": 1000 } ], "commonaward": [ diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json index 80b9f8b75..f14033520 100644 --- a/bin/json/game_ruledesc.json +++ b/bin/json/game_ruledesc.json @@ -190,11 +190,11 @@ "id": 10018, "title": { "key": "ruledesc_ruledesc_title_18", - "text": "招募说明" + "text": "招募概率公示" }, "content": { "key": "ruledesc_ruledesc_content_18", - "text": "这里可以使用时空石招募新的守护者们（时空石可以用200钻石购买一个）" + "text": "这里可以使用圣桃枝招募新的守护者们\n（圣桃枝可以用200钻石购买一个）\n招募概率公示：史诗守护者获得概率：1.2%\n 完美守护者获得概率：10.8%\n 稀有守护者获得概率：88%" } }, { diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 419212661..237a8b937 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -501,7 +501,7 @@ "Id": 424002211, "When": 16, "FromCheck": "Target=3", - "TargetCheck": "Hasbuff=390001211", + "TargetCheck": "Target=2,HasBuff=390001211", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -516,7 +516,7 @@ { "Id": 424002212, "When": 16, - "FromCheck": "Hasbuff=390001211", + "FromCheck": "HasBuff=390001211", "TargetCheck": "Target=3", "MainSkillCheck": "", "AfterSkillCheck": "", @@ -1652,7 +1652,7 @@ "AfterSkillCheck": "", "BuffCheck": "", "AddCon": [ - "Hasbuff=390001415" + "HasBuff=390001415" ], "PasPr": 1000, "Type": "CallSkillPas", @@ -1859,7 +1859,7 @@ "Id": 424007213, "When": 16, "FromCheck": "Target=3", - "TargetCheck": "Hasbuff=SPDUP", + "TargetCheck": "HasBuff=SPDUP", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 576d9c186..49e6c1aad 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -57,11 +57,7 @@ ], "drop": 1004, "heroexp": 100, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -141,11 +137,7 @@ ], "drop": 1005, "heroexp": 101, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -225,11 +217,7 @@ ], "drop": 1006, "heroexp": 102, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -309,11 +297,7 @@ ], "drop": 1007, "heroexp": 100, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -393,11 +377,7 @@ ], "drop": 1008, "heroexp": 101, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -477,11 +457,7 @@ ], "drop": 1009, "heroexp": 102, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -561,11 +537,7 @@ ], "drop": 1010, "heroexp": 103, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -645,11 +617,7 @@ ], "drop": 1011, "heroexp": 104, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -729,11 +697,7 @@ ], "drop": 1012, "heroexp": 105, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -813,11 +777,7 @@ ], "drop": 1013, "heroexp": 106, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -897,11 +857,7 @@ ], "drop": 1014, "heroexp": 107, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -981,11 +937,7 @@ ], "drop": 1015, "heroexp": 108, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1065,11 +1017,7 @@ ], "drop": 1016, "heroexp": 109, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1149,11 +1097,7 @@ ], "drop": 1017, "heroexp": 110, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1233,11 +1177,7 @@ ], "drop": 1018, "heroexp": 111, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1317,11 +1257,7 @@ ], "drop": 1019, "heroexp": 112, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1401,11 +1337,7 @@ ], "drop": 1020, "heroexp": 113, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1485,11 +1417,7 @@ ], "drop": 1021, "heroexp": 114, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1569,11 +1497,7 @@ ], "drop": 1022, "heroexp": 115, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1653,11 +1577,7 @@ ], "drop": 1023, "heroexp": 116, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1737,11 +1657,7 @@ ], "drop": 1024, "heroexp": 117, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1821,11 +1737,7 @@ ], "drop": 1025, "heroexp": 118, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1905,11 +1817,7 @@ ], "drop": 1026, "heroexp": 119, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1989,11 +1897,7 @@ ], "drop": 1027, "heroexp": 120, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2073,11 +1977,7 @@ ], "drop": 1028, "heroexp": 121, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2157,11 +2057,7 @@ ], "drop": 1029, "heroexp": 122, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2241,11 +2137,7 @@ ], "drop": 1030, "heroexp": 123, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2325,11 +2217,7 @@ ], "drop": 1004, "heroexp": 124, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2409,11 +2297,7 @@ ], "drop": 1005, "heroexp": 125, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2493,11 +2377,7 @@ ], "drop": 1006, "heroexp": 126, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2577,11 +2457,7 @@ ], "drop": 1007, "heroexp": 127, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2661,11 +2537,7 @@ ], "drop": 1008, "heroexp": 128, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2745,11 +2617,7 @@ ], "drop": 1003, "heroexp": 129, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2829,11 +2697,7 @@ ], "drop": 1004, "heroexp": 130, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2913,11 +2777,7 @@ ], "drop": 1005, "heroexp": 131, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2997,11 +2857,7 @@ ], "drop": 1006, "heroexp": 132, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3081,11 +2937,7 @@ ], "drop": 1007, "heroexp": 133, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3165,11 +3017,7 @@ ], "drop": 1008, "heroexp": 134, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3249,11 +3097,7 @@ ], "drop": 1009, "heroexp": 135, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3333,11 +3177,7 @@ ], "drop": 1010, "heroexp": 136, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3417,11 +3257,7 @@ ], "drop": 1001, "heroexp": 137, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3501,11 +3337,7 @@ ], "drop": 1002, "heroexp": 138, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3585,11 +3417,7 @@ ], "drop": 1003, "heroexp": 139, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3669,11 +3497,7 @@ ], "drop": 1004, "heroexp": 140, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3753,11 +3577,7 @@ ], "drop": 1005, "heroexp": 141, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3837,11 +3657,7 @@ ], "drop": 1006, "heroexp": 142, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3921,11 +3737,7 @@ ], "drop": 1007, "heroexp": 143, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -4005,11 +3817,7 @@ ], "drop": 1008, "heroexp": 144, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -4089,11 +3897,7 @@ ], "drop": 1009, "heroexp": 145, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -4173,11 +3977,7 @@ ], "drop": 1010, "heroexp": 146, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -4242,11 +4042,7 @@ ], "drop": 30010, "heroexp": 5000, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4313,11 +4109,7 @@ ], "drop": 30020, "heroexp": 6050, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4384,11 +4176,7 @@ ], "drop": 30030, "heroexp": 7200, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4455,11 +4243,7 @@ ], "drop": 30040, "heroexp": 8450, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4526,11 +4310,7 @@ ], "drop": 30050, "heroexp": 9800, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4597,11 +4377,7 @@ ], "drop": 30060, "heroexp": 11250, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4668,11 +4444,7 @@ ], "drop": 30070, "heroexp": 12800, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4739,11 +4511,7 @@ ], "drop": 30080, "heroexp": 14450, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4815,11 +4583,7 @@ ], "drop": 30090, "heroexp": 16200, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4891,11 +4655,7 @@ ], "drop": 30100, "heroexp": 19000, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -4967,11 +4727,7 @@ ], "drop": 30110, "heroexp": 22000, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, @@ -5043,11 +4799,7 @@ ], "drop": 30120, "heroexp": 25000, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 8638ea5bd..990237ae1 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -139,7 +139,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal res = append(res, v) } } - res = append(res, vikingCfg.Manexp) //给玩家加经验 + res = append(res, vikingCfg.Manexp...) //给玩家加经验 if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil { return } diff --git a/sys/configure/structs/Game.VikingBossData.go b/sys/configure/structs/Game.VikingBossData.go index 4a3969670..d5addc5be 100644 --- a/sys/configure/structs/Game.VikingBossData.go +++ b/sys/configure/structs/Game.VikingBossData.go @@ -22,7 +22,7 @@ type GameVikingBossData struct { Dropshow []*Gameatn Drop int32 Heroexp int32 - Manexp *Gameatn + Manexp []*Gameatn Scene string Bossmodel int32 BossSkill int32 @@ -88,7 +88,20 @@ func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) } - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["manexp"].(map[string]interface{}); !_ok_ { err = errors.New("manexp error"); return }; if _v.Manexp, err = DeserializeGameatn(_x_); err != nil { return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["manexp"].([]interface{}); !_ok_ { err = errors.New("manexp error"); return } + + _v.Manexp = 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.Manexp = append(_v.Manexp, _list_v_) + } + } + { var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_skill"].(float64); !_ok_ { err = errors.New("boss_skill error"); return }; _v.BossSkill = int32(_tempNum_) } diff --git a/sys/wordfilter/core.go b/sys/wordfilter/core.go index a7c843b21..fb1a472e9 100644 --- a/sys/wordfilter/core.go +++ b/sys/wordfilter/core.go @@ -23,7 +23,7 @@ type ( Filter(text string) string ///和谐敏感词 Replace(text string, repl rune) string - ///检测敏感词 + ///字符串是否包含铭感词 FindIn(text string) (bool, string) ///找到所有匹配词 FindAll(text string) []string