修复 isCMDScanning 在 onCancelAllConnecting 的情况下没有重置的问题，完善日语翻译

Assets/BowArrow/Resources/Prefabs/Views/Home/SettingsGameView.prefab

@@ -2115,10 +2115,10 @@ RectTransform:
   m_Father: {fileID: 243481542007038700}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 129.61539, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 129.23077, y: -16.442307}
+  m_SizeDelta: {x: 24.230768, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2075870506722154811
 CanvasRenderer:
@@ -2479,10 +2479,10 @@ RectTransform:
   m_Father: {fileID: 243481542007038700}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 45, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 45, y: -16.442307}
+  m_SizeDelta: {x: 24.230768, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4646865985747465999
 CanvasRenderer:
@@ -5125,7 +5125,7 @@ RectTransform:
   m_GameObject: {fileID: 8963406417100636762}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.2173077, y: 1.2173077, z: 1.2173077}
+  m_LocalScale: {x: 1.2385817, y: 1.2385817, z: 1.2385817}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8963406415416676176}

Assets/BowArrow/Scenes/Login.unity

@@ -14539,8 +14539,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 268.83463, y: -51.5}
-  m_SizeDelta: {x: 193.14616, y: 0}
+  m_AnchoredPosition: {x: 267, y: -51.5}
+  m_SizeDelta: {x: 196, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
 MonoBehaviour:
@@ -27574,8 +27574,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 430.59235, y: -51.5}
-  m_SizeDelta: {x: 110.36923, y: 0}
+  m_AnchoredPosition: {x: 431, y: -51.5}
+  m_SizeDelta: {x: 112, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
 MonoBehaviour:
@@ -28797,8 +28797,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 588.5539, y: -51.5}
-  m_SizeDelta: {x: 110.36923, y: 0}
+  m_AnchoredPosition: {x: 591, y: -51.5}
+  m_SizeDelta: {x: 112, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
 MonoBehaviour:
@@ -34477,8 +34477,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 509.5731, y: -51.5}
-  m_SizeDelta: {x: 27.592308, y: 0}
+  m_AnchoredPosition: {x: 511, y: -51.5}
+  m_SizeDelta: {x: 28, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359
 MonoBehaviour:

Assets/BowArrow/Scripts/Bluetooth/BluetoothAim.cs

@@ -1356,6 +1356,7 @@ public class BluetoothAim : MonoBehaviour
             //Debug.LogWarning("onCancelAllConnecting 2:" + status);
             userDoConnect = false;
             doConnect = false;
+            isCMDScanning = false;
             OnDisconnect();
             // BleUDP.ins.Disconnect();
             firstBluetoothWindows.Disconnect();
@@ -1369,6 +1370,7 @@ public class BluetoothAim : MonoBehaviour
             //Debug.LogWarning("onCancelAllConnecting 2:" + status);
             userDoConnect = false;
             doConnect = false;
+            isCMDScanning = false;
             OnDisconnect(); 
             DisconnectBleHelper();
             SetStatus(_bluetoothStatus);
@@ -1811,7 +1813,8 @@ public class BluetoothAim : MonoBehaviour
     /// </summary>
     public void ConnectCMD()
     {
- 
+        
+        SmartBowLogger.Log(this, $"ConnectCMD isCMDScanning：{isCMDScanning}");
         if (isCMDScanning) return;
         PopupMgr.ins.ClearAllTip();
         if (Application.platform == RuntimePlatform.Android)

Assets/BowArrow/Scripts/CommonConfig.cs

@@ -157,7 +157,7 @@ public class CommonConfig
     /// <summary>
     /// 隐藏调试按钮
     /// </summary>
-    public static bool bHideInfraredDemoBtnSee { get; } = false;
+    public static bool bHideInfraredDemoBtnSee { get; } = true;
 
     //打包App 的端，比如打包B 端就设置 B
     public static OperatingPlatform OP { get; } = OperatingPlatform.C;

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/Japan.json

@@ -34,7 +34,7 @@
   /**
   登录注册 页面
   **/
-  "login_placeholder_account": "口座番号入力",
+  "login_placeholder_account": "メールアドレス等",
   "login_placeholder_user": "口座番号入力",
   "login_placeholder_password": "パスワードを入力",
   "login_placeholder_graphicCode": "グラフィック認証コードを入力",
@@ -155,7 +155,8 @@
   "new-user-guider_tip_视角归位-瞄准": "写真の姿勢を参考に、的を正しく狙ってお待ちください。<size=40><color=#FFA500>{0}</color></size>秒後に修正されます。",
   "new-user-guider_tip_视角归位-瞄准-infrared": "写真の姿勢を参考に、矢筒の先端を基準に、すぐに的\nを狙ってください。照準は<size=40><color=#FFA500>{0}</color></size>秒で完了します。",
   "new-user-guider_tip_视角归位-瞄准-infraredD": "写真の姿勢を参考に、矢筒の先端を\n基準に、すぐに的を狙ってください。\n照準は<size=40><color=#FFA500>{0}</color></size>秒で完了します。",
-  "new-user-guider_tip_视角归位-瞄准-infrared-gun": "マガジンをリロードした後、実際の射撃姿勢でブルズアイ\nを狙い、目、フロントサイト、ブルズアイが一直線になって\nいることを確認してください。<size=40><color=#FFA500>{0}</color></size>数秒後、フロントサイトが\n自動的にブルズアイに移動し、キャリブレーションが完了します。",
+  //"new-user-guider_tip_视角归位-瞄准-infrared-gun": "マガジンをリロードした後、実際の射撃姿勢でブルズアイ\nを狙い、目、フロントサイト、ブルズアイが一直線になって\nいることを確認してください。<size=40><color=#FFA500>{0}</color></size>数秒後、フロントサイトが\n自動的にブルズアイに移動し、キャリブレーションが完了します。",
+  "new-user-guider_tip_视角归位-瞄准-infrared-gun": "マガジンを挿入して銃の照準で的を正しく狙って下さい。\n<size=40><color=#FFA500>{0}</color></size>秒後に十時クロスと照準が自動的に一致します",
   "new-user-guider_tip_教程结束": "最初の設定が完了しました。次回このチュートリアルに\nついてさらに詳しく知りたい場合は、設定から初心者向けガイドをご覧ください。",
   "new-user-guider_tip_准心高亮": "指示に従ってターゲットに矢\nを射ると、この手動設定が\n完了し、接続ページに戻り\nます。",
   "new-user-guider_btn_ok": "確定",
@@ -552,6 +553,15 @@
   "Personal_RecordTime": "プレイ時間",
   "Personal_RecordTime2": "{0} 時間 {1} 分 {2} 秒",
 
+  "PersonalLabelMobile": "モバイル",
+  "PersonalLabelNickname": "ニックネーム",
+  "PersonalLabelRegion": "地域",
+  "PersonalLabelGender": "ジェンダー",
+  "PersonalLabelBirthday": "生年月日",
+
+  /**
+  好友頁面
+  **/
   "Social_DeleteTitle": "この友達を削除してもよろしいですか？",
   "Social_DeleteContent": "この友達を削除してもよろしいですか？",
 
@@ -725,7 +735,7 @@
   "BrightnessOrContracts": "明るさとコントラスト",
   "CameraSensitivity": "カメラのISO",
   "AbnormalIssues": "トラブルシューティング",
-  "AbnormalIssues2": "クロスヘアが動",
+  "AbnormalIssues2": "詳細設定",
 
   //"ErrorStepTip": "请移动设备控制准心，使其移动到四个圆点。\n当准心无法移动到四个圆点时，请点击“异常问题处理”。",
   "ErrorStepTip": "デバイスを手に取って十字線を動かし、四隅のドットを消してください。",

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -509,6 +509,12 @@
   "Personal_RecordTime": "玩了超过 ",
   "Personal_RecordTime2": "{0}时{1}分{2}秒",
 
+  "PersonalLabelMobile": "Mobile",
+  "PersonalLabelNickname": "Nickname",
+  "PersonalLabelRegion": "Region",
+  "PersonalLabelGender": "Gender",
+  "PersonalLabelBirthday": "Birthday",
+
   /**
   好友頁面
   **/

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -560,6 +560,12 @@
   "Personal_RecordTime": "played more than ",
   "Personal_RecordTime2": "{0}h{1}m{2}s",
 
+  "PersonalLabelMobile": "手机号",
+  "PersonalLabelNickname": "昵称",
+  "PersonalLabelRegion": "地区",
+  "PersonalLabelGender": "性别",
+  "PersonalLabelBirthday": "生日",
+
   /**
   好友頁面
   **/

Assets/ShotSimulator/Languages/Tables/LanguagesTable_ja.asset

@@ -147,7 +147,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55615444709376
-    m_Localized: "\u79FB\u52D5\u6A19\u7684\u7FA4\u306E\u982D\u90E8\u72D9\u6483\u3067\u9AD8\u901F\u6483\u7834"
+    m_Localized: "3\u30B7\u30E7\u30C3\u30C8\u3082\u3057\u304F\u306F\u30D8\u30C3\u30C9\u30B7\u30E7\u30C3\u30C8\u306A\u30891\u30B7\u30E7\u30C3\u30C8\u3067\u6483\u7834\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 56508382670848
@@ -199,7 +199,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 55898442788864
-    m_Localized: "\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u5C04\u6483 \u203B\u56FD\u9645\u901A\u7528\u672F\u8BED"
+    m_Localized: "\u30E2\u30B6\u30F3\u30D4\u30FC\u30AF\u30C9\u30EA\u30EB"
     m_Metadata:
       m_Items: []
   - m_Id: 56005280100352
@@ -327,7 +327,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 48456153657344
-    m_Localized: "\u5358\u8272/\u8907\u6570\u6A19\u7684\u51FA\u73FE\u6642\u3001\u76F4\u8FD1\u8272\u3068\u4E00\u81F4\u3059\u308B\u6A19\u7684\u3092\u5C04\u6483"
+    m_Localized: "\u4E2D\u592E\u306B\u51FA\u73FE\u3057\u305F\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\uFF0C\u540C\u8272\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u6483\u3064\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 54939910107136

Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/PersonalView.prefab

@@ -8249,7 +8249,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 16.900024, y: 306.10486}
+  m_SizeDelta: {x: 16.900024, y: 154.50891}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &7327544348609726811
 MonoBehaviour:
@@ -9669,6 +9669,7 @@ GameObject:
   - component: {fileID: 7327544349214744871}
   - component: {fileID: 7327544349214744866}
   - component: {fileID: 7327544349214744865}
+  - component: {fileID: 936960028395757258}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -9738,6 +9739,21 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: Mobile
+--- !u!114 &936960028395757258
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7327544349214744870}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: PersonalLabelMobile
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &7327544349249149376
 GameObject:
   m_ObjectHideFlags: 0
@@ -10216,6 +10232,7 @@ GameObject:
   - component: {fileID: 7327544349476603452}
   - component: {fileID: 7327544349476603455}
   - component: {fileID: 7327544349476603454}
+  - component: {fileID: 7717877896959602036}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -10285,6 +10302,21 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: Birthday
+--- !u!114 &7717877896959602036
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7327544349476603443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: PersonalLabelBirthday
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &7327544349510886228
 GameObject:
   m_ObjectHideFlags: 0
@@ -11737,6 +11769,7 @@ GameObject:
   - component: {fileID: 7327544349864820038}
   - component: {fileID: 7327544349864820032}
   - component: {fileID: 7327544349864820039}
+  - component: {fileID: 1108271758210585008}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -11806,6 +11839,21 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: Gender
+--- !u!114 &1108271758210585008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7327544349864820037}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: PersonalLabelGender
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &7327544349914220587
 GameObject:
   m_ObjectHideFlags: 0
@@ -12256,6 +12304,7 @@ GameObject:
   - component: {fileID: 7327544349981511689}
   - component: {fileID: 7327544349981511691}
   - component: {fileID: 7327544349981511690}
+  - component: {fileID: 257453290102273575}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -12325,6 +12374,21 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: Region
+--- !u!114 &257453290102273575
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7327544349981511688}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: PersonalLabelRegion
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &7327544349999405626
 GameObject:
   m_ObjectHideFlags: 0
@@ -13387,6 +13451,7 @@ GameObject:
   - component: {fileID: 7327544350231624644}
   - component: {fileID: 7327544350231624647}
   - component: {fileID: 7327544350231624646}
+  - component: {fileID: 8998523128794166665}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -13456,6 +13521,21 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: Nick name
+--- !u!114 &8998523128794166665
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7327544350231624667}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: PersonalLabelNickname
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &7327544350241898391
 GameObject:
   m_ObjectHideFlags: 0

Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/SettingsView.prefab

@@ -3876,7 +3876,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: Japan
+  m_Text: "\u65E5\u672C\u8A9E"
 --- !u!1 &3314716098386816340
 GameObject:
   m_ObjectHideFlags: 0