diff --git a/apps/character.js b/apps/character.js index 5979d0d6..95961aa8 100644 --- a/apps/character.js +++ b/apps/character.js @@ -178,11 +178,11 @@ async function getTalent(e, avatars, MysApi) { let skill = {}; - let skillres = await MysApi.getAvatar(avatars.id); + let skillRes = await MysApi.getAvatar(avatars.id); - if (skillres.retcode == 0 && skillres.data && skillres.data.skill_list) { + if (skillRes&& skillRes.skill_list) { skill.id = avatars.id; - let skill_list = lodash.orderBy(skillres.data.skill_list, ["id"], ["asc"]); + let skill_list = lodash.orderBy(skillRes.skill_list, ["id"], ["asc"]); for (let val of skill_list) { val.level_original = val.level_current; diff --git a/resources/character/character.css b/resources/character/character.css index 514dc6cf..593f80ea 100644 --- a/resources/character/character.css +++ b/resources/character/character.css @@ -53,7 +53,7 @@ body { left: 0px; right: 0px; box-shadow: 0 -5px 10px 0 #000; - padding: 10px 10px 10px 150px; + padding: 5px 10px 10px 150px; text-shadow: 0 0 1px #000, 1px 1px 3px #000; font-family: tttgbnumber; @@ -157,7 +157,7 @@ body { } .crown { - width: 35px; + width: 30px; height: 30px; margin-left: 15px; display: inline-block; @@ -204,7 +204,7 @@ body { right: 0; font-size: 18px; border-radius: 5px; - padding: 1px 5px; + padding: 3px 5px; background-color: rgba(0, 0, 0, var(--bg-opacity)); --bg-opacity: 0.75; } @@ -423,7 +423,7 @@ body.bottom_mode { border-radius: 8px 0 0 0; padding-left: 8px; background: rgba(0, 0, 0, .5); - bottom: 2px; + bottom: -8px; font-size: 15px; } @@ -463,26 +463,31 @@ body.bottom_mode { } .left_mode .info { - bottom: 0; right: initial; padding: 10px 10px 5px 10px; - border-radius: 0 20px 0 0; + border-radius: 20px; + left: 10px; + bottom: 120px; } .left_mode .weapon { - top: -170px; - width: 110px; + top: 155px; + width: 270px; + height: 100px; padding: 0 0 3px 0; - left: 0; - border-radius: 0 10px 10px 0; + left: 0px; background: rgba(0, 0, 0, 0.8); + border-radius: 20px; } .left_mode .weapon_cont { + width: 100px; padding: 3px 10px 0 0; border-radius: 0 10px 0 0; - border-bottom: 0.5px solid rgba(0, 0, 0, 0.3); + border-right: 0.5px solid rgba(0, 0, 0, 0.3); + position: absolute; + top: 0; } .left_mode .for_bottom, @@ -497,8 +502,10 @@ body.bottom_mode { .left_mode .weapon_name { height: 50px; - padding: 5px 0 0; - line-height: 20px; + font-size: 20px; + text-align: left; + line-height: 30px; + padding: 20px 0 0 110px; } .left_mode .detail { @@ -509,6 +516,7 @@ body.bottom_mode { .left_mode .talent { padding-left: 0; margin-right: -5px; + width: 250px; } .left_mode .info, diff --git a/resources/character/character.html b/resources/character/character.html index c04dd928..74a4641b 100644 --- a/resources/character/character.html +++ b/resources/character/character.html @@ -36,7 +36,7 @@ {{ if talent.a }}
{{each talentMap name key}} -
{{name}}:{{ talent[key].level_current}}
+
{{name}}: {{ talent[key].level_current}}
{{/each}}
{{else}}