From 913fdc8968891dc3404348607d66e09302a94bc8 Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Thu, 10 Mar 2022 22:57:33 +0800
Subject: [PATCH] update

---
 Scripts/resource-parser.js | 6 +++---
 Scripts/traffic-check.js   | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js
index 22b8e61..35baeb7 100644
--- a/Scripts/resource-parser.js
+++ b/Scripts/resource-parser.js
@@ -1,5 +1,5 @@
 /** 
-☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧  ⟦2022-03-02 13:45⟧
+☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧  ⟦2022-03-10 22:55⟧
 ----------------------------------------------------------
 🛠 发现 𝐁𝐔𝐆 请反馈: @ShawnKOP_bot
 ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API
@@ -1145,7 +1145,7 @@ function Subs2QX(subs, Pudp, Ptfo, Pcert0, PTls13) {
             var type = list0[i].split("://")[0].trim()
             var listi = list0[i].replace(/ /g, "")
             var tag0 = list0[i].indexOf("tag=")!=-1 ? list0[i].split(/\&*(emoji|udp|tf0|cert|rename|replace)\=/)[0].split("tag=")[1] : ""
-            list0[i] = (type == "vmess" || type=="ssr") ? list0[i].split("#")[0] : list0[i]
+            list0[i] = (type == "vmess" || type=="ssr") ? list0[i].split(/#|,|，/)[0] : list0[i]
             const NodeCheck = (item) => listi.toLowerCase().indexOf(item) != -1;
             try {
                 if (type == "vmess" && list0[i].indexOf("remarks=") == -1) {
@@ -1934,7 +1934,7 @@ function get_emoji(emojip, sname) {
     "🇵🇭": ["PH", "Philippines", "菲律宾", "菲律賓"],
     "🇷🇴": [" RO ", "罗马尼亚"],
     "🇧🇾": ["BY","白俄罗斯","白俄羅斯"],
-    "🇷🇺": ["RU", "Russia", "俄罗斯", "俄国", "俄羅斯", "伯力", "莫斯科", "圣彼得堡", "西伯利亚", "新西伯利亚", "京俄", "杭俄","廣俄","滬俄","广俄","沪俄"],
+    "🇷🇺": ["RU", "Russia", "俄罗斯", "毛子", "俄国", "俄羅斯", "伯力", "莫斯科", "圣彼得堡", "西伯利亚", "新西伯利亚", "京俄", "杭俄","廣俄","滬俄","广俄","沪俄"],
     "🇸🇦": ["沙特", "迪拜"],
     "🇸🇪": ["SE", "Sweden","瑞典"],
     "🇸🇬": ["SG", "Singapore","SINGAPORE", "新加坡", "狮城", "沪新", "京新", "泉新", "穗新", "深新", "杭新", "广新","廣新","滬新"],
diff --git a/Scripts/traffic-check.js b/Scripts/traffic-check.js
index ed3579c..2794a14 100644
--- a/Scripts/traffic-check.js
+++ b/Scripts/traffic-check.js
@@ -95,7 +95,7 @@ function getServerTraffic(data,nodes){
             checked.push(nname)
             checkedtraffic.push(total)
         } else {
-            checkedtraffic.push(checkedtraffic[checked.indexOf(nname)]+total)
+            checkedtraffic[checked.indexOf(nname)]=checkedtraffic[checked.indexOf(nname)]+total
         }
     } else {
     }      
@@ -103,6 +103,8 @@ function getServerTraffic(data,nodes){
 
 //流量排序
 function Rank(){
+console.log(checked)
+console.log(checkedtraffic)
     checked.sort((prev,next)=> {
         return checkedtraffic[checked.indexOf(next)]-checkedtraffic[checked.indexOf(prev)]
     })
@@ -151,7 +153,7 @@ $configuration.sendMessage(messageTraffic).then(resolve => {
 
 //单位展示
 function CUnit(cnt) {
-    cnt = Number(cnt)>=1024? (cnt/1024).toFixed(2)+" GB " : cnt.toFixed(0)+" MB "
+    cnt = Number(cnt)>=1024? (cnt/1024).toFixed(2)+" GB " : cnt.toFixed(1)+" MB "
     return cnt
 }