diff --git a/src/assets/icons/menu/illustrated.png b/src/assets/icons/menu/illustrated.png new file mode 100644 index 0000000..83217ff Binary files /dev/null and b/src/assets/icons/menu/illustrated.png differ diff --git a/src/components/drawer.vue b/src/components/drawer.vue new file mode 100644 index 0000000..3b96ad5 --- /dev/null +++ b/src/components/drawer.vue @@ -0,0 +1,137 @@ + + + + \ No newline at end of file diff --git a/src/components/equip-icon.vue b/src/components/equip-icon.vue index 0e592b7..54dbd88 100644 --- a/src/components/equip-icon.vue +++ b/src/components/equip-icon.vue @@ -3,7 +3,7 @@ :style="{ 'box-shadow': 'inset 0 0 7px 2px ' + ((equip && equip.quality.color) || '#a1a1a1') }"> -
lv{{ equip.lv }}
+
lv{{ equip.lv }}
@@ -25,12 +25,12 @@ const prop = defineProps({ }) const isUnique = (equip) => { - if(!equip){ + if (!equip) { return false; } const quality = equip.quality.quality; return quality && quality == qualitys[4]; - } +} const iconClass = computed(() => { if (prop.equip && prop.equip.isUnique()) { @@ -51,7 +51,8 @@ onMounted(() => { }); justify-content: center; border-radius: 0.3rem; position: relative; - .lv{ + + .lv { position: absolute; left: 0.1rem; bottom: 0.1rem; diff --git a/src/components/index.ts b/src/components/index.ts index 142a581..58a1c70 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -4,6 +4,9 @@ import EquipTip from './equip-tip.vue'; import EquipTips from './equip-tips.vue'; import EquipIcon from './equip-icon.vue'; import Dialog from './dialog.vue'; +import Drawer from './drawer.vue'; import PopoverMenu from './popover-menu.vue'; import Confirm from './confirm.vue'; -export { Tooltip, Equip, EquipTip, EquipTips, EquipIcon, Dialog, PopoverMenu, Confirm }; +export { Tooltip, Equip, EquipTip, EquipTips, EquipIcon, Dialog, Drawer, PopoverMenu, Confirm }; + +export * from './tabs'; diff --git a/src/components/tabs/index.ts b/src/components/tabs/index.ts new file mode 100644 index 0000000..b9d4815 --- /dev/null +++ b/src/components/tabs/index.ts @@ -0,0 +1,4 @@ +import Tab from './tab.vue'; +import Tabs from './tabs.vue'; + +export { Tabs, Tab }; diff --git a/src/components/tabs/tab.vue b/src/components/tabs/tab.vue new file mode 100644 index 0000000..35fce06 --- /dev/null +++ b/src/components/tabs/tab.vue @@ -0,0 +1,36 @@ + + + + \ No newline at end of file diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue new file mode 100644 index 0000000..fd63e5f --- /dev/null +++ b/src/components/tabs/tabs.vue @@ -0,0 +1,102 @@ + + + + \ No newline at end of file diff --git a/src/config/equips/armor.ts b/src/config/equips/armor.ts index acbc1c5..6f680a8 100644 --- a/src/config/equips/armor.ts +++ b/src/config/equips/armor.ts @@ -3,7 +3,7 @@ import { qualitys, entry_initor, extra_entry_num, quality_coefficient } from './ const extraEntrys = ['atk', 'hp', 'def', 'defPercent', 'hpPercent']; -const uniqueCategorys = [ +export const armorUniqueCategorys = [ { name: 'dispute', icon: 'U_Armor01.png', @@ -67,7 +67,7 @@ const uniqueCategorys = [ ], }, ]; -const categorys = [ +export const armorCategorys = [ { name: 'guard', icon: 'A_A2.png', @@ -141,7 +141,7 @@ export const armorExtraEntry = (quality, lv) => { }; const createBase = (quality, lv) => { - const array = quality == 'unique' ? uniqueCategorys : categorys; + const array = quality == 'unique' ? armorUniqueCategorys : armorCategorys; const category = array[Math.floor(Math.random() * array.length)]; const entry = new Array(); category.entry.forEach((item) => { diff --git a/src/config/equips/neck.ts b/src/config/equips/neck.ts index 3e4a9d5..66838f3 100644 --- a/src/config/equips/neck.ts +++ b/src/config/equips/neck.ts @@ -3,7 +3,7 @@ import { qualitys, entry_initor, extra_entry_num, quality_coefficient } from './ const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'bloc']; -const uniqueCategorys = [ +export const neckUniqueCategorys = [ { name: 'demonSlayer', icon: 'U_neck01.png', @@ -49,7 +49,7 @@ const uniqueCategorys = [ ], }, ]; -const categorys = [ +export const neckCategorys = [ { name: 'crusade', icon: 'Ac_1.png', @@ -108,7 +108,7 @@ export const neckExtraEntry = (quality, lv) => { }; const createBase = (quality, lv) => { - const array = quality == 'unique' ? uniqueCategorys : categorys; + const array = quality == 'unique' ? neckUniqueCategorys : neckCategorys; const category = array[Math.floor(Math.random() * array.length)]; const entry = new Array(); category.entry.forEach((item) => { diff --git a/src/config/equips/ring.ts b/src/config/equips/ring.ts index 51a5ad7..2edb88c 100644 --- a/src/config/equips/ring.ts +++ b/src/config/equips/ring.ts @@ -3,7 +3,7 @@ import { qualitys, entry_initor, extra_entry_num, quality_coefficient } from './ const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def']; -const uniqueCategorys = [ +export const ringUniqueCategorys = [ { name: 'death', icon: 'U_ring01.png', @@ -48,7 +48,7 @@ const uniqueCategorys = [ ], }, ]; -const categorys = [ +export const ringCategorys = [ { name: 'life', icon: 'Ac_9.png', @@ -102,7 +102,7 @@ export const ringExtraEntry = (quality, lv) => { }; const createBase = (quality, lv) => { - const array = quality == 'unique' ? uniqueCategorys : categorys; + const array = quality == 'unique' ? ringUniqueCategorys : ringCategorys; const category = array[Math.floor(Math.random() * array.length)]; const entry = new Array(); category.entry.forEach((item) => { @@ -112,4 +112,3 @@ const createBase = (quality, lv) => { }); return new EquipBase(category.name, category.icon, entry); }; - diff --git a/src/config/equips/weapon.ts b/src/config/equips/weapon.ts index 08cff46..3f7ad35 100644 --- a/src/config/equips/weapon.ts +++ b/src/config/equips/weapon.ts @@ -3,7 +3,7 @@ import { qualitys, entry_initor, extra_entry_num, quality_coefficient } from './ const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'atkPercent', 'defPercent', 'hpPercent']; -const uniqueCategorys = [ +export const weaponUniqueCategorys = [ { name: 'creation', icon: 'U_Sword01.png', @@ -87,7 +87,7 @@ const uniqueCategorys = [ ], }, ]; -const categorys = [ +export const weaponCategorys = [ { name: 'hellrock', icon: 'W_Sword016.png', @@ -169,7 +169,7 @@ export const weaponExtraEntry = (quality, lv) => { }; const createBase = (quality, lv) => { - const array = quality == 'unique' ? uniqueCategorys : categorys; + const array = quality == 'unique' ? weaponUniqueCategorys : weaponCategorys; const category = array[Math.floor(Math.random() * array.length)]; const entry = new Array(); category.entry.forEach((item) => { diff --git a/src/config/i18n/zh.ts b/src/config/i18n/zh.ts index 6e84462..e63487d 100644 --- a/src/config/i18n/zh.ts +++ b/src/config/i18n/zh.ts @@ -106,9 +106,9 @@ export default class Zh { neaten = '一键整理'; use = '装备'; strengthen = '强化'; - stren = ['需要金币', '强化至','垫一刀', '自动强化目标等级', '自动强化', '自动强化中', '中断自动强化']; - success= '成功'; - fail= '失败'; + stren = ['需要金币', '强化至', '垫一刀', '自动强化目标等级', '自动强化', '自动强化中', '中断自动强化']; + success = '成功'; + fail = '失败'; stDesc = [ '强化说明', '花费金币强化装备', @@ -172,4 +172,6 @@ export default class Zh { importArchive = ['导入', '导入存档成功,继续游戏吧!', '导入存档失败']; music = ['播放或禁音背景音乐(M)']; + + illustrated = ['装备图鉴(I)']; } diff --git a/src/config/icons.ts b/src/config/icons.ts index 22aa975..14d84bf 100644 --- a/src/config/icons.ts +++ b/src/config/icons.ts @@ -8,6 +8,7 @@ export const menu_icons = { importGame: require('@/assets/icons/menu/icon-import.png'), musicPlay: require('@/assets/icons/menu/music-play.png'), musicPause: require('@/assets/icons/menu/music-pause.png'), + illustrated: require('@/assets/icons/menu/illustrated.png'), }; export const attr_icon_urls = { diff --git a/src/views/illustrated/equips.vue b/src/views/illustrated/equips.vue new file mode 100644 index 0000000..1f9f51f --- /dev/null +++ b/src/views/illustrated/equips.vue @@ -0,0 +1,76 @@ + + + + \ No newline at end of file diff --git a/src/views/illustrated/illustrated.vue b/src/views/illustrated/illustrated.vue new file mode 100644 index 0000000..f99f19d --- /dev/null +++ b/src/views/illustrated/illustrated.vue @@ -0,0 +1,69 @@ + + + + \ No newline at end of file diff --git a/src/views/illustrated/index.ts b/src/views/illustrated/index.ts new file mode 100644 index 0000000..8097a4b --- /dev/null +++ b/src/views/illustrated/index.ts @@ -0,0 +1,3 @@ +import Illustrated from './illustrated.vue'; + +export default Illustrated; diff --git a/src/views/menu.vue b/src/views/menu.vue index 52daf84..b053be0 100644 --- a/src/views/menu.vue +++ b/src/views/menu.vue @@ -7,6 +7,7 @@ + @@ -21,6 +22,7 @@ import Reborn from "./reborn"; import SaveGame from "./save-game.vue"; import Archive from "./archive.vue"; import Music from "./music.vue"; +import Illustrated from "./illustrated"; const { t } = useI18n(); const { state, commit, dispatch } = useStore(); @@ -33,7 +35,7 @@ onMounted(() => { }); top: 1rem; background: rgba($color: #000000, $alpha: 0.1); left: 0.5rem; - bottom:0.5rem; + bottom: 0.5rem; padding: 0.1rem; border-top-right-radius: 0.1rem; // width:2.5rem;