Merge branch 'master' into master

.gitignore

@@ -0,0 +1,2 @@
+/monsters-info/Download-pad.skyozora.com
+/monsters-info/opencc

README.md

@@ -1,16 +1,12 @@
 智龙迷城车队阵型图制作工具 | Puzzle & Dragons Dash Formation Maker
 ======
-* 这个工具可以帮助你方便的制作和分享车队阵型。  
-This tool can help you easily create and share Dash Formation.  
-![主要界面预览](https://github.com/Mapaler/PADDashFormation/raw/master/document/preview-main.png)  
-
-* 易用的编辑界面。  
-Easy to use editing interface.  
-![编辑界面预览](https://github.com/Mapaler/PADDashFormation/raw/master/document/preview-edit.png)
-
-* 可以简单的修改显示语言，手机上也可以轻松使用。  
-Easy to change language and use on your phone。  
-![手机端预览](https://github.com/Mapaler/PADDashFormation/raw/master/document/preview-mobile.png)
+* 这个工具可以帮助你方便的制作和分享车队阵型或单人队形。  
+This tool can help you easily create and share Dash Formation or Solo Formation.  
+![协力界面预览](https://github.com/Mapaler/PADDashFormation/raw/master/document/preview-main.png)  
+![单人界面预览](https://github.com/Mapaler/PADDashFormation/raw/master/document/preview-solo.png)  
+* 易用的编辑界面，手机上也可以轻松使用。  
+Easy to use editing interface and use on your phone.   
+![手机端预览](https://github.com/Mapaler/PADDashFormation/raw/master/document/preview-mobile.jpg)
 ## 目前支持的语言 | Supported Languages
 1. 中文（简体）
 1. 中文（繁體）
@@ -22,14 +18,15 @@ Easy to change language and use on your phone。
 ## 在哪里打开 | Where to open
 * 快速使用在线版 | Quick Start  
     * https://mapaler.github.io/PADDashFormation/ (Github Pages)
-    * http://mapaler.gitee.io/paddashformation/ (中国码云，比较快|Chinese mirror)
-    * [示例 \| Sample](https://mapaler.github.io/PADDashFormation/?data=%7B%22title%22%3A%22%E6%88%91%E7%9A%84%E6%9C%A8%E8%BD%A6%E9%98%9F%7CMy%20Wood%20Dash%20Formation%22%2C%22detail%22%3A%22%E6%88%91%E5%B9%B3%E6%97%B6%E7%9A%84%E6%9C%A8%E8%BD%A6%E9%98%9F%5Cn5%E4%B8%AASX%E5%88%9A%E5%A5%BD%E5%A4%9F%5Cn%E5%BC%80%E8%BD%A6%E4%BA%86%EF%BC%8C%E6%BB%B4%E6%BB%B4%22%2C%22team%22%3A%5B%5B%5B%7B%22id%22%3A4813%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B20%2C20%2C20%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B21%2C21%2C21%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B22%2C22%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B19%2C19%5D%7D%2C%7B%22id%22%3A5323%2C%22level%22%3A99%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B20%2C20%2C11%2C11%5D%7D%5D%2C%5B%7B%22id%22%3A5267%2C%22level%22%3A99%2C%22awoken%22%3A5%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A-1%7D%2C%7B%22id%22%3A4986%2C%22level%22%3A99%2C%22awoken%22%3A4%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A0%7D%2C%7B%22id%22%3A0%7D%5D%5D%2C%5B%5B%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B22%2C13%2C13%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B21%2C21%2C21%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B22%2C22%2C22%5D%7D%2C%7B%22id%22%3A5042%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B20%2C20%2C11%2C11%5D%7D%2C%7B%22id%22%3A4813%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B24%2C24%2C11%2C11%5D%7D%5D%2C%5B%7B%22id%22%3A-1%7D%2C%7B%22id%22%3A0%7D%2C%7B%22id%22%3A4986%2C%22level%22%3A99%2C%22awoken%22%3A4%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A-1%7D%2C%7B%22id%22%3A5267%2C%22level%22%3A99%2C%22awoken%22%3A5%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%5D%5D%5D%7D)
+    * http://mapaler.gitee.io/paddashformation/ (码云的镜象，国内比较快|Chinese mirror)
+    * [车队示例 \| Multi Team Sample](https://mapaler.github.io/PADDashFormation/?data=%7B%22title%22%3A%22%E6%88%91%E7%9A%84%E6%9C%A8%E8%BD%A6%E9%98%9F%7CMy%20Wood%20Dash%20Formation%22%2C%22detail%22%3A%22%E6%88%91%E5%B9%B3%E6%97%B6%E7%9A%84%E6%9C%A8%E8%BD%A6%E9%98%9F%5Cn5%E4%B8%AASX%E5%88%9A%E5%A5%BD%E5%A4%9F%5Cn%E5%BC%80%E8%BD%A6%E4%BA%86%EF%BC%8C%E6%BB%B4%E6%BB%B4%22%2C%22team%22%3A%5B%5B%5B%7B%22id%22%3A4813%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B20%2C20%2C20%5D%2C%22sawoken%22%3A1%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B21%2C21%2C21%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B22%2C22%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B19%2C19%5D%7D%2C%7B%22id%22%3A5323%2C%22level%22%3A99%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B20%2C20%2C11%2C11%5D%7D%5D%2C%5B%7B%22id%22%3A5267%2C%22level%22%3A99%2C%22awoken%22%3A5%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A3640%2C%22level%22%3A99%2C%22awoken%22%3A8%2C%22plus%22%3A%5B0%2C0%2C0%5D%2C%22sawoken%22%3A-1%7D%2C%7B%22id%22%3A4986%2C%22level%22%3A1%2C%22awoken%22%3A4%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A0%7D%2C%7B%22id%22%3A0%7D%5D%5D%2C%5B%5B%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B22%2C13%2C13%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B21%2C21%2C21%5D%7D%2C%7B%22id%22%3A2948%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B22%2C22%2C22%5D%7D%2C%7B%22id%22%3A4813%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B20%2C20%2C11%2C11%5D%2C%22sawoken%22%3A1%7D%2C%7B%22id%22%3A5042%2C%22level%22%3A101%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B20%2C20%2C11%2C11%5D%2C%22sawoken%22%3A2%7D%5D%2C%5B%7B%22id%22%3A3640%2C%22level%22%3A99%2C%22awoken%22%3A8%2C%22plus%22%3A%5B0%2C0%2C0%5D%2C%22sawoken%22%3A-1%7D%2C%7B%22id%22%3A4986%2C%22level%22%3A1%2C%22awoken%22%3A4%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A0%7D%2C%7B%22id%22%3A5267%2C%22level%22%3A1%2C%22awoken%22%3A5%2C%22plus%22%3A%5B99%2C99%2C99%5D%7D%2C%7B%22id%22%3A5267%2C%22level%22%3A1%2C%22awoken%22%3A5%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%5D%5D%5D%7D)
+    * [单人示例 \| Solo Sample](https://mapaler.github.io/PADDashFormation/solo.html?data=%7B%22title%22%3A%22%E5%A4%A7%E5%8F%B7%E6%89%93%E9%87%8C%C2%B7%E4%B8%89%E9%92%88%22%2C%22detail%22%3A%22%E6%B3%A8%E6%84%8F%E5%89%8D%E9%9D%A2%E5%87%A0%E5%85%B3%E8%A6%81%E5%BF%AB%E7%82%B9%E6%89%93%EF%BC%8C%E4%B8%8D%E7%84%B6%E5%B0%8F%E6%8A%A4%E5%A3%AB2%E6%8A%80%E8%B7%B3%E4%BA%86%EF%BC%8C%E4%BC%9A%E8%A2%AB%E5%B0%81%E8%A7%89%E9%86%92%E9%98%9F%E9%95%BF%E6%8D%B6%E6%AD%BB%E3%80%82%22%2C%22team%22%3A%5B%5B%5B%7B%22id%22%3A5139%2C%22level%22%3A102%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B17%2C17%2C11%2C11%5D%2C%22sawoken%22%3A1%7D%2C%7B%22id%22%3A4635%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B27%2C27%2C27%5D%2C%22sawoken%22%3A2%7D%2C%7B%22id%22%3A5004%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B17%2C17%2C17%5D%2C%22sawoken%22%3A0%7D%2C%7B%22id%22%3A4137%2C%22level%22%3A101%2C%22awoken%22%3A8%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B23%2C23%2C11%2C11%5D%2C%22sawoken%22%3A1%7D%2C%7B%22id%22%3A5331%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B18%2C18%2C11%2C11%5D%2C%22sawoken%22%3A2%7D%2C%7B%22id%22%3A5139%2C%22level%22%3A110%2C%22awoken%22%3A9%2C%22plus%22%3A%5B99%2C99%2C99%5D%2C%22latent%22%3A%5B17%2C17%2C11%2C11%5D%2C%22sawoken%22%3A2%7D%5D%2C%5B%7B%22id%22%3A4140%2C%22level%22%3A99%2C%22awoken%22%3A5%2C%22plus%22%3A%5B99%2C99%2C99%5D%7D%2C%7B%22id%22%3A4148%2C%22level%22%3A71%2C%22awoken%22%3A5%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A5257%2C%22level%22%3A99%2C%22awoken%22%3A6%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A5239%2C%22level%22%3A1%2C%22awoken%22%3A6%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A4154%2C%22level%22%3A99%2C%22awoken%22%3A5%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%2C%7B%22id%22%3A4897%2C%22level%22%3A99%2C%22awoken%22%3A5%2C%22plus%22%3A%5B0%2C0%2C0%5D%7D%5D%5D%5D%7D)
 * 或下载压缩包后使用火狐浏览器打开`index.html`。  
 Or download ZIP, and open the `index.html` with Firefox.
 
 ## 小提示 | Tips
-* 直接复制网址即可分享组队  
-Copy the URL directly to share the Formation  
+* 直接复制网址即可分享组队。你可以使用*短网址服务*进一步缩短网址。  
+Copy the URL directly to share the Formation. You can use any *Short URL Service* to further shorten the URL.  
 ![分享组队](https://github.com/Mapaler/PADDashFormation/raw/master/document/tips-share.png)
 * 使用后退即可撤销上一次修改  
 Use back to undo the last edit  
@@ -40,6 +37,8 @@ Click on the monster avatar in the editing interface to jump to the Guide.
 * 可以在编辑界面的怪物ID输入怪物名称来搜索怪物  
 You can search for monsters by entering the monster name in the monster ID of the editing interface.  
 ![搜索怪物](https://github.com/Mapaler/PADDashFormation/raw/master/document/tips-search.png)
+* 车队模式只显示部分杀潜觉以及共用的觉醒的统计，单人则全部显示。  
+2-Player Multi Games Mode only show the killer latent and several common awoken statistics, but solo mode shows all.
 
 # 翻译我 | TRANSLATE ME
 ## How to **Pull requests**

fonts/sfont.svg → fonts/FOT-KurokaneStd-EB.svg

@@ -1,10 +1,10 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20120731 at Fri Jul 13 13:38:05 2018
- By www
-Copyright (c) 2008 Fontworks Inc. All Rights Reserved.
+Created by FontForge 20170924 at Sat Jun 22 00:09:48 2019
+ By www-data
+Copyright (c) 2008-2013 Fontworks Inc. All Rights Reserved.
 </metadata>
 <defs>
 <font id="KurokaneStd-EB" horiz-adv-x="1000" vert-adv-y="1000" >
@@ -20,7 +20,7 @@ Copyright (c) 2008 Fontworks Inc. All Rights Reserved.
     cap-height="767"
     bbox="-265 -322 1216 1145"
     underline-thickness="50"
-    underline-position="-50"
+    underline-position="-100"
     unicode-range="U+0021-2F920"
   />
 <missing-glyph 
@@ -443,7 +443,7 @@ d="M391 247v-122h-143v122h-184v126h184v125h143v-125h184v-126h-184zM64 -35v125h51
 d="M44 340v115l155 204h-131v107h181q31 0 59 -35q29 -37 29 -84q0 -88 -140 -192h159v-115h-312z" />
     <glyph glyph-name="uni00B3" unicode="&#xb3;" horiz-adv-x="394" 
 d="M132 358l67 164h-152v90h119l27 65h-142v90h181q30 0 59 -26q33 -30 33 -71q0 -30 -28 -66q55 -31 55 -97q0 -106 -121 -192z" />
-    <glyph glyph-name="uni00B5" unicode="&#xb5;" horiz-adv-x="639" 
+    <glyph glyph-name="mu" unicode="&#xb5;" horiz-adv-x="639" 
 d="M76 -250v748h203v-375h99v375h204v-327q0 -53 -46 -114q-69 -93 -202 -93h-64q-15 -124 -44 -214h-150z" />
     <glyph glyph-name="uni00B9" unicode="&#xb9;" horiz-adv-x="394" 
 d="M122 339v312h-77v115h228v-427h-151z" />
@@ -1486,7 +1486,7 @@ d="M690 111l-156 151l-295 -312l-108 78q-2 123 -2 228q0 136 48 219q61 104 189 104
 d="M809 72q-128 -128 -309 -128t-309 128q-128 127 -128 308t128 308q128 128 309 128t309 -128q128 -127 128 -308t-128 -308zM702 177q84 84 84 203q0 118 -84 202t-202 84t-202 -84t-84 -202t84 -203q84 -84 202 -84t202 84z" />
     <glyph glyph-name="uni30FC" unicode="&#x30fc;" 
 d="M125 292v175h750v-175h-750z" />
-    <glyph glyph-name="afii00208" unicode="&#x2015;" 
+    <glyph glyph-name="uni2015" unicode="&#x2015;" 
 d="M0 305v150h1000v-150h-1000z" />
     <glyph glyph-name="uni2010" unicode="&#x2010;" 
 d="M288 293v174h425v-174h-425z" />
@@ -2243,7 +2243,7 @@ d="M800 -53q-81 81 -167 213h-339l-82 -202l-151 56l305 753h254l339 -738zM540 321q
 d="M229 -36v803h340q86 0 146 -45q76 -58 76 -174q0 -80 -53 -158q78 -63 78 -173t-58 -188q-49 -65 -93 -65h-436zM573 605h-141v-160h141v160zM579 284h-147v-159h147v159z" />
     <glyph glyph-name="Gamma" unicode="&#x393;" 
 d="M222 -35v802h590v-172h-375v-630h-215z" />
-    <glyph glyph-name="Delta" unicode="&#x394;" 
+    <glyph glyph-name="uni0394" unicode="&#x394;" 
 d="M72 -36l285 803h254l317 -803h-856zM635 124q-133 224 -176 450l-159 -450h335z" />
     <glyph glyph-name="Epsilon" unicode="&#x395;" 
 d="M216 -36v803h591v-161h-376v-138h349v-161h-349v-183h376v-160h-591z" />
@@ -2283,7 +2283,7 @@ d="M398 -36v81h-8q-96 0 -187 67q-125 90 -125 255q0 161 125 252q93 69 187 69h8v79
 d="M618 -36l-6 323h-224l-6 -323h-225v136q0 152 109 260q-109 87 -109 222v185h214l6 -316h246l6 316h214v-185q0 -129 -109 -219q109 -105 109 -263v-136h-225z" />
     <glyph glyph-name="Psi" unicode="&#x3a8;" 
 d="M398 -36v139q-254 29 -254 274q0 115 45 221q-57 -29 -112 -29h-11v198h265v-501h67v501h204v-501h67v501h265v-198h-11q-55 0 -112 29q45 -106 45 -221q0 -245 -254 -274v-139h-204z" />
-    <glyph glyph-name="Omega" unicode="&#x3a9;" 
+    <glyph glyph-name="uni03A9" unicode="&#x3a9;" 
 d="M570 -35l87 631h-314l87 -631h-360v196h3q88 0 155 -33q-98 126 -98 285t86 256q86 98 227 98h114q141 0 227 -98q86 -97 86 -256t-98 -285q67 33 155 33h3v-196h-360z" />
     <glyph glyph-name="alpha" unicode="&#x3b1;" 
 d="M680 -36q-99 0 -126 48q-65 -55 -153 -55q-84 0 -139 53q-66 61 -66 178q0 114 65 209q76 110 198 110q60 0 102 -32q4 -3 43 -56l36 80h186l-161 -376h126l-39 -158zM368 222q0 -75 52 -75q50 0 76 48q18 32 18 65q0 30 -16 51q-17 24 -43 24q-33 0 -60 -33
@@ -2311,7 +2311,7 @@ d="M669 -19q-70 -25 -156 -25q-182 0 -182 162q0 43 12 93q3 16 108 287h173l-89 -39
 d="M655 -59q-101 65 -164 231l-44 -15q-32 -117 -107 -192h-138l118 533h201l-45 -174l228 190l114 -138q-45 -60 -149 -119l107 -233z" />
     <glyph glyph-name="lambda" unicode="&#x3bb;" 
 d="M766 13q-63 -60 -154 -60q-50 0 -94 24q-66 37 -66 143v18q0 57 14 116q-33 -77 -118 -176q-83 -96 -142 -130l-95 80l303 472l103 -72l54 194h-176l21 96l26 19q22 17 37 22q51 18 90 18q63 0 111 -41q63 -54 63 -157q0 -71 -53 -255q-12 -42 -38 -112l-32 -88h169z" />
-    <glyph glyph-name="mu" unicode="&#x3bc;" 
+    <glyph glyph-name="uni03BC" unicode="&#x3bc;" 
 d="M180 -119l138 618h188l-85 -389h99l88 389h158q4 -23 4 -75q0 -463 -284 -463q-62 0 -102 23q-34 -85 -69 -103h-135z" />
     <glyph glyph-name="nu" unicode="&#x3bd;" 
 d="M262 -35l30 534h179l-25 -363h40l151 363h153q-27 -285 -121 -413q-89 -121 -252 -121h-155z" />
@@ -2340,138 +2340,138 @@ d="M621 -114l-144 186l-187 -189l-115 113q39 67 186 239l-123 159l148 120l120 -142
 d="M319 -119l15 71q-103 22 -151 68q-55 53 -55 150q0 132 115 329h146l-88 -390h64l142 658h194l-144 -658h59l84 390h145q7 -58 7 -113q0 -230 -91 -333q-76 -85 -236 -100l-17 -72h-189z" />
     <glyph glyph-name="omega" unicode="&#x3c9;" 
 d="M691 499h140q8 -72 8 -142q0 -275 -102 -355q-60 -47 -119 -47q-56 0 -94 42q-23 25 -58 94q-66 -82 -73 -89q-50 -47 -117 -47q-74 0 -105 67q-20 43 -20 106q0 179 121 371h139l-73 -328l181 170l101 -170z" />
-    <glyph glyph-name="afii10017" unicode="&#x410;" 
+    <glyph glyph-name="uni0410" unicode="&#x410;" 
 d="M800 -53q-81 81 -167 213h-339l-82 -202l-151 56l305 753h254l339 -738zM540 321q-56 113 -86 234l-95 -234h181z" />
-    <glyph glyph-name="afii10018" unicode="&#x411;" 
+    <glyph glyph-name="uni0411" unicode="&#x411;" 
 d="M213 -36v802h561v-161h-354v-159h164q58 0 123 -37q109 -61 109 -192q0 -125 -88 -198q-68 -55 -137 -55h-378zM578 284h-158v-159h158v159z" />
-    <glyph glyph-name="afii10019" unicode="&#x412;" 
+    <glyph glyph-name="uni0412" unicode="&#x412;" 
 d="M229 -36v803h340q86 0 146 -45q76 -58 76 -174q0 -80 -53 -158q78 -63 78 -173t-58 -188q-49 -65 -93 -65h-436zM573 605h-141v-160h141v160zM579 284h-147v-159h147v159z" />
-    <glyph glyph-name="afii10020" unicode="&#x413;" 
+    <glyph glyph-name="uni0413" unicode="&#x413;" 
 d="M222 -35v802h590v-172h-375v-630h-215z" />
-    <glyph glyph-name="afii10021" unicode="&#x414;" 
+    <glyph glyph-name="uni0414" unicode="&#x414;" 
 d="M720 -119v83h-465v-83h-203v243h91l81 642h605v-642h94v-243h-203zM625 605h-205q-25 -329 -98 -481h303v481z" />
-    <glyph glyph-name="afii10022" unicode="&#x415;" 
+    <glyph glyph-name="uni0415" unicode="&#x415;" 
 d="M216 -36v803h591v-161h-376v-138h349v-161h-349v-183h376v-160h-591z" />
-    <glyph glyph-name="afii10023" unicode="&#x401;" 
+    <glyph glyph-name="uni0401" unicode="&#x401;" 
 d="M566 834v181h198v-181h-198zM284 834v181h199v-181h-199zM216 -36v803h591v-161h-376v-138h349v-161h-349v-183h376v-160h-591z" />
-    <glyph glyph-name="afii10024" unicode="&#x416;" 
+    <glyph glyph-name="uni0416" unicode="&#x416;" 
 d="M850 -56q-108 103 -151 325h-94v-305h-210v305h-94q-43 -222 -151 -325l-134 63l125 403h49q-28 58 -28 136q0 32 2 56q-48 -30 -114 -30q-10 0 -15 1v194h279l32 -341h49v340h210v-340h49l32 341h279v-194q-5 -1 -15 -1q-66 0 -114 30q2 -24 2 -56q0 -78 -28 -136h49
 l125 -403z" />
-    <glyph glyph-name="afii10025" unicode="&#x417;" 
+    <glyph glyph-name="uni0417" unicode="&#x417;" 
 d="M451 366l87 204h-308v128q140 76 288 76q118 0 189 -67q63 -58 63 -135q0 -96 -109 -187q143 -89 143 -202q0 -105 -88 -169q-79 -57 -187 -57q-202 0 -314 77v128h344z" />
-    <glyph glyph-name="afii10026" unicode="&#x418;" 
+    <glyph glyph-name="uni0418" unicode="&#x418;" 
 d="M655 -36v370q-143 -213 -310 -370h-204v803h204v-505l310 505h204v-803h-204z" />
-    <glyph glyph-name="afii10027" unicode="&#x419;" 
+    <glyph glyph-name="uni0419" unicode="&#x419;" 
 d="M748 979q-16 -77 -84 -121q-67 -44 -164 -44t-164 44q-68 44 -84 121l154 51q35 -67 94 -67t94 67zM655 -36v370q-143 -213 -310 -370h-204v803h204v-505l310 505h204v-803h-204z" />
-    <glyph glyph-name="afii10028" unicode="&#x41a;" 
+    <glyph glyph-name="uni041A" unicode="&#x41a;" 
 d="M715 -56q-120 103 -169 325h-140q-7 -177 -65 -305h-149v802h214v-340h68l33 340h336v-196h-18q-86 0 -147 32q3 -24 3 -56q0 -77 -27 -136h55l150 -397z" />
-    <glyph glyph-name="afii10029" unicode="&#x41b;" 
+    <glyph glyph-name="uni041B" unicode="&#x41b;" 
 d="M639 -36v636h-236q-34 -419 -177 -650l-151 40l126 776h654v-802h-216z" />
-    <glyph glyph-name="afii10030" unicode="&#x41c;" 
+    <glyph glyph-name="uni041C" unicode="&#x41c;" 
 d="M714 -36v311q-69 -139 -138 -231h-151q-70 93 -139 233v-313h-204v803h204l214 -544l214 544h204v-803h-204z" />
-    <glyph glyph-name="afii10031" unicode="&#x41d;" 
+    <glyph glyph-name="uni041D" unicode="&#x41d;" 
 d="M666 -36v343h-332v-343h-214v803h214v-299h332v299h214v-803h-214z" />
-    <glyph glyph-name="afii10032" unicode="&#x41e;" 
+    <glyph glyph-name="uni041E" unicode="&#x41e;" 
 d="M400 -36q-97 0 -187 81q-124 111 -124 320t124 321q90 81 187 81h200q97 0 187 -81q124 -112 124 -321t-124 -320q-90 -81 -187 -81h-200zM636 606h-272v-482h272v482z" />
-    <glyph glyph-name="afii10033" unicode="&#x41f;" 
+    <glyph glyph-name="uni041F" unicode="&#x41f;" 
 d="M661 -36v636h-322v-636h-214v803h750v-803h-214z" />
-    <glyph glyph-name="afii10034" unicode="&#x420;" 
+    <glyph glyph-name="uni0420" unicode="&#x420;" 
 d="M410 296q-1 -190 -65 -332h-149v803h480q28 0 85 -58q73 -73 73 -165q0 -120 -127 -248h-297zM586 606h-176v-149h176v149z" />
-    <glyph glyph-name="afii10035" unicode="&#x421;" 
+    <glyph glyph-name="uni0421" unicode="&#x421;" 
 d="M454 -36q-87 0 -160 81q-98 109 -98 320t98 321q73 81 160 81h291v-161h-274v-482h274v-160h-291z" />
-    <glyph glyph-name="afii10036" unicode="&#x422;" 
+    <glyph glyph-name="uni0422" unicode="&#x422;" 
 d="M398 -36v642h-193v161h590v-161h-194v-642h-203z" />
-    <glyph glyph-name="afii10037" unicode="&#x423;" 
+    <glyph glyph-name="uni0423" unicode="&#x423;" 
 d="M621 245q-62 -20 -128 -20q-141 0 -239 60q-95 58 -95 138v344h214v-370h248v370h213v-528q0 -123 -77 -188q-114 -95 -405 -95v178h269v111z" />
-    <glyph glyph-name="afii10038" unicode="&#x424;" 
+    <glyph glyph-name="uni0424" unicode="&#x424;" 
 d="M398 -36v81h-8q-96 0 -187 67q-125 90 -125 255q0 161 125 252q93 69 187 69h8v79h204v-79h8q94 0 187 -69q125 -91 125 -252q0 -165 -124 -255q-92 -67 -188 -67h-8v-81h-204zM694 538h-92v-342h92v342zM398 538h-92v-342h92v342z" />
-    <glyph glyph-name="afii10039" unicode="&#x425;" 
+    <glyph glyph-name="uni0425" unicode="&#x425;" 
 d="M618 -36l-6 323h-224l-6 -323h-225v136q0 152 109 260q-109 87 -109 222v185h214l6 -316h246l6 316h214v-185q0 -129 -109 -219q109 -105 109 -263v-136h-225z" />
-    <glyph glyph-name="afii10040" unicode="&#x426;" 
+    <glyph glyph-name="uni0426" unicode="&#x426;" 
 d="M759 -119v83h-641v803h214v-636h323v636h214v-636h94v-250h-204z" />
-    <glyph glyph-name="afii10041" unicode="&#x427;" 
+    <glyph glyph-name="uni0427" unicode="&#x427;" 
 d="M615 -35v272q-65 -21 -128 -21q-140 0 -239 62q-95 59 -95 140v349h215v-370h247v370h214v-802h-214z" />
-    <glyph glyph-name="afii10042" unicode="&#x428;" 
+    <glyph glyph-name="uni0428" unicode="&#x428;" 
 d="M75 -36v803h202v-642h122v642h202v-642h122v642h202v-803h-850z" />
-    <glyph glyph-name="afii10043" unicode="&#x429;" 
+    <glyph glyph-name="uni0429" unicode="&#x429;" 
 d="M793 -119v83h-735v803h202v-642h121v642h203v-642h121v642h202v-642h84v-244h-198z" />
-    <glyph glyph-name="afii10044" unicode="&#x42a;" 
+    <glyph glyph-name="uni042A" unicode="&#x42a;" 
 d="M313 -36v641h-265v162h478v-307h159q57 0 123 -38q108 -63 108 -198q0 -129 -88 -203q-68 -57 -137 -57h-378zM678 293h-152v-163h152v163z" />
-    <glyph glyph-name="afii10045" unicode="&#x42b;" 
+    <glyph glyph-name="uni042B" unicode="&#x42b;" 
 d="M718 -36v803h212v-803h-212zM70 -36v803h211v-307h145q57 0 122 -38q108 -63 108 -198q0 -132 -88 -205q-66 -55 -136 -55h-362zM427 293h-146v-163h146v163z" />
-    <glyph glyph-name="afii10046" unicode="&#x42c;" 
+    <glyph glyph-name="uni042C" unicode="&#x42c;" 
 d="M220 -36v803h213v-307h159q57 0 123 -38q108 -63 108 -198q0 -129 -88 -203q-68 -57 -137 -57h-378zM585 293h-152v-163h152v163z" />
-    <glyph glyph-name="afii10047" unicode="&#x42d;" 
+    <glyph glyph-name="uni042D" unicode="&#x42d;" 
 d="M207 -36v160h393v183h-336v161h336v138h-393v161h396q92 0 163 -81q94 -108 94 -321q0 -215 -97 -322q-71 -79 -160 -79h-396z" />
-    <glyph glyph-name="afii10048" unicode="&#x42e;" 
+    <glyph glyph-name="uni042E" unicode="&#x42e;" 
 d="M590 -36q-65 0 -129 70q-87 96 -99 276h-83v-346h-207v803h207v-302h87q20 156 103 240q61 62 121 62h147q71 0 138 -81q92 -112 92 -321t-92 -320q-66 -81 -138 -81h-147zM754 611h-186v-492h186v492z" />
-    <glyph glyph-name="afii10049" unicode="&#x42f;" 
+    <glyph glyph-name="uni042F" unicode="&#x42f;" 
 d="M646 -36q-65 142 -66 332h-57q-40 -157 -131 -272q-45 -57 -83 -83l-137 82l137 277q-124 127 -124 244q0 92 73 165q58 58 86 58h451v-803h-149zM580 606h-146v-149h146v149z" />
-    <glyph glyph-name="afii10065" unicode="&#x430;" 
+    <glyph glyph-name="uni0430" unicode="&#x430;" 
 d="M379 -36q-63 0 -128 70q-77 83 -77 202q0 124 88 202q68 60 130 60h344v-346q67 15 140 15v-203h-497zM532 336h-144v-211h144v211z" />
-    <glyph glyph-name="afii10066" unicode="&#x431;" 
+    <glyph glyph-name="uni0431" unicode="&#x431;" 
 d="M424 -35q-62 0 -131 72q-81 84 -81 199v254q0 75 58 154q90 123 277 123h186v-167h-300v-102h127q61 0 133 -60q95 -78 95 -202q0 -115 -82 -199q-70 -72 -132 -72h-150zM564 339h-131v-215h131v215z" />
-    <glyph glyph-name="afii10067" unicode="&#x432;" 
+    <glyph glyph-name="uni0432" unicode="&#x432;" 
 d="M246 -35v533h304q84 0 144 -31q76 -41 76 -119q0 -60 -33 -101q60 -44 60 -114q0 -80 -59 -129q-46 -39 -93 -39h-399zM572 359h-139v-67h139v67zM572 174h-139v-71h139v71z" />
-    <glyph glyph-name="afii10068" unicode="&#x433;" 
+    <glyph glyph-name="uni0433" unicode="&#x433;" 
 d="M277 -35v533h493v-167h-281v-366h-212z" />
-    <glyph glyph-name="afii10069" unicode="&#x434;" 
+    <glyph glyph-name="uni0434" unicode="&#x434;" 
 d="M625 -119v83h-280v-83h-193v241h59l57 376h489v-376h61v-241h-193zM559 344h-113l-10 -67q-14 -94 -41 -155h164v222z" />
-    <glyph glyph-name="afii10070" unicode="&#x435;" 
+    <glyph glyph-name="uni0435" unicode="&#x435;" 
 d="M403 -36q-63 0 -128 70q-76 83 -76 202q0 124 88 202q68 61 129 61h156q61 0 130 -61q87 -78 87 -202v-54h-376v-57h330v-161h-340zM576 340h-163v-52h163v52z" />
-    <glyph glyph-name="afii10071" unicode="&#x451;" 
+    <glyph glyph-name="uni0451" unicode="&#x451;" 
 d="M532 611v176h186v-176h-186zM276 611v176h186v-176h-186zM403 -36q-63 0 -128 70q-76 83 -76 202q0 124 88 202q68 61 129 61h156q61 0 130 -61q87 -78 87 -202v-54h-376v-57h330v-161h-340zM576 340h-163v-52h163v52z" />
-    <glyph glyph-name="afii10072" unicode="&#x436;" 
+    <glyph glyph-name="uni0436" unicode="&#x436;" 
 d="M774 -57q-72 74 -102 190h-74v-168h-196v168h-74q-30 -116 -102 -190l-124 73l83 258h38q-17 38 -17 64q0 15 -3 28q-36 -26 -97 -26h-3v158h236l24 -224h39v224h196v-224h39l24 224h236v-158h-3q-61 0 -97 26q-3 -13 -3 -28q0 -26 -17 -64h38l83 -258z" />
-    <glyph glyph-name="afii10073" unicode="&#x437;" 
+    <glyph glyph-name="uni0437" unicode="&#x437;" 
 d="M444 234l77 107h-283v122q126 45 275 45q81 0 149 -26q94 -36 94 -106q0 -77 -81 -128q111 -46 111 -133q0 -78 -101 -123q-82 -36 -178 -36q-183 0 -276 54v118h291z" />
-    <glyph glyph-name="afii10074" unicode="&#x438;" 
+    <glyph glyph-name="uni0438" unicode="&#x438;" 
 d="M577 -35v206q-78 -133 -154 -206h-194v533h194v-310l154 310h194v-533h-194z" />
-    <glyph glyph-name="afii10075" unicode="&#x439;" 
+    <glyph glyph-name="uni0439" unicode="&#x439;" 
 d="M733 751q-15 -73 -77 -113q-61 -41 -156 -41q-91 0 -154 41q-64 41 -79 113l145 48q34 -64 88 -64q55 0 88 64zM577 -35v206q-78 -133 -154 -206h-194v533h194v-310l154 310h194v-533h-194z" />
-    <glyph glyph-name="afii10076" unicode="&#x43a;" 
+    <glyph glyph-name="uni043A" unicode="&#x43a;" 
 d="M681 -58q-78 88 -113 185h-141q-16 -101 -40 -162h-149v533h203v-224h62l18 224h272v-160h-3q-77 0 -116 26q1 -11 1 -26q0 -26 -17 -64h53l102 -259z" />
-    <glyph glyph-name="afii10077" unicode="&#x43b;" 
+    <glyph glyph-name="uni043B" unicode="&#x43b;" 
 d="M557 -35v372h-111q-26 -263 -120 -382l-144 27l77 516h504v-533h-206z" />
-    <glyph glyph-name="afii10078" unicode="&#x43c;" 
+    <glyph glyph-name="uni043C" unicode="&#x43c;" 
 d="M661 -35v187q-58 -84 -114 -140h-94q-56 56 -114 140v-187h-186v533h186l161 -296l161 296h186v-533h-186z" />
-    <glyph glyph-name="afii10079" unicode="&#x43d;" 
+    <glyph glyph-name="uni043D" unicode="&#x43d;" 
 d="M564 -35v198h-128v-198h-204v533h204v-178h128v178h204v-533h-204z" />
-    <glyph glyph-name="afii10080" unicode="&#x43e;" 
+    <glyph glyph-name="uni043E" unicode="&#x43e;" 
 d="M419 -36q-66 0 -140 72q-87 85 -87 200q0 124 101 202q77 60 142 60h130q65 0 142 -60q101 -78 101 -202q0 -115 -87 -200q-74 -72 -140 -72h-162zM569 338h-139v-213h139v213z" />
-    <glyph glyph-name="afii10081" unicode="&#x43f;" 
+    <glyph glyph-name="uni043F" unicode="&#x43f;" 
 d="M564 -35v372h-128v-372h-204v533h536v-533h-204z" />
-    <glyph glyph-name="afii10082" unicode="&#x440;" 
+    <glyph glyph-name="uni0440" unicode="&#x440;" 
 d="M447 52q-19 -103 -51 -170h-135v616h338q61 0 124 -47q84 -63 84 -171q0 -113 -73 -177q-58 -51 -123 -51h-164zM605 346h-145v-141h145v141z" />
-    <glyph glyph-name="afii10083" unicode="&#x441;" 
+    <glyph glyph-name="uni0441" unicode="&#x441;" 
 d="M419 -36q-63 0 -128 70q-77 83 -77 202q0 124 87 202q68 61 129 61h292v-162h-295v-212h295v-161h-303z" />
-    <glyph glyph-name="afii10084" unicode="&#x442;" 
+    <glyph glyph-name="uni0442" unicode="&#x442;" 
 d="M396 -35v370h-167v163h542v-163h-167v-370h-208z" />
-    <glyph glyph-name="afii10085" unicode="&#x443;" 
+    <glyph glyph-name="uni0443" unicode="&#x443;" 
 d="M558 82q-34 -6 -75 -6q-130 0 -202 62q-58 51 -58 115v245h203v-274h132v274h195v-395q0 -72 -66 -132q-96 -88 -290 -88v150h161v49z" />
-    <glyph glyph-name="afii10086" unicode="&#x444;" 
+    <glyph glyph-name="uni0444" unicode="&#x444;" 
 d="M586 52q-18 -103 -50 -170h-135v170h-141q-63 0 -118 51q-70 64 -70 177q0 108 80 171q60 47 119 47h130v269h198v-269h130q59 0 119 -47q80 -63 80 -171q0 -113 -70 -177q-55 -51 -118 -51h-154zM734 346h-135l-1 -141h136v141zM401 346h-135v-141h135v141z" />
-    <glyph glyph-name="afii10087" unicode="&#x445;" 
+    <glyph glyph-name="uni0445" unicode="&#x445;" 
 d="M563 -36v180h-127v-180h-204v135q0 73 68 133q-68 64 -68 134v132h204v-177h127v177h205v-132q0 -74 -67 -133q67 -63 67 -134v-135h-205z" />
-    <glyph glyph-name="afii10088" unicode="&#x446;" 
+    <glyph glyph-name="uni0446" unicode="&#x446;" 
 d="M659 -119v84h-431v533h203v-376h129v376h204v-376h88v-241h-193z" />
-    <glyph glyph-name="afii10089" unicode="&#x447;" 
+    <glyph glyph-name="uni0447" unicode="&#x447;" 
 d="M552 -35v136h-8q-140 0 -231 65q-81 56 -81 124v208h205v-228h115v228h210v-533h-210z" />
-    <glyph glyph-name="afii10090" unicode="&#x448;" 
+    <glyph glyph-name="uni0448" unicode="&#x448;" 
 d="M118 -36v534h203v-381h77v381h204v-381h77v381h203v-534h-764z" />
-    <glyph glyph-name="afii10091" unicode="&#x449;" 
+    <glyph glyph-name="uni0449" unicode="&#x449;" 
 d="M766 -119v83h-660v534h203v-381h77v381h204v-381h77v381h204v-376h88v-241h-193z" />
-    <glyph glyph-name="afii10092" unicode="&#x44a;" 
+    <glyph glyph-name="uni044A" unicode="&#x44a;" 
 d="M296 -36v372h-179v162h383v-175h149q55 0 102 -24q88 -44 88 -153q0 -96 -63 -146q-46 -36 -98 -36h-382zM620 191h-120v-83h120v83z" />
-    <glyph glyph-name="afii10093" unicode="&#x44b;" 
+    <glyph glyph-name="uni044B" unicode="&#x44b;" 
 d="M678 -36v534h205v-534h-205zM117 -36v534h203v-175h128q52 0 97 -24q84 -44 84 -153q0 -96 -60 -146q-43 -36 -93 -36h-359zM421 191h-101v-83h101v83z" />
-    <glyph glyph-name="afii10094" unicode="&#x44c;" 
+    <glyph glyph-name="uni044C" unicode="&#x44c;" 
 d="M253 -36v534h204v-175h149q55 0 102 -24q88 -44 88 -153q0 -96 -63 -146q-46 -36 -98 -36h-382zM577 191h-120v-83h120v83z" />
-    <glyph glyph-name="afii10095" unicode="&#x44d;" 
+    <glyph glyph-name="uni044D" unicode="&#x44d;" 
 d="M234 -35v151h331v50h-289v134h289v48h-331v150h327q65 0 132 -60q85 -77 85 -202q0 -120 -74 -201q-64 -70 -130 -70h-340z" />
-    <glyph glyph-name="afii10096" unicode="&#x44e;" 
+    <glyph glyph-name="uni044E" unicode="&#x44e;" 
 d="M573 -36q-47 0 -100 52q-62 59 -81 149h-71v-200h-205v533h205v-180h74q23 85 92 138q55 42 98 42h141q56 0 119 -60q81 -78 81 -202q0 -119 -71 -202q-60 -70 -118 -70h-164zM720 340h-129v-217h129v217z" />
-    <glyph glyph-name="afii10097" unicode="&#x44f;" 
+    <glyph glyph-name="uni044F" unicode="&#x44f;" 
 d="M607 -35q-34 57 -49 177h-73q-40 -120 -144 -200l-128 68l89 167q-73 48 -73 148q0 89 76 136q61 37 144 37h306v-533h-148zM551 357h-119v-81h119v81z" />
     <glyph glyph-name="uni4E9C" unicode="&#x4e9c;" 
 d="M74 -44v124h244v105h-199v400h199v95h-219v125h800v-125h-218v-95h198v-400h-198v-105h243v-124h-850zM516 680h-33v-95h33v95zM714 460h-33v-150h33v150zM516 460h-33v-150h33v150zM318 460h-34v-150h34v150zM516 185h-33v-105h33v105z" />
@@ -23213,7 +23213,7 @@ d="M703 540v71l125 158h-106v68h138q20 0 43 -28q25 -30 25 -57q0 -62 -119 -141h131
 d="M653 655v186q164 -26 298 -125v-141zM653 424v183q177 -28 298 -117v-134z" />
     <glyph glyph-name="uni301F" unicode="&#x301f;" 
 d="M347 153q-177 28 -298 117v135l298 -69v-183zM347 -81q-164 26 -298 125v141l298 -80v-186z" />
-    <glyph glyph-name="afii61352" unicode="&#x2116;" 
+    <glyph glyph-name="uni2116" unicode="&#x2116;" 
 d="M847 -36v161h133v-161h-133zM611 -35q-42 0 -85 69q-52 82 -52 202q0 128 61 205q45 57 86 57h83q41 0 86 -57q61 -77 61 -205q0 -118 -52 -201q-44 -70 -85 -70h-103zM311 -36q-72 163 -136 383v-383h-134v803h134l136 -494v494h134v-803h-134zM708 343h-90v-223h90v223
 z" />
     <glyph glyph-name="uni33CD" unicode="&#x33cd;" 
@@ -24484,7 +24484,7 @@ d="M784 556l45 97h-120v68h89l23 48h-109v68h132q23 0 46 -21q25 -23 25 -52q0 -21 -
     <glyph glyph-name="uni3397" unicode="&#x3397;" 
 d="M921 14q-50 -60 -136 -60q-48 0 -87 23q-34 21 -60 63q-57 -54 -107 -88l-52 79v-67h-286q-51 0 -103 70q-62 83 -62 202q0 124 71 202q55 61 105 61l106 -1v269h169v-688l100 147q-9 60 -9 125q0 219 78 334q67 96 168 96q60 0 104 -44q49 -49 49 -131q0 -172 -208 -430
 l1 -53h180zM837 622h-99v-184zM327 125q-17 111 -17 204v8h-103v-212h120z" />
-    <glyph glyph-name="afii61289" unicode="&#x2113;" 
+    <glyph glyph-name="uni2113" unicode="&#x2113;" 
 d="M694 14q-52 -60 -146 -60q-108 0 -161 95q-81 -67 -142 -97l-80 85l165 220q-3 39 -3 78q0 230 84 349q67 97 175 97q62 0 107 -42q51 -49 51 -130q0 -183 -217 -423l1 -63h189zM607 622h-104v-168z" />
     <glyph glyph-name="uni3398" unicode="&#x3398;" 
 d="M920 14q-50 -60 -136 -60q-96 0 -150 93q-67 -61 -118 -95l-41 51l-74 -61q-63 84 -88 179h-82q-13 -93 -30 -157h-121v803h167v-452l-1 -14l118 216l143 -106q-53 -83 -119 -149h57l45 -136l88 108q-7 53 -7 117q0 220 78 334q66 96 167 96q60 0 104 -44q49 -49 49 -131
@@ -26887,7 +26887,7 @@ d="M367 305v184h-122v143h122v184h126v-184h125v-143h-125v-184h-126zM85 305v511h12
 d="M779 812h107v-181q0 -31 -35 -59q-37 -29 -84 -29q-88 0 -192 140v-159h-115v312h115l204 -155v131z" />
     <glyph glyph-name="uni00B3.vert" vert-adv-y="394" orientation="v" 
 d="M797 829h90v-181q0 -30 -26 -59q-30 -33 -71 -33q-30 0 -66 28q-31 -55 -97 -55q-106 0 -192 121l43 98l164 -67v152h90v-119l65 -26v141z" />
-    <glyph glyph-name="uni00B5.vert" vert-adv-y="639" orientation="v" 
+    <glyph glyph-name="mu.vert" vert-adv-y="639" orientation="v" 
 d="M291 298q-53 0 -114 46q-93 69 -93 202v64q-124 15 -214 44v150h748v-203h-375v-99h375v-204h-327z" />
     <glyph glyph-name="uni00B9.vert" vert-adv-y="394" orientation="v" 
 d="M459 607v151h312v77h115v-228h-427z" />

index.html

@@ -10,11 +10,40 @@
 <script type="text/javascript" src="languages/language-list.js"></script>
 <script type="text/javascript" src="universal_function.js"></script>
 <script type="text/javascript" src="script.js"></script>
+<script type="text/javascript">
+var solo = false;
+var teamObj = function(){
+	return [
+		[
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+		],
+		[
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+		],
+	];
+}
+var formation = {
+	title:"",
+	detail:"",
+	team:[
+		new teamObj(),//队伍A
+		new teamObj(),//队伍B
+	]
+};
+</script>
 </head>
 
 <body>
 	<div class="control-box">
-		<label class="languages-label"><select class="languages"></select></label>
+		<label class="languages-label"><select class="languages"></select></label><a href="solo.html" class="solo-link"></a>
 	</div>
 	<div class="formation-box">
 		<div class="title-box"><input type="text" class="title" placeholder="输入阵型标题" /></div>
@@ -126,6 +155,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -135,6 +165,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -144,6 +175,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -153,6 +185,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -162,6 +195,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -177,6 +211,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -186,6 +221,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -195,6 +231,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -204,6 +241,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -213,6 +251,7 @@
 							<div class="subproperty"></div>
 							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
 							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
 							<div class="level"></div>
 						</a>
 					</li>
@@ -317,18 +356,18 @@
 					</li>
 				</ul>
 			</div>
-			<div class="awoken-total-box">
-				<!--怪物觉醒-->
-				<ul class="m-awoken-ul">
-					<li class="awoken-count a-c-21 display-none"><span class="awoken-icon awoken-21"></span><span class="count"></span></li><!--SB-->
-					<li class="awoken-count a-c-28 display-none"><span class="awoken-icon awoken-28"></span><span class="count"></span></li><!--SX-->
-					<li class="awoken-count a-c-11 display-none"><span class="awoken-icon awoken-11"></span><span class="count"></span></li><!--防暗-->
-					<li class="awoken-count a-c-12 display-none"><span class="awoken-icon awoken-12"></span><span class="count"></span></li><!--防废-->
-					<li class="awoken-count a-c-13 display-none"><span class="awoken-icon awoken-13"></span><span class="count"></span></li><!--防毒-->
-					<li class="awoken-count a-c-54 display-none"><span class="awoken-icon awoken-54"></span><span class="count"></span></li><!--防云-->
-					<li class="awoken-count a-c-55 display-none"><span class="awoken-icon awoken-55"></span><span class="count"></span></li><!--防封条-->
-				</ul>
-			</div>
+		</div>
+		<div class="awoken-total-box">
+			<!--怪物觉醒-->
+			<ul class="awoken-ul">
+				<li class="awoken-count a-c-21 display-none"><span class="awoken-icon awoken-21"></span><span class="count"></span></li><!--SB-->
+				<li class="awoken-count a-c-28 display-none"><span class="awoken-icon awoken-28"></span><span class="count"></span></li><!--SX-->
+				<li class="awoken-count a-c-11 display-none"><span class="awoken-icon awoken-11"></span><span class="count"></span></li><!--防暗-->
+				<li class="awoken-count a-c-12 display-none"><span class="awoken-icon awoken-12"></span><span class="count"></span></li><!--防废-->
+				<li class="awoken-count a-c-13 display-none"><span class="awoken-icon awoken-13"></span><span class="count"></span></li><!--防毒-->
+				<li class="awoken-count a-c-54 display-none"><span class="awoken-icon awoken-54"></span><span class="count"></span></li><!--防云-->
+				<li class="awoken-count a-c-55 display-none"><span class="awoken-icon awoken-55"></span><span class="count"></span></li><!--防封条-->
+			</ul>
 		</div>
 		<div class="detail-box"><textarea class="detail" placeholder="输入说明"></textarea></div>
 	</div>
@@ -355,7 +394,7 @@
 		<div class="setting-box">
 			<div class="setting-row row-mon-awoken">
 				<!--怪物觉醒-->
-				<ul class="m-awoken-ul">
+				<ul class="awoken-ul">
 					<li class="awoken-icon awoken-count"></li>
 					<li class="awoken-icon"></li>
 					<li class="awoken-icon"></li>
@@ -368,6 +407,20 @@
 					<li class="awoken-icon"></li>
 				</ul>
 			</div>
+			<div class="setting-row row-mon-super-awoken">
+				<!--怪物超觉醒-->
+				<ul class="awoken-ul">
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+				</ul>
+			</div>
 			<div class="setting-row row-mon-level">
 				<!--怪物等级-->
 				<input type="number" class="m-level" min=1 max=110/>
@@ -393,19 +446,19 @@
 					<li class="latent-icon"></li>
 				</ul>
 				<ul class="m-latent-allowable-ul">
-					<li class="latent-icon latent-icon-17" value="17"></li>
-					<li class="latent-icon latent-icon-18" value="18"></li>
-					<li class="latent-icon latent-icon-19" value="19"></li>
-					<li class="latent-icon latent-icon-20" value="20"></li>
-					<li class="latent-icon latent-icon-21" value="21"></li>
-					<li class="latent-icon latent-icon-22" value="22"></li>
-					<li class="latent-icon latent-icon-23" value="23"></li>
-					<li class="latent-icon latent-icon-24" value="24"></li>
-					<li class="latent-icon latent-icon-13" value="13"></li>
-					<li class="latent-icon latent-icon-14" value="14"></li>
-					<li class="latent-icon latent-icon-15" value="15"></li>
-					<li class="latent-icon latent-icon-16" value="16"></li>
-					<li class="latent-icon latent-icon-11" value="11"></li>
+					<li class="latent-icon latent-icon-17" value="17"></li><!--神杀-->
+					<li class="latent-icon latent-icon-18" value="18"></li><!--龙杀-->
+					<li class="latent-icon latent-icon-19" value="19"></li><!--恶魔杀-->
+					<li class="latent-icon latent-icon-20" value="20"></li><!--机械杀-->
+					<li class="latent-icon latent-icon-21" value="21"></li><!--平衡杀-->
+					<li class="latent-icon latent-icon-22" value="22"></li><!--攻击杀-->
+					<li class="latent-icon latent-icon-23" value="23"></li><!--体力杀-->
+					<li class="latent-icon latent-icon-24" value="24"></li><!--回复杀-->
+					<li class="latent-icon latent-icon-13" value="13"></li><!--进化杀-->
+					<li class="latent-icon latent-icon-14" value="14"></li><!--觉醒杀-->
+					<li class="latent-icon latent-icon-15" value="15"></li><!--强化杀-->
+					<li class="latent-icon latent-icon-16" value="16"></li><!--卖钱杀-->
+					<li class="latent-icon latent-icon-11" value="11"></li><!--防坐-->
 				</ul>
 			</div>
 			

languages/en.css

@@ -48,6 +48,9 @@
 .edit-box .setting-box .row-mon-awoken::before{
 	content: "▼Monster Awoken";
 }
+.edit-box .setting-box .row-mon-super-awoken::before{
+	content: "▼Super Awoken";
+}
 .edit-box .setting-box .row-mon-plus::before{
 	content: "▼Monster Plus";
 }
@@ -128,4 +131,10 @@
 }
 .type-name-15::after{
 	content: "Redeemable";
+}
+.control-box .solo-link::before{
+	content: "Jump To Solo Mode";
+}
+.control-box .multi-link::before{
+	content: "Jump To 2-Player Mode";
 }

languages/en.js

@@ -1,4 +1,4 @@
-document.title = 'P&D Dash Formation Maker';
+document.title = solo?'P&D Solo Formation Maker':'P&D Dash Formation Maker';
 var txtTitle = document.querySelector(".title-box .title");
 var txtDetail = document.querySelector(".detail-box .detail");
 txtTitle.placeholder = "Input Formation Title";

languages/ja.css

@@ -47,6 +47,9 @@
 .edit-box .setting-box .row-mon-awoken::before{
 	content: "▼モンスター覚醒";
 }
+.edit-box .setting-box .row-mon-super-awoken::before{
+	content: "▼モンスター超覚醒";
+}
 .edit-box .setting-box .row-mon-plus::before{
 	content: "▼モンスタープラス";
 }
@@ -121,4 +124,10 @@
 }
 .type-name-15::after{
 	content: "売却用";
+}
+.control-box .solo-link::before{
+	content: "ソロゲームに移動";
+}
+.control-box .multi-link::before{
+	content: "2人協力のゲームに移動";
 }

languages/ja.js

@@ -1,4 +1,4 @@
-document.title = 'パズル＆ドラゴンズ周回チーム制作ツール';
+document.title = solo?'パズル＆ドラゴンズソロチーム制作ツール':'パズル＆ドラゴンズ協力周回チーム制作ツール';
 var txtTitle = document.querySelector(".title-box .title");
 var txtDetail = document.querySelector(".detail-box .detail");
 txtTitle.placeholder = "入力フォーメーションのタイトル";

languages/ko.css

@@ -47,6 +47,9 @@
 .edit-box .setting-box .row-mon-awoken::before{
 	content: "▼몬스터 각성";
 }
+.edit-box .setting-box .row-mon-super-awoken::before{
+	content: "▼몬스터 슈퍼 각성";
+}
 .edit-box .setting-box .row-mon-plus::before{
 	content: "▼몬스터 플러스";
 }
@@ -122,3 +125,9 @@
 .type-name-15::after{
 	content: "매각용";
 }
+.control-box .solo-link::before{
+	content: "싱글 플레이어 게임으로 이동";
+}
+.control-box .multi-link::before{
+	content: "2인 게임으로 이동";
+}

languages/ko.js

@@ -1,4 +1,4 @@
-document.title = '퍼즐앤드래곤 팀 생산 도구';
+document.title = solo?'퍼즐앤드래곤 솔로 팀 제작 도구':'퍼즐앤드래곤 멀티 팀 제작 도구';
 var txtTitle = document.querySelector(".title-box .title");
 var txtDetail = document.querySelector(".detail-box .detail");
 txtTitle.placeholder = "편대 칭호 입력";

languages/zh-TW.css

@@ -47,6 +47,9 @@
 .edit-box .setting-box .row-mon-awoken::before{
 	content: "▼怪物覺醒";
 }
+.edit-box .setting-box .row-mon-super-awoken::before{
+	content: "▼超覺醒";
+}
 .edit-box .setting-box .row-mon-plus::before{
 	content: "▼怪物加值";
 }
@@ -124,4 +127,10 @@
 }
 .control-box .languages-label::before{
 	content: "語言：";
+}
+.control-box .solo-link::before{
+    content: "轉到單人遊戲";
+}
+.control-box .multi-link::before{
+    content: "轉到2人車隊";
 }

languages/zh-TW.js

@@ -1,4 +1,4 @@
-document.title = '龍族拼圖車隊陣型圖製作工具';
+document.title = solo?'龍族拼圖單人陣型圖製作工具':'龍族拼圖車隊陣型圖製作工具';
 var txtTitle = document.querySelector(".title-box .title");
 var txtDetail = document.querySelector(".detail-box .detail");
 txtTitle.placeholder = "輸入陣型標題";

languages/zh.css

@@ -47,6 +47,9 @@
 .edit-box .setting-box .row-mon-awoken::before{
 	content: "▼怪物觉醒";
 }
+.edit-box .setting-box .row-mon-super-awoken::before{
+	content: "▼超觉醒";
+}
 .edit-box .setting-box .row-mon-plus::before{
 	content: "▼怪物加值";
 }
@@ -124,4 +127,10 @@
 }
 .control-box .languages-label::before{
 	content: "语言：";
+}
+.control-box .solo-link::before{
+	content: "转到单人游戏";
+}
+.control-box .multi-link::before{
+	content: "转到2人车队";
 }

languages/zh.js

@@ -1 +1 @@
-
+document.title = solo?'智龙迷城单人阵型图制作工具':'智龙迷城车队阵型图制作工具';

monsters-info/README.md

@@ -6,9 +6,9 @@ The current acquisition time is
 
 | 语言 | 时间 | API |
 | --- | --- | --- |
-| 日语(ja) | 2019-6-14 17:40 | https://api-adrv2.padsv.gungho.jp/api.php?action=download_card_data |
-| 英语(en) | 2019-6-14 15:20 | https://api-na-adrv2.padsv.gungho.jp/api.php?action=download_card_data |
-| 韩语(ko) | 2019-6-14 15:20 | https://api-kr-adrv2.padsv.gungho.jp/api.php?action=download_card_data |
+| 日语(ja) | 2019-6-21 15:00 | https://api-adrv2.padsv.gungho.jp/api.php?action=download_card_data |
+| 英语(en) | 2019-6-21 14:00 | https://api-na-adrv2.padsv.gungho.jp/api.php?action=download_card_data |
+| 韩语(ko) | 2019-6-21 14:00 | https://api-kr-adrv2.padsv.gungho.jp/api.php?action=download_card_data |
 
 经研究后得出如下结论，JSON里数字指的数组下标。  
 The following conclusions were drawn from the research. The number in JSON refers to the array subscript.(no translate)
@@ -55,3 +55,5 @@ node.exe extractByNode.js
 会将几种语言的信息提取到一个文件内  
 Extract information from several languages into one file  
 `mon.json`
+
+运行`提取中文数据.bat`，将战友网页面内容抽出，再使用Win64版exe`opencc`来繁转简。

monsters-info/extractByNode.js

@@ -1,40 +1,31 @@
 var fs = require('fs');
+var officialAPI = ["ja","en","ko"]; //来源于官方API
+var custom = ["cht","chs"]; //来源于自定义文件
 
-console.log('正在读取日文怪物信息');
-var ja_json = fs.readFileSync("./ja.json", 'utf-8'); //使用同步读取
-var ja = JSON.parse(ja_json);//将字符串转换为json对象
-var msja = ja.card;
-console.log('正在读取英文怪物信息');
-var en_json = fs.readFileSync("./en.json", 'utf-8'); //使用同步读取
-var en = JSON.parse(en_json);//将字符串转换为json对象
-var msen = en.card;
-console.log('正在读取韩文怪物信息');
-var ko_json = fs.readFileSync("./ko.json", 'utf-8'); //使用同步读取
-var ko = JSON.parse(ko_json);//将字符串转换为json对象
-var msko = ko.card;
-var mArr = [];
+var cards = officialAPI.map(function(code){
+	console.log("正在读取官方 " + code + " 信息");
+	var json = fs.readFileSync("official-API/" + code +".json", 'utf-8'); //使用同步读取
+	var card = JSON.parse(json).card;//将字符串转换为json对象
+	return card;
+})
 
-for (var mi=0;mi<msja.length;mi++)
+var mainCard = cards[0]; //数据的主要card
+var mArr = []; //储存输出内容
+for (var mi=0;mi<mainCard.length;mi++)
 {
-	var m = msja[mi],m2 = msen[mi],m3 = msko[mi];
+	var m = mainCard[mi];
 	if (m[0] != mi) //id超了，都是些怪物了
 	{
 		break;
 	}else
 	{
-		if (m2[0] != m[0]){m2 = null;} //ID不一致时则没有内容
-		if (m3[0] != m[0]){m3 = null;} //ID不一致时则没有内容
-
 		//名字
-		var nameObj = {
-			ja:m[1],
-			//en:((m2 && !/^\*+/.test(m2[1]))?m2[1]:""), //没有数据，或者名字是星号都为空
-			//ko:((m3 && !/^\*+/.test(m3[1]))?m3[1]:""),
-		}
-		if (m2 && !/^\*+/.test(m2[1]))
-			nameObj.en = m2[1];
-		if (m3 && !/^\*+/.test(m3[1]))
-			nameObj.en = m3[1];
+		var nameObj = {};
+		officialAPI.forEach(function(code,idx){
+			var _m = cards[idx][mi];
+			if (_m && !/^\*+/.test(_m[1])) //没有数据，或者名字是星号，则为空
+				nameObj[code] = _m[1];
+		})
 
 		//类型
 		var type = [m[5]];
@@ -45,6 +36,7 @@ for (var mi=0;mi<msja.length;mi++)
 
 		var awokenCIdx = 58+m[57]*3; //awoken Count Index
 		var awoken = m.slice(awokenCIdx+1,awokenCIdx+1+m[awokenCIdx]);
+		var superAwoken = m[awokenCIdx+1+m[awokenCIdx]].split(",").map(function(ns){return parseInt(ns);}); //超觉醒
 
 		var mon = {
 			id:	m[0],
@@ -53,25 +45,29 @@ for (var mi=0;mi<msja.length;mi++)
 			type: type,
 			rare: m[7],
 			awoken: awoken,
-			maxLevel: m[m.length-3]>0?110:m[10],
+			maxLv: m[m.length-3]>0?110:m[10],
 			assist: (m[m.length-5]>2 && [303,305,307,600,602].indexOf(m[0])<0)?1:0, //但是5种小企鹅是特殊情况
 		}
+		if (mon.maxLv>99 && superAwoken)
+		{
+			mon.sAwoken = superAwoken;
+		}
 		mArr.push(mon);
 	}
 }
 
+var cards_c = custom.map(function(code){
+	console.log("正在读取自定义 " + code + " 信息");
+	var json = fs.readFileSync("custom/" + code +".json", 'utf-8'); //使用同步读取
+	var card = JSON.parse(json);//将字符串转换为json对象
+	return card;
+})
 
-console.log('正在读取繁体中文怪物信息');
-var CHTtext = fs.readFileSync("CHT.json", 'utf-8'); //使用同步读取
-console.log('正在读取简体中文怪物信息');
-var CHStext = fs.readFileSync("CHS.json", 'utf-8'); //使用同步读取
-var CHT = JSON.parse(CHTtext);//将字符串转换为json对象
-var CHS = JSON.parse(CHStext);//将字符串转换为json对象
-
-CHT.forEach(function(cm,idx){
-	var m = mArr[cm.id];
-	m.name["cht"] = cm.name;
-	m.name["chs"] = CHS[idx].name;
+cards_c.forEach(function(card,cidx){ //每个文件循环
+	card.forEach(function(cm,idx){ //每个文件内的名字循环
+		var m = mArr[cm.id];
+		m.name[custom[cidx]] = cm.name;
+	});
 });
 
 var str = JSON.stringify(mArr);

monsters-info/extract_CHT.js

@@ -0,0 +1,59 @@
+var fs = require('fs');
+var sourceFolder = "Download-pad.skyozora.com/pad.skyozora.com";
+var outJSON = "custom/CHT.json";
+var path = require('path');//解析需要遍历的文件夹
+
+fs.access(outJSON,function(err){
+	var monArr;
+	if (err)
+	{
+		monArr = [];
+	}else
+	{
+		var monArr = JSON.parse(fs.readFileSync(outJSON, 'utf-8'));//读取繁体中文数据避免重复工作
+	}
+
+	//根据文件路径读取文件，返回文件列表
+	fs.readdir(sourceFolder,function(err,files){
+		if(err){
+			console.warn(err);
+		}else{
+			//遍历读取到的文件列表
+			files.forEach(function(filename){
+				var searchID = /^(\d+)\.html$/i.exec(filename);
+				if (searchID && !monArr.some(function(cn){return cn.id == searchID[1];}))
+				{
+					var filepath = path.join(sourceFolder, filename);//合并当前文件的路径
+					var htmlText = fs.readFileSync(filepath, 'utf-8'); //使用同步读取
+					var searchName = /<h2 .+>\s*?([\s\S]+)\s*?<\/h2>/igm.exec(htmlText);
+					try
+					{
+						var m = {
+							id:searchID[1],
+							name:searchName[1].replace("\n",""),
+						}
+						monArr.push(m);
+						if (monArr.length % 100 == 0)
+						{
+							console.log("已添加 " + monArr.length + " 个数据");
+						}
+					}catch(e)
+					{
+						console.log(filename,e)
+					}
+				}
+			});
+			monArr.sort(function(a,b){
+				return a.id - b.id;
+			})
+			var str = JSON.stringify(monArr);
+			fs.writeFile(outJSON,str,function(err){
+				if(err){
+					console.error(err);
+				}
+				console.log("---繁体中文导出成功，共 " + monArr.length + " 个名称---");
+			})
+		}
+	});
+})
+

monsters-info/official-API/test-mon.html

@@ -0,0 +1,98 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>代码测试</title>
+<script type="text/javascript">
+var card;
+var mid;
+var GM_xmlhttpRequest = function(GM_param) {
+	var xhr = new XMLHttpRequest(); //创建XMLHttpRequest对象
+	xhr.open(GM_param.method, GM_param.url, true);
+	if (GM_param.responseType) xhr.responseType = GM_param.responseType;
+	if (GM_param.overrideMimeType) xhr.overrideMimeType(GM_param.overrideMimeType);
+	xhr.onreadystatechange = function() //设置回调函数
+		{
+			if (xhr.readyState === xhr.DONE) {
+				if (xhr.status === 200 && GM_param.onload)
+					GM_param.onload(xhr);
+				if (xhr.status !== 200 && GM_param.onerror)
+					GM_param.onerror(xhr);
+			}
+		}
+	for (var header in GM_param.headers) {
+		xhr.setRequestHeader(header, GM_param.headers[header]);
+	}
+	xhr.send(GM_param.data ? GM_param.data : null);
+}
+function g(id)
+{
+	var m = card[id];
+	var pn = ["火","水","木","光","暗"];
+	var p = [pn[m[2]]||"无", pn[m[3]]||"无"];
+	var tn = ["0进化","1平衡","2体力","3回复","4龙","5神","6攻击","7恶魔","8机械","9","10","11","12觉醒","13","14强化","15卖钱"];
+	var type = [];
+	type.push(tn[m[5]]);
+	if (m[6]!=-1) //第二个type
+		type.push(tn[m[6]]);
+	if (m[m.length-9]!=-1) //第三个type要倒着来
+		type.push(tn[m[m.length-9]]);
+	console.log("%oNo.%d %s [%s/%s]，Lv%d，%s究极退化为%d，类型：%s，%d星，COST%d，%s个觉醒，三维%s，110级增长%d%%，%s当二技，1级吃经验%d，1级卖￥%d，%dMP，成长类型%d，升2级经验%d，技能编号%d，队长%d",
+		m, //对象
+		m[0], //ID
+		m[1], //名字
+		p[0],p[1], //属性
+		m[10], //最大等级
+		m[4]?"可":"不可", //可退化？
+		m[40], //可退化？
+		type.join("|"), //类型
+		m[7], //星级
+		m[8], //cost
+		m[58+m[57]*3], //觉醒数
+		m[14]+"-"+m[15]+"/"+m[14]+"-"+m[17]+"/"+m[20]+"-"+m[21], //三维
+		m[m.length-3], //110级增长
+		m[m.length-5]>2?"能":"不能", //二技
+		Math.round(m[11]/4), //1级经验，每级，直接乘
+		Math.round(m[13]/10), //1级卖钱
+		m[m.length-8], //MP
+		m[23], //成长类型
+		Math.round(m[23] * Math.pow((2 - 1) / 98,m[24])), //1级升2级经验
+		m[25], //技能编号
+		m[26] //队长技能编号
+	);
+}
+GM_xmlhttpRequest({
+	method: "GET",
+	url:"ja.json",
+	onload: function(response) {
+		card = JSON.parse(response.response).card;
+		/*
+		var ts = card.filter(function(m){
+			return [9,10,11,13].indexOf(m[5])>=0;
+		})
+		console.log(ts);
+		*/
+		/*
+		console.log(card.sort(function(a,b){
+			return  b[b.length-3] - a[a.length-3];
+		}));
+		g(0);
+		*/
+	},
+	onerror: function(response) {
+		console.error("怪物数据获取错误",response);
+	}
+});
+</script>
+</head>
+
+<body>
+<script type="text/javascript">
+window.onload = function()
+{
+	mid = document.querySelector("#mid");
+}
+</script>
+<input type="number" id="mid"><input type="button" value="测试" onclick="g(parseInt(mid.value));">
+</body>
+</html>

monsters-info/official-API/test-skill.html

@@ -0,0 +1,58 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>代码测试</title>
+<script type="text/javascript">
+var skill;
+var mid;
+var GM_xmlhttpRequest = function(GM_param) {
+	var xhr = new XMLHttpRequest(); //创建XMLHttpRequest对象
+	xhr.open(GM_param.method, GM_param.url, true);
+	if (GM_param.responseType) xhr.responseType = GM_param.responseType;
+	if (GM_param.overrideMimeType) xhr.overrideMimeType(GM_param.overrideMimeType);
+	xhr.onreadystatechange = function() //设置回调函数
+		{
+			if (xhr.readyState === xhr.DONE) {
+				if (xhr.status === 200 && GM_param.onload)
+					GM_param.onload(xhr);
+				if (xhr.status !== 200 && GM_param.onerror)
+					GM_param.onerror(xhr);
+			}
+		}
+	for (var header in GM_param.headers) {
+		xhr.setRequestHeader(header, GM_param.headers[header]);
+	}
+	xhr.send(GM_param.data ? GM_param.data : null);
+}
+function g(id)
+{
+	var m = skill[id];
+	console.log("%oCD:%s",
+		m, //对象
+		m[4] + "-" + (m[4]-m[3]+1), //技能CD
+	);
+}
+GM_xmlhttpRequest({
+	method: "GET",
+	url:"ja-skill.json",
+	onload: function(response) {
+		skill = JSON.parse(response.response).skill;
+	},
+	onerror: function(response) {
+		console.error("怪物数据获取错误",response);
+	}
+});
+</script>
+</head>
+
+<body>
+<script type="text/javascript">
+window.onload = function()
+{
+	mid = document.querySelector("#mid");
+}
+</script>
+<input type="number" id="mid"><input type="button" value="测试" onclick="g(parseInt(mid.value));">
+</body>
+</html>

monsters-info/提取中文数据.bat

@@ -0,0 +1,7 @@
+@echo off
+echo 开始提取网页数据
+node.exe extract_CHT.js
+echo 正在将繁体中文转换为简体中文
+opencc\opencc.exe -i custom\CHT.json -o custom\CHS.json -c opencc\t2s.json
+echo 转换完成
+pause

script.js

@@ -1,37 +1,11 @@
 var ms = null;
 var language = null;
 var memberTeamObj = function(){
-	return {id:0,level:0,awoken:0,plus:[0,0,0],latent:[]};
+	return {id:0,level:0,awoken:0,plus:[0,0,0],latent:[]}; //sawoken作为可选项目，默认不在内
 }
 var memberAssistObj = function(){
 	return {id:0,level:0,awoken:0,plus:[0,0,0]};
 }
-var teamObj = function(){
-	return [
-		[
-			{id:0},
-			{id:0},
-			{id:0},
-			{id:0},
-			{id:0},
-		],
-		[
-			{id:0},
-			{id:0},
-			{id:0},
-			{id:0},
-			{id:0},
-		],
-	];
-}
-var formation = {
-	title:"",
-	detail:"",
-	team:[
-		new teamObj(),//队伍A
-		new teamObj(),//队伍B
-	]
-};
 window.onload = function()
 {
 	//添加语言列表
@@ -62,7 +36,7 @@ window.onload = function()
 
 	GM_xmlhttpRequest({
 		method: "GET",
-		url:"monsters-info/mon.json?ver=2",
+		url:"monsters-info/mon.json",
 		onload: function(response) {
 			ms = JSON.parse(response.response);
 			initialize();//初始化
@@ -138,6 +112,8 @@ function initialize()
 			return ln?(ln.length>0):false;
 		}).join(" | ");
 	});
+	//控制框
+	var controlBox = document.querySelector(".control-box");
 
 	//标题和介绍文本框
 	var txtTitle = document.querySelector(".title-box .title");
@@ -168,10 +144,12 @@ function initialize()
 	editBox.show = function(){
 		editBox.classList.remove("display-none");
 		formationBox.classList.add("blur-bg");
+		controlBox.classList.add("blur-bg");
 	}
 	editBox.hide = function(){
 		editBox.classList.add("display-none");
 		formationBox.classList.remove("blur-bg");
+		controlBox.classList.remove("blur-bg");
 	}
 
 	var settingBox = editBox.querySelector(".setting-box")
@@ -185,7 +163,7 @@ function initialize()
 	}
 	monstersSearch.oninput = monstersSearch.onchange;
 	//觉醒
-	var monEditAwokens = Array.prototype.slice.call(settingBox.querySelectorAll(".m-awoken-ul>.awoken-icon"));
+	var monEditAwokens = Array.prototype.slice.call(settingBox.querySelectorAll(".row-mon-awoken .awoken-ul .awoken-icon"));
 	monEditAwokens.forEach(function(akDom,idx,domArr){
 		akDom.onclick = function(){
 			if (idx>0 && idx>=domArr.filter(function(d){return !d.classList.contains("display-none")}).length-1)
@@ -196,17 +174,33 @@ function initialize()
 			{
 				if(ai<=idx)
 				{
-					if(domArr[ai].classList.contains("unselected-awoken"))
-						domArr[ai].classList.remove("unselected-awoken");
+					domArr[ai].classList.remove("unselected-awoken");
 				}
 				else
 				{
-					if(!domArr[ai].classList.contains("unselected-awoken"))
-						domArr[ai].classList.add("unselected-awoken");
+					domArr[ai].classList.add("unselected-awoken");
 				}
 			}
 		}
 	})
+	//超觉醒
+	var monEditSAwokens = Array.prototype.slice.call(settingBox.querySelectorAll(".row-mon-super-awoken .awoken-ul .awoken-icon"));
+	monEditSAwokens.forEach(function(akDom,idx,domArr){
+		akDom.onclick = function(){
+			for(var ai=0;ai<domArr.length;ai++)
+			{
+				if(ai==idx)
+				{
+					domArr[ai].classList.toggle("unselected-awoken");
+				}
+				else
+				{
+					domArr[ai].classList.add("unselected-awoken");
+				}
+			}
+		}
+	})
+
 	//等级
 	var monEditLv = settingBox.querySelector(".m-level");
 	var monEditLvMax = settingBox.querySelector(".m-level-btn-max");
@@ -298,6 +292,23 @@ function initialize()
 		mD.awoken = monEditAwokens.filter(function(akDom){
 			return !akDom.classList.contains("unselected-awoken") && !akDom.classList.contains("display-none") 
 		}).length - 1;
+		if (ms[mD.id].sAwoken) //如果支持超觉醒
+		{
+			mD.sawoken = -1;
+			for (var sai = 0;sai<monEditSAwokens.length;sai++)
+			{
+				
+				if (
+					!monEditSAwokens[sai].classList.contains("unselected-awoken") &&
+					!monEditSAwokens[sai].classList.contains("display-none")
+				)
+				{
+					mD.sawoken = sai;
+					break;
+				}
+			}
+		}
+		
 		if (ms[mD.id].type.some(function(t){return t == 0 || t == 12 || t == 14 || t == 15;}) && [303,305,307,600,602].indexOf(mD.id)<0)
 		{ //当4种特殊type的时候是无法297和打觉醒的，但是5种小企鹅可以
 			mD.plus = [0,0,0]; 
@@ -313,18 +324,21 @@ function initialize()
 		}
 
 		changeid(mD,editBox.monsterBox,editBox.latentBox);
+		refreshAwokenCount(formation.team);
 		creatNewUrl();
 		editBox.hide();
 	}
 	btnNull.onclick = function(){
 		var mD = formation.team[editBox.memberIdx[0]][editBox.memberIdx[1]][editBox.memberIdx[2]] = {id:0};
 		changeid(mD,editBox.monsterBox,editBox.latentBox);
+		refreshAwokenCount(formation.team);
 		creatNewUrl();
 		editBox.hide();
 	}
 	btnDelay.onclick = function(){ //应对威吓
 		var mD = formation.team[editBox.memberIdx[0]][editBox.memberIdx[1]][editBox.memberIdx[2]] = {id:-1};
 		changeid(mD,editBox.monsterBox,editBox.latentBox);
+		refreshAwokenCount(formation.team);
 		creatNewUrl();
 		editBox.hide();
 	}
@@ -381,14 +395,14 @@ function changeid(mon,monDom,latentDom)
 	{
 		var levelDom = monDom.querySelector(".level");
 		levelDom.innerHTML = mon.level;
-		if (mon.level == 99 || (mon.level >= md.maxLevel && md.maxLevel <=99))
+		if (mon.level == 99 || (mon.level >= md.maxLv && md.maxLv <=99))
 		{
 			levelDom.classList.add("max");
 		}else
 		{
 			levelDom.classList.remove("max");
 		}
-		if (md.maxLevel>99 && mon.level>=99)
+		if (md.maxLv>99 && mon.level>=99)
 			levelDom.classList.add("_110");
 		else
 			levelDom.classList.remove("_110");
@@ -416,7 +430,19 @@ function changeid(mon,monDom,latentDom)
 					awokenIcon.classList.remove("allowable-assist");
 			}
 		}
-		refreshAwokenCount(formation.team);
+	}
+	var sawoken = monDom.querySelector(".super-awoken");
+	if (sawoken) //如果存在超觉醒的DOM且提供了超觉醒
+	{
+		if (mon.sawoken != undefined && mon.sawoken>=0)
+		{
+			var awokenIcon = sawoken.querySelector(".awoken-icon");
+			sawoken.classList.remove("display-none");
+			awokenIcon.className = "awoken-icon awoken-" + md.sAwoken[mon.sawoken];
+		}else
+		{
+			sawoken.classList.add("display-none");
+		}
 	}
 	if (mon.plus) //如果提供了加值
 	{
@@ -494,8 +520,12 @@ function editMon(AorB,isAssist,tempIdx)
 	monstersSearch.value = mD.id>0?mD.id:0;
 	monstersSearch.onchange();
 	var settingBox = editBox.querySelector(".setting-box");
-	var monEditAwokens = settingBox.querySelectorAll(".m-awoken-ul .awoken-icon");
+	//觉醒
+	var monEditAwokens = settingBox.querySelectorAll(".row-mon-awoken .awoken-ul .awoken-icon");
 	if (mD.awoken>0) monEditAwokens[mD.awoken].onclick();
+	//超觉醒
+	var monEditSAwokens = settingBox.querySelectorAll(".row-mon-super-awoken .awoken-ul .awoken-icon");
+	if (mD.sawoken>=0) monEditSAwokens[mD.sawoken].onclick();
 	var monEditLv = settingBox.querySelector(".m-level");
 	monEditLv.value = mD.level || 1;
 	var monEditAddHp = settingBox.querySelector(".m-plus-hp");
@@ -514,11 +544,13 @@ function editMon(AorB,isAssist,tempIdx)
 		editBox.refreshLatent(editBox.latent);
 		btnDelay.classList.add("display-none");
 		settingBox.querySelector(".row-mon-latent").classList.remove("display-none");
+		if (ms[mD.id].sAwoken)settingBox.querySelector(".row-mon-super-awoken").classList.remove("display-none");
 		editBox.querySelector(".edit-box-title").classList.remove("edit-box-title-assist");
 	}else
 	{
 		btnDelay.classList.remove("display-none");
 		settingBox.querySelector(".row-mon-latent").classList.add("display-none");
+		settingBox.querySelector(".row-mon-super-awoken").classList.add("display-none");
 		editBox.querySelector(".edit-box-title").classList.add("edit-box-title-assist");
 	}
 }
@@ -554,7 +586,7 @@ function editBoxChangeMonId(id)
 	}
 
 	var settingBox = editBox.querySelector(".setting-box");
-	var mAwoken = settingBox.querySelectorAll(".m-awoken-ul li");
+	var mAwoken = settingBox.querySelectorAll(".row-mon-awoken .awoken-ul li");
 	mAwoken[0].innerHTML = md.awoken.length?"★":"0";
 	for (var ai=1;ai<mAwoken.length;ai++)
 	{
@@ -567,10 +599,30 @@ function editBoxChangeMonId(id)
 		}
 	}
 
+	//超觉醒
+	var mSAwokenRow = settingBox.querySelector(".row-mon-super-awoken");
+	var mSAwoken = mSAwokenRow.querySelectorAll(".awoken-ul li");
+	if (md.sAwoken)
+	{
+		mSAwokenRow.classList.remove("display-none");
+		for (var ai=0;ai<mSAwoken.length;ai++)
+		{
+			if (ai < md.sAwoken.length)
+				mSAwoken[ai].className = "awoken-icon unselected-awoken awoken-" + md.sAwoken[ai];
+			else
+				mSAwoken[ai].className = "display-none";
+		}
+	}else
+	{
+		console.log(mSAwokenRow.classList);
+		mSAwokenRow.classList.add("display-none");
+		console.log(mSAwokenRow.classList);
+	}
+
 	var monEditLvMax = settingBox.querySelector(".m-level-btn-max");
-	monEditLvMax.innerHTML = monEditLvMax.value = md.maxLevel;
+	monEditLvMax.innerHTML = monEditLvMax.value = md.maxLv;
 	var monEditLv = settingBox.querySelector(".m-level");
-	monEditLv.value = md.maxLevel>99?99:md.maxLevel;
+	monEditLv.value = md.maxLv>99?99:md.maxLv;
 
 	var rowPlus =  settingBox.querySelector(".row-mon-plus");
 	var rowLatent =  settingBox.querySelector(".row-mon-latent");
@@ -632,29 +684,56 @@ function refreshAll(fmt){
 	var fATeam = formationA.querySelectorAll(".formation-team .monster");
 	var fALatents = formationA.querySelectorAll(".formation-latents .latent-ul");
 	var fAAssist = formationA.querySelectorAll(".formation-assist .monster");
-	var fBTeam = formationB.querySelectorAll(".formation-team .monster");
-	var fBLatents = formationB.querySelectorAll(".formation-latents .latent-ul");
-	var fBAssist = formationB.querySelectorAll(".formation-assist .monster");
-	for (var ti=0;ti<5;ti++)
+	if (formationB)
+	{
+		var fBTeam = formationB.querySelectorAll(".formation-team .monster");
+		var fBLatents = formationB.querySelectorAll(".formation-latents .latent-ul");
+		var fBAssist = formationB.querySelectorAll(".formation-assist .monster");
+	}
+	for (var ti=0;ti<(formationB?5:6);ti++)
 	{
 		changeid(fmt.team[0][0][ti],fATeam[ti],fALatents[ti]);
 		changeid(fmt.team[0][1][ti],fAAssist[ti]);
-		changeid(fmt.team[1][0][ti],fBTeam[ti],fBLatents[ti]);
-		changeid(fmt.team[1][1][ti],fBAssist[ti]);
+		if (formationB)
+		{
+			changeid(fmt.team[1][0][ti],fBTeam[ti],fBLatents[ti]);
+			changeid(fmt.team[1][1][ti],fBAssist[ti]);
+		}
 	}
 	refreshAwokenCount(fmt.team);
 }
 //刷新觉醒总计
 function refreshAwokenCount(team){
-	var awokenUL = document.querySelector(".awoken-total-box .m-awoken-ul");
+	var awokenUL = document.querySelector(".awoken-total-box .awoken-ul");
 	function setCount(idx,number){
 		var ali = awokenUL.querySelector(".a-c-" + idx);
+		if (!ali) return; //没有这个觉醒就撤回 
 		ali.querySelector(".count").innerHTML = number;
 		if (number)
 			ali.classList.remove("display-none");
 		else
 			ali.classList.add("display-none");
 	}
+	for (var ai=1;ai<=67;ai++)
+	{
+		if (ai == 10) //防封
+		{
+			setCount(ai,awokenCountInTeam(team,ai,solo)+awokenCountInTeam(team,52,solo)*2);
+		}else if (ai == 19) //手指
+		{
+			setCount(ai,awokenCountInTeam(team,ai,solo)+awokenCountInTeam(team,53,solo)*2);
+		}else if (ai == 21) //SB
+		{
+			setCount(ai,awokenCountInTeam(team,ai,solo)+awokenCountInTeam(team,56,solo)*2);
+		}else if (ai == 52 || ai == 53 || ai == 56) //大手指，大SB
+		{
+			continue;
+		}else
+		{
+			setCount(ai,awokenCountInTeam(team,ai,solo));
+		}
+	}
+	/*
 	setCount(21,awokenCountInTeam(team,21)+awokenCountInTeam(team,56)*2); //SB+大SB
 	setCount(28,awokenCountInTeam(team,28)); //SX
 	setCount(11,awokenCountInTeam(team,11)); //防暗
@@ -662,4 +741,5 @@ function refreshAwokenCount(team){
 	setCount(13,awokenCountInTeam(team,13)); //防毒
 	setCount(54,awokenCountInTeam(team,54)); //防云
 	setCount(55,awokenCountInTeam(team,55)); //防封条
+	*/
 }

solo.html

@@ -0,0 +1,434 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>智龙迷城车队阵型图制作工具</title>
+<meta name="viewport" content="width=664" />
+<link href="style.css" rel="stylesheet" type="text/css">
+<link href="style-monsterimages.css" rel="stylesheet" type="text/css">
+<link id="language-css" href="languages/zh.css" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="languages/language-list.js"></script>
+<script type="text/javascript" src="universal_function.js"></script>
+<script type="text/javascript" src="script.js"></script>
+<script type="text/javascript">
+var solo = true;
+var teamObj = function(){
+	return [
+		[
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+		],
+		[
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+			{id:0},
+		],
+	];
+}
+var formation = {
+	title:"",
+	detail:"",
+	team:[
+		new teamObj(),//队伍A
+	]
+};
+</script>
+<style type="text/css">
+.formation-A-bigbox::after{
+	display: none;
+}
+</style>
+</head>
+
+<body>
+	<div class="control-box">
+		<label class="languages-label"><select class="languages"></select></label><a href="index.html" class="multi-link"></a>
+	</div>
+	<div class="formation-box">
+		<div class="title-box"><input type="text" class="title" placeholder="输入阵型标题" /></div>
+		<div class="formation-A-bigbox">
+			<div class="formation-A-box">
+				<ul class="formation-assist">
+					<li class="member member-1 null">
+						<a class="monster" target="_blank" onclick="editMon(0,1,0);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-2 null">
+						<a class="monster" target="_blank" onclick="editMon(0,1,1);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-3 null">
+						<a class="monster" target="_blank" onclick="editMon(0,1,2);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-4 null">
+						<a class="monster" target="_blank" onclick="editMon(0,1,3);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-5 null">
+						<a class="monster" target="_blank" onclick="editMon(0,1,4);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-6 null">
+						<a class="monster" target="_blank" onclick="editMon(0,1,5);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="level"></div>
+						</a>
+					</li>
+				</ul>
+				<ul class="formation-latents">
+					<li class="latents latents-1">
+						<ul class="latent-ul display-none">
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+						</ul>
+					</li>
+					<li class="latents latents-2">
+						<ul class="latent-ul display-none">
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+						</ul>
+					</li>
+					<li class="latents latents-3">
+						<ul class="latent-ul display-none">
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+						</ul>
+					</li>
+					<li class="latents latents-4">
+						<ul class="latent-ul display-none">
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+						</ul>
+					</li>
+					<li class="latents latents-5">
+						<ul class="latent-ul display-none">
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+						</ul>
+					</li>
+					<li class="latents latents-6">
+						<ul class="latent-ul display-none">
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+							<li class="latent-icon"></li>
+						</ul>
+					</li>
+				</ul>
+				<ul class="formation-team">
+					<li class="member member-1 team-leader null">
+						<a class="monster" target="_blank" onclick="editMon(0,0,0);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-2 null">
+						<a class="monster" target="_blank" onclick="editMon(0,0,1);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-3 null">
+						<a class="monster" target="_blank" onclick="editMon(0,0,2);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-4 null">
+						<a class="monster" target="_blank" onclick="editMon(0,0,3);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-5 null">
+						<a class="monster" target="_blank" onclick="editMon(0,0,4);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
+							<div class="level"></div>
+						</a>
+					</li>
+					<li class="member member-6 team-leader null">
+						<a class="monster" target="_blank" onclick="editMon(0,0,5);return false;">
+							<div class="property"></div>
+							<div class="subproperty"></div>
+							<div class="plus"><div class="hp"></div><div class="atk"></div><div class="rcv"></div><div class="_297">297</div></div>
+							<div class="awoken-count display-none"></div>
+							<div class="super-awoken display-none"><div class="awoken-icon"></div></div>
+							<div class="level"></div>
+						</a>
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div class="awoken-total-box">
+			<!--怪物觉醒-->
+			<ul class="awoken-ul">
+				<li class="awoken-count a-c-1 display-none"><span class="awoken-icon awoken-1"></span><span class="count"></span></li><!--HP+-->
+				<li class="awoken-count a-c-2 display-none"><span class="awoken-icon awoken-2"></span><span class="count"></span></li><!--攻击+-->
+				<li class="awoken-count a-c-3 display-none"><span class="awoken-icon awoken-3"></span><span class="count"></span></li><!--回复+-->
+				<li class="awoken-count a-c-4 display-none"><span class="awoken-icon awoken-4"></span><span class="count"></span></li><!--火盾-->
+				<li class="awoken-count a-c-5 display-none"><span class="awoken-icon awoken-5"></span><span class="count"></span></li><!--水盾-->
+				<li class="awoken-count a-c-6 display-none"><span class="awoken-icon awoken-6"></span><span class="count"></span></li><!--木盾-->
+				<li class="awoken-count a-c-7 display-none"><span class="awoken-icon awoken-7"></span><span class="count"></span></li><!--光盾-->
+				<li class="awoken-count a-c-8 display-none"><span class="awoken-icon awoken-8"></span><span class="count"></span></li><!--暗盾-->
+				<li class="awoken-count a-c-9 display-none"><span class="awoken-icon awoken-9"></span><span class="count"></span></li><!--自回-->
+				<li class="awoken-count a-c-10 display-none"><span class="awoken-icon awoken-10"></span><span class="count"></span></li><!--防封-->
+				<li class="awoken-count a-c-11 display-none"><span class="awoken-icon awoken-11"></span><span class="count"></span></li><!--防暗-->
+				<li class="awoken-count a-c-12 display-none"><span class="awoken-icon awoken-12"></span><span class="count"></span></li><!--防废-->
+				<li class="awoken-count a-c-13 display-none"><span class="awoken-icon awoken-13"></span><span class="count"></span></li><!--防毒-->
+				<li class="awoken-count a-c-14 display-none"><span class="awoken-icon awoken-14"></span><span class="count"></span></li><!--火+-->
+				<li class="awoken-count a-c-15 display-none"><span class="awoken-icon awoken-15"></span><span class="count"></span></li><!--水+-->
+				<li class="awoken-count a-c-16 display-none"><span class="awoken-icon awoken-16"></span><span class="count"></span></li><!--木+-->
+				<li class="awoken-count a-c-17 display-none"><span class="awoken-icon awoken-17"></span><span class="count"></span></li><!--光+-->
+				<li class="awoken-count a-c-18 display-none"><span class="awoken-icon awoken-18"></span><span class="count"></span></li><!--暗+-->
+				<li class="awoken-count a-c-19 display-none"><span class="awoken-icon awoken-19"></span><span class="count"></span></li><!--手指-->
+				<li class="awoken-count a-c-20 display-none"><span class="awoken-icon awoken-20"></span><span class="count"></span></li><!--心解-->
+				<li class="awoken-count a-c-21 display-none"><span class="awoken-icon awoken-21"></span><span class="count"></span></li><!--SB-->
+				<li class="awoken-count a-c-22 display-none"><span class="awoken-icon awoken-22"></span><span class="count"></span></li><!--火横-->
+				<li class="awoken-count a-c-23 display-none"><span class="awoken-icon awoken-23"></span><span class="count"></span></li><!--水横-->
+				<li class="awoken-count a-c-24 display-none"><span class="awoken-icon awoken-24"></span><span class="count"></span></li><!--木横-->
+				<li class="awoken-count a-c-25 display-none"><span class="awoken-icon awoken-25"></span><span class="count"></span></li><!--光横-->
+				<li class="awoken-count a-c-26 display-none"><span class="awoken-icon awoken-26"></span><span class="count"></span></li><!--暗横-->
+				<li class="awoken-count a-c-27 display-none"><span class="awoken-icon awoken-27"></span><span class="count"></span></li><!--U-->
+				<li class="awoken-count a-c-28 display-none"><span class="awoken-icon awoken-28"></span><span class="count"></span></li><!--SX-->
+				<li class="awoken-count a-c-29 display-none"><span class="awoken-icon awoken-29"></span><span class="count"></span></li><!--心+-->
+				<li class="awoken-count a-c-30 display-none"><span class="awoken-icon awoken-30"></span><span class="count"></span></li><!--协力-->
+				<li class="awoken-count a-c-31 display-none"><span class="awoken-icon awoken-31"></span><span class="count"></span></li><!--龙杀-->
+				<li class="awoken-count a-c-32 display-none"><span class="awoken-icon awoken-32"></span><span class="count"></span></li><!--神杀-->
+				<li class="awoken-count a-c-33 display-none"><span class="awoken-icon awoken-33"></span><span class="count"></span></li><!--恶魔杀-->
+				<li class="awoken-count a-c-34 display-none"><span class="awoken-icon awoken-34"></span><span class="count"></span></li><!--机杀-->
+				<li class="awoken-count a-c-35 display-none"><span class="awoken-icon awoken-35"></span><span class="count"></span></li><!--平衡杀-->
+				<li class="awoken-count a-c-36 display-none"><span class="awoken-icon awoken-36"></span><span class="count"></span></li><!--攻击杀-->
+				<li class="awoken-count a-c-37 display-none"><span class="awoken-icon awoken-37"></span><span class="count"></span></li><!--体力杀-->
+				<li class="awoken-count a-c-38 display-none"><span class="awoken-icon awoken-38"></span><span class="count"></span></li><!--回复杀-->
+				<li class="awoken-count a-c-39 display-none"><span class="awoken-icon awoken-39"></span><span class="count"></span></li><!--进化杀-->
+				<li class="awoken-count a-c-40 display-none"><span class="awoken-icon awoken-40"></span><span class="count"></span></li><!--觉醒杀-->
+				<li class="awoken-count a-c-41 display-none"><span class="awoken-icon awoken-41"></span><span class="count"></span></li><!--强化杀-->
+				<li class="awoken-count a-c-42 display-none"><span class="awoken-icon awoken-42"></span><span class="count"></span></li><!--卖钱杀-->
+				<li class="awoken-count a-c-43 display-none"><span class="awoken-icon awoken-43"></span><span class="count"></span></li><!--7c-->
+				<li class="awoken-count a-c-44 display-none"><span class="awoken-icon awoken-44"></span><span class="count"></span></li><!--5色破防-->
+				<li class="awoken-count a-c-45 display-none"><span class="awoken-icon awoken-45"></span><span class="count"></span></li><!--心追-->
+				<li class="awoken-count a-c-46 display-none"><span class="awoken-icon awoken-46"></span><span class="count"></span></li><!--全体HP-->
+				<li class="awoken-count a-c-47 display-none"><span class="awoken-icon awoken-47"></span><span class="count"></span></li><!--全体回复-->
+				<li class="awoken-count a-c-48 display-none"><span class="awoken-icon awoken-48"></span><span class="count"></span></li><!--破无效-->
+				<li class="awoken-count a-c-49 display-none"><span class="awoken-icon awoken-49"></span><span class="count"></span></li><!--武器觉醒-->
+				<li class="awoken-count a-c-50 display-none"><span class="awoken-icon awoken-50"></span><span class="count"></span></li><!--方块心追-->
+				<li class="awoken-count a-c-51 display-none"><span class="awoken-icon awoken-51"></span><span class="count"></span></li><!--5色溜-->
+				<li class="awoken-count a-c-52 display-none"><span class="awoken-icon awoken-52"></span><span class="count"></span></li><!--大防封-->
+				<li class="awoken-count a-c-53 display-none"><span class="awoken-icon awoken-53"></span><span class="count"></span></li><!--大手指-->
+				<li class="awoken-count a-c-54 display-none"><span class="awoken-icon awoken-54"></span><span class="count"></span></li><!--防云-->
+				<li class="awoken-count a-c-55 display-none"><span class="awoken-icon awoken-55"></span><span class="count"></span></li><!--防封条-->
+				<li class="awoken-count a-c-56 display-none"><span class="awoken-icon awoken-56"></span><span class="count"></span></li><!--大SB-->
+				<li class="awoken-count a-c-57 display-none"><span class="awoken-icon awoken-57"></span><span class="count"></span></li><!--满血强化-->
+				<li class="awoken-count a-c-58 display-none"><span class="awoken-icon awoken-58"></span><span class="count"></span></li><!--下半血强化-->
+				<li class="awoken-count a-c-59 display-none"><span class="awoken-icon awoken-59"></span><span class="count"></span></li><!--L盾-->
+				<li class="awoken-count a-c-60 display-none"><span class="awoken-icon awoken-60"></span><span class="count"></span></li><!--L解锁-->
+				<li class="awoken-count a-c-61 display-none"><span class="awoken-icon awoken-61"></span><span class="count"></span></li><!--10c-->
+				<li class="awoken-count a-c-62 display-none"><span class="awoken-icon awoken-62"></span><span class="count"></span></li><!--c珠-->
+				<li class="awoken-count a-c-63 display-none"><span class="awoken-icon awoken-63"></span><span class="count"></span></li><!--语音-->
+				<li class="awoken-count a-c-64 display-none"><span class="awoken-icon awoken-64"></span><span class="count"></span></li><!--奖励增加-->
+				<li class="awoken-count a-c-65 display-none"><span class="awoken-icon awoken-65"></span><span class="count"></span></li><!--HP--->
+				<li class="awoken-count a-c-66 display-none"><span class="awoken-icon awoken-66"></span><span class="count"></span></li><!--攻击--->
+				<li class="awoken-count a-c-67 display-none"><span class="awoken-icon awoken-67"></span><span class="count"></span></li><!--回复--->
+			</ul>
+		</div>
+		<div class="detail-box"><textarea class="detail" placeholder="输入说明"></textarea></div>
+	</div>
+	<div class="edit-box display-none">
+		<div class="edit-box-title"><!--修改怪物--></div>
+		<div class="monsterinfo-box">
+			<a class="monster" target="_blank">
+				<div class="property"></div>
+				<div class="subproperty"></div>
+			</a>
+			<div class="monster-id"></div>
+			<div class="monster-rare"></div>
+			<div class="monster-name"></div>
+			<ul class="monster-type">
+				<li class="type-name"><div class="type-icon"></div></li>
+				<li class="type-name"><div class="type-icon"></div></li>
+				<li class="type-name"><div class="type-icon"></div></li>
+			</ul>
+		</div>
+		<div class="search-box">
+			<input type="search" class="m-id" list="monsters-list"/>
+			<datalist id="monsters-list"></datalist>
+		</div>
+		<div class="setting-box">
+			<div class="setting-row row-mon-awoken">
+				<!--怪物觉醒-->
+				<ul class="awoken-ul">
+					<li class="awoken-icon awoken-count"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+				</ul>
+			</div>
+			<div class="setting-row row-mon-super-awoken">
+				<!--怪物超觉醒-->
+				<ul class="awoken-ul">
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+					<li class="awoken-icon"></li>
+				</ul>
+			</div>
+			<div class="setting-row row-mon-level">
+				<!--怪物等级-->
+				<input type="number" class="m-level" min=1 max=110/>
+				<button class="m-level-btn-max" value="99">99</button>
+			</div>
+			<div class="setting-row row-mon-plus">
+				<!--怪物加值-->
+				<button class="m-plus-btn-297">297</button>
+				<ul>
+					<li class="m-plus-hp-li"><input type="number" class="m-plus-hp" min=0 max=99 /><button class="m-plus-hp-btn-99" value="99">99</button></li>
+					<li class="m-plus-atk-li"><input type="number" class="m-plus-atk" min=0 max=99 /><button class="m-plus-atk-btn-99" value="99">99</button></li>
+					<li class="m-plus-rcv-li"><input type="number" class="m-plus-rcv" min=0 max=99 /><button class="m-plus-rcv-btn-99" value="99">99</button></li>
+				</ul>
+			</div>
+			<div class="setting-row row-mon-latent">
+				<!--潜在觉醒-->
+				<ul class="m-latent-ul">
+					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
+					<li class="latent-icon"></li>
+				</ul>
+				<ul class="m-latent-allowable-ul">
+					<li class="latent-icon latent-icon-1" value="1"></li><!--HP-->
+					<li class="latent-icon latent-icon-2" value="2"></li><!--攻击-->
+					<li class="latent-icon latent-icon-3" value="3"></li><!--回复-->
+					<li class="latent-icon latent-icon-4" value="4"></li><!--手指-->
+					<li class="latent-icon latent-icon-5" value="5"></li><!--自回-->
+					<li class="latent-icon latent-icon-6" value="6"></li><!--火盾-->
+					<li class="latent-icon latent-icon-7" value="7"></li><!--水盾-->
+					<li class="latent-icon latent-icon-8" value="8"></li><!--木盾-->
+					<li class="latent-icon latent-icon-9" value="9"></li><!--光盾-->
+					<li class="latent-icon latent-icon-10" value="10"></li><!--暗盾-->
+					<li class="latent-icon latent-icon-11" value="11"></li><!--防坐-->
+					<li class="latent-icon latent-icon-12" value="12"></li><!--三维-->
+					<li class="latent-icon latent-icon-13" value="13"></li><!--进化杀-->
+					<li class="latent-icon latent-icon-14" value="14"></li><!--觉醒杀-->
+					<li class="latent-icon latent-icon-15" value="15"></li><!--强化杀-->
+					<li class="latent-icon latent-icon-16" value="16"></li><!--卖钱杀-->
+					<li class="latent-icon latent-icon-17" value="17"></li><!--神杀-->
+					<li class="latent-icon latent-icon-18" value="18"></li><!--龙杀-->
+					<li class="latent-icon latent-icon-19" value="19"></li><!--恶魔杀-->
+					<li class="latent-icon latent-icon-20" value="20"></li><!--机械杀-->
+					<li class="latent-icon latent-icon-21" value="21"></li><!--平衡杀-->
+					<li class="latent-icon latent-icon-22" value="22"></li><!--攻击杀-->
+					<li class="latent-icon latent-icon-23" value="23"></li><!--体力杀-->
+					<li class="latent-icon latent-icon-24" value="24"></li><!--回复杀-->
+					<li class="latent-icon latent-icon-25" value="25"></li><!--大HP-->
+					<li class="latent-icon latent-icon-26" value="26"></li><!--大攻击-->
+					<li class="latent-icon latent-icon-27" value="27"></li><!--大回复-->
+					<li class="latent-icon latent-icon-28" value="28"></li><!--大手指-->
+					<li class="latent-icon latent-icon-29" value="29"></li><!--大火盾-->
+					<li class="latent-icon latent-icon-30" value="30"></li><!--大水盾-->
+					<li class="latent-icon latent-icon-31" value="31"></li><!--大木盾-->
+					<li class="latent-icon latent-icon-32" value="32"></li><!--大光盾-->
+					<li class="latent-icon latent-icon-33" value="33"></li><!--大暗盾-->
+				</ul>
+			</div>
+			
+		</div>
+		<div class="button-box">
+			<button class="button-null"><!--留空格子--></button>
+			<button class="button-delay"><!--应对威吓--></button>
+			<button class="button-done"><!--确认修改--></button>
+			<button class="button-cancel"><!--取消修改--></button>
+		</div>
+	</div>
+</body>
+</html>

style-monsterimages.css

@@ -417,9 +417,42 @@
 .latent-icon{
 	background-image: url(images/latent.png);
 }
+.latent-icon-1{ /*HP*/
+	background-position: 0px -32px;
+}
+.latent-icon-2{ /*攻击*/
+	background-position: 0px -64px;
+}
+.latent-icon-3{ /*回复*/
+	background-position: 0px -96px;
+}
+.latent-icon-4{ /*手指*/
+	background-position: 0px -128px;
+}
+.latent-icon-5{ /*自回*/
+	background-position: 0px -160px;
+}
+.latent-icon-6{ /*火盾*/
+	background-position: 0px -192px;
+}
+.latent-icon-7{ /*水盾*/
+	background-position: 0px -224px;
+}
+.latent-icon-8{ /*木盾*/
+	background-position: 0px -256px;
+}
+.latent-icon-9{ /*光盾*/
+	background-position: 0px -288px;
+}
+.latent-icon-10{ /*暗盾*/
+	background-position: 0px -320px;
+}
 .latent-icon-11{ /*防坐*/
 	background-position: 0px -352px;
 }
+.latent-icon-12{ /*三维*/
+	background-position: 0px -384px;
+}
 .latent-icon-13{ /*进化杀*/
 	background-position: 0px -416px;
 }
@@ -456,6 +489,34 @@
 .latent-icon-24{ /*回复杀*/
 	background-position: 0px -768px;
 }
+.latent-icon-25{ /*大HP*/
+	background-position: 0px -800px;
+}
+.latent-icon-26{ /*大攻击*/
+	background-position: 0px -832px;
+}
+.latent-icon-27{ /*大回复*/
+	background-position: 0px -864px;
+}
+.latent-icon-28{ /*大手指*/
+	background-position: 0px -896px;
+}
+.latent-icon-29{ /*大火盾*/
+	background-position: 0px -928px;
+}
+.latent-icon-30{ /*大水盾*/
+	background-position: 0px -960px;
+}
+.latent-icon-31{ /*大木盾*/
+	background-position: 0px -992px;
+}
+.latent-icon-32{ /*大光盾*/
+	background-position: 0px -1024px;
+}
+.latent-icon-33{ /*大暗盾*/
+	background-position: 0px -1056px;
+}
+.latent-icon-12,
 .latent-icon-13,
 .latent-icon-14,
 .latent-icon-15,
@@ -467,6 +528,52 @@
 .latent-icon-21,
 .latent-icon-22,
 .latent-icon-23,
-.latent-icon-24{
+.latent-icon-24,
+.latent-icon-25,
+.latent-icon-26,
+.latent-icon-27,
+.latent-icon-28,
+.latent-icon-29,
+.latent-icon-30,
+.latent-icon-31,
+.latent-icon-32,
+.latent-icon-33{
 	width: 76px;
-}
+}
+/*
+var sawokens = [
+	"HP",
+	"攻击",
+	"回复",
+	"手指",
+	"自回",
+	"火盾",
+	"水盾",
+	"木盾",
+	"光盾",
+	"暗盾",
+	"防坐",
+	"三维",
+	"进化杀",
+	"觉醒杀",
+	"强化杀",
+	"卖钱杀",
+	"神杀",
+	"龙杀",
+	"恶魔杀",
+	"机械杀",
+	"平衡杀",
+	"攻击杀",
+	"体力杀",
+	"回复杀",
+	"大HP",
+	"大攻击",
+	"大回复",
+	"大手指",
+	"大火盾",
+	"大水盾",
+	"大木盾",
+	"大光盾",
+	"大暗盾",
+];
+*/

style.css

@@ -3,12 +3,11 @@
 	font-family: 'FOT-KurokaneStd-EB';
 	font-style: normal;
 	/*font-weight: 400;*/
-	src: url(fonts/sfont.woff2) format('woff2'),
-		 url(fonts/sfont?#iefix) format('embedded-opentype'),
-		 url(fonts/sfont.woff2) format('woff2'),
-		 url(fonts/sfont.woff) format('woff'),
-		 url(fonts/sfont.ttf) format('truetype'),
-		 url(fonts/sfont.svg#mywebfontregular) format('svg');
+	src: url("fonts/FOT-KurokaneStd-EB.woff2") format('woff2'),
+		 url("fonts/FOT-KurokaneStd-EB.woff") format('woff'),
+		 url("fonts/FOT-KurokaneStd-EB.ttf") format('truetype'),
+		 url("fonts/FOT-KurokaneStd-EB.eot") format('embedded-opentype'),
+		 url("fonts/FOT-KurokaneStd-EB.svg") format('svg');
 }
 body{
 	font-family: "Microsoft Yahei","Source Han Sans",Arial, Helvetica, sans-serif;
@@ -49,7 +48,7 @@ ul{
 }
 /*队伍的整个盒子*/
 .formation-box{
-	/*width: 648px;*/
+	width: 648px;
 	min-width: 648px;
 }
 
@@ -162,6 +161,13 @@ ul{
 	text-shadow: none;
 	background-position: 0 -38px;
 }
+/*怪物-超觉醒*/
+.monster .super-awoken{
+	position: absolute;
+	right:0;
+	top: 30px;
+	transform: scale(0.80) translateX(4px);
+}
 /*怪物-等级*/
 .monster .level{
 	color: white;
@@ -432,16 +438,23 @@ ul{
 .edit-box .setting-box .row-mon-awoken::before{
 	content: "▼怪物觉醒";
 }*/
-.row-mon-awoken .m-awoken-ul{
+.row-mon-awoken .awoken-ul, .row-mon-super-awoken .awoken-ul{
+	font-size: 0;
 	height: 32px;
 }
-.m-awoken-ul .awoken-icon{
+.awoken-ul li{
+	margin-left: 5px;
+}
+.awoken-ul li:first-of-type{
+	margin-left: 0;
+}
+.edit-box .awoken-ul .awoken-icon{
 	cursor: pointer;
 }
-.m-awoken-ul .awoken-icon.unselected-awoken{
+.awoken-ul .awoken-icon.unselected-awoken{
 	opacity: 0.3;
 }
-.awoken-icon.awoken-count{
+.row-mon-awoken .awoken-icon.awoken-count{
 	color: yellow;
 	font-size: 22px;
 	line-height: 28px;
@@ -449,6 +462,12 @@ ul{
 	text-shadow: black 0 0 4px;
 	text-align: center;
 }
+.row-mon-awoken .m-super-awoken-ul{
+	margin-top: 5px;
+}
+/*.edit-box .setting-box .row-mon-super-awoken::before{
+	content: "▼超觉醒";
+}*/
 .edit-box .setting-box .row-mon-plus::before{
 	/*content: "▼怪物加值";*/
 	display: block;
@@ -570,18 +589,20 @@ ul{
 .detail-box{
 	margin-top:5px;
 }
-.awoken-total-box .m-awoken-ul .awoken-count{
+.awoken-total-box .awoken-ul .awoken-count{
 	font-size: 20px;
 	line-height: 32px;
 	font-family: 'FOT-KurokaneStd-EB';
 	float: left;
 	margin-right: 5px;
 }
-.awoken-total-box .m-awoken-ul .count{
+.awoken-total-box .awoken-ul .count{
 	height: 32px;
+	width: 45px;
+	display: inline-block;
 	vertical-align: middle;
 }
-.awoken-total-box .m-awoken-ul .count::before{
+.awoken-total-box .awoken-ul .count::before{
 	content: "×";
 }
 
@@ -590,4 +611,13 @@ ul{
 }
 .control-box .languages-label::before{
 	content: "Lanuage:";
+}
+.control-box .solo-link,.control-box .multi-link{
+	margin-left: 10px;
+}
+.control-box .solo-link::before{
+	content: "Jump To Solo Version";
+}
+.control-box .multi-link::before{
+	content: "Jump To 2-Player Version";
 }

universal_function.js

@@ -75,7 +75,7 @@ function usedHole(latent)
 	},0);
 }
 //计算用了多少潜觉格子
-function awokenCountInTeam(formationTeam,ak)
+function awokenCountInTeam(formationTeam,ak,solo)
 {
     var allAwokenCount = formationTeam.reduce(function(fc,fm){
         var formationAwokenCount = fm.reduce(function(tc,tm,isAssist){
@@ -85,14 +85,20 @@ function awokenCountInTeam(formationTeam,ak)
                     return c;
                 }
                 var mdAwoken = ms[m.id].awoken; //这个怪物的觉醒数据
-                if (!mdAwoken || (isAssist && mdAwoken[0] != 49))
-                { //如果没有觉醒 || （如果是辅助队 &&第一个不是武器觉醒）
+                var mdSAwoken = ms[m.id].sAwoken; //这个怪物的超觉醒数据
+                if ((!mdAwoken && !mdSAwoken) || (isAssist && mdAwoken[0] != 49))
+                { //如果没有觉醒和超觉醒 || （如果是辅助队 &&第一个不是武器觉醒）
                     return c;
                 }
-                //启用的觉醒数
+                //启用的觉醒数组片段
                 var enableAwoken = mdAwoken.slice(0,m.awoken);
                 //相同的觉醒数
                 var hasAwoken = enableAwoken.filter(function(a){return a == ak;}).length;
+                //如果有超觉醒，且超觉醒id和计数的id相同
+                if (mdSAwoken && (mdSAwoken[m.sawoken] == ak))
+                {
+                    hasAwoken++;
+                }
                 return c + hasAwoken;
             },0);
             return tc + teamAwokenCount;