Merge pull request #287 from penguin-statistics/dev

v1.1.10 Release
penguin-statistics · Apr 23, 2020 · 99db098 · 99db098
2 parents 779af27 + bae4c6d
commit 99db098
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/src/components/global/PWAPopups.vue b/src/components/global/PWAPopups.vue
@@ -11,12 +11,6 @@
         "refresh": "Refresh",
         "success": "Website Updated!"
       }
-    },
-    "en": {
-      "update": {
-        "refresh": "새로고침",
-        "success": "업데이트 완료!"
-      }
     }
   }
 </i18n>

diff --git a/src/main.js b/src/main.js
@@ -119,9 +119,6 @@ Vue.use(VueAnalytics, {
     enabled: true, // enable/disable
     amount: 5, // amount of events fired
     delay: 2000 // delay in milliseconds
-  },
-  autoTracking: {
-    screenview: true
   }
 });
 

diff --git a/src/mixins/hooks/Analytics.js b/src/mixins/hooks/Analytics.js
@@ -1,4 +1,5 @@
 import config from "@/config";
+import Console from "@/utils/Console";
 
 export default {
   watch: {
@@ -17,9 +18,10 @@ export default {
   methods: {
     logRouteEvent (newValue) {
       if (newValue.name === "StatsByStage_Selected") {
-        // Console.log(this.$store.state.dataSource, newValue.params.stageId);
+        Console.info("Analytics", "fetched stage", this.$store.getters['dataSource/source'], newValue.params.stageId);
         this.$ga.event('result', 'fetch_' + this.$store.getters['dataSource/source'], newValue.params.stageId, 1)
-      } else if (newValue.name === "StatsByItem_Selected") {
+      } else if (newValue.name === "StatsByItem_SelectedItem") {
+        Console.info("Analytics", "fetched item", this.$store.getters['dataSource/source'], newValue.params.stageId);
         this.$ga.event('result', 'fetch_' + this.$store.getters['dataSource/source'], newValue.params.itemId, 1)
       }
     },

diff --git a/src/utils/marshaller.js b/src/utils/marshaller.js
@@ -17,7 +17,9 @@ export default {
     body.exp_demand = options.requireExp;
     body.gold_demand = options.requireLmb;
     if (options.foreignServer) {
-      body["exclude"] = ["6-1","6-10","6-11","6-12","6-14","6-15","6-16","6-2","6-3","6-4","6-5","6-8","6-9","S6-1","S6-2","S6-3","S6-4"]
+      body["exclude"] = ["6-1","6-10","6-11","6-12","6-14","6-15","6-16","6-2","6-3","6-4","6-5","6-8","6-9","S6-1","S6-2","S6-3","S6-4",
+        "DM-1","DM-2","DM-3","DM-4","DM-5","DM-6","DM-7","DM-8"
+      ]
     }
 
     return body

diff --git a/src/views/About/Changelog.vue b/src/views/About/Changelog.vue
@@ -99,14 +99,22 @@ export default {
         },
         {
           active: true,
+          version: "v1.1.10",
+          date: "2020-04-23T06:00:00Z",
+          changes: [
+            "添加：于 Planner 内添加更多外服排除关卡 (DM-* 关卡)",
+            "修复：Google Analytics Screenview Tracking 问题",
+            "修复：网站升级提示于 en 语言时出现 ko 语言下的提示信息",
+          ]
+        },
+        {
           version: "v1.1.9",
           date: "2020-04-23T06:00:00Z",
           changes: [
             "修复：由于添加国内加速镜像站点的若干问题",
           ]
         },
         {
-          active: true,
           version: "v1.1.8",
           date: "2020-04-23T08:00:00Z",
           changes: [

diff --git a/src/views/Planner.vue b/src/views/Planner.vue
@@ -6,7 +6,7 @@
         "byProduct": "考虑合成副产物",
         "requireExp": "大量需求经验",
         "requireLmb": "大量需求龙门币",
-        "foreignServer": "不考虑第六章"
+        "foreignServer": "排除仅国服出现的关卡"
       },
       "actions": {
         "import": "导入",
@@ -39,7 +39,7 @@
         "byProduct": "Consider by-products",
         "requireExp": "Large demand for EXP",
         "requireLmb": "Large demand for LMD",
-        "foreignServer": "Do not add Chapter 6 into calculation"
+        "foreignServer": "Do not suggest CN-only stages"
       },
       "actions": {
         "import": "Import",