diff --git a/apps/profile/ProfileChange.js b/apps/profile/ProfileChange.js index 680524a8..d8c203fb 100644 --- a/apps/profile/ProfileChange.js +++ b/apps/profile/ProfileChange.js @@ -101,7 +101,7 @@ const ProfileChange = { // 匹配圣遗物套装 let asMap = ArtifactSet.getAliasMap(game) let asKey = lodash.keys(asMap).sort((a, b) => b.length - a.length).join('|') - let asReg = new RegExp(`(${asKey})套?[2,4]?\\+?(${asKey})?套?[2,4]?\\+?(${asKey})?套?[2,4]?`) + let asReg = new RegExp(`^(${asKey})套?[2,4]?\\+?(${asKey})?套?[2,4]?\\+?(${asKey})?套?[2,4]?$`) let asRet = asReg.exec(txt) if (asRet && asRet[1] && asMap[asRet[1]]) { if (game === 'gs') { diff --git a/models/profile/CharArtis.js b/models/profile/CharArtis.js index d134b300..2179623c 100644 --- a/models/profile/CharArtis.js +++ b/models/profile/CharArtis.js @@ -19,7 +19,7 @@ const CharArtis = { let def = function (attrWeight) { let title = [] - let weight = lodash.extend({}, attrWeight || usefulAttr[char.name] || { atk: 75, cpct: 100, cdmg: 100, dmg: 100 }) + let weight = lodash.extend({}, attrWeight || usefulAttr[char.name] || {}) let check = (key, max = 75, maxPlus = 75, isWeapon = true) => { let original = weight[key] || 0 if (original < max) { diff --git a/resources/character/profile-detail.css b/resources/character/profile-detail.css index 2d6b34c0..a62e94f7 100644 --- a/resources/character/profile-detail.css +++ b/resources/character/profile-detail.css @@ -853,14 +853,14 @@ body { border-radius: 10px 10px 0 0; text-shadow: 0 0 1px #000, 1px 1px 2px rgba(0, 0, 0, 0.7); padding: 17px 10px 3px 15px; - background: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7), rgba(25, 25, 25, 0.3), rgba(25, 25, 25, 0.3), rgba(25, 25, 25, 0)); + background: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7), rgba(25, 25, 25, 0.3), rgba(25, 25, 25, 0), rgba(25, 25, 25, 0)); } .artis .item.arti .arti-icon { left: auto; right: -5px; - top: -10px; - width: 100px; - height: 100px; + top: -12px; + width: 85px; + height: 85px; } .artis .item.arti .arti-icon .img { width: 100%; @@ -868,7 +868,7 @@ body { margin: 0; } .artis .item.arti .arti-icon span { - bottom: 35px; + bottom: 20px; right: 15px; background: rgba(0, 0, 0, 0.8); } diff --git a/resources/character/profile-detail.less b/resources/character/profile-detail.less index a3c97c75..a2fc176f 100644 --- a/resources/character/profile-detail.less +++ b/resources/character/profile-detail.less @@ -1078,15 +1078,15 @@ body { border-radius: 10px 10px 0 0; text-shadow: 0 0 1px #000, 1px 1px 2px rgba(0, 0, 0, 0.7); padding: 17px 10px 3px 15px; - background: linear-gradient(to right, rgba(0, 0, 0, .7), rgba(0, 0, 0, .7), rgba(25, 25, 25, .3), rgba(25, 25, 25, .3), rgba(25, 25, 25, 0)); + background: linear-gradient(to right, rgba(0, 0, 0, .7), rgba(0, 0, 0, .7), rgba(25, 25, 25, .3), rgba(25, 25, 25, .0), rgba(25, 25, 25, 0)); } .arti-icon { left: auto; right: -5px; - top: -10px; - width: 100px; - height: 100px; + top: -12px; + width: 85px; + height: 85px; .img { width: 100%; @@ -1095,7 +1095,7 @@ body { } span { - bottom: 35px; + bottom: 20px; right: 15px; background: rgba(0, 0, 0, .8); }