1

Souma-Sumire · Dec 24, 2024 · c70c345 · c70c345
1 parent 5befb12
commit c70c345
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -62,5 +62,6 @@
   "Record File Name": "File Name",
   "recordPathPlaceholder": "Please enter the path to save the recording file",
   "recordFileNamePlaceholder": "Please enter the file name of the recording file",
-  "filePathExplanation": "Make sure the path exists"
+  "filePathExplanation": "Make sure the path exists",
+  "Default": "Default"
 }
diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -62,5 +62,6 @@
   "Record File Name": "ファイル名",
   "recordPathPlaceholder": "録音ファイルを保存するパスを入力してください",
   "recordFileNamePlaceholder": "録音ファイルのファイル名を入力してください",
-  "filePathExplanation": "パスが存在することを確認してください"
+  "filePathExplanation": "パスが存在することを確認してください",
+  "Default": "Default"
 }
diff --git a/src/locales/zhCn.json b/src/locales/zhCn.json
@@ -67,5 +67,6 @@
   "fileNameExplanation": "%CCYY: 年, %MM: 月, %DD: 日, %hh: 时, %mm: 分, %ss: 秒",
   "Recording Profile": "录制资料",
   "filePathExplanation": "须保证目录存在",
-  "Set Recording Name": "设置路径"
+  "Set Recording Name": "设置路径",
+  "Default": "未归类"
 }
diff --git a/src/pages/obs2.vue b/src/pages/obs2.vue
@@ -149,6 +149,9 @@ class Obs {
     if (!(userConfig.value.host && userConfig.value.password)) {
       return
     }
+    if (this.status.connecting) {
+      return
+    }
     this.status.connecting = true
     this.ws.connect(`ws://127.0.0.1:${userConfig.value.host}`, userConfig.value.password).then(() => {
       this.ws.call('GetRecordStatus').then((v) => {
@@ -314,7 +317,7 @@ function getZoneType(zoneInfo: (typeof ZoneInfo)[number]): typeof CONTENT_TYPES[
 function checkCondition(condition: ConditionType) {
   const zoneType = getZoneType(playerZoneInfo.value)
   if (!userContentSetting.value.find(item => item.type === zoneType && item[condition])) {
-    if (condition === 'enter') {
+    if (condition === 'enter' && obs.status.recording) {
       // 上一次录制战斗通关，则这次切换场地（且不需要切割）时结束录制。
       obs.stopRecord()
     }

diff --git a/src/resources/actionChinese.json b/src/resources/actionChinese.json
@@ -36395,10 +36395,10 @@
   "40134": "雷燃爆",
   "40135": "爆炸",
   "40136": "大爆炸",
-  "40137": "罪裁断",
+  "40137": "罪壤断",
   "40138": "急冲刺",
   "40139": "罪炎",
-  "40140": "罪裁断",
+  "40140": "罪壤断",
   "40141": "急冲刺",
   "40142": "罪雷",
   "40143": "弓形冲波",