From 4e6a87df16f747b05bafd4624a64c2dcfbaf9379 Mon Sep 17 00:00:00 2001
From: Ctrlcvs <1509167646@qq.com>
Date: Wed, 9 Nov 2022 00:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=87=E4=BB=A4`#=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=93=E5=8A=9B`=20=E8=A1=A5=E5=85=85=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=88=AB=E5=90=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/Note.js                           | 17 +++++++++++++++++
 apps/index.js                          |  4 ++--
 resources/Atlas_alias/Atlas_list.yaml  | 13 ++++++++++---
 resources/Atlas_alias/wuqi_tujian.yaml |  9 +++++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/apps/Note.js b/apps/Note.js
index c74c288..2465f67 100644
--- a/apps/Note.js
+++ b/apps/Note.js
@@ -37,6 +37,23 @@ export async function Note(e, {
 	let notes = new note(e);
 	let cookie, uid, res;
 	if (isV3) {
+		if(e.msg.replace(/全|全部/g,'多').includes('多')){
+			let ck=await gsCfg.getBingCkSingle(e.user_id)
+			let sendMsg=[]
+			e._reply=e.reply;
+			e.reply=((msg)=>{
+				sendMsg.push(msg)
+			})
+			if(Object.keys(ck).length>1){
+				e._reply(`多账号体力查询中请稍等...`)
+			}
+			for(let item of Object.keys(ck)){
+				let res=await (await e.runtime.createMysApi(ck[item].uid,ck[item].ck)).getData('dailyNote')
+				await notes.getNote(ck[item].ck,ck[item].uid,res,{render})
+			}
+			e._reply(sendMsg)
+			return true;
+		}
 		let MysInfo = await import(`file://${_path}/plugins/genshin/model/mys/mysInfo.js`);
 		res = await MysInfo.default.get(e, 'dailyNote')
 		if (!res || res.retcode !== 0) return true
diff --git a/apps/index.js b/apps/index.js
index 00d3ee4..d565325 100644
--- a/apps/index.js
+++ b/apps/index.js
@@ -91,7 +91,7 @@ let rule = {
 		describe: "角色、食物、怪物、武器信息图鉴",
 	},
 	Note: {
-		reg: "^#*(体力|树脂|查询体力|便笺|便签)$",
+		reg: "^#*(多|全|全部)*(体力|树脂|查询体力|便笺|便签)$",
 		describe: "体力",
 	},
 	noteTask: {
@@ -99,7 +99,7 @@ let rule = {
 		describe: "体力推送",
 	},
 	Note_appoint: {
-		reg: "^#体力模板(设置(.*)|列表(.*))|(#我的体力模板列表|#体力模板移除(.*))$",
+		reg: "^#(体力模板(设置(.*)|列表(.*))|(我的体力模板列表|体力模板移除(.*)))$",
 		describe: "体力模板设置",
 	},
 	genShenMap: {
diff --git a/resources/Atlas_alias/Atlas_list.yaml b/resources/Atlas_alias/Atlas_list.yaml
index ee8657c..8c09b20 100644
--- a/resources/Atlas_alias/Atlas_list.yaml
+++ b/resources/Atlas_alias/Atlas_list.yaml
@@ -193,8 +193,8 @@
   - "#行秋图鉴"
   - "#芭芭拉图鉴"
   - "#夜兰图鉴"
-  - 妮露图鉴
-  - 坎蒂丝图鉴
+  - "妮露图鉴"
+  - "坎蒂丝图鉴"
 冰系角色图鉴|冰系人物图鉴|冰系英雄图鉴:
   - "#申鹤图鉴"
   - "#优菈图鉴"
@@ -219,7 +219,7 @@
   - "#北斗图鉴"
   - "#久岐忍图鉴"
   - "#多莉图鉴"
-  - 赛诺图鉴
+  - "#赛诺图鉴"
 岩系角色图鉴|岩系人物图鉴|岩系英雄图鉴:
   - "#岩主图鉴"
   - "#云堇图鉴"
@@ -301,6 +301,7 @@
   - "#烟绯图鉴"
   - "#鹿野院平藏图鉴"
   - "#纳西妲图鉴"
+  - "#流浪者图鉴"
 武器图鉴:
   - 武器星级
   - "#五星武器图鉴"
@@ -337,6 +338,7 @@
   - "#纪行武器图鉴"
   - "#活动武器图鉴"
 五星武器图鉴|5星武器图鉴:
+  - "#图莱杜拉的回忆图鉴"
   - "#千夜浮梦图鉴"
   - "#圣显之钥图鉴"
   - "#赤沙之杖图鉴"
@@ -452,6 +454,7 @@
   - "#森林王器图鉴"
   - "#竭泽图鉴"
   - "#贯月矢图鉴"
+  - "#东花坊时雨图鉴"
 三星武器图鉴|3星武器图鉴:
   - "#飞天御剑图鉴"
   - "#铁影阔剑图鉴"
@@ -522,6 +525,7 @@
   - "#银剑图鉴"
   - "#无锋剑图鉴"
   - "#原木刀图鉴"
+  - "#东花坊时雨图鉴"
 双手剑武器图鉴|双手武器图鉴:
   - "#玛海菈的水色图鉴"
   - "#赤角石溃杵图鉴"
@@ -612,6 +616,7 @@
   - "#新手长枪图鉴"
   - "#贯月矢图鉴"
 法器武器图鉴|法器图鉴:
+  - "#图莱杜拉的回忆图鉴"
   - "#千夜浮梦图鉴"
   - "#流浪的晚星图鉴"
   - "#证誓之明瞳图鉴"
@@ -761,6 +766,7 @@
   - "#甲级宝珏图鉴"
   - "#猎弓图鉴"
 暴击伤害武器图鉴|爆伤武器图鉴:
+  - "#图莱杜拉的回忆图鉴"
   - "#若水图鉴"
   - "#神乐之真意图鉴"
   - "#赤角石溃杵图鉴"
@@ -1045,6 +1051,7 @@
   - "#风花之颂图鉴"
   - "#嘟嘟可故事集图鉴"
   - "#笼钓瓶一心图鉴"
+  - "#东花坊时雨图鉴"
 原魔图鉴|圆魔图鉴|怪物图鉴:
   - "#史莱姆图鉴"
   - "#无相图鉴"
diff --git a/resources/Atlas_alias/wuqi_tujian.yaml b/resources/Atlas_alias/wuqi_tujian.yaml
index 8a8771e..7aedc9b 100644
--- a/resources/Atlas_alias/wuqi_tujian.yaml
+++ b/resources/Atlas_alias/wuqi_tujian.yaml
@@ -151,6 +151,12 @@
   - 纳西妲
   - 草神
   - 神灯
+图莱杜拉的回忆:
+  - 图莱杜拉的回忆
+  - 图莱杜拉
+  - 流浪者
+  - 散兵
+  - 铃铛
 昭心:
   - 糟心
 幽夜华尔兹:
@@ -427,3 +433,6 @@
 风信之锋:
   - 风信之锋
   - 四星鸟枪
+东花坊时雨:
+  - 雨伞
+  - 四星伞