merge remote

Author: Cenmrev

V2RayW/App.config

@@ -10,48 +10,19 @@
     </startup>
     <userSettings>
         <V2RayW.Properties.Settings>
-            <setting name="transportSettings" serializeAs="String">
-                <value>{
-  "network": "tcp",
-  "security": "none",
-  "tlsSettings": {
-    "serverName": "v2ray.com",
-    "allowInsecure": false
-  },
-  "tcpSettings": {
-    "connectionReuse": true,
-    "header": {
-      "type": "none"
-    }
-  },
-  "kcpSettings": {
-    "mtu": 1350,
-    "tti": 20,
-    "uplinkCapacity": 5,
-    "downlinkCapacity": 20,
-    "congestion": false,
-    "readBufferSize": 1,
-    "writeBufferSize": 1,
-    "header": {
-      "type": "none"
-    }
-  },
-  "wsSettings": {
-    "connectionReuse": true,
-    "path": ""
-  }
-}</value>
-            </setting>
-            <setting name="dns" serializeAs="String">
+            <setting name="logLevel" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="dnsString" serializeAs="String">
                 <value>localhost</value>
             </setting>
             <setting name="localPort" serializeAs="String">
                 <value>8080</value>
             </setting>
             <setting name="profilesStr" serializeAs="String">
-                <value>{"address":"v2ray.cool","allowPassive":0,"alterId":64,"network":0,"port":10086,"remark":"test server","userId":"23ad6b10-8d1a-40f7-8ad0-e3e35cd38297","security":0}</value>
+                <value />
             </setting>
-            <setting name="proxyIsOn" serializeAs="String">
+            <setting name="coreLoaded" serializeAs="String">
                 <value>False</value>
             </setting>
             <setting name="selectedServerIndex" serializeAs="String">
@@ -63,21 +34,30 @@
             <setting name="proxyMode" serializeAs="String">
                 <value>0</value>
             </setting>
-            <setting name="inProtocol" serializeAs="String">
-                <value>0</value>
-            </setting>
             <setting name="alarmUnknown" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="mux" serializeAs="String">
-                <value>{
-  "enabled": false,
-  "concurrency": 8
-}</value>
-            </setting>
-            <setting name="cusProfiles" serializeAs="String">
+            <setting name="cusProfilesStr" serializeAs="String">
                 <value />
             </setting>
+            <setting name="httpPort" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="shareOverLan" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="selectedCusServerIndex" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="useCusProfile" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="useMultipleServer" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="mainInboundType" serializeAs="String">
+                <value>0</value>
+            </setting>
         </V2RayW.Properties.Settings>
     </userSettings>
 </configuration>

V2RayW/ConfigForm.cs

@@ -7,8 +7,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System.Diagnostics;
 
 namespace V2RayW

V2RayW/FormTransSetting.cs

@@ -7,8 +7,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System.Web.Script.Serialization;
 namespace V2RayW
 {
@@ -96,7 +94,7 @@ private void FormTransSetting_Load(object sender, EventArgs e)
             // load current settings to view
             //kcp
             dynamic streamSettings = currentProfile.streamSettings;
-            textBoxKcpMtu.Text = streamSettings.kcpSettings.mtu;
+            textBoxKcpMtu.Text = streamSettings["kcpSettings"]["mtu"].ToString();
             textBoxKcpTti.Text = streamSettings.kcpSettings.tti;
             textBoxKcpUc.Text = streamSettings.kcpSettings.uplinkCapacity;
             textBoxKcpDc.Text = streamSettings.kcpSettings.downlinkCapacity;