diff --git a/src/components/Fireworks.vue b/src/components/Fireworks.vue index 94484f83..492262a5 100644 --- a/src/components/Fireworks.vue +++ b/src/components/Fireworks.vue @@ -126,8 +126,8 @@ onMounted(() => { _move() { let dx = this.boomArea.x - this.x, dy = this.boomArea.y - this.y; - this.x = this.x + dx * 0.02; - this.y = this.y + dy * 0.02; + this.x = this.x + dx * 0.01; + this.y = this.y + dy * 0.01; // console.log(this.x, this.y, dx, this.ba) if (Math.abs(dx) <= this.ba && Math.abs(dy) <= this.ba) { diff --git a/src/components/Practice/Practice.vue b/src/components/Practice/Practice.vue index 8b7405cf..7ec13d22 100644 --- a/src/components/Practice/Practice.vue +++ b/src/components/Practice/Practice.vue @@ -25,6 +25,9 @@ let wordData = $ref({ index: -1 }) +let articleData = $ref({ + +}) watch(()=>store.load,n=>{ if (n){ wordData.words = store.chapter diff --git a/src/components/Practice/TypeArticle.vue b/src/components/Practice/TypeArticle.vue index 83f4ba12..a098a43f 100644 --- a/src/components/Practice/TypeArticle.vue +++ b/src/components/Practice/TypeArticle.vue @@ -21,6 +21,8 @@ import {useBaseStore} from "@/stores/base"; import Footer from "@/components/Practice/Footer.vue" import {usePracticeStore} from "@/components/Practice/usePracticeStore.ts"; import {useEventListener} from "@/hooks/useEvent.ts"; +import TypeWord from "@/components/Practice/TypeWord.vue"; +import {emitter, EventKey} from "@/utils/eventBus.ts"; let article1 = `How does the older investor differ in his approach to investment from the younger investor? There is no shortage of tipsters around offering 'get-rich-quick' opportunities. But if you are a serious private investor, leave the Las Vegas mentality to those with money to fritter. The serious investor needs a proper 'portfolio' -- a well-planned selection of investments, with a definite structure and a clear aim. But exactly how does a newcomer to the stock market go about achieving that? @@ -59,10 +61,11 @@ const practiceStore = usePracticeStore() let isPlay = $ref(false) let articleWrapperRef = $ref(null) -let sectionIndex = $ref(0) -let sentenceIndex = $ref(0) -let wordIndex = $ref(6) -let index = $ref(0) +let tabIndex = $ref(0) +let sectionIndex = $ref(1) +let sentenceIndex = $ref(2) +let wordIndex = $ref(4) +let stringIndex = $ref(0) let input = $ref('') let wrong = $ref('') let isSpace = $ref(false) @@ -73,6 +76,11 @@ let hoverIndex = $ref({ sentenceIndex: 0, }) +let wordData = $ref({ + words: [], + index: -1 +}) + let article = reactive
({ article: article1, articleTranslate: `上星期我去看戏。我的座位很好，戏很有意思，但我却无法欣赏。一青年男子与一青年女子坐在我的身后，大声地说着话。我非常生气，因为我听不见演员在说什么。我回过头去，怒视着那一男一女，他们却毫不理会。最后，我忍不住了，又一次回过头去，生气地说，“我一个字也听不见了！” @@ -148,12 +156,12 @@ function play() { window.speechSynthesis.speak(msg); } - const currentIndex = computed(() => { return `${sectionIndex}${sentenceIndex}${wordIndex}` }) function onKeyDown(e: KeyboardEvent) { + if (tabIndex !== 0) return // console.log('keyDown', e.key, e.code, e.keyCode) wrong = '' let currentSection = article.sections[sectionIndex] @@ -163,12 +171,11 @@ function onKeyDown(e: KeyboardEvent) { if (isSpace) { if (e.code === 'Space') { isSpace = false - index = 0 + stringIndex = 0 wordIndex++ if (!store.skipWordNamesWithSimpleWords.includes(currentWord.toLowerCase())) { practiceStore.inputNumber++ } - playCorrect() if (!currentSentence.words[wordIndex]) { wordIndex = 0 @@ -212,22 +219,33 @@ function onKeyDown(e: KeyboardEvent) { ) { let letter = e.key - let key = currentWord[index] - console.log('key', key,) + let key = currentWord[stringIndex] + // console.log('key', key,) if (key === letter) { input += letter wrong = '' - console.log('匹配上了') - index++ + // console.log('匹配上了') + stringIndex++ //如果当前词没有index，说明这个词完了，下一个是空格 - if (!currentWord[index]) { + if (!currentWord[stringIndex]) { input = wrong = '' isSpace = true //但如果当前句子也没有index+1，并且当前段也没sentenceIndex+1，说明本段完了，不需要打空格，直接跳到下一段吧 if (!currentSentence.words[wordIndex + 1] && !currentSection[sentenceIndex + 1]) { - wordIndex = sentenceIndex = index = 0 + wordIndex = sentenceIndex = stringIndex = 0 sectionIndex++ isSpace = false + if (!article.sections[sectionIndex]) { + console.log('文章打完了') + //如果有错误单词，那么就滑动到单词界面复习 + if (practiceStore.wrongWords.length) { + tabIndex = 1 + wordData.words = cloneDeep(practiceStore.wrongWords) + wordData.index = 0 + } else { + emitter.emit(EventKey.openStatModal) + } + } } } } else { @@ -255,7 +273,7 @@ function onKeyDown(e: KeyboardEvent) { setTimeout(() => { wrong = '' }, 500) - console.log('未匹配') + // console.log('未匹配') } playKeySound() } else { @@ -285,7 +303,6 @@ function onKeyDown(e: KeyboardEvent) { } } } - // console.log( // 'sectionIndex', sectionIndex, // 'sentenceIndex', sentenceIndex, @@ -355,7 +372,7 @@ function otherWord(word: string, i: number, i2: number, i3: number) {