Merge branch 'master' into v18.3_dev

multi.html

@@ -734,9 +734,9 @@ var formation = new Formation(teamsCount,5);
 					<!--怪物加值-->
 					<div class="plus-box">
 						<ul>
-							<li class="m-hp-li"><span class="plus-value"><input type="number" class="m-plus-hp" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
-							<li class="m-atk-li"><span class="plus-value"><input type="number" class="m-plus-atk" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
-							<li class="m-rcv-li"><span class="plus-value"><input type="number" class="m-plus-rcv" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-hp-li"><span class="plus-value"><input type="number" class="m-plus-hp" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-atk-li"><span class="plus-value"><input type="number" class="m-plus-atk" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-rcv-li"><span class="plus-value"><input type="number" class="m-plus-rcv" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
 						</ul><button class="m-plus-btn-297"><span>297</span></button>
 					</div>
 				</div>

script.js

@@ -1797,7 +1797,7 @@ function editMon(teamNum,isAssist,indexInTeam)
 	const monEditAddHp = settingBox.querySelector(".row-mon-plus .m-plus-hp");
 	const monEditAddAtk = settingBox.querySelector(".row-mon-plus .m-plus-atk");
 	const monEditAddRcv = settingBox.querySelector(".row-mon-plus .m-plus-rcv");
-	if (mon.plus)
+	if (mon.plus && mon.id>0)
 	{
 		monEditAddHp.value = mon.plus[0];
 		monEditAddAtk.value = mon.plus[1];

solo.html

@@ -686,9 +686,9 @@ var formation = new Formation(teamsCount,6);
 					<!--怪物加值-->
 					<div class="plus-box">
 						<ul>
-							<li class="m-hp-li"><span class="plus-value"><input type="number" class="m-plus-hp" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
-							<li class="m-atk-li"><span class="plus-value"><input type="number" class="m-plus-atk" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
-							<li class="m-rcv-li"><span class="plus-value"><input type="number" class="m-plus-rcv" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-hp-li"><span class="plus-value"><input type="number" class="m-plus-hp" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-atk-li"><span class="plus-value"><input type="number" class="m-plus-atk" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-rcv-li"><span class="plus-value"><input type="number" class="m-plus-rcv" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
 						</ul><button class="m-plus-btn-297"><span>297</span></button>
 					</div>
 				</div>

triple.html

@@ -1381,9 +1381,9 @@ var formation = new Formation(teamsCount,6);
 					<!--怪物加值-->
 					<div class="plus-box">
 						<ul>
-							<li class="m-hp-li"><span class="plus-value"><input type="number" class="m-plus-hp" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
-							<li class="m-atk-li"><span class="plus-value"><input type="number" class="m-plus-atk" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
-							<li class="m-rcv-li"><span class="plus-value"><input type="number" class="m-plus-rcv" min=0 max=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-hp-li"><span class="plus-value"><input type="number" class="m-plus-hp" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-atk-li"><span class="plus-value"><input type="number" class="m-plus-atk" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
+							<li class="m-rcv-li"><span class="plus-value"><input type="number" class="m-plus-rcv" min=0 max=99 value=99 /></span><button class="m-plus-btn" value="0">0</button></li>
 						</ul><button class="m-plus-btn-297"><span>297</span></button>
 					</div>
 				</div>