Dec 16 201216 dpsv2 test version

xulai1001 · Dec 16, 2020 · d3b47c7 · d3b47c7
1 parent 531d1df
commit d3b47c7
Show file tree

Hide file tree

Showing 224 changed files with 7,335 additions and 3,688 deletions.
diff --git a/_docs/dpsv2.js b/_docs/dpsv2.js
diff --git a/_docs/dpsv2.md b/_docs/dpsv2.md
@@ -0,0 +1,10 @@
+---
+title: DPSv2(测试)
+withjs: true
+order: 1
+category: 工具
+icon: calculator
+---
+<span id="vue_version">正在载入游戏数据，请耐心等待……</span>
+<button id="btn_update_data" type="button" class="btn btn-primary" onclick="AKDATA.reload();">清除缓存</button>
+
diff --git a/_docs/plot.js b/_docs/plot.js
@@ -494,9 +494,9 @@ function buildArgs(info, enemy, raidBuff, key) {
   };
   info.options.forEach(x => { char_obj.options[x] = true; });
   let enemy_obj = {
-    def: parseFloat(enemy.def),
-    magicResistance: parseFloat(enemy.magicResistance),
-    count: parseFloat(enemy.count)
+    def: parseFloat(enemy.def) || 0,
+    magicResistance: parseFloat(enemy.magicResistance) || 0 ,
+    count: parseFloat(enemy.count) || 1
   };
   Object.keys(raidBuff).forEach(k => { raidBuff[k] = parseFloat(raidBuff[k]); });
   return {

diff --git a/_docs/test.js b/_docs/test.js
@@ -3,7 +3,7 @@ let ua = navigator.userAgent;
 document.getElementById("user_agent").innerText = ua;
 
 $("#jquery").text($.fn.jquery);
-$("#vue").html("Vue: {{ error }} <br> <div v-html='content'></div>");
+$("#vue").html("Vue: {{ error }} <br> <div v-html='content' class='row'></div>");
 
 let vue_app = new Vue({
   el: "#vue",
@@ -18,7 +18,7 @@ function init() {
     'excel/char_patch_table.json',
     'excel/skill_table.json',
     '../version.json',
-    '../customdata/dps_specialtags.json',
+    '../customdata/dps_specialtags_v2.json',
     '../customdata/dps_options.json',
     '../resources/dps_actions.js',
     '../resources/dpsv2.js',
@@ -28,23 +28,52 @@ function init() {
 
 function load() {
   AKDATA.patchAllChars();
-  test_dps();
+  test_dps_all();
   //find_skills(x => x.indexOf("instant") >= 0);
 }
 
 pmBase.hook.on('init', init);
 
+function card(title, str) {
+  return `
+  <div class="card col-3">
+    <div class="card-header">
+      <div class="card-title mb-0">${title}</div>
+    </div>
+    ${str}
+  </div>`;
+}
+
 // dpsv2 test
 function test_dps() {
-  var charId = "char_185_frncat";
-  var skillId = 'skchr_frncat_2';
+  var ch = "char_126_shotst";
+  var sk = 'skchr_shotst_1';
+  var options = { cond: true };
   var dps = new AKDATA.Dps.DpsCalculator();
-  dps.calculateDps({ charId, skillId });
+  var char = { charId: ch, skillId: sk, options };
+  var enemy = { def: 200, magicResistance: 20, count: 1 };
+  vue_app.content = "";
+  console.log (`-- ${ch} - ${sk}`);
+  dps.calculateDps(char, enemy);
+  vue_app.content += card(`${ch} - ${sk}`, "<pre>" + JSON.stringify(dps.summary, null, 2) + "</pre>");
+}
 
-  vue_app.content = `<pre>
-  ${JSON.stringify(dps.summary, null, 2)}
-  </pre>`;
-  console.log(dps);
+function test_dps_all() {
+  vue_app.content = "";
+    Object.keys(AKDATA.Data.character_table).forEach(ch => {
+    var charData = AKDATA.Data.character_table[ch];
+    charData.skills.map(x => x.skillId).forEach(sk => {
+      var options = { cond: true };
+      var char = { charId: ch, skillId: sk, options };
+      var enemy = { def: 200, magicResistance: 20, count: 1 };
+      var dps = new AKDATA.Dps.DpsCalculator();
+      if (ch.startsWith("char")) { 
+        console.log (`-- ${ch} - ${sk}`);
+        dps.calculateDps(char, enemy);
+        vue_app.content += card(`${ch} - ${sk}`, "<pre>" + JSON.stringify(dps.summary, null, 2) + "</pre>");
+      }
+    });
+  });
 }
 
 function find_skills(filter) {

diff --git a/_docs/test.md b/_docs/test.md
@@ -9,8 +9,7 @@ icon: bug
 
 jQuery: <span id="jquery">Error</span>
 
-<div id="vue">
-</div>
+<div id="vue"></div>
 
 如果不能正常显示，您可以换个浏览器试试。
 

diff --git a/_docs/whatsnew.md b/_docs/whatsnew.md
@@ -5,6 +5,11 @@ order: 4
 category: 工具
 icon: info-circle
 ---
+## 20.12.16
+- [dpsv2] v2测试版页面开放
+- [issue] 已知问题：原版计算中，多数额外伤害没有计算damage_scale
+- [gamedata] 更新游戏数据，增加了角色头像
+
 ## 20.12.02
 - [dpsv2] 阶段性进展
 - [bugfix] 灼地等每秒计算的技能在叠加攻速团辅时应该仍然以1秒间隔计算

diff --git a/_includes/header.html b/_includes/header.html
@@ -13,8 +13,8 @@
   <div class="l-header__body">
     <div class="l-header__logo">
       <a href="{{ gameHome | default: "/" | relative_url }}">
-  		  <img src="{{ site.logo | relative_url }}" alt="{{ site.logo }}">
-        <img src="/akdata/logo.png">
+          <div style="width:30%; float:left"><img src="{{ site.logo | relative_url }}" alt="{{ site.logo }}"></div>
+          <div style="width:70%; float:left;"><img src="/akdata/logo.png" style="width:100%; margin-top: 5px;"></div>
   		</a>
     </div>
     <div class="l-header__left">

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -4,14 +4,17 @@
 
 <div class="l-main__body">
     <div class="l-page">
-      <div class="l-page__header">
+      <div class="l-page__header form-inline">
         <h1 class="l-page__title">
           <a href="{{page.url | relative_url }}">{{ page.title}}</a>
         </h1>
-        <hr>
+        <div class="l-content ml-4" style="margin-top: 16px">
+          {{ content }}
+        </div>
       </div>
+      <hr style="width:100%; color: rgba(0, 0, 0, 0.3)" class="m-0">
       <div class="l-page__body">
-        <div class="l-content">{{ content }}</div>
+
         <div class="l-dynamic"></div>
       </div>
       <div class="l-page__footer">

diff --git a/_sass/_common.scss b/_sass/_common.scss
@@ -27,6 +27,9 @@ table.table td {
 .p-page__control {
   margin-bottom:1em;
 }
+.p {
+  margin-bottom: 0.5em;
+}
 
 .c-infotable {
   /*

diff --git a/_sass/layout/_header.scss b/_sass/layout/_header.scss
@@ -13,7 +13,7 @@
 
   &__logo {
     height: 100%;
-    width: 300px;
+    width: 250px;
     align-items: center;
     display: flex;
     text-align: center;

diff --git a/_sass/layout/_sidebar.scss b/_sass/layout/_sidebar.scss
@@ -1,5 +1,5 @@
 .l-layout__sidebar {
-  flex: 0 0 300px;
+  flex: 0 0 250px;
   background: $side-background-color;
   box-shadow: inset -1px 0 0 $layout-border-color;
 

diff --git a/assets/images/char/char_002_amiya.png b/assets/images/char/char_002_amiya.png
diff --git a/assets/images/char/char_009_12fce.png b/assets/images/char/char_009_12fce.png
diff --git a/assets/images/char/char_010_chen.png b/assets/images/char/char_010_chen.png
diff --git a/assets/images/char/char_017_huang.png b/assets/images/char/char_017_huang.png
diff --git a/assets/images/char/char_1001_amiya2.png b/assets/images/char/char_1001_amiya2.png
diff --git a/assets/images/char/char_101_sora.png b/assets/images/char/char_101_sora.png
diff --git a/assets/images/char/char_102_texas.png b/assets/images/char/char_102_texas.png
diff --git a/assets/images/char/char_103_angel.png b/assets/images/char/char_103_angel.png
diff --git a/assets/images/char/char_106_franka.png b/assets/images/char/char_106_franka.png
diff --git a/assets/images/char/char_107_liskam.png b/assets/images/char/char_107_liskam.png
diff --git a/assets/images/char/char_108_silent.png b/assets/images/char/char_108_silent.png
diff --git a/assets/images/char/char_109_fmout.png b/assets/images/char/char_109_fmout.png
diff --git a/assets/images/char/char_110_deepcl.png b/assets/images/char/char_110_deepcl.png
diff --git a/assets/images/char/char_112_siege.png b/assets/images/char/char_112_siege.png
diff --git a/assets/images/char/char_113_cqbw.png b/assets/images/char/char_113_cqbw.png
diff --git a/assets/images/char/char_115_headbr.png b/assets/images/char/char_115_headbr.png
diff --git a/assets/images/char/char_117_myrrh.png b/assets/images/char/char_117_myrrh.png
diff --git a/assets/images/char/char_118_yuki.png b/assets/images/char/char_118_yuki.png
diff --git a/assets/images/char/char_120_hibisc.png b/assets/images/char/char_120_hibisc.png
diff --git a/assets/images/char/char_121_lava.png b/assets/images/char/char_121_lava.png
diff --git a/assets/images/char/char_122_beagle.png b/assets/images/char/char_122_beagle.png
diff --git a/assets/images/char/char_123_fang.png b/assets/images/char/char_123_fang.png
diff --git a/assets/images/char/char_124_kroos.png b/assets/images/char/char_124_kroos.png
diff --git a/assets/images/char/char_126_shotst.png b/assets/images/char/char_126_shotst.png
diff --git a/assets/images/char/char_127_estell.png b/assets/images/char/char_127_estell.png
diff --git a/assets/images/char/char_128_plosis.png b/assets/images/char/char_128_plosis.png
diff --git a/assets/images/char/char_129_bluep.png b/assets/images/char/char_129_bluep.png
diff --git a/assets/images/char/char_130_doberm.png b/assets/images/char/char_130_doberm.png
diff --git a/assets/images/char/char_131_flameb.png b/assets/images/char/char_131_flameb.png
diff --git a/assets/images/char/char_133_mm.png b/assets/images/char/char_133_mm.png
diff --git a/assets/images/char/char_134_ifrit.png b/assets/images/char/char_134_ifrit.png
diff --git a/assets/images/char/char_136_hsguma.png b/assets/images/char/char_136_hsguma.png
diff --git a/assets/images/char/char_137_brownb.png b/assets/images/char/char_137_brownb.png
diff --git a/assets/images/char/char_140_whitew.png b/assets/images/char/char_140_whitew.png
diff --git a/assets/images/char/char_141_nights.png b/assets/images/char/char_141_nights.png
diff --git a/assets/images/char/char_143_ghost.png b/assets/images/char/char_143_ghost.png
diff --git a/assets/images/char/char_144_red.png b/assets/images/char/char_144_red.png
diff --git a/assets/images/char/char_145_prove.png b/assets/images/char/char_145_prove.png
diff --git a/assets/images/char/char_147_shining.png b/assets/images/char/char_147_shining.png
diff --git a/assets/images/char/char_148_nearl.png b/assets/images/char/char_148_nearl.png
diff --git a/assets/images/char/char_149_scave.png b/assets/images/char/char_149_scave.png
diff --git a/assets/images/char/char_150_snakek.png b/assets/images/char/char_150_snakek.png
diff --git a/assets/images/char/char_151_myrtle.png b/assets/images/char/char_151_myrtle.png
diff --git a/assets/images/char/char_155_tiger.png b/assets/images/char/char_155_tiger.png
diff --git a/assets/images/char/char_158_milu.png b/assets/images/char/char_158_milu.png
diff --git a/assets/images/char/char_159_peacok.png b/assets/images/char/char_159_peacok.png
diff --git a/assets/images/char/char_163_hpsts.png b/assets/images/char/char_163_hpsts.png
diff --git a/assets/images/char/char_164_nightm.png b/assets/images/char/char_164_nightm.png
diff --git a/assets/images/char/char_166_skfire.png b/assets/images/char/char_166_skfire.png
diff --git a/assets/images/char/char_171_bldsk.png b/assets/images/char/char_171_bldsk.png
diff --git a/assets/images/char/char_172_svrash.png b/assets/images/char/char_172_svrash.png
diff --git a/assets/images/char/char_173_slchan.png b/assets/images/char/char_173_slchan.png
diff --git a/assets/images/char/char_174_slbell.png b/assets/images/char/char_174_slbell.png
diff --git a/assets/images/char/char_179_cgbird.png b/assets/images/char/char_179_cgbird.png
diff --git a/assets/images/char/char_180_amgoat.png b/assets/images/char/char_180_amgoat.png
diff --git a/assets/images/char/char_181_flower.png b/assets/images/char/char_181_flower.png
diff --git a/assets/images/char/char_183_skgoat.png b/assets/images/char/char_183_skgoat.png
diff --git a/assets/images/char/char_185_frncat.png b/assets/images/char/char_185_frncat.png
diff --git a/assets/images/char/char_187_ccheal.png b/assets/images/char/char_187_ccheal.png
diff --git a/assets/images/char/char_188_helage.png b/assets/images/char/char_188_helage.png
diff --git a/assets/images/char/char_190_clour.png b/assets/images/char/char_190_clour.png
diff --git a/assets/images/char/char_192_falco.png b/assets/images/char/char_192_falco.png
diff --git a/assets/images/char/char_193_frostl.png b/assets/images/char/char_193_frostl.png
diff --git a/assets/images/char/char_195_glassb.png b/assets/images/char/char_195_glassb.png
diff --git a/assets/images/char/char_196_sunbr.png b/assets/images/char/char_196_sunbr.png
diff --git a/assets/images/char/char_197_poca.png b/assets/images/char/char_197_poca.png
diff --git a/assets/images/char/char_198_blackd.png b/assets/images/char/char_198_blackd.png
diff --git a/assets/images/char/char_199_yak.png b/assets/images/char/char_199_yak.png
diff --git a/assets/images/char/char_2013_cerber.png b/assets/images/char/char_2013_cerber.png
diff --git a/assets/images/char/char_2014_nian.png b/assets/images/char/char_2014_nian.png
diff --git a/assets/images/char/char_201_moeshd.png b/assets/images/char/char_201_moeshd.png
diff --git a/assets/images/char/char_202_demkni.png b/assets/images/char/char_202_demkni.png
diff --git a/assets/images/char/char_204_platnm.png b/assets/images/char/char_204_platnm.png
diff --git a/assets/images/char/char_208_melan.png b/assets/images/char/char_208_melan.png
diff --git a/assets/images/char/char_209_ardign.png b/assets/images/char/char_209_ardign.png
diff --git a/assets/images/char/char_210_stward.png b/assets/images/char/char_210_stward.png
diff --git a/assets/images/char/char_211_adnach.png b/assets/images/char/char_211_adnach.png
diff --git a/assets/images/char/char_212_ansel.png b/assets/images/char/char_212_ansel.png
diff --git a/assets/images/char/char_213_mostma.png b/assets/images/char/char_213_mostma.png
diff --git a/assets/images/char/char_215_mantic.png b/assets/images/char/char_215_mantic.png
diff --git a/assets/images/char/char_218_cuttle.png b/assets/images/char/char_218_cuttle.png
diff --git a/assets/images/char/char_219_meteo.png b/assets/images/char/char_219_meteo.png
diff --git a/assets/images/char/char_220_grani.png b/assets/images/char/char_220_grani.png
diff --git a/assets/images/char/char_222_bpipe.png b/assets/images/char/char_222_bpipe.png
diff --git a/assets/images/char/char_225_haak.png b/assets/images/char/char_225_haak.png
diff --git a/assets/images/char/char_226_hmau.png b/assets/images/char/char_226_hmau.png
diff --git a/assets/images/char/char_230_savage.png b/assets/images/char/char_230_savage.png
diff --git a/assets/images/char/char_235_jesica.png b/assets/images/char/char_235_jesica.png
diff --git a/assets/images/char/char_236_rope.png b/assets/images/char/char_236_rope.png
diff --git a/assets/images/char/char_237_gravel.png b/assets/images/char/char_237_gravel.png
diff --git a/assets/images/char/char_240_wyvern.png b/assets/images/char/char_240_wyvern.png
diff --git a/assets/images/char/char_241_panda.png b/assets/images/char/char_241_panda.png
diff --git a/assets/images/char/char_242_otter.png b/assets/images/char/char_242_otter.png
diff --git a/assets/images/char/char_243_waaifu.png b/assets/images/char/char_243_waaifu.png
diff --git a/assets/images/char/char_248_mgllan.png b/assets/images/char/char_248_mgllan.png
diff --git a/assets/images/char/char_250_phatom.png b/assets/images/char/char_250_phatom.png
diff --git a/assets/images/char/char_252_bibeak.png b/assets/images/char/char_252_bibeak.png
diff --git a/assets/images/char/char_253_greyy.png b/assets/images/char/char_253_greyy.png
diff --git a/assets/images/char/char_254_vodfox.png b/assets/images/char/char_254_vodfox.png
diff --git a/assets/images/char/char_258_podego.png b/assets/images/char/char_258_podego.png
diff --git a/assets/images/char/char_260_durnar.png b/assets/images/char/char_260_durnar.png
diff --git a/assets/images/char/char_261_sddrag.png b/assets/images/char/char_261_sddrag.png
diff --git a/assets/images/char/char_263_skadi.png b/assets/images/char/char_263_skadi.png
diff --git a/assets/images/char/char_265_sophia.png b/assets/images/char/char_265_sophia.png
diff --git a/assets/images/char/char_271_spikes.png b/assets/images/char/char_271_spikes.png
diff --git a/assets/images/char/char_272_strong.png b/assets/images/char/char_272_strong.png
diff --git a/assets/images/char/char_274_astesi.png b/assets/images/char/char_274_astesi.png
diff --git a/assets/images/char/char_275_breeze.png b/assets/images/char/char_275_breeze.png
diff --git a/assets/images/char/char_277_sqrrel.png b/assets/images/char/char_277_sqrrel.png
diff --git a/assets/images/char/char_278_orchid.png b/assets/images/char/char_278_orchid.png
diff --git a/assets/images/char/char_279_excu.png b/assets/images/char/char_279_excu.png
diff --git a/assets/images/char/char_281_popka.png b/assets/images/char/char_281_popka.png
diff --git a/assets/images/char/char_282_catap.png b/assets/images/char/char_282_catap.png
diff --git a/assets/images/char/char_283_midn.png b/assets/images/char/char_283_midn.png
diff --git a/assets/images/char/char_284_spot.png b/assets/images/char/char_284_spot.png
diff --git a/assets/images/char/char_285_medic2.png b/assets/images/char/char_285_medic2.png
diff --git a/assets/images/char/char_286_cast3.png b/assets/images/char/char_286_cast3.png
diff --git a/assets/images/char/char_289_gyuki.png b/assets/images/char/char_289_gyuki.png
diff --git a/assets/images/char/char_290_vigna.png b/assets/images/char/char_290_vigna.png
diff --git a/assets/images/char/char_291_aglina.png b/assets/images/char/char_291_aglina.png
diff --git a/assets/images/char/char_293_thorns.png b/assets/images/char/char_293_thorns.png
diff --git a/assets/images/char/char_294_ayer.png b/assets/images/char/char_294_ayer.png
diff --git a/assets/images/char/char_298_susuro.png b/assets/images/char/char_298_susuro.png
diff --git a/assets/images/char/char_301_cutter.png b/assets/images/char/char_301_cutter.png
diff --git a/assets/images/char/char_302_glaze.png b/assets/images/char/char_302_glaze.png
diff --git a/assets/images/char/char_306_leizi.png b/assets/images/char/char_306_leizi.png
diff --git a/assets/images/char/char_308_swire.png b/assets/images/char/char_308_swire.png
diff --git a/assets/images/char/char_311_mudrok.png b/assets/images/char/char_311_mudrok.png
diff --git a/assets/images/char/char_325_bison.png b/assets/images/char/char_325_bison.png
diff --git a/assets/images/char/char_326_glacus.png b/assets/images/char/char_326_glacus.png
diff --git a/assets/images/char/char_328_cammou.png b/assets/images/char/char_328_cammou.png
diff --git a/assets/images/char/char_333_sidero.png b/assets/images/char/char_333_sidero.png
diff --git a/assets/images/char/char_336_folivo.png b/assets/images/char/char_336_folivo.png
diff --git a/assets/images/char/char_337_utage.png b/assets/images/char/char_337_utage.png
diff --git a/assets/images/char/char_340_shwaz.png b/assets/images/char/char_340_shwaz.png
diff --git a/assets/images/char/char_343_tknogi.png b/assets/images/char/char_343_tknogi.png
diff --git a/assets/images/char/char_344_beewax.png b/assets/images/char/char_344_beewax.png
diff --git a/assets/images/char/char_345_folnic.png b/assets/images/char/char_345_folnic.png
diff --git a/assets/images/char/char_346_aosta.png b/assets/images/char/char_346_aosta.png
diff --git a/assets/images/char/char_347_jaksel.png b/assets/images/char/char_347_jaksel.png
diff --git a/assets/images/char/char_348_ceylon.png b/assets/images/char/char_348_ceylon.png
diff --git a/assets/images/char/char_349_chiave.png b/assets/images/char/char_349_chiave.png
diff --git a/assets/images/char/char_350_surtr.png b/assets/images/char/char_350_surtr.png
diff --git a/assets/images/char/char_355_ethan.png b/assets/images/char/char_355_ethan.png
diff --git a/assets/images/char/char_356_broca.png b/assets/images/char/char_356_broca.png
diff --git a/assets/images/char/char_358_lisa.png b/assets/images/char/char_358_lisa.png
diff --git a/assets/images/char/char_365_aprl.png b/assets/images/char/char_365_aprl.png
diff --git a/assets/images/char/char_366_acdrop.png b/assets/images/char/char_366_acdrop.png
diff --git a/assets/images/char/char_367_swllow.png b/assets/images/char/char_367_swllow.png
diff --git a/assets/images/char/char_373_lionhd.png b/assets/images/char/char_373_lionhd.png
diff --git a/assets/images/char/char_376_therex.png b/assets/images/char/char_376_therex.png
diff --git a/assets/images/char/char_378_asbest.png b/assets/images/char/char_378_asbest.png
diff --git a/assets/images/char/char_379_sesa.png b/assets/images/char/char_379_sesa.png
diff --git a/assets/images/char/char_381_bubble.png b/assets/images/char/char_381_bubble.png
diff --git a/assets/images/char/char_383_snsant.png b/assets/images/char/char_383_snsant.png
diff --git a/assets/images/char/char_385_finlpp.png b/assets/images/char/char_385_finlpp.png
diff --git a/assets/images/char/char_388_mint.png b/assets/images/char/char_388_mint.png
diff --git a/assets/images/char/char_391_rosmon.png b/assets/images/char/char_391_rosmon.png
diff --git a/assets/images/char/char_400_weedy.png b/assets/images/char/char_400_weedy.png
diff --git a/assets/images/char/char_401_elysm.png b/assets/images/char/char_401_elysm.png
diff --git a/assets/images/char/char_405_absin.png b/assets/images/char/char_405_absin.png
diff --git a/assets/images/char/char_411_tomimi.png b/assets/images/char/char_411_tomimi.png
diff --git a/assets/images/char/char_415_flint.png b/assets/images/char/char_415_flint.png
diff --git a/assets/images/char/char_416_zumama.png b/assets/images/char/char_416_zumama.png
diff --git a/assets/images/char/char_423_blemsh.png b/assets/images/char/char_423_blemsh.png
diff --git a/assets/images/char/char_436_whispr.png b/assets/images/char/char_436_whispr.png
diff --git a/assets/images/char/char_500_noirc.png b/assets/images/char/char_500_noirc.png
diff --git a/assets/images/char/char_501_durin.png b/assets/images/char/char_501_durin.png
diff --git a/assets/images/char/char_502_nblade.png b/assets/images/char/char_502_nblade.png
diff --git a/assets/images/char/char_503_rang.png b/assets/images/char/char_503_rang.png
diff --git a/assets/images/char/char_505_rcast.png b/assets/images/char/char_505_rcast.png
diff --git a/assets/images/char/char_506_rmedic.png b/assets/images/char/char_506_rmedic.png
diff --git a/assets/images/char/char_507_rsnipe.png b/assets/images/char/char_507_rsnipe.png
diff --git a/assets/images/char/char_508_aguard.png b/assets/images/char/char_508_aguard.png
diff --git a/assets/images/char/char_509_acast.png b/assets/images/char/char_509_acast.png
diff --git a/assets/images/char/char_510_amedic.png b/assets/images/char/char_510_amedic.png
diff --git a/assets/images/char/char_511_asnipe.png b/assets/images/char/char_511_asnipe.png
diff --git a/assets/images/char/token_10000_silent_healrb.png b/assets/images/char/token_10000_silent_healrb.png
diff --git a/assets/images/char/token_10003_cgbird_bird.png b/assets/images/char/token_10003_cgbird_bird.png
diff --git a/assets/images/char/token_10005_mgllan_drone1.png b/assets/images/char/token_10005_mgllan_drone1.png
diff --git a/assets/images/char/token_10005_mgllan_drone2.png b/assets/images/char/token_10005_mgllan_drone2.png
diff --git a/assets/images/char/token_10005_mgllan_drone3.png b/assets/images/char/token_10005_mgllan_drone3.png
diff --git a/assets/images/char/token_10007_phatom_twin.png b/assets/images/char/token_10007_phatom_twin.png
diff --git a/assets/images/char/token_10008_cqbw_box.png b/assets/images/char/token_10008_cqbw_box.png
diff --git a/assets/images/char/token_10010_folivo_car.png b/assets/images/char/token_10010_folivo_car.png
diff --git a/assets/images/char/token_10011_beewax_oblisk.png b/assets/images/char/token_10011_beewax_oblisk.png
diff --git a/assets/images/char/trap_001_crate.png b/assets/images/char/trap_001_crate.png
diff --git a/assets/images/char/trap_007_ballis.png b/assets/images/char/trap_007_ballis.png
diff --git a/assets/images/pic.py b/assets/images/pic.py
@@ -0,0 +1,34 @@
+#encoding: utf-8
+import json, urllib.request, os, sys, time
+
+gamedata_path = "../../resources/gamedata/excel"
+f = open(gamedata_path + "/character_table.json", "r", encoding="utf-8")
+chardb = json.load(f)
+names = list(chardb.keys())
+names.append("char_1001_amiya2");
+
+total = len(names)
+success = 0
+skip = 0
+error = 0
+
+for ch in names:
+    filename = "char/%s.png" % ch
+    url = "https://andata.somedata.top/dataX/char/profile/%s.png" % ch
+    sys.stdout.write("%s ..." % ch)
+    if (os.path.exists(filename)):
+        print("skipped")
+        skip+=1
+    else:
+        try:
+            img = urllib.request.urlopen(url).read()
+            with open(filename, "wb") as fi:
+                fi.write(img)
+            print("ok")
+            success+=1
+        except urllib.error.HTTPError as e:
+            print(e)
+            error+=1
+        time.sleep(0.5)    
+print("total %d, success %d, skip %d, error %d" % (total, success, skip, error))
+
diff --git a/debug.log b/debug.log
@@ -1,3 +1,6 @@
 [1030/160423.466:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ�Ҳ���ָ����·���� (0x3)
 [1102/001739.474:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ�Ҳ���ָ����·���� (0x3)
 [1114/011731.961:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ�Ҳ���ָ����·���� (0x3)
+[1203/010732.491:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ�Ҳ���ָ����·���� (0x3)
+[1208/212419.094:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ�Ҳ���ָ����·���� (0x3)
+[1215/130220.202:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ�Ҳ���ָ����·���� (0x3)
diff --git a/logo.png b/logo.png
diff --git a/resources/akdata.css b/resources/akdata.css
@@ -54,5 +54,18 @@
 }
 
 .table th {
-    font-weight: 400;
+    font-weight: 600;
+}
+.card-header {
+    padding: 0.5rem 1.5rem!important;
+}
+.card-title {
+    font-weight: 600!important;
+}
+.card-body {
+    padding: 1rem 1.875rem!important;
+}
+
+h5 {
+    font-weight: 600!important;
 }
diff --git a/resources/akdata.js b/resources/akdata.js
@@ -7,7 +7,7 @@ const useCache = true;
 const cacheBeginTime = new Date(2019, 12, 10).getTime();
 
 window.AKDATA = {
-  akdata: "201119", // jsdelivr tag version
+  akdata: "201216", // jsdelivr tag version
 
   Data: {},
 

diff --git a/resources/attributes.js b/resources/attributes.js
@@ -64,7 +64,7 @@ class NoLog {
 }
 
 // 天赋/技能名字cache
-displayNames = {};
+var displayNames = {};
 
 function calculateDps(char, enemy, raidBuff) {
   let log = new Log();
@@ -143,9 +143,9 @@ function calculateDps(char, enemy, raidBuff) {
   let normalAttack = calculateAttack(attr, enemy, raidBlackboard, false, charData, levelData, log);
   if (!normalAttack) return;
 
-  globalDps = Math.round((normalAttack.totalDamage + skillAttack.totalDamage) / 
+  var globalDps = Math.round((normalAttack.totalDamage + skillAttack.totalDamage) / 
                          (normalAttack.dur.duration + normalAttack.dur.stunDuration + skillAttack.dur.duration + skillAttack.dur.prepDuration));
-  globalHps = Math.round((normalAttack.totalHeal + skillAttack.totalHeal) /
+  var globalHps = Math.round((normalAttack.totalHeal + skillAttack.totalHeal) /
                          (normalAttack.dur.duration + normalAttack.dur.stunDuration + skillAttack.dur.duration + skillAttack.dur.prepDuration));
   //console.log(globalDps, globalHps);
   let killTime = 0;
@@ -871,6 +871,7 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
           } else if (skillId == "skchr_sophia_2") {
             blackboard.def *= ts;
             blackboard.attack_speed *= ts;
+            blackboard.max_target = basic.blockCnt;
             writeBuff("2技能 - 自身享受全部增益");
           }
         } else {
@@ -1272,7 +1273,7 @@ function calcDurations(isSkill, attackTime, attackSpeed, levelData, buffList, bu
       case 1: // 普通，前面已经算过一遍了，这里只特判
         let sp_rate = 1 + buffFrame.spRecoveryPerSec;
         if (buffList["tachr_002_amiya_1"]) { // 情绪吸收
-          attackCount = Math.ceil((spData.spCost - stunDuration) / (buffList["tachr_002_amiya_1"]["amiya_t_1[atk].sp"] + attackTime*sp_rate));
+          attackCount = Math.ceil((spData.spCost - stunDuration*sp_rate) / (buffList["tachr_002_amiya_1"]["amiya_t_1[atk].sp"] + attackTime*sp_rate));
           log.write(`[特殊] ${displayNames["tachr_002_amiya_1"]}: attack sp = ${attackCount * buffList["tachr_002_amiya_1"]["amiya_t_1[atk].sp"]}`);
           duration = attackCount * attackTime;
         } else if (buffList["tachr_134_ifrit_2"]) { // [莱茵回路]. 需要解出攻击次数
@@ -1486,7 +1487,7 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
   if (isSkill && blackboard.id == "skchr_platnm_2") { // 白金
     let rate = (attackTime - 1) / (buffList["tachr_204_platnm_1"]["attack@max_delta"] - 1);
     // 熔断
-    rate = Math.min(Math.max(rate, 0), buffList["tachr_204_platnm_1"]["attack@max_delta"]);
+    rate = Math.min(Math.max(rate, 0), 1);
     buffFrame.atk_scale = 1 + rate * (buffList["tachr_204_platnm_1"]["attack@max_atk_scale"] - 1);
     finalFrame = getBuffedAttributes(basicFrame, buffFrame); // 重算
     log.write(`[特殊] ${displayNames["tachr_204_platnm_1"]}: atk_scale = ${buffFrame.atk_scale.toFixed(3)} (${(rate*100).toFixed(1)}%蓄力)`);
@@ -1680,7 +1681,7 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
       switch (buffName) {
         // 伤害
         case "skchr_ethan_1":
-          pool[1] += bb["attack@poison_damage"] * dur.duration * (1-emrpct);
+          pool[1] += bb["attack@poison_damage"] * dur.duration * (1-emrpct) * ecount;
           break;
         case "skchr_aglina_2":
         case "skchr_aglina_3":

diff --git a/resources/customdata/dps_specialtags.json b/resources/customdata/dps_specialtags.json
@@ -229,4 +229,4 @@
     "tachr_436_whispr_1":   { "cond": true },
     "tachr_503_rang_1":	{ "cond": true },
     "tachr_511_asnipe_1":   { "crit": true }
-}
+}