fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 肉鸽事件/选项 (#17256)

Browse Source 
* fix: 全角问号事件/选项

* fix: remove dupes for EN

* fix: 鸭爵主演？工作热情？

* fix: anchor for similars

* chore: remove stale encounters

* chore: 合并重复正则

* chore: remove unused choices from base.json + fix ordering in sui.json

* fix: 多余空格

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
This commit is contained in:
uye
2026-07-04 18:30:04 +08:00
committed by GitHub
parent 884375e925
commit c558e49ca6
8 changed files with 35 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resource/global/YoStarEN/resource/tasks/Roguelike/JieGarden.json
View File

@@ -252,15 +252,18 @@
},
"JieGarden@RoguelikeEncounterOptionAnalyzer-OptionHeaderBar-Text": {
"ocrReplace": [
[" ", ""],
["Eatyourfill", "饱餐一顿"],
["Boostmorale", "鼓舞士气"],
["Treatyourwounds", "医治伤口"],
["Wavethesignalflag", "摇动令旗"],
[" |<|>|-|'", ""],
["Takeabreak", "稍事休息"],
["Reorganize", "重整编制"],
["Boostmorale", "鼓舞士气"],
["Treatyourwounds", "医治伤口"],
["Eatyourfill", "饱餐一顿"],
["Wavethesignalflag", "摇动令旗"],
["Lightacandle", "点燃蜡烛"],
["Getintoformation", "布下阵法"],
["Lightacandle", "点燃蜡烛"]
["Pickabigone", "挑个大的"],
["Pickasmallone", "挑个小的"],
["Prettyreasonable[onceyouthinkaboutit]*", "细细想来也有道理"]
]
}
}

110
resource/global/YoStarEN/resource/tasks/Roguelike/base.json
View File

@@ -979,7 +979,6 @@
["ShackledBloodline", "受缚之血"],
["PhantomRamblings", "幽影狂言"],
["ArtandMadness", "艺术与疯狂"],
["DuckLordtheLeadActor", "鸭爵主演"],
["DuckLord.*sParty", "鸭爵的宴会"],
["DuckLord.*sImprov", "即兴鸭子演出"],
["AboutThatUrsusMan", "有关那位乌萨斯人"],
@@ -989,7 +988,10 @@
["SecretEntrance", "暗门"],
["SecretChamber", "密室"],
["JunkyardBazaar", "废品地摊"],
["Reprieve", "解脱"],
["^Reprieve$", "解脱"],
["Reprieve\\?", "解脱？"],
["APassionforWork\\?", "工作热情？"],
["DuckLordtheLeadActor\\?", "鸭爵主演？"],
["CrazyPuppets", "疯狂玩偶"],
["AttendingaBanquet", "赴宴"],
["AGatheringofFollowers", "追随者集会"],
@@ -1036,8 +1038,6 @@
["Puppy.*DogEyes", "狗眼婆娑"],
["DuckforceTest", "鸭力测试"],
["SomeTimetoKill", "打发时间"],
["APassionforWork", "工作热情"],
["BusinessEmpire", "商业帝国?"],
["DelusionsofLunacy", "狂徒妄念"],
["TheKnightPersists", "骑士仍在"],
["TheBeginning", "开端"],
@@ -1057,21 +1057,18 @@
["TheSwordintheStone", "“石中剑”"],
["TinMan", "“锡人”"],
["MissingMountains", "不见群山"],
["Reprieve\\??", "解脱?"],
["OnsiteatPublicSignalAmplificationStation756", "在地公共信号放大站756号"],
["ArtConnoisseur", "“鉴赏家”"],
["RoyalRumble", "“皇家争执”"],
["SearchingForAPathForward", "探寻前路"],
["OperationRewards", "行动奖励"],
["DuckLordtheLeadActor\\??", "鸭爵主演?"],
["CeremonyofHealing", "疗愈仪式"],
["WildernessSurvivalExpert", "野外生存专家"],
["AlwaysonAlert", "时刻警惕"],
["ChainofSuspicion", "猜疑链"],
["MeetinginaDream", "梦中之会"],
["LowlandMarket", "低地市集"],
["APassionforWork\\??", "工作热情?"],
["BusinessEmpire\\??", "商业帝国?"],
["BusinessEmpire\\??", "商业帝国？"],
["ADarkRoom", "昏黑之室"],
["RegularMaintenance", "定期维护"],
["AuspiciousSign", "吉兆"],
@@ -1100,6 +1097,7 @@
["UnfreezingRiver", "不冻河"],
["FenceofWoodandSnow", "雪与木的笆篱"],
["AmmaTal", "安玛塔卢"],
["Let.?stryagain", "再试试看吧"],
["CrossingSamisArm", "走过萨米的臂膀"],
["ShatteredOmen", "木裂前兆"],
["PessimistsCage", "悲观者囚笼"],
@@ -1206,100 +1204,8 @@
["TheFinishingStroke", "收笔"],
["MeetingaFriend", "会友"],
["WhereThenMeetsNow", "古今交汇"],
["Pickabigone", "挑个大的"],
["Pickasmallone", "挑个小的"],
["Prettyreasonable[onceyouthinkaboutit]*", "细细想来也有道理"],
["Surveythesituation[whilemaintainingorder]*", "勘察情况并维持秩序"],
["Pickthecrushedherbs", "选择碎草药"],
["Picktheprettyfabric", "选择好看的织物"],
["Pickthedamppoultice", "选择湿膏药"],
["Picktheprettywoodcut", "选择好看的木刻"],
["Pickthepurefrostydew", "选择纯霜露"],
["Picktheamber", "选择琥珀核"],
["HelptheSamiwiththeFoldartal", "帮助拿着密文板的萨米人"],
["Followthesoundofroaring", "循着嚎叫声走去"],
["Followthesoundofthehorn", "循着号角声走去"],
["'?Vitality'?", "“活力”"],
["'?Money'?", "“金钱”"],
["'?Treescar'?", "“树痕”"],
["'?Battle'?", "“战斗”"],
["'?Protect'?", "“护卫”"],
["Useathermalcamera", "使用热像仪"],
["Lookthroughamulticolor[photometrictelescope]*", "检查多色测光望远镜的目镜"],
["Leisurelyopenacanofsoup", "不紧不慢地打开一听罐头汤"],
["Escape", "逃离"],
["Explainyoursituation", "解释情况"],
["Lookfortools", "寻找工具"],
["Giveasmalltokenofappreciation", "意思意思"],
["Givealargerewardasthanks", "重金酬谢"],
["Sendyourcoordinatesandcall[forbackup]*", "提供位置，呼叫增援"],
["Alittleknockshoulddoit", "“敲一敲”都能解决"],
["Pickthediscardedtarotcard[byherhand]*", "选择她弃在手边的塔罗牌"],
["Perhapswecanhelpeachotherout", "我们或许能协作互助"],
["Whatareyoudoing\\?", "你在做什么?"],
["Approachwithcaution", "一边警戒一边前进"],
["Doasyouretold", "乖乖照做"],
["Putonthehelmet", "戴上头盔"],
["Overloadsurveyequipment", "过载使用探测仪器"],
["RelyonAmma.?slegacy", "依靠安玛的遗赠"],
["Picksomethingfromdeepinside[thewarehouse]*", "选择仓库深处的货品"],
["Picksomethingbyhisleg", "选择他脚边的货品"],
["Seekhope", "寻求希望"],
["Seekprotection", "寻求护佑"],
["LookforTreescar.?strail", "寻求\"树痕\"的踪迹"],
["Guardthewoodland", "护卫林地"],
["Defendthewoodland", "坚守林地"],
["Can.?twejustwalkonthetrees\\?", "树上就不能走吗？"],
["Probewithyourinstrument", "用仪器探测"],
["Givemesomeofthat", "分我一点"],
["Eavesdropontheirconversation", "偷听他们聊天"],
["Getalittlecloser", "走近一些"],
["Seemslikethedrone.?sfound[something]*", "无人机好像有新发现"],
["Weveseentheregister.?now[chooseyourfighter!\\?]*", "接过名册木板，是该选择了！"],
["FirsttimersinSamihave[definitelyneverseenthisbefore!\\?]*", "没来过萨米的人一定没见过！"],
["Leaveinpanic", "仓皇离开"],
["Stay", "留下"],
["Takeanothersip", "再喝一口"],
["Halosappearonboththeirheads", "他们的头顶都生出了光环"],
["Gethelptocarrythemaway", "找些帮手来把这里搬空"],
["Pleasehelpmeandmycompanions", "请帮帮我，还有我的同伴们"],
["Wereherefortheseminar", "我们是来参加研讨会的"],
["Recruit", "花钱雇佣"],
["Promisefuturecompensation", "许诺未来的报酬"],
["Delivertheburdenbeastandloot", "交付驮兽载满的资源"],
["Sayhellototheboss", "和负责人打个招呼"],
["Workoutaway", "与阿纳萨商量"],
["KingofTerra", "《泰拉之王》"],
["FollowtheLich.?swisdom", "跟随巫妖的智慧"],
["FollowtheCyclops.?sprophecy", "跟随独眼巨人的预示"],
["Sharesitspreywiththecreature", "它邀请对方共享猎物"],
["Pouncesatthecreature", "它向前扑去"],
["Answersthecreature.?swish", "它回应愿望"],
["Travelwiththeburdenbeast", "与驮兽同行"],
["Askforadownpayment", "索要定金"],
["Whatdoyouthink.?Carrot\\?", "胡萝卜，你觉得呢？"],
["Willthisworkasaticket\\?", "这可以代替门票吗？"],
["IfOriginiumwasedible", "\"假如源石可以吃……\""],
["Ifthelandunitedintoone", "\"假如大地合为一国……\""],
["Trytowinoverthecity", "尝试讨好城市"],
["Presentthedrawingrepresenting[hope]*", "拿出希望的画作"],
["Presentthespearheadrepresenting[hatred]*", "拿出仇恨的矛头"],
["Destroyitsvessel", "撞碎它的载体"],
["Offersomeofyourbelongings", "奉上一些财物"],
["Offerallofyourbelongings", "奉上所有财物"],
["Offeraprayer", "虔诚祈祷"],
["Raiseyourspearhead!\\?", "举起矛头！"],
["Stabtheduckrightthrough", "准备把鸭子刺个对穿"],
["Exactrevenge", "狩猎死仇"],
["Weneedthisforourstory", "我们的故事需要这个"],
["DeclaretheKings.?struenames", "报出魔王的名讳"],
["Let.?stryagain", "再试试看吧"],
["Heaven-Blessed Hunt", "大狩维天"],
["For Tomorrow", "只为明日"],
["Business Empire?", "商业帝国？"],
["Duck Lord the Lead Actor?", "鸭爵主演？"],
["A Passion for Work?", "工作热情？"],
["Reprieve?", "解脱？"]
["Heaven-BlessedHunt", "大狩维天"],
["ForTomorrow", "只为明日"]
],
"roi": [0, 395, 725, 235]
},

35
resource/global/YoStarJP/resource/tasks/Roguelike/base.json
View File

@@ -1078,22 +1078,19 @@
["束縛された血族", "受缚之血"],
[".*からの誘い", "幽影狂言"],
["芸術と狂気", "艺术与疯狂"],
["主役.*ダ[ッツヅ]ク卿？", "鸭爵主演?"],
["主役.*ダ[ッツヅ]ク卿", "鸭爵主演"],
["主役.*ダ[ッツヅ]ク卿？", "鸭爵主演？"],
["ダック卿のパーティー", "鸭爵的宴会"],
["ダック卿の即興劇", "即兴鸭子演出"],
["あのウルサス人のこと", "有关那位乌萨斯人"],
["邪悪な棺", "邪恶之棺"],
["^血には血を", "以血还血"],
["^血には血.*", "以血还血"],
["隠し扉", "暗门"],
["密室", "密室"],
["ガラクタの屋台", "废品地摊"],
["鑑定家", "鉴赏家"],
["苦しみからの解放？", "解脱?"],
["苦しみからの解放？", "解脱？"],
["苦しみからの解放", "解脱"],
["狂ったぬいぐるみ", "疯狂玩偶"],
["パーティーに赴く", "赴宴"],
["パーティー?に[赴起走]", "赴宴"],
["信者の会合", "追随者集会"],
["そ[っつ]としておこう", "别打扰他们"],
@@ -1109,17 +1106,14 @@
["「ブリキの男」", "“锡人”"],
["「鑑定家」", "“鉴赏家”"],
["「皇帝論争」", "“皇家争执”"],
["断崖の葬式", "悬高之葬"],
[".*崖の葬式", "悬高之葬"],
["継承", "继承"],
["米承", "继承"],
["帰郷", "重返家园"],
["薪", "引火之木"],
["灯台守", "灯塔看守人"],
["シーボーン学者", "海嗣学者"],
[".*ーン学者", "海嗣学者"],
["海辺の歌い手", "海边的歌者"],
["海外の出張販売", "远销海外"],
["海.*の出張販売", "远销海外"],
["伝統技術", "传统技术"],
["伝統支術", "传统技术"],
@@ -1147,12 +1141,9 @@
["宝埋もれし港.*", "藏宝港湾"],
["宝箱の舞", "宝箱之舞"],
["(涙|戻)目の.*ッロ(ー)?", "狗眼婆娑"],
["ダックパワーテスト", "鸭力测试"],
[".*クパワーテス.*", "鸭力测试"],
["[暇眼]潰し", "打发时间"],
["仕事への情熱は", "工作热情"],
["仕事への情熱は？", "工作热情?"],
["ビジネス帝国", "商业帝国"],
["仕事への情熱は？", "工作热情？"],
["凶徒の妄執", "狂徒妄念"],
["騎士は未(だ|た)そこにあり", "骑士仍在"],
["発端", "开端"],
@@ -1171,35 +1162,27 @@
["低地の市場", "低地市集"],
["雪と木の垣根", "雪与木的笆篱"],
["ア.*マ[ーニ二]タル", "安玛塔卢"],
["北地の巫術師競技会", "北地巫师竞技"],
[".*の.*術師競技会", "北地巫师竞技"],
["最高の友達", "最好的朋友"],
["深淵を前に", "深渊入口"],
["手当たり次第に", "随到随取"],
["手当(た|だ).*第.*", "随到随取"],
["定.*メンテナンス", "定期维护"],
["暗い部屋", "昏黑之室"],
["癒しの儀", "疗愈仪式"],
["黒い足跡", "黑色足迹"],
["凍らない川", "不冻河"],
["サバイバルのプロ", "野外生存专家"],
["サバ(イ|プ).*のプ(ロ|口|回|国)", "野外生存专家"],
["ローカル信号増幅局756号", "在地公共信号放大站756号"],
[".*信号増幅局756号", "在地公共信号放大站756号"],
["トリマウンツ旅行社特派団", "特里蒙旅行社特派团"],
[".*旅行社特派団", "特里蒙旅行社特派团"],
["ローカル移動局N6号", "在地公共移动站N6号"],
[".*移動局N6号", "在地公共移动站N6号"],
["人気リ.*ート", "度假胜地"],
["傷だらけの主樹", "负伤的主树"],
["霞む連峰", "不见群山"],
["遠見の行く先", "远见所向"],
["サーミの言葉", "萨米之语"],
[".*(ミ|三)の言葉", "萨米之语"],
["サー(ミ|三)の.*葉", "萨米之语"],
["ウルサス", "乌萨斯"],
["無用の長物", "无用之物"],
["ボブの雑貨屋さん", "鲍勃杂货店"],
["ボブの.*屋.*", "鲍勃杂货店"],
["観測ステーション", "科考站"],
["行き先を求めて", "探寻前路"],
@@ -1216,15 +1199,13 @@
["北風の魔女", "北风女巫"],
[".*風の魔.*", "北风女巫"],
["常に警戒を", "时刻警惕"],
["猜疑の連鎖", "猜疑链"],
[".*疑の連鎖", "猜疑链"],
["行く先の森", "前行的林地"],
["^行.*の森", "前行的林地"],
["変化", "变化"],
["再構築", "重构"],
["探索者の小さな一歩", "探索者的一小步"],
["苦しみからの解放？", "解脱?"],
["ビジネス帝国？", "商业帝国?"],
["苦しみからの解放？", "解脱？"],
["ビジネス帝国？", "商业帝国？"],
["疑念を解く", "解惑"],
["空からの落とし物", "高空坠物"],
["心優しきレディ", "好心的女士"],
@@ -1326,11 +1307,7 @@
["時を移して物へと換える", "移时换物"],
["古今の交わり", "古今交汇"],
["大征伐にて天下の安寧を保つ", "大狩维天"],
["ただ明日のために", "只为明日"],
["ビジネス帝国？", "商业帝国？"],
["主役：ダック卿？", "鸭爵主演？"],
["仕事への情熱は？", "工作热情？"],
["苦しみからの解放？", "解脱？"]
["ただ明日のために", "只为明日"]
],
"roi": [0, 320, 725, 310]
},

14
resource/global/txwy/resource/tasks/Roguelike/base.json
View File

@@ -814,7 +814,7 @@
["受縛之血", "受缚之血"],
["幽影狂言", "幽影狂言"],
["藝術與瘋狂", "艺术与疯狂"],
["鴨爵主演[？?]?", "鸭爵主演?"],
["鴨爵主演[？?]?", "鸭爵主演？"],
["鴨爵的宴會", "鸭爵的宴会"],
["即興鴨子演出", "即兴鸭子演出"],
["有關那位烏薩斯人", "有关那位乌萨斯人"],
@@ -824,7 +824,7 @@
["密室", "密室"],
["廢品地攤", "废品地摊"],
["“?鑑賞家”?", "“鉴赏家”"],
["解脫[？?]?", "解脱?"],
["解脫[？?]?", "解脱？"],
["瘋狂玩偶", "疯狂玩偶"],
["赴宴", "赴宴"],
["追隨者集會", "追随者集会"],
@@ -871,8 +871,8 @@
["狗眼婆.*", "狗眼婆娑"],
["鴨力測試", "鸭力测试"],
["打發時間", "打发时间"],
["工作熱情[？?]?", "工作热情?"],
["商業帝.*", "商业帝国?"],
["工作熱情[？?]?", "工作热情？"],
["商業帝.*", "商业帝国？"],
["狂徒妄念", "狂徒妄念"],
["騎士仍在", "骑士仍在"],
["開端", "开端"],
@@ -1007,11 +1007,7 @@
["移時換物", "移时换物"],
["古今交會", "古今交汇"],
["大狩維天", "大狩维天"],
["只為明日", "只为明日"],
["商業帝國？", "商业帝国？"],
["鴨爵主演？", "鸭爵主演？"],
["工作熱情？", "工作热情？"],
["解脫？", "解脱？"]
["只為明日", "只为明日"]
]
},
"Roguelike@StageTraderInvestSystemFull": {

4
resource/roguelike/Mizuki/encounter/default.json
View File

@@ -195,12 +195,12 @@
"choose": 2
},
{
"name": "工作热情",
"name": "工作热情？",
"option_num": 2,
"choose": 2
},
{
"name": "商业帝国?",
"name": "商业帝国？",
"option_num": 2,
"choose": 2
},

4
resource/roguelike/Phantom/encounter/default.json
View File

@@ -113,7 +113,7 @@
"choose": 2
},
{
"name": "鸭爵主演",
"name": "鸭爵主演？",
"option_num": 2,
"choose": 2
},
@@ -163,7 +163,7 @@
"choose": 1
},
{
"name": "解脱?",
"name": "解脱？",
"option_num": 2,
"choose": 2
},

4
resource/roguelike/Phantom/encounter/deposit.json
View File

@@ -58,7 +58,7 @@
"choose": 2
},
{
"name": "鸭爵主演",
"name": "鸭爵主演？",
"option_num": 2,
"choose": 2
},
@@ -93,7 +93,7 @@
"choose": 1
},
{
"name": "解脱?",
"name": "解脱？",
"option_num": 2,
"choose": 2
},

2
resource/roguelike/Sami/encounter/default.json
View File

@@ -301,7 +301,7 @@
"choose": 2,
"choices": [
{
"name": "你在做什么?",
"name": "你在做什么？",
"option_num": 3,
"choose": 2,
"requirements": [