up 7.21.3

* Fix

* Fix res and uri

* Fix core config

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.21.2</Version>
+        <Version>7.21.3</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1816,9 +1816,9 @@ public static class ConfigHandler
         ProfileItem? activeProfile = null;
         if (isSub && subid.IsNotEmpty())
         {
-            await RemoveServersViaSubid(config, subid, true);
             lstOriSub = await AppManager.Instance.ProfileItems(subid);
             activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId);
+            await RemoveServersViaSubid(config, subid, true);
         }
 
         var counter = 0;

v2rayN/ServiceLib/Handler/Fmt/InnerFmt.cs

@@ -230,6 +230,9 @@ public class InnerFmt
             jsonObj["TransportExtraObj"] = transportExtraObj;
             jsonObj.Remove("TransportExtra");
         }
+        // remove subid and isSub
+        jsonObj.Remove("Subid");
+        jsonObj.Remove("IsSub");
         // Remove empty properties to reduce the length of the exported string
         RemoveEmptyJson(jsonObj);
         var jsonStr = JsonUtils.Serialize(jsonObj, false);

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -3718,7 +3718,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode 的本地化字符串。
+        ///   查找类似 For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode 的本地化字符串。
         /// </summary>
         public static string TbSettingsBindInterfaceTip {
             get {

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
     <value>Bind Interface</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value>
+    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
     <value>Bind Interface</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value>
+    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
     <value>Bind Interface</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value>
+    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1720,7 +1720,7 @@
     <value>绑定网口</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>用于多网口环境，填写要绑定的网口名称，仅生效于 Windows 系统和 TUN 模式</value>
+    <value>用于多网口环境，填写要绑定的网口名称，仅生效于 Windows 系统或 TUN 模式</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1720,7 +1720,7 @@
     <value>綁定網路介面</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>適用於多網路介面環境，請填寫要綁定的介面名稱；Windows 系統有效，其他系統僅在 TUN 模式下生效。</value>
+    <value>適用於多網路介面環境，請填寫要綁定的介面名稱；Windows 系統有效，其他系統僅在 TUN 模式下生效</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>
@@ -1728,4 +1728,4 @@
   <data name="menuExport2InnerUri" xml:space="preserve">
     <value>匯出 v2rayN 內部分享連結至剪貼簿（多選）</value>
   </data>
-</root>
+</root>

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs

@@ -10,9 +10,9 @@ public partial class CoreConfigV2rayService
             var listenPort = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
             _coreConfig.inbounds = [];
             var inbound = BuildInbound(_config.Inbound.First(), EInboundProtocol.socks, true);
+            var isUsingLocalMixedPort = _node.Address == Global.Loopback && _node.Port == listenPort;
 
-            if (!context.IsTunEnabled
-                || (context.IsTunEnabled && _node.Address != Global.Loopback && _node.Port != listenPort))
+            if (!context.IsTunEnabled || !isUsingLocalMixedPort)
             {
                 _coreConfig.inbounds.Add(inbound);