Merge pull request #163 from huangchen1031/main

fix(AchievementSidebar): 修复“所有”模块的计数问题
YuehaiTeam · Nov 19, 2024 · dbec520 · dbec520
2 parents 493ed73 + 4fac81b
commit dbec520
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/generated/amos-data b/src/generated/amos-data
diff --git a/src/views/Achievement/AchievementSidebar.vue b/src/views/Achievement/AchievementSidebar.vue
@@ -19,12 +19,22 @@
                         <small>
                             <b>
                                 <img :src="img('yuanshi')" alt="原石" />
-                                {{ achievementFinStat[i.id || 0]?.reward || 0 }}/{{ i.totalReward }}
+                                {{
+                                    i.key === ALLCAT
+                                        ? totalFin?.reward || 0
+                                        : achievementFinStat[i.id || 0]?.reward || 0
+                                }}/{{ i.totalReward }}
                             </b>
                             <span>
-                                {{ achievementFinStat[i.id || 0]?.count || 0 }}/{{ i.achievements.length }} ({{
-                                    Math.round(
-                                        ((achievementFinStat[i.id || 0]?.count || 0) / i.achievements.length) * 100,
+                                {{
+                                    i.key === ALLCAT ? totalFin?.count || 0 : achievementFinStat[i.id || 0]?.count || 0
+                                }}/{{ i.achievements.length }} ({{
+                                    Math.floor(
+                                        ((i.key === ALLCAT
+                                            ? totalFin?.count || 0
+                                            : achievementFinStat[i.id || 0]?.count || 0) /
+                                            i.achievements.length) *
+                                            100,
                                     )
                                 }}%)
                             </span>
@@ -55,7 +65,7 @@ import { i18n } from '@/i18n'
 import { ref, toRef, defineComponent } from 'vue'
 import type { ElScrollbar } from 'element-plus'
 export default defineComponent({
-    props: ['achievementCat', 'achievementFinStat', 'hideFinished'],
+    props: ['achievementCat', 'achievementFinStat', 'hideFinished', 'totalFin'],
     setup() {
         const DEFAULTCAT = 'wonders-of-the-world'
         const ALLCAT = 'all'

diff --git a/src/views/Achievement/Index.vue b/src/views/Achievement/Index.vue
@@ -104,6 +104,7 @@
                 ></div>
             </div>
             <achievement-sidebar
+                :totalFin="totalFin"
                 :achievementCat="allAchievementCat"
                 :achievementFinStat="achievementFinStat"
                 :hideFinished="hideFinished"
+2 −2		amos/TextMap/TextMap-CHS.d.ts
+3,581 −1		amos/TextMap/TextMap-CHS.js
+2 −2		amos/TextMap/TextMap-EN.d.ts
+3,581 −1		amos/TextMap/TextMap-EN.js
+3 −3		amos/achievements/index.d.ts
+16,407 −1		amos/achievements/index.js
+3 −3		amos/achievements/partial.d.ts
+128 −1		amos/achievements/partial.js
+5 −5		amos/achievements/typing-partial.d.ts
+1 −1		amos/achievements/typing-partial.js
+23 −23		amos/achievements/typing.d.ts
+1 −1		amos/achievements/typing.js
+3 −3		amos/artifacts/index.d.ts
+632 −1		amos/artifacts/index.js
+15 −15		amos/artifacts/typing.d.ts
+8 −8		amos/artifacts/typing.js
+3 −3		amos/characters/index.d.ts
+92 −1		amos/characters/index.js
+5 −5		amos/characters/typing.d.ts
+1 −1		amos/characters/typing.js
+3,581 −0		json/TextMap/TextMap-CHS.json
+3,581 −0		json/TextMap/TextMap-EN.json
+17,193 −0		json/achievements/index.json
+128 −0		json/achievements/partial.json
+1,111 −0		json/artifacts/index.json
+92 −0		json/characters/index.json
+13 −0		package.json
+0 −1		tsconfig.tsbuildinfo