Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
This commit is contained in:
commit
0c0d422dae
@ -153,7 +153,7 @@ function Construct(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const equipping = skillList.includes(vbox.bound[itemEquip]) && !skill
|
const equipping = skillList.includes(vbox.bound[itemEquip]) && !skill
|
||||||
&& !tutorialDisableEquip && !duplicateSkill;
|
&& !tutorialDisableEquip && !duplicateSkill && i === construct.skills.length;
|
||||||
const border = () => {
|
const border = () => {
|
||||||
if (!skill) return '';
|
if (!skill) return '';
|
||||||
const borderFn = buttons[removeTier(skill.skill)];
|
const borderFn = buttons[removeTier(skill.skill)];
|
||||||
@ -166,7 +166,7 @@ function Construct(props) {
|
|||||||
<label onDragStart={ev => {
|
<label onDragStart={ev => {
|
||||||
ev.dataTransfer.setData('text', '');
|
ev.dataTransfer.setData('text', '');
|
||||||
skillClick(ev);
|
skillClick(ev);
|
||||||
}} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
|
}} key={i} draggable={skill} onDragEnd={() => setItemUnequip([])}>
|
||||||
<button
|
<button
|
||||||
key={i}
|
key={i}
|
||||||
disabled={!skill && !equipping}
|
disabled={!skill && !equipping}
|
||||||
@ -184,7 +184,7 @@ function Construct(props) {
|
|||||||
const s = construct.specs[i];
|
const s = construct.specs[i];
|
||||||
|
|
||||||
if (!s) {
|
if (!s) {
|
||||||
const equipping = specList.includes(vbox.bound[itemEquip]);
|
const equipping = specList.includes(vbox.bound[itemEquip]) && i === construct.specs.length;
|
||||||
const classes = `${equipping ? 'equipping' : 'gray'} empty`;
|
const classes = `${equipping ? 'equipping' : 'gray'} empty`;
|
||||||
return (
|
return (
|
||||||
<button key={i} class={classes} disabled={!equipping} >
|
<button key={i} class={classes} disabled={!equipping} >
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user