Skip to content

Commit

Permalink
fix: word
Browse files Browse the repository at this point in the history
  • Loading branch information
Tsuk1ko committed Apr 17, 2024
1 parent 1d4feea commit 3d4d89d
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion src/components/material/DropDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<ArknNumItem
v-for="drop in dropDetail.drops"
:key="`detail-${dropDetail.code}-${drop[0]}`"
v-show="$root.isImplementedMaterial(drop[0])"
v-show="$root.isUnreleasedMaterial(drop[0])"
:img="drop[0]"
:lable="$t(`material.${drop[0]}`)"
:num="dropDetail.showByNum ? drop[1] : $_.round(drop[1] * 100, 2) + '%'"
Expand Down
8 changes: 4 additions & 4 deletions src/components/material/IreneCalculatorDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<mdui-switch v-model="settings.isGuardOrSniper" :truncate="true">{{
$t('ireneCalc.settings.isGuardOrSniper')
}}</mdui-switch>
<mdui-switch v-if="isAscalonImplemented" v-model="settings.useAscalon" :truncate="true"
<mdui-switch v-if="isAscalonUnreleased" v-model="settings.useAscalon" :truncate="true"
>{{ $t(`character.${ASCALON_ID}`) }} (+5%)</mdui-switch
>
<div class="inline-block">
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/components/material/PlannerDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<ArknNumItem
v-for="drop in stage.drops"
:key="`${stage.code}-${drop.name}`"
v-show="$root.isImplementedMaterial(drop.name)"
v-show="$root.isUnreleasedMaterial(drop.name)"
:class="{ 'highlight-bg': parent.highlight[drop.name] && parent.hlGaps[drop.name][0] }"
:img="drop.name"
:lable="$t(`material.${drop.name}`)"
Expand Down
4 changes: 2 additions & 2 deletions src/components/material/PresetSettingDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
class="mdui-p-r-2"
@change="
val =>
!$root.isImplementedUniequip(id) && !val && $nextTick($refs.dialog.handleUpdate)
!$root.isUnreleasedUniequip(id) && !val && $nextTick($refs.dialog.handleUpdate)
"
>{{ $t(`uniequip.${id}`) }}</mdui-checkbox
>
Expand All @@ -126,7 +126,7 @@
</div>
<div
v-show="
$root.isImplementedGradedUniequip ||
$root.isUnreleasedGradedUniequip ||
pSetting.uniequip[id][1] !== 0 ||
pSetting.uniequip[id][2] !== 1
"
Expand Down
2 changes: 1 addition & 1 deletion src/locales/cn/hr.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"showAvatar": "显示头像",
"hide12": "隐藏1★2★",
"showPrivate": "显示非公开招募@:(common.operator)",
"showNotImplemented": "显示未实装@:(common.operator)",
"showNotUnreleased": "显示未实装@:(common.operator)",
"showGuarantees": "查看保底词条组合"
},
"tagType": {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/cn/riic.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"setting": {
"hideIrrelevant": "筛选时隐藏无关技能",
"showNotImplemented": "显示未实装@:(common.operator)"
"showNotUnreleased": "显示未实装@:(common.operator)"
},
"select": {
"BUILDING": "设施",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/jp/hr.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"showAvatar": "アバターを表示",
"hide12": "1★2★を隠す",
"showPrivate": "ガチャ限定の@:(common.operator)を表示する",
"showNotImplemented": "実装されていない@:(common.operator)を表示する",
"showNotUnreleased": "実装されていない@:(common.operator)を表示する",
"showGuarantees": "4★以上確定タグの組み合わせを表示する"
},
"tagType": {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/jp/riic.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"setting": {
"hideIrrelevant": "フィルタリング時に無関係なスキルを隠す",
"showNotImplemented": "実装されていない@:(common.operator)を表示する"
"showNotUnreleased": "実装されていない@:(common.operator)を表示する"
},
"select": {
"BUILDING": "施設",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/tw/hr.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"showAvatar": "顯示頭像",
"hide12": "隱藏1★2★",
"showPrivate": "顯示非公開招募@:(common.operator)",
"showNotImplemented": "顯示未實裝@:(common.operator)",
"showNotUnreleased": "顯示未實裝@:(common.operator)",
"showGuarantees": "檢視保底詞條組合"
},
"tagType": {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/tw/riic.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"setting": {
"hideIrrelevant": "篩選時隱藏無關技能",
"showNotImplemented": "顯示未實裝@:(common.operator)"
"showNotUnreleased": "顯示未實裝@:(common.operator)"
},
"select": {
"BUILDING": "設施",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/us/hr.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"showAvatar": "Show avatar",
"hide12": "Hide 1★/2★",
"showPrivate": "Show gacha-only operators",
"showNotImplemented": "Show spoiler operators",
"showNotUnreleased": "Show unreleased operators",
"showGuarantees": "Show all combinations with 4★ or higher"
},
"tagType": {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/us/riic.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"setting": {
"hideIrrelevant": "Hide irrelevant skills when filtering",
"showNotImplemented": "Show spoiler operators"
"showNotUnreleased": "Show unreleased operators"
},
"select": {
"BUILDING": "Building",
Expand Down
12 changes: 6 additions & 6 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ new Vue({
render: h => h(App),
provide() {
return {
isImplementedChar: this.isImplementedChar,
isUnreleasedChar: this.isUnreleasedChar,
};
},
data: {
Expand Down Expand Up @@ -185,9 +185,9 @@ new Vue({
}
},
},
isImplementedGradedUniequip() {
isUnreleasedGradedUniequip() {
// 分级模组和黑键同期实装
return this.isImplementedChar('4046_ebnhlz');
return this.isUnreleasedChar('4046_ebnhlz');
},
},
methods: {
Expand All @@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions src/views/Hr.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
<mdui-switch
v-if="$root.serverNotZH"
class="mdui-m-r-2"
v-model="setting.showNotImplemented"
>{{ $t('hr.setting.showNotImplemented') }}</mdui-switch
v-model="setting.showNotUnreleased"
>{{ $t('hr.setting.showNotUnreleased') }}</mdui-switch
>
</td>
</tr>
Expand Down Expand Up @@ -417,7 +417,7 @@ export default defineComponent({
showAvatar: false,
hide12: false,
showPrivate: false,
showNotImplemented: false,
showNotUnreleased: false,
showGuarantees: false,
ocrspaceApikey: '',
useLocalOCR: false,
Expand Down Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions src/views/Material/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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) => {
Expand Down Expand Up @@ -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])
Expand All @@ -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() {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
);
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/views/Material/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<drag
:key="char.name"
class="mdui-chip no-bs mdui-m-r-1 pointer"
:class="{ 'opacity-5': !$root.isImplementedChar(char.name) }"
:class="{ 'opacity-5': !$root.isUnreleasedChar(char.name) }"
@click="$refs.presetTodoDialog.open({ tag: char, index })"
>
<avatar class="mdui-chip-icon no-pe" :name="char.name" />
Expand Down
12 changes: 6 additions & 6 deletions src/views/RIIC.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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}`)
}}</tag-button
>
</div>
Expand All @@ -62,8 +62,8 @@
<mdui-switch
v-if="$root.serverNotCN"
class="mdui-m-r-2"
v-model="setting.showNotImplemented"
>{{ $t('riic.setting.showNotImplemented') }}</mdui-switch
v-model="setting.showNotUnreleased"
>{{ $t('riic.setting.showNotUnreleased') }}</mdui-switch
>
</div>
</div>
Expand Down Expand Up @@ -163,7 +163,7 @@ export default defineComponent({
tagDisplay,
setting: {
hideIrrelevant: false,
showNotImplemented: false,
showNotUnreleased: false,
},
settingList: ['hideIrrelevant'],
drawer: null,
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 3d4d89d

Please sign in to comment.