Merge branch 'master' into feature/backend

This commit is contained in:
luying
2021-12-06 09:37:55 +08:00
8 changed files with 1900 additions and 504 deletions
@@ -33,9 +33,10 @@ export class GachaHandler {
async getGachaList(msg: {}, session: BackendSession) { async getGachaList(msg: {}, session: BackendSession) {
const { } = msg; const { } = msg;
const roleId: string = session.get('roleId'); const roleId: string = session.get('roleId');
let role = await RoleModel.findByRoleId(roleId, 'gachaHasGuide');
const list = await getGachaList(roleId); const list = await getGachaList(roleId);
return resResult(STATUS.SUCCESS, { list }); return resResult(STATUS.SUCCESS, { hasInit: !!role.gachaHasGuide, list });
} }
/** /**
@@ -442,7 +443,7 @@ export class GachaHandler {
return resResult(STATUS.GACHA_GUIDE_HAS_DONE); return resResult(STATUS.GACHA_GUIDE_HAS_DONE);
} }
let userGacha = await UserGachaModel.findByRole(roleId, GACHA_ID.NORMAL); let userGacha = await UserGachaModel.findByRole(roleId, GACHA_ID.NORMAL);
let { guideResultList = [], candidates = [] } = userGacha; let { guideResultList = [], candidates = [], } = userGacha;
let simpleResult: { contentId: number, hid: number }[] = [] let simpleResult: { contentId: number, hid: number }[] = []
if(id == 0) { if(id == 0) {
@@ -469,7 +470,7 @@ export class GachaHandler {
let { heroes, resultHeroes } = await createHeroes(roleId, roleName, sid, serverId, heroInfo); let { heroes, resultHeroes } = await createHeroes(roleId, roleName, sid, serverId, heroInfo);
await addItems(roleId, roleName, sid, items); await addItems(roleId, roleName, sid, items);
// 更新数据 // 更新数据
await RoleModel.updateRoleInfo(roleId, { gachaHasGuide: true }); role = await RoleModel.updateRoleInfo(roleId, { gachaHasGuide: true });
await UserGachaRecModel.createRec(roleId, gachaId, 0, count, resultList); await UserGachaRecModel.createRec(roleId, gachaId, 0, count, resultList);
// 任务 // 任务
@@ -482,6 +483,7 @@ export class GachaHandler {
await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GACHA_QUALITY_COUNT, count, { heroes: activityData }) await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GACHA_QUALITY_COUNT, count, { heroes: activityData })
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
hasInit: !!role.gachaHasGuide,
gachaId, gachaId,
heroes: resultHeroes, heroes: resultHeroes,
addHeros: heroes, addHeros: heroes,
+11 -11
View File
@@ -15,15 +15,15 @@
"turnLimted": 20, "turnLimted": 20,
"forcedCharactor": "&", "forcedCharactor": "&",
"fobiddenCharactor": "&", "fobiddenCharactor": "&",
"victoryInfoInUI": "1.消灭所有敌军\r\n2.所有村民到达村口时,死亡的村民数量≤2", "victoryInfoInUI": "1.消灭所有敌军\r\n2.死亡的村民数量≤2\r\n3.剩下的村民都到达洞口",
"loseInfoInUI": "1.我方全部阵亡\r\n2.死亡的村民数量≥3", "loseInfoInUI": "1.我方全部阵亡\r\n2.死亡的村民数量≥3\r\n3.20回合内未能胜利",
"starInfoInUI": "1.我方无人阵亡;\r\n2.在20回合内获得胜利", "starInfoInUI": "1.我方无人阵亡;\r\n2.在20回合内获得胜利",
"cost": 10, "cost": 10,
"iconInMap": "spine&qingnian", "iconInMap": "spine&qingnian",
"iconName": "世外小村", "iconName": "世外小村",
"heroInUI": "3&47", "heroInUI": "3&1013",
"detailUIBg": "1000_1", "detailUIBg": "1000_1",
"recommendedPower": 10009, "recommendedPower": 113544,
"previousGk": 126, "previousGk": 126,
"relatedGk": 1000128, "relatedGk": 1000128,
"movePoint": 496, "movePoint": 496,
@@ -51,25 +51,25 @@
"turnLimted": 20, "turnLimted": 20,
"forcedCharactor": "&", "forcedCharactor": "&",
"fobiddenCharactor": "&", "fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军", "victoryInfoInUI": "1.消灭所有敌军\r\n2.解救所有被绑架的村民\r\n",
"loseInfoInUI": "我方全部阵亡", "loseInfoInUI": "1.我方全部阵亡\r\n2.20回合内未能胜利",
"starInfoInUI": "1.我方无人阵亡;\r\n2.在20回合内获得胜利", "starInfoInUI": "1.我方无人阵亡;\r\n2.在20回合内获得胜利",
"cost": 10, "cost": 10,
"iconInMap": "spine&yinbingdao", "iconInMap": "spine&yinbingdao",
"iconName": "迷雾洞窟", "iconName": "迷雾洞窟",
"heroInUI": "3&3601", "heroInUI": "3&1013",
"detailUIBg": "1000_2", "detailUIBg": "1000_2",
"recommendedPower": 10010, "recommendedPower": 127737,
"previousGk": 2511, "previousGk": 2511,
"relatedGk": 1000224, "relatedGk": 1000224,
"movePoint": 503, "movePoint": 503,
"needPrepare": 1, "needPrepare": 1,
"spineInBigMap": "&", "spineInBigMap": "&",
"HeroNum": "6&6", "HeroNum": "6&6",
"gkInfo": "2.唧唧复唧唧,木兰当户织,谁言寸草心,报得三春晖。", "gkInfo": " 赵云一行人刚将村中的百姓带入山洞避难,一位急急忙忙寻找妻子的青年便找上门来。\r\n 洞内仍有不少以往百姓为了躲避战乱设下的陷阱,可务必要当心!\r\n 也许在这昏暗的洞穴里,点燃火炬一路小心前行,才是上策。",
"HeroNum_1": "1&6", "HeroNum_1": "1&6",
"progress": "&", "progress": "1&0|2&0",
"progressDesc": "&" "progressDesc": "待解救的百姓数量&已解救的百姓数量"
}, },
{ {
"war_id": 2513, "war_id": 2513,
File diff suppressed because it is too large Load Diff
+32 -32
View File
@@ -676,13 +676,13 @@
"heroId": 40, "heroId": 40,
"skinID": 41040, "skinID": 41040,
"name": "小乔-初始", "name": "小乔-初始",
"imgPosofInfoUI": "-365&-260", "imgPosofInfoUI": "-365&-55",
"imgPosofotherhero": "20&-100", "imgPosofotherhero": "20&105",
"imgPosofDialog": "555&-260", "imgPosofDialog": "555&-55",
"imgPosofInfoMVP": "-530&-250", "imgPosofInfoMVP": "-530&-45",
"imgPosofherorank": "-675&-175", "imgPosofherorank": "-675&30",
"imgPosoforfashion": "-345&-145", "imgPosoforfashion": "-345&60",
"imgPosofskinmsg": "-20&-70", "imgPosofskinmsg": "-20&125",
"imgPosofheroget": "&" "imgPosofheroget": "&"
}, },
{ {
@@ -690,13 +690,13 @@
"heroId": 40, "heroId": 40,
"skinID": 41140, "skinID": 41140,
"name": "小乔-精英", "name": "小乔-精英",
"imgPosofInfoUI": "-365&-260", "imgPosofInfoUI": "-365&-55",
"imgPosofotherhero": "20&-100", "imgPosofotherhero": "20&105",
"imgPosofDialog": "555&-260", "imgPosofDialog": "555&-55",
"imgPosofInfoMVP": "-530&-250", "imgPosofInfoMVP": "-530&-45",
"imgPosofherorank": "-675&-175", "imgPosofherorank": "-675&30",
"imgPosoforfashion": "-345&-145", "imgPosoforfashion": "-345&60",
"imgPosofskinmsg": "-20&-70", "imgPosofskinmsg": "-20&125",
"imgPosofheroget": "&" "imgPosofheroget": "&"
}, },
{ {
@@ -704,13 +704,13 @@
"heroId": 41, "heroId": 41,
"skinID": 41041, "skinID": 41041,
"name": "大乔-初始", "name": "大乔-初始",
"imgPosofInfoUI": "-345&-205", "imgPosofInfoUI": "-345&-75",
"imgPosofotherhero": "-5&-30", "imgPosofotherhero": "-5&100",
"imgPosofDialog": "555&-200", "imgPosofDialog": "555&-70",
"imgPosofInfoMVP": "-475&-160", "imgPosofInfoMVP": "-475&10",
"imgPosofherorank": "-675&-115", "imgPosofherorank": "-675&15",
"imgPosoforfashion": "-330&-40", "imgPosoforfashion": "-330&90",
"imgPosofskinmsg": "-45&0", "imgPosofskinmsg": "-45&130",
"imgPosofheroget": "&" "imgPosofheroget": "&"
}, },
{ {
@@ -718,13 +718,13 @@
"heroId": 41, "heroId": 41,
"skinID": 41141, "skinID": 41141,
"name": "大乔-精英", "name": "大乔-精英",
"imgPosofInfoUI": "-345&-205", "imgPosofInfoUI": "-345&-75",
"imgPosofotherhero": "-5&-30", "imgPosofotherhero": "-5&100",
"imgPosofDialog": "555&-200", "imgPosofDialog": "555&-70",
"imgPosofInfoMVP": "-475&-160", "imgPosofInfoMVP": "-475&10",
"imgPosofherorank": "-675&-115", "imgPosofherorank": "-675&15",
"imgPosoforfashion": "-330&-40", "imgPosoforfashion": "-330&90",
"imgPosofskinmsg": "-45&0", "imgPosofskinmsg": "-45&130",
"imgPosofheroget": "&" "imgPosofheroget": "&"
}, },
{ {
@@ -1965,12 +1965,12 @@
"skinID": 0, "skinID": 0,
"name": "阴兵", "name": "阴兵",
"imgPosofInfoUI": "598&-164", "imgPosofInfoUI": "598&-164",
"imgPosofotherhero": 0, "imgPosofotherhero": "598&-164",
"imgPosofDialog": "598&-164", "imgPosofDialog": "598&-164",
"imgPosofInfoMVP": "-471&-161", "imgPosofInfoMVP": "-471&-161",
"imgPosofherorank": 0, "imgPosofherorank": "598&-164",
"imgPosoforfashion": 0, "imgPosoforfashion": "598&-164",
"imgPosofskinmsg": 0, "imgPosofskinmsg": "598&-164",
"imgPosofheroget": "&" "imgPosofheroget": "&"
}, },
{ {
+290 -10
View File
@@ -59,7 +59,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 2, "id": 2,
@@ -121,7 +149,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 3, "id": 3,
@@ -183,7 +239,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 4, "id": 4,
@@ -245,7 +329,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 5, "id": 5,
@@ -307,7 +419,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 6, "id": 6,
@@ -369,7 +509,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 7, "id": 7,
@@ -431,7 +599,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 8, "id": 8,
@@ -493,7 +689,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 9, "id": 9,
@@ -555,7 +779,35 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
}, },
{ {
"id": 10, "id": 10,
@@ -617,6 +869,34 @@
"56": 1, "56": 1,
"57": 255, "57": 255,
"58": 255, "58": 255,
"__EMPTY": 0 "59": 1,
"60": 1,
"61": 1,
"62": 1,
"63": 1,
"64": 1,
"65": 1,
"66": 1,
"67": 1,
"68": 1,
"69": 1,
"70": 1,
"71": 1,
"72": 1,
"73": 1,
"74": 1,
"75": 1,
"76": 1,
"77": 1,
"78": 1,
"79": 255,
"80": 1,
"81": 255,
"82": 255,
"83": 1,
"84": 1,
"85": 1,
"86": 1,
"87": 1
} }
] ]
+203 -7
View File
@@ -177,7 +177,7 @@
{ {
"mapid": 26, "mapid": 26,
"name": "箭塔", "name": "箭塔",
"seid": "60026&", "seid": "60260&",
"description": "很平常的祭坛", "description": "很平常的祭坛",
"spine": "jianta" "spine": "jianta"
}, },
@@ -282,21 +282,21 @@
{ {
"mapid": 41, "mapid": 41,
"name": "陷坑", "name": "陷坑",
"seid": "60041&", "seid": "60410&",
"description": "战场上常见的陷阱", "description": "战场上常见的陷阱",
"spine": "xiankeng" "spine": "xiankeng"
}, },
{ {
"mapid": 42, "mapid": 42,
"name": "矿场", "name": "矿场",
"seid": "60042&", "seid": "60420&",
"description": "被山贼占领的矿场", "description": "被山贼占领的矿场",
"spine": "cangku_red" "spine": "cangku_red"
}, },
{ {
"mapid": 43, "mapid": 43,
"name": "矿场", "name": "矿场",
"seid": "60043&", "seid": "60430&",
"description": "受到我方保护的矿场", "description": "受到我方保护的矿场",
"spine": "cangku_blue" "spine": "cangku_blue"
}, },
@@ -359,7 +359,7 @@
{ {
"mapid": 52, "mapid": 52,
"name": "上缓坡", "name": "上缓坡",
"seid": "60052&", "seid": "60520&",
"description": "站在此地形上,会被传送至最近的【下缓坡】", "description": "站在此地形上,会被传送至最近的【下缓坡】",
"spine": "&" "spine": "&"
}, },
@@ -396,13 +396,209 @@
"name": "草垛", "name": "草垛",
"seid": "&", "seid": "&",
"description": "乡村常见的干草堆", "description": "乡村常见的干草堆",
"spine": 0 "spine": "&"
}, },
{ {
"mapid": 58, "mapid": 58,
"name": "井", "name": "井",
"seid": "&", "seid": "&",
"description": "打水的井", "description": "打水的井",
"spine": 0 "spine": "&"
},
{
"mapid": 59,
"name": "兵营",
"seid": "60591&",
"description": "我方占据的兵营",
"spine": "bingying_blue"
},
{
"mapid": 60,
"name": "兵营",
"seid": "60600&",
"description": "无人占据的兵营",
"spine": "bingying_hui"
},
{
"mapid": 61,
"name": "兵营",
"seid": "60610&",
"description": "敌军占据的兵营",
"spine": "bingying_red"
},
{
"mapid": 62,
"name": "靶场",
"seid": "60620&",
"description": "我方占据的靶场",
"spine": "bachang_blue"
},
{
"mapid": 63,
"name": "靶场",
"seid": "60630&",
"description": "无人占据的靶场",
"spine": "bachang_hui"
},
{
"mapid": 64,
"name": "靶场",
"seid": "60640&",
"description": "敌军占据的靶场",
"spine": "bachang_red"
},
{
"mapid": 65,
"name": "马厩",
"seid": "60651&60653&60654",
"description": "我方占据的马厩",
"spine": "majiu_blue"
},
{
"mapid": 66,
"name": "马厩",
"seid": "60661&60662",
"description": "无人占据的马厩",
"spine": "majiu_hui"
},
{
"mapid": 67,
"name": "马厩",
"seid": "60671&60673&60674",
"description": "敌军占据的马厩",
"spine": "majiu_red"
},
{
"mapid": 68,
"name": "书院",
"seid": "60680&",
"description": "我方占据的书院",
"spine": "shuyuan_blue"
},
{
"mapid": 69,
"name": "书院",
"seid": "60690&",
"description": "无人占据的书院",
"spine": "shuyuan_hui"
},
{
"mapid": 70,
"name": "书院",
"seid": "60700&",
"description": "敌军占据的书院",
"spine": "shuyuan_red"
},
{
"mapid": 71,
"name": "号角",
"seid": "60710&",
"description": "我方占据的号角",
"spine": "haojiao_blue"
},
{
"mapid": 72,
"name": "号角",
"seid": "60720&",
"description": "无人占据的号角",
"spine": "haojiao_hui"
},
{
"mapid": 73,
"name": "号角",
"seid": "60730&",
"description": "敌军占据的号角",
"spine": "haojiao_red"
},
{
"mapid": 74,
"name": "战鼓",
"seid": "60740&",
"description": "我方占据的战鼓",
"spine": "zhangu_blue"
},
{
"mapid": 75,
"name": "战鼓",
"seid": "60750&",
"description": "无人占据的战鼓",
"spine": "zhangu_hui"
},
{
"mapid": 76,
"name": "战鼓",
"seid": "60760&",
"description": "敌军占据的战鼓",
"spine": "zhangu_red"
},
{
"mapid": 77,
"name": "平原",
"seid": "&",
"description": "很平常的平原",
"spine": "chelidian_lan"
},
{
"mapid": 78,
"name": "铁门",
"seid": "&",
"description": "打开的铁门",
"spine": "tiemen_open"
},
{
"mapid": 79,
"name": "铁门",
"seid": "&",
"description": "关闭的铁门",
"spine": "tiemen_close"
},
{
"mapid": 80,
"name": "城门",
"seid": "&",
"description": "打开的城门",
"spine": "chengmen_open"
},
{
"mapid": 81,
"name": "城门",
"seid": "&",
"description": "关闭的城门",
"spine": "chengmen_close"
},
{
"mapid": 83,
"name": "机关",
"seid": "&",
"description": "可被打开的机关",
"spine": "&"
},
{
"mapid": 84,
"name": "机关",
"seid": "&",
"description": "已经被打开的机关",
"spine": "&"
},
{
"mapid": 85,
"name": "皇宫",
"seid": "60850&60851",
"description": "皇宫",
"spine": "&"
},
{
"mapid": 86,
"name": "火炬",
"seid": "&",
"description": "山洞里常见的照明物",
"spine": "&"
},
{
"mapid": 87,
"name": "火炬(点燃)",
"seid": "&",
"description": "点燃的火炬,可以照亮地上的陷阱,还能削弱阴气",
"spine": "&"
} }
] ]
+1 -1
View File
@@ -6025,7 +6025,7 @@
}, },
{ {
"pointId": 503, "pointId": 503,
"position": "-1228&739", "position": "-1250&736",
"previousPoint": 502, "previousPoint": 502,
"type": 2, "type": 2,
"relatedPoint": 502, "relatedPoint": 502,
@@ -58,6 +58,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 1 "id": 1
}, },
{ {
@@ -119,6 +148,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 2 "id": 2
}, },
{ {
@@ -180,6 +238,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 3 "id": 3
}, },
{ {
@@ -241,6 +328,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 4 "id": 4
}, },
{ {
@@ -302,6 +418,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 5 "id": 5
}, },
{ {
@@ -363,6 +508,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 6 "id": 6
}, },
{ {
@@ -424,6 +598,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 7 "id": 7
}, },
{ {
@@ -485,6 +688,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 8 "id": 8
}, },
{ {
@@ -546,6 +778,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 9 "id": 9
}, },
{ {
@@ -607,6 +868,35 @@
"56": 100, "56": 100,
"57": 100, "57": 100,
"58": 100, "58": 100,
"59": 100,
"60": 100,
"61": 100,
"62": 100,
"63": 100,
"64": 100,
"65": 100,
"66": 100,
"67": 100,
"68": 100,
"69": 100,
"70": 100,
"71": 100,
"72": 100,
"73": 100,
"74": 100,
"75": 100,
"76": 100,
"77": 100,
"78": 100,
"79": 100,
"80": 100,
"81": 100,
"82": 100,
"83": 100,
"84": 100,
"85": 100,
"86": 100,
"87": 100,
"id": 10 "id": 10
} }
] ]