From 3aa2456e8f8e2cdaf7abd72d15110cbba9025715 Mon Sep 17 00:00:00 2001
From: panganqi <pangaq@shanghaitech.edu.cn>
Date: Wed, 14 Sep 2022 01:56:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=B5=81=E6=B4=BE=20(#180)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fisrt commit

* del copy files

* change filemode

* Delete profile-detail-Copy1.html

* Delete profile-stat-Copy1.css

* Update artis_user.js
---
 .gitignore                                     |  0
 models/profile-lib/CharArtis.js                |  9 +++++++--
 resources/meta/character/云堇/artis_user.js  |  7 +++++++
 resources/meta/character/优菈/artis_user.js  |  7 +++++++
 .../meta/character/八重神子/artis_user.js  | 16 ++++++++++++++++
 resources/meta/character/刻晴/artis_user.js  | 11 +++++++++++
 resources/meta/character/可莉/artis_user.js  |  7 +++++++
 resources/meta/character/夜兰/artis_user.js  | 13 +++++++++++++
 resources/meta/character/夜兰/calc.js        |  4 ++--
 resources/meta/character/宵宫/artis_user.js  | 10 ++++++++++
 resources/meta/character/温迪/artis_user.js  |  7 +++++++
 resources/meta/character/甘雨/artis_user.js  |  9 +++++++++
 .../meta/character/神里绫人/artis_user.js  | 17 +++++++++++++++++
 .../meta/character/神里绫华/artis_user.js  | 14 ++++++++++++++
 resources/meta/character/胡桃/artis_user.js  | 15 +++++++++++++++
 resources/meta/character/行秋/artis_user.js  | 18 ++++++++++++++++++
 .../meta/character/达达利亚/artis_user.js  |  7 +++++++
 .../meta/character/雷电将军/artis_user.js  | 10 ++++++++++
 resources/meta/character/香菱/artis_user.js  |  6 ++++++
 resources/meta/reliquaries/artis-mark.js       |  2 +-
 20 files changed, 184 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 .gitignore
 create mode 100644 resources/meta/character/云堇/artis_user.js
 create mode 100644 resources/meta/character/优菈/artis_user.js
 create mode 100644 resources/meta/character/八重神子/artis_user.js
 create mode 100644 resources/meta/character/刻晴/artis_user.js
 create mode 100644 resources/meta/character/可莉/artis_user.js
 create mode 100644 resources/meta/character/夜兰/artis_user.js
 create mode 100644 resources/meta/character/宵宫/artis_user.js
 create mode 100644 resources/meta/character/温迪/artis_user.js
 create mode 100644 resources/meta/character/甘雨/artis_user.js
 create mode 100644 resources/meta/character/神里绫人/artis_user.js
 create mode 100644 resources/meta/character/神里绫华/artis_user.js
 create mode 100644 resources/meta/character/胡桃/artis_user.js
 create mode 100644 resources/meta/character/行秋/artis_user.js
 create mode 100644 resources/meta/character/达达利亚/artis_user.js
 create mode 100644 resources/meta/character/雷电将军/artis_user.js
 create mode 100644 resources/meta/character/香菱/artis_user.js

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/models/profile-lib/CharArtis.js b/models/profile-lib/CharArtis.js
index 5d2b4683..0ff60626 100644
--- a/models/profile-lib/CharArtis.js
+++ b/models/profile-lib/CharArtis.js
@@ -11,6 +11,11 @@ async function init () {
     if (fs.existsSync(`${charPath}/${char}/artis.js`)) {
       charCfg[char] = await Data.importModule(`resources/meta/character/${char}/artis.js`)
     }
+    if (fs.existsSync(`${charPath}/${char}/artis_user.js`)) {
+      charCfg[char] = await Data.importModule(`resources/meta/character/${char}/artis_user.js`)
+    }
+    
+    
   }
 }
 
@@ -30,7 +35,7 @@ const CharArtis = {
       let title = '通用'
       let weight = attrWeight || usefulAttr[char.name] || { atk: 75, cp: 100, cd: 100 }
       if (artis.is('绝缘4') && weight.recharge < 75) {
-        weight.recharge = 75
+        weight.recharge += 25
         title = '绝缘4'
       }
       return {
@@ -44,7 +49,7 @@ const CharArtis = {
     }
 
     if (charRule) {
-      return charRule({ attr, artis, rule, def, weapon: profile.weapon })
+      return charRule({ attr, artis, rule, def, weapon: profile.weapon,cons:profile.cons })
     }
   }
 }
diff --git a/resources/meta/character/云堇/artis_user.js b/resources/meta/character/云堇/artis_user.js
new file mode 100644
index 00000000..17e02cfd
--- /dev/null
+++ b/resources/meta/character/云堇/artis_user.js
@@ -0,0 +1,7 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 辅助精通雷神，具体数值待定
+  if (weapon.name === '西风长枪' && weapon.affix >= 1) {
+    return rule('云堇-西风', { hp: 0, atk: 0, def: 100, cp: 100, cd: 0, mastery: 0, dmg: 25, phy: 0, recharge: 90, heal: 0 })
+  }
+  return def({ hp: 0, atk: 0, def: 100, cp: 75, cd: 0, mastery: 0, dmg: 25, phy: 0, recharge: 90, heal: 0 })
+}
\ No newline at end of file
diff --git a/resources/meta/character/优菈/artis_user.js b/resources/meta/character/优菈/artis_user.js
new file mode 100644
index 00000000..422ad5d4
--- /dev/null
+++ b/resources/meta/character/优菈/artis_user.js
@@ -0,0 +1,7 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 优菈核爆
+  if (attr.cpct < 30) {
+    return rule('优菈-核爆', { atk: 75, cp: 0, cd: 100, mastery: 0, dmg: 100, recharge: 0 })
+  }
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 40, phy: 100, recharge: 40, heal: 0 })
+}
\ No newline at end of file
diff --git a/resources/meta/character/八重神子/artis_user.js b/resources/meta/character/八重神子/artis_user.js
new file mode 100644
index 00000000..54f1c046
--- /dev/null
+++ b/resources/meta/character/八重神子/artis_user.js
@@ -0,0 +1,16 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 辅助精通雷神，具体数值待定
+    let mastery_score = 0
+  if (attr.mastery > 100) {
+    mastery_score = 75
+    if (weapon.name === '神乐之真意' && weapon.affix >= 3) {
+      return rule('八重-高精', { atk: 75, cp: 100, cd: 100, mastery: mastery_score ,dmg: 80, recharge: 0 })
+  }
+    return rule('八重-激化', { atk: 75, cp: 100, cd: 100, mastery: 75, dmg: 100, recharge: 0 })
+  }
+    if (weapon.name === '神乐之真意' && weapon.affix >= 3) {
+      return rule('八重-高精', { atk: 75, cp: 100, cd: 100, mastery: mastery_score ,dmg: 80, recharge: 0 })
+  }
+  
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+}
diff --git a/resources/meta/character/刻晴/artis_user.js b/resources/meta/character/刻晴/artis_user.js
new file mode 100644
index 00000000..f2c2179d
--- /dev/null
+++ b/resources/meta/character/刻晴/artis_user.js
@@ -0,0 +1,11 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 激化精通璃月雷神，具体数值待定
+  if (attr.mastery > 80) {
+    return rule('刻晴-激化', { atk: 60, cp: 100, cd: 100, mastery: 40, dmg: 100, recharge: 0 })
+  }
+  if (weapon.name === '磐岩结绿' && weapon.affix >= 1) {
+    let temp = 35 + 5*weapon.affix
+    return rule('刻晴-绿剑', { hp: temp, atk: 60, cp: 100, cd: 100, mastery: 40, dmg: 100, recharge: 0 })
+  }
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 0, heal: 0 })
+}
diff --git a/resources/meta/character/可莉/artis_user.js b/resources/meta/character/可莉/artis_user.js
new file mode 100644
index 00000000..7b9f183d
--- /dev/null
+++ b/resources/meta/character/可莉/artis_user.js
@@ -0,0 +1,7 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 蒸发可莉，具体数值待定
+  if (attr.mastery < 80) {
+    return rule('可莉-纯火', { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+  }
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+}
\ No newline at end of file
diff --git a/resources/meta/character/夜兰/artis_user.js b/resources/meta/character/夜兰/artis_user.js
new file mode 100644
index 00000000..44a16c08
--- /dev/null
+++ b/resources/meta/character/夜兰/artis_user.js
@@ -0,0 +1,13 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 小蒸一下夜兰
+  if (attr.mastery > 100 && weapon.name === '若水') {
+    return rule('夜兰-蒸发', { hp: 100, cp: 100, cd: 100, mastery: 75, dmg: 100, recharge: 35 })
+  }
+  if (weapon.name === '若水') {
+    return rule('夜兰-若水', { hp: 100, cp: 100, cd: 100, dmg: 100, recharge: 35 })
+  }
+  if (weapon.name === '西风猎弓') {
+    return rule('夜兰-西风', { hp: 80, cp: 100, cd: 100, dmg: 100, recharge: 55 })
+  }
+  return def({ hp: 80, cp: 100, cd: 100, dmg: 100, recharge: 35 })
+}
diff --git a/resources/meta/character/夜兰/calc.js b/resources/meta/character/夜兰/calc.js
index ea065c69..f4c0da92 100644
--- a/resources/meta/character/夜兰/calc.js
+++ b/resources/meta/character/夜兰/calc.js
@@ -3,8 +3,8 @@ export const details = [{
   dmg: ({ talent, attr, calc }, { basic }) => basic(calc(attr.hp) * talent.a['破局矢伤害'] / 100, 'a2')
 
 }, {
-  title: 'E络命丝伤害',
-  dmg: ({ talent, attr, calc }, { basic }) => basic(calc(attr.hp) * talent.e['技能伤害'] / 100, 'e')
+  title: 'E络命丝蒸发伤害',
+  dmg: ({ talent, attr, calc }, { basic }) => basic(calc(attr.hp) * talent.e['技能伤害'] / 100, 'e','zf')
 
 }, {
   title: 'Q协同单段伤害',
diff --git a/resources/meta/character/宵宫/artis_user.js b/resources/meta/character/宵宫/artis_user.js
new file mode 100644
index 00000000..bba8dc22
--- /dev/null
+++ b/resources/meta/character/宵宫/artis_user.js
@@ -0,0 +1,10 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 宵宫纯色流派
+  if (attr.mastery < 80) {
+    return rule('宵宫-纯色', { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+  }
+  if (attr.mastery > 300) {
+    return rule('宵宫-凹蒸发', { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 100, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+  }
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+}
diff --git a/resources/meta/character/温迪/artis_user.js b/resources/meta/character/温迪/artis_user.js
new file mode 100644
index 00000000..01affc44
--- /dev/null
+++ b/resources/meta/character/温迪/artis_user.js
@@ -0,0 +1,7 @@
+export default function ({ attr, weapon, rule, def }) {
+
+  if (attr.recharge > 240) {
+    return rule('温迪-工具人', { atk: 75, cp:100, cd: 100, mastery: 75, dmg: 100, recharge: 100 })
+  }
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 75, heal: 0 })
+}
\ No newline at end of file
diff --git a/resources/meta/character/甘雨/artis_user.js b/resources/meta/character/甘雨/artis_user.js
new file mode 100644
index 00000000..260071fa
--- /dev/null
+++ b/resources/meta/character/甘雨/artis_user.js
@@ -0,0 +1,9 @@
+export default function ({ attr,artis, rule, def }) {
+  if (artis.is('冰套4')) {
+    return rule('永冻甘雨', { atk: 75, cp: 100, cd: 100, dmg: 100, recharge: 0 })
+  }
+  if (attr.cpct < 20) {
+    return rule('甘雨-核爆', { atk: 75, cp: 0, cd: 100, mastery: 75, dmg: 100, recharge: 0 })
+  }
+  return def({ atk: 75, cp: 100, cd: 100, mastery: 75, dmg: 100 })
+}
diff --git a/resources/meta/character/神里绫人/artis_user.js b/resources/meta/character/神里绫人/artis_user.js
new file mode 100644
index 00000000..da840864
--- /dev/null
+++ b/resources/meta/character/神里绫人/artis_user.js
@@ -0,0 +1,17 @@
+export default function ({ attr, weapon, rule, def }) {
+  //蒸发绿剑绫人
+  if (weapon.name === '磐岩结绿' && weapon.affix >= 1 && attr.mastery > 60) {
+    let temp = 35 + 5*weapon.affix
+    return rule('绫人-绿剑', { hp: temp, atk: 60, cp: 100, cd: 100, mastery: 60, dmg: 100, recharge: 0 })
+  }
+  // 蒸发绫人，具体数值待定
+  if (attr.mastery > 60) {
+    return rule('绫人-蒸发', { hp: 45,atk: 60, cp: 100, cd: 100, mastery: 60, dmg: 100, recharge: 0 })
+  }
+  // 
+  if (weapon.name === '磐岩结绿' && weapon.affix >= 1) {
+    let temp = 35 + 5*weapon.affix
+    return rule('绫人-绿剑', { hp: temp, atk: 60, cp: 100, cd: 100, mastery: 0, dmg: 100, recharge: 0 })
+  }
+  return def({ hp: 45, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100})
+}
diff --git a/resources/meta/character/神里绫华/artis_user.js b/resources/meta/character/神里绫华/artis_user.js
new file mode 100644
index 00000000..7818ca59
--- /dev/null
+++ b/resources/meta/character/神里绫华/artis_user.js
@@ -0,0 +1,14 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 傻逼的融化神里，具体数值待定
+  if (attr.mastery > 100) {
+    return rule('神里-融化', { atk: 75, cp: 100, cd: 100, mastery: 40, dmg: 100, recharge: 0 })
+  }
+  if (weapon.name === '磐岩结绿' && weapon.affix >= 1) {
+    let temp = 15 + 5*weapon.affix
+    return rule('神里-绿剑', { hp: temp, atk: 75, cp: 100, cd: 100, mastery: 0, dmg: 100, recharge: 0 })
+  }
+  if (attr.recharge > 120) {
+    return rule('神里-充能', { atk: 75, cp: 100, cd: 100, mastery: 0, dmg: 100, recharge: 30 })
+  }
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 0, heal: 0 })
+}
\ No newline at end of file
diff --git a/resources/meta/character/胡桃/artis_user.js b/resources/meta/character/胡桃/artis_user.js
new file mode 100644
index 00000000..46f070ed
--- /dev/null
+++ b/resources/meta/character/胡桃/artis_user.js
@@ -0,0 +1,15 @@
+export default function ({ attr, weapon, rule, def, cons }) {
+  // 核爆胡桃，具体数值待定
+  let hp_base = 75
+  if (weapon.name === '护摩之杖' && weapon.affix >= 1){
+      hp_base = hp_base + (weapon.affix-1)*2.5
+  }
+  if (cons>=3){
+      hp_base = hp_base + 5
+  }
+  
+  if (attr.cpct < 30) {
+    return rule('胡桃-核爆', { hp: hp_base, atk: 25, def: 0, cp: 0, cd: 100, mastery: 80, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+  }
+  return def({ hp: hp_base, atk: 30, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+}
diff --git a/resources/meta/character/行秋/artis_user.js b/resources/meta/character/行秋/artis_user.js
new file mode 100644
index 00000000..9bb26106
--- /dev/null
+++ b/resources/meta/character/行秋/artis_user.js
@@ -0,0 +1,18 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 优菈核爆
+  if (attr.cpct < 30) {
+    return rule('行秋-核爆', { atk: 75, cp: 0, cd: 100, mastery: 75, dmg: 100, recharge: 0 })
+  }
+  if (attr.mastery > 100) {
+    return rule('行秋-蒸发', { atk: 60, cp: 100, cd: 100, mastery: 60, dmg: 100, recharge: 0 })
+  }
+  if (weapon.name === '磐岩结绿' && weapon.affix >= 1 &&attr.mastery > 100) {
+    let temp = 15 + 5*weapon.affix
+    return rule('行秋-绿剑', { hp: temp, atk: 60, cp: 100, cd: 100, mastery: 40, dmg: 100, recharge: 0 })
+  }
+  if (weapon.name === '磐岩结绿' && weapon.affix >= 1) {
+    let temp = 15 + 5*weapon.affix
+    return rule('行秋-绿剑', { hp: temp, atk: 60, cp: 100, cd: 100, mastery: 0, dmg: 100, recharge: 0 })
+  }
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 40, heal: 0 })
+}
diff --git a/resources/meta/character/达达利亚/artis_user.js b/resources/meta/character/达达利亚/artis_user.js
new file mode 100644
index 00000000..290144f7
--- /dev/null
+++ b/resources/meta/character/达达利亚/artis_user.js
@@ -0,0 +1,7 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 公子核爆
+  if (attr.cpct < 30) {
+    return rule('公子-核爆', { atk: 75, cp: 0, cd: 100, mastery: 75, dmg: 100, recharge: 0 })
+  }
+  return def({ hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 })
+}
\ No newline at end of file
diff --git a/resources/meta/character/雷电将军/artis_user.js b/resources/meta/character/雷电将军/artis_user.js
new file mode 100644
index 00000000..f1f46562
--- /dev/null
+++ b/resources/meta/character/雷电将军/artis_user.js
@@ -0,0 +1,10 @@
+export default function ({ attr, weapon, rule, def }) {
+  // 辅助精通雷神，具体数值待定
+  if (attr.mastery > 500) {
+    return rule('雷神-精通', { atk: 75, cp: 90, cd: 90, mastery: 100, dmg: 75, recharge: 90 })
+  }
+  if (weapon.name === '薙草之稻光' && weapon.affix >= 3) {
+    return rule('雷神-高精', { atk: 80, cp: 100, cd: 100, dmg: 90, recharge: 80 })
+  }
+  return def({ atk: 75, cp: 100, cd: 100, mastery: 0, dmg: 75, recharge: 90 })
+}
diff --git a/resources/meta/character/香菱/artis_user.js b/resources/meta/character/香菱/artis_user.js
new file mode 100644
index 00000000..1eb8bea0
--- /dev/null
+++ b/resources/meta/character/香菱/artis_user.js
@@ -0,0 +1,6 @@
+export default function ({ attr, weapon, rule, def }) {
+  if (weapon.name === '薙草之稻光' && weapon.affix >= 3) {
+    return rule('香菱-高精', { hp: 0, atk: 60, def: 0, cp: 100, cd: 100, mastery: 70, dmg: 100, phy: 0, recharge: 75, heal: 0 })
+  }
+  return def({ hp: 0, atk: 70, def: 0, cp: 100, cd: 100, mastery: 70, dmg: 100, phy: 0, recharge: 70, heal: 0 })
+}
\ No newline at end of file
diff --git a/resources/meta/reliquaries/artis-mark.js b/resources/meta/reliquaries/artis-mark.js
index ed0d30cb..bc9d630a 100644
--- a/resources/meta/reliquaries/artis-mark.js
+++ b/resources/meta/reliquaries/artis-mark.js
@@ -94,4 +94,4 @@ export const usefulAttr = {
   柯莱: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 30, heal: 0 },
   空: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 },
   荧: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 }
-}
+}
\ No newline at end of file