仓库整理

.gitignore

@@ -1,4 +1,4 @@
 /node_modules
-/bundle.min.js
-/bundle.js
 /.fleet
+/src/dist/bundle.min.js
+/src/dist/bundle.js

.idea/torncity-zhcn-translate.iml

@@ -4,6 +4,9 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.fleet" />
+      <excludeFolder url="file://$MODULE_DIR$/misc" />
+      <excludeFolder url="file://$MODULE_DIR$/src/dist" />
+      <excludePattern pattern="release.min.user.js" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

build.js

@@ -2,6 +2,7 @@
  * 此脚本用于加入userscript meta，
  * 并生成日期时间与版本号
  */
+
 let startTime = Date.now();
 let fs = require('fs');
 
@@ -16,7 +17,7 @@ let metaData = `// ==UserScript==
 // @description  托恩，起飞！
 // @author       Woohoo[2687093] Sabrina_Devil[2696209]
 // @match        https://www.torn.com/*
-// @updateURL    https://gitlab.com/JJins/wuhu-torn-helper/-/raw/dev/release.min.user.js
+// @downloadURL  https://gitlab.com/JJins/wuhu-torn-helper/-/raw/dev/release.min.user.js
 // @grant        GM_xmlhttpRequest
 // @grant        unsafeWindow
 // @connect      ljs-lyt.com
@@ -28,6 +29,6 @@ let metaData = `// ==UserScript==
 // ==/UserScript==
 `
 
-const data = fs.readFileSync('./bundle.min.js', 'utf8');
+const data = fs.readFileSync('./dist/bundle.min.js', 'utf8');
 fs.writeFileSync('./release.min.user.js', metaData + data.replace('$$WUHU_DEV_VERSION$$', version), 'utf8');
 console.log(`版本 ${ version } 构建完成, build.js耗时${ Date.now() - startTime }ms`);

package.json

@@ -4,12 +4,8 @@
   "description": "芜湖助手",
   "dependencies": {},
   "scripts": {
-    "release": "rollup -c rollup-prod.config.js && node build.js # 发布",
-    "build": "rollup -c # 调试编译",
-    "rollup_watch": "rollup -c -w # 监控",
-    "minify": "uglifyjs misc/wuhu-torn-helper.js -o release.min.user.js -m # 弃用",
-    "serve": "# 弃用",
-    "compile": "tsc --outDir output # 弃用"
+    "release": "rollup -c rollup-prod.config.js && node build.js",
+    "watch": "rollup -c -w"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^4.1.0",

rollup-prod.config.js

@@ -4,9 +4,9 @@ import { string } from "rollup-plugin-string";
 import { uglify } from "rollup-plugin-uglify";
 
 export default {
-    input: 'src/index.ts',
+    input: 'src/ts/index.ts',
     output: {
-        file: 'bundle.min.js',
+        file: 'dist/bundle.min.js',
         format: 'iife',
     },
     plugins: [

rollup.config.js

@@ -4,9 +4,9 @@ import json from "@rollup/plugin-json";
 import { string } from "rollup-plugin-string";
 
 export default {
-    input: 'src/index.ts',
+    input: 'src/ts/index.ts',
     output: {
-        file: 'bundle.js',
+        file: 'dist/bundle.js',
         format: 'iife',
     },
     plugins: [

src/ts/class/Common.ts

@@ -80,6 +80,11 @@ export class Common extends WuhuBase {
         // 现金变动提醒
         if (WuhuConfig.get('CashChangeAlert')) CommonUtils.elementReady("#user-money").then(userMoney => {
             new MutationObserver((mutations, observer) => {
+                if (!WuhuConfig.get('CashChangeAlert')) {
+                    observer.disconnect();
+                    new Alert('现金变动提醒已关闭', { sysNotify: true });
+                    return;
+                }
                 Log.info("现金变动提醒", mutations);
                 mutations.forEach(item => {
                     if (item.attributeName === 'data-money') {

src/ts/class/provider/Provider.ts

@@ -12,8 +12,8 @@ export default class Provider {
     constructor() {
     }
 
+    // 返回继承类的实例
     public static getInstance<T extends typeof Provider>(this: T): InstanceType<T> {
-        // return this.instance ||= new this();
         if (!this.instance) {
             let startTime = performance.now();
             this.instance = new this();