diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 5bb745b1..4f3c9a80 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -871,8 +871,7 @@ namespace v2rayN.Handler return false; } - return o.configVersion == n.configVersion - && o.configType == n.configType + return o.configType == n.configType && o.address == n.address && o.port == n.port && o.id == n.id diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs index f687ba11..155f1ae2 100644 --- a/v2rayN/v2rayN/Tool/Utils.cs +++ b/v2rayN/v2rayN/Tool/Utils.cs @@ -367,23 +367,22 @@ namespace v2rayN if (GBs > 0) { // multi GB - /*ulong TBs = GBs / factor; + long TBs = GBs / factor; if (TBs > 0) { - // 你是魔鬼吗? 用这么多流量 - result = TBs + GBs % factor / (factor + 0.0); + result = TBs + (GBs % factor / (factor + 0.0)); unit = "TB"; return; - }*/ - result = GBs + MBs % factor / (factor + 0.0); + } + result = GBs + (MBs % factor / (factor + 0.0)); unit = "GB"; return; } - result = MBs + KBs % factor / (factor + 0.0); + result = MBs + (KBs % factor / (factor + 0.0)); unit = "MB"; return; } - result = KBs + amount % factor / (factor + 0.0); + result = KBs + (amount % factor / (factor + 0.0)); unit = "KB"; return; }