From d7a7d24311660ec8f645931301c1d8a60beb6b42 Mon Sep 17 00:00:00 2001
From: Kokomi <102026640+yoimiya-kokomi@users.noreply.github.com>
Date: Wed, 15 Mar 2023 03:11:59 +0800
Subject: [PATCH] =?UTF-8?q?Miao-Yunzai=E4=B8=8B=E9=BB=98=E8=AE=A4=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8miao-plugin=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=BE=BF=E5=90=8E=E7=BB=AD=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=20=E5=9B=9E=E8=B0=83=E5=8F=AF=E8=8E=89?=
 =?UTF-8?q?=E7=BA=AF=E7=81=AB=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/App.js                        | 8 ++++----
 resources/meta/character/可莉/artis.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/App.js b/components/App.js
index 4a96a76f..26a160ef 100644
--- a/components/App.js
+++ b/components/App.js
@@ -1,5 +1,6 @@
 import lodash from 'lodash'
 import Plugin from './common/Plugin.js'
+import { Version } from '#miao'
 
 class App {
   constructor (cfg) {
@@ -33,7 +34,7 @@ class App {
           name: `喵喵:${cfg.name || cfg.id}`,
           dsc: cfg.desc || cfg.name || '喵喵插件',
           event: event === 'poke' ? 'notice.*.poke' : 'message',
-          priority: 50,
+          priority: cfg.priority || 50,
           rule: rules
         })
       }
@@ -96,13 +97,12 @@ class App {
       if (app.yzRule && app.yzCheck) {
         let yzKey = `Yz${key}`
         let yzRule = lodash.trim(app.yzRule.toString(), '/')
-
         rules.push({
           reg: yzRule,
           fnc: yzKey
         })
         cls.prototype[yzKey] = async function () {
-          if (!app.yzCheck()) {
+          if (Version.isMiao || !app.yzCheck()) {
             return false
           }
           let e = this.e
@@ -120,7 +120,7 @@ class App {
     return {
       reg: 'noCheck',
       describe: cfg.desc || '',
-      priority: 50,
+      priority: cfg.priority || 50,
       hashMark: true
     }
   }
diff --git a/resources/meta/character/可莉/artis.js b/resources/meta/character/可莉/artis.js
index 9e3a2ab8..0cb3c4f5 100644
--- a/resources/meta/character/可莉/artis.js
+++ b/resources/meta/character/可莉/artis.js
@@ -1,5 +1,5 @@
 export default function ({ attr, weapon, rule, def }) {
-  if ( attr.mastery < 110 ) {
+  if (attr.mastery < 50 && attr.cpct * 2 + attr.cdmg > 320) {
     return rule('可莉-纯火', { atk: 85, cpct: 100, cdmg: 100, dmg: 100, recharge: 55 })
   }
   return def({ atk: 75, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, recharge: 30 })