diff --git a/public/assets/Shikigami/l/563.png b/public/assets/Shikigami/l/563.png
new file mode 100644
index 0000000..10ad108
Binary files /dev/null and b/public/assets/Shikigami/l/563.png differ
diff --git a/public/assets/Shikigami/l/564.png b/public/assets/Shikigami/l/564.png
new file mode 100644
index 0000000..b1241ba
Binary files /dev/null and b/public/assets/Shikigami/l/564.png differ
diff --git a/public/assets/Shikigami/l/567.png b/public/assets/Shikigami/l/567.png
new file mode 100644
index 0000000..9177d22
Binary files /dev/null and b/public/assets/Shikigami/l/567.png differ
diff --git a/public/assets/Shikigami/l/576.png b/public/assets/Shikigami/l/576.png
new file mode 100644
index 0000000..2c04482
Binary files /dev/null and b/public/assets/Shikigami/l/576.png differ
diff --git a/public/assets/Shikigami/sp/566.png b/public/assets/Shikigami/sp/566.png
new file mode 100644
index 0000000..a5c7be1
Binary files /dev/null and b/public/assets/Shikigami/sp/566.png differ
diff --git a/public/assets/Shikigami/sp/568.png b/public/assets/Shikigami/sp/568.png
new file mode 100644
index 0000000..ee13d17
Binary files /dev/null and b/public/assets/Shikigami/sp/568.png differ
diff --git a/public/assets/Shikigami/sp/572.png b/public/assets/Shikigami/sp/572.png
new file mode 100644
index 0000000..e0315b9
Binary files /dev/null and b/public/assets/Shikigami/sp/572.png differ
diff --git a/public/assets/Shikigami/sp/574.png b/public/assets/Shikigami/sp/574.png
new file mode 100644
index 0000000..223beb7
Binary files /dev/null and b/public/assets/Shikigami/sp/574.png differ
diff --git a/public/assets/Shikigami/sp/578.png b/public/assets/Shikigami/sp/578.png
new file mode 100644
index 0000000..244b1c7
Binary files /dev/null and b/public/assets/Shikigami/sp/578.png differ
diff --git a/public/assets/Shikigami/sp/579.png b/public/assets/Shikigami/sp/579.png
new file mode 100644
index 0000000..b74e0b7
Binary files /dev/null and b/public/assets/Shikigami/sp/579.png differ
diff --git a/public/assets/Shikigami/sp/580.png b/public/assets/Shikigami/sp/580.png
new file mode 100644
index 0000000..aa969de
Binary files /dev/null and b/public/assets/Shikigami/sp/580.png differ
diff --git a/public/assets/Shikigami/ssr/569.png b/public/assets/Shikigami/ssr/569.png
new file mode 100644
index 0000000..fb04834
Binary files /dev/null and b/public/assets/Shikigami/ssr/569.png differ
diff --git a/public/assets/Shikigami/ssr/570.png b/public/assets/Shikigami/ssr/570.png
new file mode 100644
index 0000000..52a4362
Binary files /dev/null and b/public/assets/Shikigami/ssr/570.png differ
diff --git a/public/assets/Shikigami/ssr/573.png b/public/assets/Shikigami/ssr/573.png
new file mode 100644
index 0000000..6e275be
Binary files /dev/null and b/public/assets/Shikigami/ssr/573.png differ
diff --git a/public/assets/Shikigami/ssr/575.png b/public/assets/Shikigami/ssr/575.png
new file mode 100644
index 0000000..407242b
Binary files /dev/null and b/public/assets/Shikigami/ssr/575.png differ
diff --git a/public/assets/Shikigami/ssr/577.png b/public/assets/Shikigami/ssr/577.png
new file mode 100644
index 0000000..de3937d
Binary files /dev/null and b/public/assets/Shikigami/ssr/577.png differ
diff --git a/public/assets/Shikigami/ssr/581.png b/public/assets/Shikigami/ssr/581.png
new file mode 100644
index 0000000..8f2066a
Binary files /dev/null and b/public/assets/Shikigami/ssr/581.png differ
diff --git a/public/assets/Yuhun/夜荒魂.png b/public/assets/Yuhun/夜荒魂.png
new file mode 100644
index 0000000..7e5054d
Binary files /dev/null and b/public/assets/Yuhun/夜荒魂.png differ
diff --git a/public/assets/Yuhun/奉海图.png b/public/assets/Yuhun/奉海图.png
new file mode 100644
index 0000000..efa7020
Binary files /dev/null and b/public/assets/Yuhun/奉海图.png differ
diff --git a/public/assets/Yuhun/散件.png b/public/assets/Yuhun/散件.png
new file mode 100644
index 0000000..5ce1209
Binary files /dev/null and b/public/assets/Yuhun/散件.png differ
diff --git a/public/assets/Yuhun/无刀取.png b/public/assets/Yuhun/无刀取.png
new file mode 100644
index 0000000..ae13ecc
Binary files /dev/null and b/public/assets/Yuhun/无刀取.png differ
diff --git a/src/App.vue b/src/App.vue
index 4b1ed4b..23175a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,16 +1,25 @@
-
+
-
+
@@ -20,9 +29,11 @@ import Toolbar from './components/Toolbar.vue'
#main-container {
margin-top: 48px; /* 与工具栏高度相同 */
position: relative;
- width: 100%;
+
min-height: 100vh; /* 允许容器扩展 */
-//position: relative;
+ display: inline-block;
+ max-width: 100%;
+
}
/* 如果 Yys 组件需要特定的高度或布局，可以根据需要调整 */
diff --git a/src/components/ShikigamiProperty.vue b/src/components/ShikigamiProperty.vue
index f952649..80846b3 100644
--- a/src/components/ShikigamiProperty.vue
+++ b/src/components/ShikigamiProperty.vue
@@ -31,7 +31,7 @@
-
+
@@ -67,20 +67,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -122,7 +111,7 @@
-
+
@@ -138,8 +127,12 @@ import propertyData from "../data/property.json";
import {ref, watch, computed} from 'vue'
import ShikigamiSelect from "@/components/ShikigamiSelect.vue";
import YuhunSelect from "@/components/YuhunSelect.vue";
+import {useI18n} from 'vue-i18n'
// import YuhunSelect from "./YuhunSelect.vue";
+// 获取当前的 i18n 实例
+const {t} = useI18n()
+
const props = defineProps({
currentShikigami: {
type: Object,
@@ -152,8 +145,9 @@ const props = defineProps({
const emit = defineEmits(['closeProperty', 'updateProperty'])
-let showYuhunSelect = ref(false)
-let shikigami = ref({
+const showYuhunSelect = ref(false)
+const yuhunTarget = ref('1')
+const shikigami = ref({
edit: false,
yuhun: {
yuhunSetEffect: [],
@@ -165,11 +159,27 @@ let shikigami = ref({
levelRequired: "40",
speed: "",
skillRequiredMode: "all",
- skillRequired: ["技能一", "技能二", "技能三"]
+ skillRequired: ["5", "5", "5"]
})
-let yuhunIndex = ref(-1)
-let current = ref({})
-let show = ref(props.showProperty)
+const yuhunIndex = ref(-1)
+const current = ref({})
+const show = ref(props.showProperty)
+const yuhunTargetOptions = [
+ { label: 'yuhun_target.fullName.0', value: '0' },
+ { label: 'yuhun_target.fullName.1', value: '1' },
+ { label: 'yuhun_target.fullName.2', value: '2' },
+ { label: 'yuhun_target.fullName.3', value: '3' },
+ { label: 'yuhun_target.fullName.4', value: '4' },
+ { label: 'yuhun_target.fullName.5', value: '5' },
+ { label: 'yuhun_target.fullName.6', value: '6' },
+ { label: 'yuhun_target.fullName.7', value: '7' },
+ { label: 'yuhun_target.fullName.8', value: '8' },
+ { label: 'yuhun_target.fullName.9', value: '9' },
+ { label: 'yuhun_target.fullName.10', value: '10' },
+ { label: 'yuhun_target.fullName.11', value: '11' },
+ { label: 'yuhun_target.fullName.12', value: '12' },
+]
+
watch(() => props.currentShikigami, (newVal) => {
if (newVal.properties != undefined && newVal.properties.edit == true) {
@@ -184,10 +194,20 @@ watch(() => props.showProperty, (newVal) => {
show.value = newVal;
})
-watch(() => shikigami.value.yuhun.target, (newVal) => {
+watch(() => shikigami.value.skillRequiredMode, (newVal) => {
+ if(newVal == "all") {
+ shikigami.value.skillRequired = ["5", "5", "5"]
+ }
+ else if (newVal == "111") {
+ shikigami.value.skillRequired = ["1", "1", "1"]
+ }
+})
+
+watch(() => yuhunTarget.value, (newVal) => {
switch (newVal) {
//
case "1": {
+ shikigami.value.yuhun.target = 1
shikigami.value.yuhun.property2 = ["Attack"];
shikigami.value.yuhun.property4 = ["Attack"];
shikigami.value.yuhun.property6 = ["Crit", "CritDamage"];
@@ -195,6 +215,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "2": {
+ shikigami.value.yuhun.target = 2
shikigami.value.yuhun.property2 = ["Speed"];
shikigami.value.yuhun.property4 = ["ControlHit"];
shikigami.value.yuhun.property6 = ["Attack", "Defense", "Health", "Crit", "CritDamage"];
@@ -202,6 +223,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "3": {
+ shikigami.value.yuhun.target = 3
shikigami.value.yuhun.property2 = ["Speed"];
shikigami.value.yuhun.property4 = ["ControlMiss"];
shikigami.value.yuhun.property6 = ["Attack", "Defense", "Health", "Crit", "CritDamage"];
@@ -209,6 +231,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "4": {
+ shikigami.value.yuhun.target = 4
shikigami.value.yuhun.property2 = ["Health"];
shikigami.value.yuhun.property4 = ["Health"];
shikigami.value.yuhun.property6 = ["Health"];
@@ -216,6 +239,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "5": {
+ shikigami.value.yuhun.target = 5
shikigami.value.yuhun.property2 = ["Attack"];
shikigami.value.yuhun.property4 = ["Attack"];
shikigami.value.yuhun.property6 = ["Attack"];
@@ -223,6 +247,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "6": {
+ shikigami.value.yuhun.target = 6
shikigami.value.yuhun.property2 = ["Defense"];
shikigami.value.yuhun.property4 = ["Defense"];
shikigami.value.yuhun.property6 = ["Defense"];
@@ -230,6 +255,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "7": {
+ shikigami.value.yuhun.target = 7
shikigami.value.yuhun.property2 = ["Speed"];
shikigami.value.yuhun.property4 = ["Attack", "Defense", "Health", "ControlHit", "ControlMiss"];
shikigami.value.yuhun.property6 = ["Attack", "Defense", "Health", "Crit", "CritDamage"];
@@ -237,6 +263,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "8": {
+ shikigami.value.yuhun.target = 8
shikigami.value.yuhun.property2 = ["Attack", "Defense", "Health", "Speed"];
shikigami.value.yuhun.property4 = ["Attack", "Defense", "Health", "ControlHit", "ControlMiss"];
shikigami.value.yuhun.property6 = ["Crit"];
@@ -244,6 +271,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "9": {
+ shikigami.value.yuhun.target = 9
shikigami.value.yuhun.property2 = ["Attack", "Defense", "Health", "Speed"];
shikigami.value.yuhun.property4 = ["Attack", "Defense", "Health", "ControlHit", "ControlMiss"];
shikigami.value.yuhun.property6 = ["CritDamage"];
@@ -251,6 +279,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "10": {
+ shikigami.value.yuhun.target = 10
shikigami.value.yuhun.property2 = ["Speed"];
shikigami.value.yuhun.property4 = ["Health"];
shikigami.value.yuhun.property6 = ["Crit", "CritDamage"];
@@ -258,6 +287,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "11": {
+ shikigami.value.yuhun.target = 11
shikigami.value.yuhun.property2 = ["Speed"];
shikigami.value.yuhun.property4 = ["ControlHit", "ControlMiss"];
shikigami.value.yuhun.property6 = ["Attack", "Defense", "Health", "Crit", "CritDamage"];
@@ -265,6 +295,7 @@ watch(() => shikigami.value.yuhun.target, (newVal) => {
}
//
case "12": {
+ shikigami.value.yuhun.target = 12
shikigami.value.yuhun.property2 = ["Defense"];
shikigami.value.yuhun.property4 = ["Defense"];
shikigami.value.yuhun.property6 = ["Crit", "CritDamage"];
@@ -313,11 +344,12 @@ const confirm = () => {
}
const resetData = () => {
+ yuhunTarget.value = '1'
shikigami.value = {
edit: false,
yuhun: {
yuhunSetEffect: [],
- target: "伤害输出",
+ target: "0",
property2: ["Attack"],
property4: ["Attack"],
property6: ["Crit", "CritDamage"],
@@ -325,7 +357,11 @@ const resetData = () => {
levelRequired: "40",
speed: "",
skillRequiredMode: "all",
- skillRequired: ["技能一", "技能二", "技能三"]
+ skillRequired: ["5", "5", "5"]
}
}
+
+const updateSkillRequired = (index, value) => {
+ shikigami.value.skillRequired[index] = value;
+}
\ No newline at end of file
diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue
index 1158e65..58ccf80 100644
--- a/src/components/Toolbar.vue
+++ b/src/components/Toolbar.vue
@@ -1,19 +1,19 @@