v1.6.1

050644zf · Apr 13, 2024 · c7d7dd2 · c7d7dd2
1 parent 1f40bd0
commit c7d7dd2
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 32 deletions.
diff --git a/reader/src/ASTRv2/components/opcard.vue b/reader/src/ASTRv2/components/opcard.vue
@@ -53,7 +53,7 @@
                         </template>
                             <n-scrollbar style="max-height: 50vh;">
                                 <n-flex vertical align="center">
-                                    <n-image v-if="equip.type=='ADVANCED'" :src="'https://raw.githubusercontent.com/Aceship/Arknight-Images/main/equip/icon/'+equip.uniEquipId +'.png'" height="200"/>
+                                    <n-image v-if="equip.type=='ADVANCED'" :src="getEquipUrl(equip.uniEquipId)" height="200"/>
                                 <n-text v-html="parseContent(equip.uniEquipDesc)"></n-text>
                                 </n-flex>
 
@@ -97,6 +97,7 @@
 
 <script>
 import func from '../func.js'
+import source from '../source.js'
 import {ArrowForwardOutlined} from "@vicons/material"
 import i18n from '../i18n.json'
 export default {
@@ -126,6 +127,9 @@ export default {
             var fontcolor = "white";
             if(color=="yellow") fontcolor = "black";
             return {color:color, textColor:fontcolor};
+        },
+        getEquipUrl(uniEquipId){
+            return source.getEquipUrl(func.imageRepo, uniEquipId)
         }
     },
     components:{

diff --git a/reader/src/ASTRv2/content/img.vue b/reader/src/ASTRv2/content/img.vue
@@ -1,11 +1,12 @@
 <template>
     <n-image
         :class="{images: imgtype=='images' || bgMode=='full', backgrounds:imgtype=='backgrounds'&&bgMode=='stripe'}"
-        :src="`https://raw.githubusercontent.com/Aceship/Arknight-Images/main/avg/${imgtype}/${line.attributes.image}.png`" />
+        :src="getAvgUrl()" />
 </template>
 
 <script>
 import func from '../func'
+import source from '../source'
 export default {
     data() {
         return {
@@ -20,6 +21,12 @@ export default {
             type: Boolean,
             default: false
         }
+    },
+    methods: {
+        getAvgUrl(){
+            return source.getAvgUrl('fexli', this.imgtype, this.line.attributes.image);
+        }
+    
     }
 }
 </script>

diff --git a/reader/src/ASTRv2/func.js b/reader/src/ASTRv2/func.js
@@ -18,6 +18,7 @@ var inited = window.localStorage.getItem('inited');
 var mirror = window.localStorage.getItem('mirror');
 var fontsize = window.localStorage.getItem('fontsize');
 var margin = window.localStorage.getItem('margin');
+var imageRepo = window.localStorage.getItem('imageRepo');
 var storyFile = urlParams.get('f');
 var storyData = {eventName: "Loading..."};
 var isOldversion = false;
@@ -33,6 +34,7 @@ if(!hidetip){hidetip = false};
 if(!showDelay){showDelay = 'y'};
 if(!hideName){hideName = 'n'};
 if(!bgMode){bgMode = 'stripe'};
+if(!imageRepo){imageRepo = 'fexli'}
 if(!inited){inited = false};
 if(!mirror){mirror = 'origin'};
 if(!margin){margin = 4}
@@ -53,6 +55,7 @@ export default {
     showDelay: showDelay,
     bgMode: bgMode,
     bgModes: bgModes,
+    imageRepo: imageRepo,
     hideName: hideName,
     inited: inited,
     mirror: mirror,

diff --git a/reader/src/ASTRv2/menupage/homepage.vue b/reader/src/ASTRv2/menupage/homepage.vue
@@ -69,8 +69,8 @@
             <n-li>数据资源&更新自动化支持 / Data Source & Auto Update Support: <n-a
                     href="https://github.com/Kengxxiao/ArknightsGameData">Kengxxiao/ArknightsGameData</n-a>
             </n-li>
-            <n-li>剧情&干员图片资源 / Stories&Operators' Images Source: <n-a href="https://github.com/Aceship/AN-EN-Tags">
-                    Aceship/AN-EN-Tags</n-a>
+            <n-li> 剧情&干员图片资源 / Stories&Operators' Images Source: <n-a href="https://github.com/Aceship/AN-EN-Tags">
+                    Aceship/AN-EN-Tags</n-a> , <n-a href="https://github.com/fexli/ArknightsResource/tree/main">fexli/ArknightsResource</n-a>
             </n-li>
             <n-li>活动封面资源 / Event Banners Source: <n-a href="https://prts.wiki/">PRTS Wiki</n-a>
             </n-li>
@@ -95,96 +95,101 @@
                 <template #header>
                     点击展开 / Click to Unfold
                 </template>
-                <n-h4>wv 1.6</n-h4>
+                <n-h4>v1.6.1</n-h4>
+                <n-oi>
+                    <n-li>Fixed display issue of white background & black color font subtitle.</n-li>
+                    <n-li>Using <n-a href="https://github.com/fexli/ArknightsResource/tree/main">fexli/ArknightsResource</n-a> as new image source</n-li>
+                </n-oi>
+                <n-h4>v1.6</n-h4>
                 <n-oi>
                     <n-li>Add event start time and sort by time feature in intermezzi and sidestory, thank's to  <n-a href="https://github.com/Tsuk1ko">Tsuk1ko</n-a>'s assistance.</n-li>
                     <n-li>
                         New Operators' Data page that shows the operators' archive, modules and records.
                     </n-li>
                 </n-oi>                     
-                <n-h4>wv 1.5.1</n-h4>
+                <n-h4>v1.5.1</n-h4>
                 <n-oi>
                     <n-li>Add aria roles for accessibility tools and main menu selection qol , thank's to hanss314's <n-a href="https://github.com/050644zf/ArknightsStoryTextReader/pull/53">PR</n-a></n-li>
                 </n-oi>                
-                <n-h4>wv 1.5</n-h4>
+                <n-h4>v1.5</n-h4>
                 <n-oi>
                     <n-li>Adapt to the major changes of game data.</n-li>
                 </n-oi>                
-                <n-h4>wv 1.4.3</n-h4>
+                <n-h4>v1.4.3</n-h4>
                 <n-oi>
                     <n-li>Add copy permalink to line and line warpping feature.</n-li>
                 </n-oi>
-                <n-h4>wv 1.4.2</n-h4>
+                <n-h4>v1.4.2</n-h4>
                 <n-oi>
                     <n-li>Optimize the Predicate line.</n-li>
                     <n-li>Add line margin adjustment.</n-li>
                 </n-oi>
-                <n-h4>wv 1.4.1</n-h4>
+                <n-h4>v1.4.1</n-h4>
                 <n-oi>
                     <n-li>Add initialization guidance when launch ASTR first time.</n-li>
                     <n-li>Add mirror accerlation support. Currently support Source serif loading.</n-li>
                     <n-li>Add fontsize adjustment.</n-li>
                 </n-oi>
-                <n-h4>wv 1.4</n-h4>
+                <n-h4>v1.4</n-h4>
                 <n-oi>
                     <n-li>Using Source Han Serif in the content of ASTR.</n-li>
                 </n-oi>
-                <n-h4>wv 1.3.1</n-h4>
+                <n-h4>v1.3.1</n-h4>
                 <n-oi>
                     <n-li>Fix line break in subtitle class.</n-li>
                 </n-oi>
-                <n-h4>wv 1.3</n-h4>
+                <n-h4>v1.3</n-h4>
                 <n-oi>
                     <n-li>Fix the search issue.</n-li>
                 </n-oi>
-                <n-h4>wv 1.2.4</n-h4>
+                <n-h4>v1.2.4</n-h4>
                 <n-oi>
                     <n-li>Revert changes for new json format.</n-li>
                 </n-oi>
-                <n-h4>wv 1.2.3</n-h4>
+                <n-h4>v1.2.3</n-h4>
                 <n-oi>
                     <n-li>Add new property support for excel export.</n-li>
                     <n-li>Add Lone Trail Investigation Reports.</n-li>
                     <n-li>Disable the search feature until available.</n-li>
                 </n-oi> 
-                <n-h4>wv 1.2.2</n-h4>
+                <n-h4>v1.2.2</n-h4>
                 <n-oi>
                     <n-li>Rhine Theme for Rhine Event!</n-li>
                 </n-oi> 
-                <n-h4>wv 1.2.1</n-h4>
+                <n-h4>v1.2.1</n-h4>
                 <n-oi>
                     <n-li> Fix missing space before & after html tag in content</n-li>
                     <n-li> Change the alignment to center in content page</n-li>
                 </n-oi>                
-                <n-h4>wv 1.2</n-h4>
+                <n-h4>v1.2</n-h4>
                 <n-oi>
                     <n-li> Add Arknights Annual Report 2023</n-li>
                 </n-oi>
-                <n-h4>wv 1.1.1</n-h4>
+                <n-h4>v1.1.1</n-h4>
                 <n-oi>
                     <n-li> Add "open in new tab" feature in menus.</n-li>
                 </n-oi>                
-                <n-h4>wv 1.1</n-h4>
+                <n-h4>v1.1</n-h4>
                 <n-oi>
                     <n-li> Bring back the paging feature</n-li>
                     <n-li> Tweak the size of option button</n-li>
                 </n-oi>
-                <n-h4>wv 1.0.1</n-h4>
+                <n-h4>v1.0.1</n-h4>
                 <n-oi>
                     <n-li> Add extra story in misc</n-li>
                 </n-oi>
-                <n-h4>wv 1.0</n-h4>
+                <n-h4>v1.0</n-h4>
                 <n-oi>
                     <n-li> Add layout responsiveness for different scrren.</n-li>
                     <n-li> Add "Scroll to the Top" button</n-li>
                     <n-li> Add tab swap animation on menupage.</n-li>
                     <n-li> Add Japanese UI support. Thanks to <n-a href="https://github.com/050644zf/ArknightsStoryTextReader/pull/36">c-stella's PR</n-a></n-li>
                 </n-oi>
-                <n-h4>wv 0.99.1</n-h4>
+                <n-h4>v0.99.1</n-h4>
                 <n-oi>
                     <n-li>Fix Monthly Team Records</n-li>
                 </n-oi>
-                <n-h4>wv 0.99</n-h4>
+                <n-h4>v0.99</n-h4>
                 <n-oi>
                     <n-li>UI overhaul.</n-li>
                     <n-li>Add animation in list selection and story introdution switch</n-li>
@@ -194,46 +199,46 @@
                             href="https://github.com/050644zf/ArknightsStoryTextReader/pull/32">Fryze's PR</n-a>
                     </n-li>
                 </n-oi>
-                <n-h4>wv 0.98.1</n-h4>
+                <n-h4>v0.98.1</n-h4>
                 <n-oi>
                     <n-li> Fix the wrong language issue in Monthly Squad Records, Integrated Stratgies</n-li>
                     <n-li> Add animation in Event Characters/Words analysis</n-li>
                     <n-li> Fix the en_US terms, thanks to <n-a
                             href="https://github.com/050644zf/ArknightsStoryTextReader/pull/25">jaywyeee's PR</n-a>
                     </n-li>
                 </n-oi>
-                <n-h4>wv 0.98</n-h4>
+                <n-h4>v0.98</n-h4>
                 <n-oi>
                     <n-li> Add Backgroud Support</n-li>
                 </n-oi>
-                <n-h4>wv 0.97</n-h4>
+                <n-h4>v0.97</n-h4>
                 <n-oi>
                     <n-li>Optimized the style of website</n-li>
                     <n-li>Optimized some content in misc</n-li>
                     <n-li>Add "Stultifera Navis Operation Log" in misc</n-li>
                     <n-li>Add Warp to Story Feature</n-li>
                 </n-oi>
-                <n-h4>wv 0.96</n-h4>
+                <n-h4>v0.96</n-h4>
                 <n-oi>
 
                 </n-oi>
-                <n-h4>wv 0.95</n-h4>
+                <n-h4>v0.95</n-h4>
                 <n-oi>
                     <n-li>Add "Arknights Journey Review" in misc</n-li>
                     <n-li>Add loading screen</n-li>
                 </n-oi>
-                <n-h4>wv 0.94</n-h4>
+                <n-h4>v0.94</n-h4>
                 <n-oi>
                     <n-li>Add support for new "Sticker" property</n-li>
                     <n-li>Add analysis for word/characters number in events</n-li>
                     <n-li>Add support for new "multiline" property</n-li>
                 </n-oi>
-                <n-h4>wv 0.93</n-h4>
+                <n-h4>v0.93</n-h4>
                 <n-oi>
                     <n-li>Add meta data for social media embeddings.</n-li>
                     <n-li>Fix the issue of loading data error in event page.</n-li>
                 </n-oi>
-                <n-h4>wv 0.92</n-h4>
+                <n-h4>v0.92</n-h4>
                 <n-oi>
                     <n-li>Add return to home feature on icon.</n-li>
                     <n-li>Add zoom in feature on story CGs.</n-li>

diff --git a/reader/src/ASTRv2/source.js b/reader/src/ASTRv2/source.js
@@ -0,0 +1,29 @@
+const IMAGES_SRC_REPOS = {
+    'Aceship': 'https://raw.githubusercontent.com/Aceship/Arknight-Images/main',
+    'fexli': 'https://raw.githubusercontent.com/fexli/ArknightsResource/main'
+}
+
+export default {
+    IMAGES_SRC_REPOS: IMAGES_SRC_REPOS,
+    getAvgUrl(repo, imgtype, image){
+        if(repo == 'Aceship'){
+            return `${IMAGES_SRC_REPOS[repo]}/avg/${imgtype}/${image}.png`
+        }
+        else if(repo == 'fexli'){
+            if(imgtype == 'backgrounds'){
+                return `${IMAGES_SRC_REPOS[repo]}/avgs/bg/${image}.png`
+            }
+            else{
+                return `${IMAGES_SRC_REPOS[repo]}/avgs/${image}.png`
+            }
+        }
+    },
+    getEquipUrl(repo, uniEquipId){
+        if(repo == 'Aceship'){
+            return `${IMAGES_SRC_REPOS[repo]}/equip/icon/${uniEquipId}.png`
+        }
+        else if(repo == 'fexli'){
+            return `${IMAGES_SRC_REPOS[repo]}/equip/${uniEquipId}.png`
+        }
+    }
+}