Merge remote-tracking branch 'origin/main'

README.md

@@ -1,10 +1,9 @@
-# ZZZ-Plugin
 
 <p align="center">
   <a href="https://github.com/ZZZure/ZZZ-Plugin"><img src="https://s2.loli.net/2024/04/19/hOEDmsoUFy6nH5d.jpg" width="480" height="270" alt="ZZZ-Plugin"></a>
 </p>
 <h1 align = "center">ZZZ-Plugin</h1>
-<h4 align = "center">🚧Yunzai绝区零Bot插件 ｜ 交流群 973399270🚧</h4>
+<h4 align = "center">🚧Yunzai绝区零Bot插件 ｜ 交流群 <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=z35HAPxRH9EZGRcLOmGJ-DeDAGBq1Q1t&authKey=QLFsLG25pPYbhrh3Tpkk8qrbhMryIY9Zb39EeXI2c%2BMxsx2UtQLLYTX%2BS1nyrdGY&noverify=0&group_code=973399270">973399270</a>🚧</h4>
 
 > [!tip]
 > 说明

apps/gachalog.js

@@ -26,11 +26,11 @@ export class GachaLog extends ZZZPlugin {
           fnc: 'startGachaLog',
         },
         {
-          reg: `${rulePrefix}(刷新|更新)抽卡(链接|记录)$`,
+          reg: `${rulePrefix}(刷新|更新)抽卡(链接|记录)?$`,
           fnc: 'refreshGachaLog',
         },
         {
-          reg: `^${rulePrefix}抽卡(分析|记录)$`,
+          reg: `^${rulePrefix}抽卡(分析|记录|统计)$`,
           fnc: 'gachaLogAnalysis',
         },
         {

apps/help.js

@@ -77,7 +77,7 @@ const helpData = [
         desc: '刷新抽卡记录，如果数据过多，可能需要等待很长一段时间，请等待回复后再%查看抽卡记录',
         needCK: true,
         needSK: true,
-        commands: ['刷新/更新抽卡链接', '刷新/更新抽卡记录'],
+        commands: ['刷新/更新抽卡', '刷新/更新抽卡链接', '刷新/更新抽卡记录'],
       },
       {
         title: '获取抽卡记录链接',
@@ -91,7 +91,7 @@ const helpData = [
         desc: '查看抽卡记录，需要手动%刷新抽卡记录，否则读取的是缓存数据',
         needCK: false,
         needSK: false,
-        commands: ['抽卡分析', '抽卡记录'],
+        commands: ['抽卡分析', '抽卡记录', '抽卡统计'],
       },
     ],
   },

guoba.support.js

@@ -27,6 +27,10 @@ export function supportGuoba() {
     configInfo: {
       // 配置项 schemas
       schemas: [
+        {
+          component: 'SOFT_GROUP_BEGIN',
+          label: '通用设置',
+        },
         {
           component: 'Divider',
           label: '通用设置',
@@ -42,6 +46,7 @@ export function supportGuoba() {
             min: 50,
             max: 200,
             placeholder: '请输入数字',
+            addonAfter: '%',
           },
         },
         {
@@ -69,9 +74,9 @@ export function supportGuoba() {
           field: 'config.update.cron',
           label: '推送时间',
           bottomHelpMessage: '设置自动检查更新推送的时间，cron表达式',
-          component: 'Input',
+          component: 'EasyCron',
           componentProps: {
-            placeholder: '请输入cron表达式',
+            placeholder: '请输入或选择cron表达式',
           },
         },
         {
@@ -106,6 +111,7 @@ export function supportGuoba() {
             min: 0,
             max: 1000,
             placeholder: '请输入数字',
+            addonAfter: 's',
           },
         },
         {
@@ -149,6 +155,7 @@ export function supportGuoba() {
         //     min: 0,
         //     max: 1000,
         //     placeholder: '请输入数字',
+        //     addonAfter: 's'
         //   },
         // },
         {
@@ -166,6 +173,7 @@ export function supportGuoba() {
             min: 0,
             max: 1000,
             placeholder: '请输入数字',
+            addonAfter: 's',
           },
         },
         {
@@ -179,6 +187,7 @@ export function supportGuoba() {
             min: 0,
             max: 1000,
             placeholder: '请输入数字',
+            addonAfter: 's',
           },
         },
         {
@@ -238,8 +247,13 @@ export function supportGuoba() {
             min: 1,
             max: 7,
             placeholder: '请输入数字1～7',
+            addonAfter: '张',
           },
         },
+        {
+          component: 'SOFT_GROUP_BEGIN',
+          label: '其他设置',
+        },
         {
           component: 'Divider',
           label: