Merge branch 'g38_ui' into devel

This commit is contained in:
2021-12-23 17:19:57 +09:00
4 changed files with 1 additions and 9 deletions
-1
View File
@@ -117,7 +117,6 @@ export default defineComponent({
} }
function doSubmit(e: Event) { function doSubmit(e: Event) {
console.log(e);
emit("submitOutput", e, amount.value, props.crewType.id); emit("submitOutput", e, amount.value, props.crewType.id);
} }
-2
View File
@@ -65,7 +65,6 @@ export default defineComponent({
const destNationName = ref(""); const destNationName = ref("");
const selectedColorID = ref(0); const selectedColorID = ref(0);
console.log(procRes.nationTypes);
const selectedNationType = ref(Object.values(procRes.nationTypes)[0].type); const selectedNationType = ref(Object.values(procRes.nationTypes)[0].type);
async function submit(e: Event) { async function submit(e: Event) {
@@ -86,7 +85,6 @@ export default defineComponent({
value: nationType.type, value: nationType.type,
}); });
} }
console.log(nationTypesOption);
return { return {
available건국: procRes.available건국, available건국: procRes.available건국,
@@ -202,8 +202,6 @@ export default defineComponent({
return Math.floor(value).toLocaleString(); return Math.floor(value).toLocaleString();
} }
console.log(dexFullInfo);
return { return {
...procRes, ...procRes,
srcArmTypeID, srcArmTypeID,
+1 -4
View File
@@ -112,7 +112,7 @@ export default defineComponent({
const troops = (!gen.troopID)?'':`,${procRes.troops[gen.troopID].name}`; const troops = (!gen.troopID)?'':`,${procRes.troops[gen.troopID].name}`;
const nameColor = getNpcColor(gen.npc); const nameColor = getNpcColor(gen.npc);
const name = nameColor?`<span style="color:${nameColor}">${gen.name}</span>`:gen.name; const name = nameColor?`<span style="color:${nameColor}">${gen.name}</span>`:gen.name;
return `${name} [${citiesMap.get(unwrap(gen.cityID))?.name}${troops}] (${gen.leadership}/${gen.leadership}/${gen.intel}) <병${unwrap(gen.crew).toLocaleString()}/훈${gen.train}/사${gen.atmos}>`; return `${name} [${citiesMap.get(unwrap(gen.cityID))?.name}${troops}] (${gen.leadership}/${gen.strength}/${gen.intel}) <병${unwrap(gen.crew).toLocaleString()}/훈${gen.train}/사${gen.atmos}>`;
} }
async function submit(e: Event) { async function submit(e: Event) {
@@ -123,9 +123,6 @@ export default defineComponent({
}, },
}); });
unwrap(e.target).dispatchEvent(event); unwrap(e.target).dispatchEvent(event);
// title: `${gen.name}[${this.cities.get(gen.cityID)?.name}] (${gen.leadership}/${gen.leadership}/${gen.intel}) <병${gen.crew.toLocaleString()}/훈${gen.train}/사${gen.atmos}`,
} }
return { return {