shawenguan il y a 2 ans
Parent
commit
03e834cf2a

+ 211 - 2
BoxJsSub/Release.json

@@ -30,7 +30,7 @@
           "script": "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Scripts/gandart/gandartComposite.js"
         },
         {
-          "name": "极速兑换(琳琅阁)",
+          "name": "极速分解(琳琅阁)",
           "script": "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Scripts/gandart/gandartExchange.js"
         }
       ],
@@ -450,7 +450,7 @@
           "desc": "合成任务ID"
         },
         {
-          "id": "lkGandartCompostieTaskSearchKey",
+          "id": "lkGandartCompositeTaskSearchKey",
           "name": "合成任务名称关键字",
           "val": "",
           "type": "text",
@@ -506,6 +506,215 @@
       ]
     },
     {
+      "id": "lkGandartExchanger",
+      "name": "光予分解",
+      "author": "@jojo",
+      "repo": "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Scripts/gandart/gandartExchange.js",
+      "script": "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Scripts/gandart/gandartExchange.js",
+      "icons": [
+        "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Images/gandart.png",
+        "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Images/gandart.png"
+      ],
+      "keys": [
+        "lkGandartToken",
+        "lkGandartExchangeTaskId",
+        "lkGandartExchangeTaskNameDisplay"
+      ],
+      "settings": [
+        {
+          "id": "lkIsEnableLogGandartExchangerCheckIn",
+          "name": "开启/关闭日志",
+          "val": true,
+          "type": "boolean",
+          "desc": "默认开启"
+        },
+        {
+          "id": "lkNotifyOnlyFailGandartExchangerCheckIn",
+          "name": "只当执行失败才通知",
+          "val": false,
+          "type": "boolean",
+          "desc": "默认关闭"
+        },
+        {
+          "id": "lkIsEnableTgNotifyGandartExchangerCheckIn",
+          "name": "开启/关闭通知",
+          "val": false,
+          "type": "boolean",
+          "desc": "默认关闭"
+        },
+        {
+          "id": "lkTgNotifyUrlGandartExchangerCheckIn",
+          "name": "通知地址",
+          "val": "",
+          "type": "text",
+          "desc": "Tg的通知地址,如:https://api.telegram.org/bot-token/sendMessage?chat_id=-100140&parse_mode=Markdown&text="
+        },
+        {
+          "id": "lkGandartExchangeFuncEnalbleList",
+          "name": "功能步骤",
+          "val": "TaskList,MateList,DecidedList",
+          "type": "checkboxes",
+          "desc": "功能步骤",
+          "items": [
+            {
+              "key": "TaskList",
+              "label": "获取置换分解任务列表"
+            },
+            {
+              "key": "MateList",
+              "label": "获取可行置换分解方案"
+            },
+            {
+              "key": "DecidedList",
+              "label": "生成最终置换分解方案"
+            },
+            {
+              "key": "ExecExchange",
+              "label": "最终执行置换分解任务"
+            }
+          ]
+        },
+        {
+          "id": "lkGandartExchangeTaskListStatus",
+          "name": "任务列表状态",
+          "val": "1",
+          "type": "radios",
+          "desc": "",
+          "items": [
+            {
+              "key": "0",
+              "label": "待开始"
+            },
+            {
+              "key": "1",
+              "label": "置换中"
+            },
+            {
+              "key": "2",
+              "label": "已结束"
+            },
+            {
+              "key": "3",
+              "label": "待开始与置换中"
+            }
+          ]
+        },
+        {
+          "id": "lkGandartCompositeTaskMode",
+          "name": "任务置换分解模式",
+          "val": "1",
+          "type": "radios",
+          "desc": "",
+          "items": [
+            {
+              "key": "0",
+              "label": "普通(即时计算置换分解)"
+            },
+            {
+              "key": "1",
+              "label": "极速(预设数据置换分解)"
+            }
+          ]
+        },
+        {
+          "id": "lkIsExchangeTaskListCache",
+          "name": "启用/弃用任务列表本地缓存",
+          "val": false,
+          "type": "boolean",
+          "desc": "默认关闭"
+        },
+        {
+          "id": "lkIsCompositeMaterialCache",
+          "name": "启用/弃用材料详情本地缓存",
+          "val": false,
+          "type": "boolean",
+          "desc": "默认关闭"
+        },
+        {
+          "id": "lkIsExchangeTaskSearchEnable",
+          "name": "启用/关闭置换分解任务名称检索",
+          "val": true,
+          "type": "boolean",
+          "desc": "默认启用"
+        },
+        {
+          "id": "lkIsExchangeBatchEnable",
+          "name": "启用/关闭批量置换分解",
+          "val": true,
+          "type": "boolean",
+          "desc": "默认启用"
+        },
+        {
+          "id": "lkGandartExchangeBatchGroupCount",
+          "name": "批量置换分解个数",
+          "val": 5,
+          "type": "number",
+          "desc": "批量置换分解个数,就是一次请求置换分解多个"
+        },
+        {
+          "id": "lkGandartExchangeTaskId",
+          "name": "置换分解任务ID",
+          "val": "",
+          "type": "text",
+          "desc": "置换分解任务ID"
+        },
+        {
+          "id": "lkGandartExchangeTaskSearchKey",
+          "name": "置换分解任务名称关键字",
+          "val": "",
+          "type": "text",
+          "desc": "置换分解任务名称关键字,进行搜索匹配到相应的任务ID"
+        },
+        {
+          "id": "lkGandartExchangeCountArray",
+          "name": "置换分解组合执行次数",
+          "val": "0#1",
+          "type": "text",
+          "desc": "置换分解组合执行次数,格式如:0#1,0代表应索引0的可行方案组合,1代表执行次数"
+        },
+        {
+          "id": "lkGandartExchangeTaskMateList",
+          "name": "置换分解组合可行方案",
+          "val": "[]",
+          "autoGrow": false,
+          "type": "textarea",
+          "desc": "普通模式运行得出,仅供查看,用于编写置换分解组合执行次数"
+        },
+        {
+          "id": "lkGandartExchangeTaskFinalList",
+          "name": "置换分解组合最终方案",
+          "val": "[]",
+          "autoGrow": false,
+          "type": "textarea",
+          "desc": "普通模式运行得出,作为极速模式下的缓存,可手动编写(慎重)"
+        },
+        {
+          "id": "lkGandartExchangeTaskList0",
+          "name": "待开始-任务列表",
+          "val": "[]",
+          "autoGrow": true,
+          "type": "textarea",
+          "desc": "待开始的任务列表,用于查看合成任务ID(勿编辑修改)"
+        },
+        {
+          "id": "lkGandartExchangeTaskList1",
+          "name": "合成中-任务列表",
+          "val": "[]",
+          "autoGrow": false,
+          "type": "textarea",
+          "desc": "合成中的任务列表,用于查看合成任务ID(勿编辑修改)"
+        },
+        {
+          "id": "lkGandartExchangeTaskList2",
+          "name": "已结束-任务列表",
+          "val": "[]",
+          "autoGrow": false,
+          "type": "textarea",
+          "desc": "已结束的任务列表,用于查看合成任务ID(勿编辑修改)"
+        }
+      ]
+    },
+    {
       "id": "lkGandartPayer",
       "name": "光予支付",
       "author": "@jojo",

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
Scripts/buyu/wbankBuYu.js


+ 2 - 2
Scripts/gandart/gandartComposite.js

@@ -43,7 +43,7 @@ const GandartConstKey = {
     CompositeTaskList2: 'lkGandartCompositeTaskList2',
     CompositeTaskId: 'lkGandartCompositeTaskId',
     CompositeTaskSearchEnable: 'lkIsCompositeTaskSearchEnable',
-    CompostieTaskSearchKey: 'lkGandartCompostieTaskSearchKey',
+    CompositeTaskSearchKey: 'lkGandartCompositeTaskSearchKey',
     CompositeTaskNameDisplay: 'lkGandartCompositeTaskNameDisplay',
     CompositeCountArray: 'lkGandartCompositeCountArray',
     CompositeTaskMateList: 'lkGandartCompositeTaskMateList',
@@ -158,7 +158,7 @@ async function checkTrySearchToCompositeTask(taskLst) {
         return;
     }
     lk.log('开始尝试通过名称来检索任务进行合成');
-    let keyName = lk.getVal(GandartConstKey.CompostieTaskSearchKey);
+    let keyName = lk.getVal(GandartConstKey.CompositeTaskSearchKey);
     if (lk.isEmpty(keyName)) {
         lk.log(`当前检索关键字为空`);
         return;

Fichier diff supprimé car celui-ci est trop grand
+ 999 - 3
Scripts/gandart/gandartExchange.js


+ 2 - 2
Scripts/gandart/gandartPay.js

@@ -176,7 +176,7 @@ async function checkPay(orderNum, orderTotal) {
                         if (availableMoney >= orderTotal) {
                             isMateWallet = true;
                             lk.log(`匹配到钱包${w1.channel}余额[${availableMoney}]用来支付订单额[${orderTotal}]`);
-                            isPaySuccess = await finalPay(w1.channel, orderNum, orderInfo);
+                            isPaySuccess = await finalPay(w1.channel, orderNum, orderTotal, orderInfo);
                             break;
                         }
                     }
@@ -453,7 +453,7 @@ function getPayUrlPath(walletName) {
     return path;
 }
 
-async function finalPay(walletName, orderNum, orderInfo) {
+async function finalPay(walletName, orderNum, orderTotal, orderInfo) {
     let isSuccess = false;
     let isPass = false;
     switch (walletName) {

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff