diff --git a/src/components/material/DropDialog.vue b/src/components/material/DropDialog.vue index 8f184dae..d2d9e769 100644 --- a/src/components/material/DropDialog.vue +++ b/src/components/material/DropDialog.vue @@ -82,7 +82,7 @@ {{ $t('ireneCalc.settings.isGuardOrSniper') }} - {{ $t(`character.${ASCALON_ID}`) }} (+5%)
@@ -155,7 +155,7 @@ dayjs.extend(duration); dayjs.extend(isToday); dayjs.extend(isTomorrow); -const isImplementedChar = inject('isImplementedChar'); +const isUnreleasedChar = inject('isUnreleasedChar'); const nls = new NamespacedLocalStorage('ireneCalc'); @@ -191,9 +191,9 @@ const settingsNotSave = reactive({ showTimePanel: false, }); -const isAscalonImplemented = computed(() => isImplementedChar(ASCALON_ID)); +const isAscalonUnreleased = computed(() => isUnreleasedChar(ASCALON_ID)); const ascalonAcc = computed(() => - settings.useAscalon && isAscalonImplemented.value ? ELITE_ASCALON_ACC : 0, + settings.useAscalon && isAscalonUnreleased.value ? ELITE_ASCALON_ACC : 0, ); const ireneAcc = computed(() => (settings.isGuardOrSniper ? ELITE_IRENE_ACC : 0)); diff --git a/src/components/material/PlannerDialog.vue b/src/components/material/PlannerDialog.vue index a54b6b41..9bbe5b5d 100644 --- a/src/components/material/PlannerDialog.vue +++ b/src/components/material/PlannerDialog.vue @@ -61,7 +61,7 @@ {{ $t(`uniequip.${id}`) }} @@ -126,7 +126,7 @@
h(App), provide() { return { - isImplementedChar: this.isImplementedChar, + isUnreleasedChar: this.isUnreleasedChar, }; }, data: { @@ -185,9 +185,9 @@ new Vue({ } }, }, - isImplementedGradedUniequip() { + isUnreleasedGradedUniequip() { // 分级模组和黑键同期实装 - return this.isImplementedChar('4046_ebnhlz'); + return this.isUnreleasedChar('4046_ebnhlz'); }, }, methods: { @@ -207,13 +207,13 @@ new Vue({ }); } }, - isImplementedChar(name) { + isUnreleasedChar(name) { return name in this.i18nServerMessages.character; }, - isImplementedMaterial(name) { + isUnreleasedMaterial(name) { return name in this.i18nServerMessages.material; }, - isImplementedUniequip(id) { + isUnreleasedUniequip(id) { return id in (this.i18nServerMessages.uniequip || {}); }, updateTitle() { diff --git a/src/views/Hr.vue b/src/views/Hr.vue index 916c6ce5..1ae228fd 100644 --- a/src/views/Hr.vue +++ b/src/views/Hr.vue @@ -74,8 +74,8 @@ {{ $t('hr.setting.showNotImplemented') }}{{ $t('hr.setting.showNotUnreleased') }} @@ -417,7 +417,7 @@ export default defineComponent({ showAvatar: false, hide12: false, showPrivate: false, - showNotImplemented: false, + showNotUnreleased: false, showGuarantees: false, ocrspaceApikey: '', useLocalOCR: false, @@ -573,8 +573,8 @@ export default defineComponent({ if (!this.setting.showPrivate) need.push(this.pubs); const chars = _.intersection(...need); if (!comb.includes(this.enumTagZh.高级资深干员)) _.remove(chars, ({ star }) => star === 6); - if (!this.setting.showNotImplemented) { - _.remove(chars, ({ name }) => !this.$root.isImplementedChar(name)); + if (!this.setting.showNotUnreleased) { + _.remove(chars, ({ name }) => !this.$root.isUnreleasedChar(name)); } if (chars.length == 0) continue; diff --git a/src/views/Material/index.js b/src/views/Material/index.js index dc9d6760..72d23023 100644 --- a/src/views/Material/index.js +++ b/src/views/Material/index.js @@ -424,8 +424,8 @@ export default defineComponent({ }); return table; }, - implementedElite() { - return _.pickBy(this.elite, (o, name) => this.$root.isImplementedChar(name)); + unreleasedElite() { + return _.pickBy(this.elite, (o, name) => this.$root.isUnreleasedChar(name)); }, compressedInputs: { get() { @@ -543,7 +543,7 @@ export default defineComponent({ if (rare) return this.selected.rare[rare - 1] ? Array.from(set) : []; return this.selected.type[type] ? Array.from(set) : []; })(); - return new Set(items.filter(id => this.$root.isImplementedMaterial(id))); + return new Set(items.filter(id => this.$root.isUnreleasedMaterial(id))); }); } const result = _.mapValues(this.selected.type, (v, type) => { @@ -602,7 +602,7 @@ export default defineComponent({ presetItems() { const input = this.$root.pureName(this.preset); const result = _.transform( - Object.keys(this.implementedElite), + Object.keys(this.unreleasedElite), (arr, name) => { const search = this.$root .getSearchGroup(this.characterTable[name]) @@ -627,7 +627,7 @@ export default defineComponent({ }, presetUniequip() { return this.sp?.uniequip.filter( - ({ id }) => this.$root.isImplementedUniequip(id) || this.pSetting.uniequip[id]?.[0], + ({ id }) => this.$root.isUnreleasedUniequip(id) || this.pSetting.uniequip[id]?.[0], ); }, sp() { @@ -955,7 +955,7 @@ export default defineComponent({ isPlannerUnavailableItem(id) { return ( this.materialTable[id]?.type === MaterialTypeEnum.MOD_TOKEN || - !this.$root.isImplementedMaterial(id) + !this.$root.isUnreleasedMaterial(id) ); }, num10k(num) { @@ -1742,7 +1742,7 @@ export default defineComponent({ return ( (this.inputsInt[id].need > 0 || gap > 0) && (this.setting.hideEnough ? gap > 0 : true) && - this.$root.isImplementedMaterial(id) + this.$root.isUnreleasedMaterial(id) ); }, }, diff --git a/src/views/Material/index.vue b/src/views/Material/index.vue index 9287365c..14b2236d 100644 --- a/src/views/Material/index.vue +++ b/src/views/Material/index.vue @@ -141,7 +141,7 @@ diff --git a/src/views/RIIC.vue b/src/views/RIIC.vue index f0404d77..93b93847 100644 --- a/src/views/RIIC.vue +++ b/src/views/RIIC.vue @@ -37,8 +37,8 @@ tagType === 'BUILDING' ? $t(`building.name.${tagName}`) : tagType === 'TRAINING' && tagName !== '全能' - ? $t(`tag.${enumTag[`${tagName}干员`]}`) - : $tt(`riic.select.${tagName}`) + ? $t(`tag.${enumTag[`${tagName}干员`]}`) + : $tt(`riic.select.${tagName}`) }}
@@ -62,8 +62,8 @@ {{ $t('riic.setting.showNotImplemented') }}{{ $t('riic.setting.showNotUnreleased') }} @@ -163,7 +163,7 @@ export default defineComponent({ tagDisplay, setting: { hideIrrelevant: false, - showNotImplemented: false, + showNotUnreleased: false, }, settingList: ['hideIrrelevant'], drawer: null, @@ -206,7 +206,7 @@ export default defineComponent({ const result = _.transform( this.buildingChar, (arr, skills, name) => { - if (!this.setting.showNotImplemented && !this.$root.isImplementedChar(name)) return; + if (!this.setting.showNotUnreleased && !this.$root.isUnreleasedChar(name)) return; if (this.selected) { const relevantSkills = skills.filter(this.isSkillRelevant); if (relevantSkills.length > 0) {