From c376af8dffb87a7716ea15eca92e710d96e2d7e2 Mon Sep 17 00:00:00 2001 From: Constrat <56174894+Constrat@users.noreply.github.com> Date: Sun, 21 Dec 2025 21:25:36 +0100 Subject: [PATCH] fix: more regex for CoppersNameOcrReplace EN --- .../resource/tasks/Roguelike/JieGarden.json | 16 +-- .../resource/tasks/Roguelike/base.json | 108 +++++++++--------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/resource/global/YoStarEN/resource/tasks/Roguelike/JieGarden.json b/resource/global/YoStarEN/resource/tasks/Roguelike/JieGarden.json index 6f5f01d3c5..5934f93fa7 100644 --- a/resource/global/YoStarEN/resource/tasks/Roguelike/JieGarden.json +++ b/resource/global/YoStarEN/resource/tasks/Roguelike/JieGarden.json @@ -39,7 +39,7 @@ ["[Bb]al:[Tt]hunderclap", "衡-霹雳"], ["[Bb]al:[Ww]aterwoo?d[Gg]uard", "衡-水生木护"], ["[Bb]al:[Ww]oo?d[Ff]ee?ds[Ff]lames", "衡-投木炎延"], - ["[Bb]al:[Ww]orld'?s?[Pp]ionee?r", "衡-天下先"], + ["[Bb]al:[Ww]orld.?s[Pp]ionee?r", "衡-天下先"], ["[Dd]ayan[Tt]ongh?bao", "大炎通宝"], ["[Ff]antastical", "入幻"], ["[Ff]lower:[Bb]ustling[Tt]rade", "花-百业俱兴"], @@ -63,26 +63,26 @@ ["[Rr]isk:[Cc]ity[Cc]oncerns", "厉-隐市忧"], ["[Rr]isk:[Cc]ontent[Mm]egamus", "厉-安硕鼷"], ["[Rr]isk:[Dd]ark[Cc]oncealment", "厉-无皎之昧"], - ["[Rr]isk:[Dd]awn'?s?[Tt]eachings", "厉-朝闻道"], + ["[Rr]isk:[Dd]awn.?s[Tt]eachings", "厉-朝闻道"], ["[Rr]isk:[Dd]ream[Cc]urio", "厉-梦奇物"], ["[Rr]isk:[Ee]astern[Gg]ap", "厉-东缺角"], ["[Rr]isk:[Ff]irst[Ww]ord[Ff]all?s", "厉-一字落"], - ["[Rr]isk:[Gg]ift ?of ?[Aa]cc?ord", "厉-合乎礼"], - ["[Rr]isk:[Ll]aw ?and ?[Oo]rder", "厉-法与律"], + ["[Rr]isk:[Gg]iftof[Aa]cc?ord", "厉-合乎礼"], + ["[Rr]isk:[Ll]awand[Oo]rder", "厉-法与律"], ["[Rr]isk:[Ll]ei[Ff]a[Pp]unishment", "厉-诛邪雷法"], ["[Rr]isk:[Mm]ortal[Ee]ndurance", "厉-人间长存"], ["[Rr]isk:[Mm]oving[Mm]ount[Hh]ard", "厉-移山难"], ["[Rr]isk:[Nn]orthern[Ss]ting", "厉-北刺面"], - ["[Rr]isk:[Pp]ainter'?s?[Rr]ealm", "厉-画人间"], + ["[Rr]isk:[Pp]ainter.?s[Rr]ealm", "厉-画人间"], ["[Rr]isk:[Ss]henn?ong[Ww]atches", "厉-神农守"], ["[Rr]isk:[Ss]inister[Ss]tealth", "厉-黑子伏"], ["[Rr]isk:[Ss]outhern[Mm]ounts", "厉-南见山"], - ["[Rr]isk:[Ss]trenous[Ss]tudy", "厉-寒窗志"], - ["[Rr]isk:[Ss]ui'?s?[Aa]wakening", "厉-岁醒天时"], + ["[Rr]isk:[Ss]trenuous[Ss]tudy", "厉-寒窗志"], + ["[Rr]isk:[Ss]ui.?s[Aa]wakening", "厉-岁醒天时"], ["[Rr]isk:[Tt]wo-[Rr]iver[Ss]pring", "厉-两江春"], ["[Rr]isk:[Uu]niversal[Cc]hange", "厉-凡物变"], ["[Rr]isk:[Ww]eiqi[Cc]hance", "厉-遇良弈"], - ["[Rr]isk:[Ww]est[Ll]ianzhen[Mm]t\\.?", "厉-西廉贞"], + ["[Rr]isk:[Ww]est[Ll]ianzhen[Mm]t.?", "厉-西廉贞"], ["[Rr]isk:[Ww]ild[Pp]ass?ion", "厉-恣狂情"], ["[Rr]usty", "锈色"], ["[Ss]urvival", "存护"], diff --git a/resource/global/YoStarEN/resource/tasks/Roguelike/base.json b/resource/global/YoStarEN/resource/tasks/Roguelike/base.json index 18b0402d79..56cd9cd899 100644 --- a/resource/global/YoStarEN/resource/tasks/Roguelike/base.json +++ b/resource/global/YoStarEN/resource/tasks/Roguelike/base.json @@ -82,58 +82,58 @@ }, "RoguelikeTraderShoppingOcr": { "ocrReplace": [ - ["Assault Co-op Rec. *Voucher", "突击协议招募券"], + ["Assault Co-op Rec.? *Voucher", "突击协议招募券"], ["Special HR Dispatch Letter", "特别人事调度函"], ["Support Replenishment[ Station]*", "支援补给站"], - ["Fortification Co-op Rec. *Voucher", "堡垒协议招募券"], + ["Fortification Co-op Rec.? *Voucher", "堡垒协议招募券"], ["Support Landmine Set", "支援地雷组"], - ["Elite Sniper Rec. *Voucher", "高级狙击招募券"], + ["Elite Sniper Rec.? *Voucher", "高级狙击招募券"], ["Godmother's Token", "教母的信物"], ["Broken Wand[- ]*Training", "断杖-典训"], ["Gaulish Macarons", "高卢小圆饼"], - ["Sniper Rec. *Voucher", "狙击招募券"], + ["Sniper Rec.? *Voucher", "狙击招募券"], ["Elite HR Dispatch Letter", "高级人事调度函"], ["HR Dispatch Letter", "人事调度函"], - ["Ranged Co-op Rec. *Voucher", "远程协议招募券"], - ["Support Mr. *Boom", "支援轰隆隆"], - ["Sabotage Co-op Rec. *Voucher", "破坏协议招募券"], - ["Elite Defender Rec. *Voucher", "高级重装招募券"], + ["Ranged Co-op Rec.? *Voucher", "远程协议招募券"], + ["Support Mr.? *Boom", "支援轰隆隆"], + ["Sabotage Co-op Rec.? *Voucher", "破坏协议招募券"], + ["Elite Defender Rec.? *Voucher", "高级重装招募券"], ["Letter of Termination Contract", "解约协议"], - ["Vanguard Rec. *Voucher", "先锋招募券"], + ["Vanguard Rec.? *Voucher", "先锋招募券"], ["Support Escape Crane", "支援起重机"], ["Support Fog Machine", "支援雾机"], ["Support Gas Tanks", "支援气罐组"], - ["Elite HR Senior Rec. *Voucher", "高级人事资深招募券"], + ["Elite HR Senior Rec.? *Voucher", "高级人事资深招募券"], ["Healer's Path[- ]*Restore Sanity", "医者-理智固剂"], - ["Elite Vanguard Rec. *Voucher", "高级先锋招募券"], + ["Elite Vanguard Rec.? *Voucher", "高级先锋招募券"], ["Special Suppressor", "特殊抑制器"], ["Hand of Diffusion", "扩散之手"], - ["Caster Rec. *Voucher", "术师招募券"], + ["Caster Rec.? *Voucher", "术师招募券"], ["Masquerade Mask", "假面舞会面具"], ["Live Rose", "活玫瑰"], - ["Elite Caster Rec. *Voucher", "高级术师招募券"], + ["Elite Caster Rec.? *Voucher", "高级术师招募券"], ["‘Profound Silence'?", "《大静谧》"], - ["Medic Rec. *Voucher", "医疗招募券"], - ["Defender Rec. *Voucher", "重装招募券"], + ["Medic Rec.? *Voucher", "医疗招募券"], + ["Defender Rec.? *Voucher", "重装招募券"], ["'?Gaulish Toponym Origins'?", "《旧高卢地名源流考》"], - ["Elite Medic Rec. *Voucher", "高级医疗招募券"], + ["Elite Medic Rec.? *Voucher", "高级医疗招募券"], ["Military Mirror Armor", "军团护心镜"], - ["Frontline Corps Rec. *Voucher", "前线统合招募券"], - ["Frontline Integration[ Senior Rec. Voucher]*", "前线统合资深招募券"], + ["Frontline Corps Rec.? *Voucher", "前线统合招募券"], + ["Frontline Integration[ Senior Rec.? Voucher]*", "前线统合资深招募券"], ["Necklace of the Presence", "显圣吊坠"], - ["Elite Specialist Rec. *Voucher", "高级特种招募券"], + ["Elite Specialist Rec.? *Voucher", "高级特种招募券"], ["Glass Bird", "玻璃小鸟"], - ["Specialist Rec. *Voucher", "特种招募券"], - ["Backline Corps Rec. *Voucher", "后方协调招募券"], + ["Specialist Rec.? *Voucher", "特种招募券"], + ["Backline Corps Rec.? *Voucher", "后方协调招募券"], ["Old Steam Armor", "古旧的蒸汽甲胄"], - ["Backline Coordination[ Senior Rec. Voucher]*", "后方协调资深招募券"], - ["Elite Supporter Rec. *Voucher", "高级辅助招募券"], - ["Supporter Rec. *Voucher", "辅助招募券"], + ["Backline Coordination[ Senior Rec.? Voucher]*", "后方协调资深招募券"], + ["Elite Supporter Rec.? *Voucher", "高级辅助招募券"], + ["Supporter Rec.? *Voucher", "辅助招募券"], ["Fortification Co-op Expansion", "堡垒协议扩充"], ["First Aid Kit", "急救药箱"], - ["Guard Rec. *Voucher", "近卫招募券"], + ["Guard Rec.? *Voucher", "近卫招募券"], ["'?Silent Squad'?", "“静音小队”"], - ["Elite Guard Rec. *Voucher", "高级近卫招募券"], + ["Elite Guard Rec.? *Voucher", "高级近卫招募券"], ["Fissured Restraints", "开裂的束缚带"], ["Abyssal Wyrdmask", "奇渊面具"], ["Worn-out Group Photo", "残破合影"], @@ -289,7 +289,7 @@ ["Elite Logistics Rations Voucher", "高级物资配给券"], ["Golden Chalice", "金酒之杯"], ["Spinach Pack", "绿叶菜罐头"], - ["No. *073 Safety Reagent", "073号安全试剂"], + ["No.? *073 Safety Reagent", "073号安全试剂"], ["Wrath of Siracusans", "叙拉古人的愤怒"], ["'?Civilight Eterna'?", "“文明的存续”"], ["Ribbon of Honor", "荣耀绶带"], @@ -303,7 +303,7 @@ ["Actor's Jewelry Box", "演员的首饰盒"], ["Flawless Jadestone", "无瑕宝玉"], ["Laughing Joker", "尖笑鬼牌"], - ["Ms. *Christine Petting Ticket", "Miss.Christine摸摸券"], + ["Ms.? *Christine Petting Ticket", "Miss.Christine摸摸券"], ["Antique Casting", "古旧铸物"], ["Blunt Claws[- ]*Training", "钝爪-典训"], ["Bend Spears[- ]*Training", "折戟-典训"], @@ -328,7 +328,7 @@ ["Surging Feast", "涌动之餐"], ["'?Eventide Terror'?", "“夜骇”"], ["'?Excessiveness'?", "“无度”"], - ["Combustible Building Mats.", "临时物资配给券"], + ["Combustible Building Mats.?", "临时物资配给券"], ["Medic Promotion Voucher", "医疗进阶券"], ["Vanguard Promotion Voucher", "先锋进阶券"], ["Sniper Promotion Voucher", "狙击进阶券"], @@ -337,7 +337,7 @@ ["Screaming Cherry", "尖叫樱桃"], ["Game Room Admin Access[ Card]*", "游戏室管理员权限卡"], ["Hand of Branding", "刻勋之手"], - ["Advanced Guard Rec.[ Voucher]*", "精锐近卫招募券"], + ["Advanced Guard Rec.?[ Voucher]*", "精锐近卫招募券"], ["Iron Guard[- ]*Tower", "铁卫-高塔"], ["Iron Guard[- ]*Wall", "铁卫-城墙"], ["Broken Wand[- ]*Solving", "断杖-破解"], @@ -360,19 +360,19 @@ ["Night-Whispers in the Forest", "林间夜话"], ["5-Star Random Promotion[ Temporary Recruitment Voucher*]", "5星随机直升临时招募券"], ["Caerula Arbor", "深蓝之树"], - ["Advanced Sniper Rec.[ Voucher]*", "精锐狙击招募券"], + ["Advanced Sniper Rec.?[ Voucher]*", "精锐狙击招募券"], ["Featured Canned Meat", "精选兽肉罐头"], - ["Advanced Defender Rec.[ Voucher]*", "精锐重装招募券"], + ["Advanced Defender Rec.?[ Voucher]*", "精锐重装招募券"], ["Medicine Sticks", "药枚"], ["Support Riot Pile", "支援防暴桩"], ["Support First-aid Kit", "支援急救包"], ["Duck Lord's Golden Brick", "鸭爵金砖"], - ["Advanced Caster Rec.[ Voucher]*", "精锐术师招募券"], + ["Advanced Caster Rec.?[ Voucher]*", "精锐术师招募券"], ["'?Sui's Wrath'?", "“岁怒”"], - ["Advanced Medic Rec.[ Voucher]*", "精锐医疗招募券"], - ["Advanced Vanguard Rec.[ Voucher]*", "精锐先锋招募券"], - ["Advanced Specialist Rec.[ Voucher]*", "精锐特种招募券"], - ["Advanced Supporter Rec.[ Voucher]*", "精锐辅助招募券"], + ["Advanced Medic Rec.?[ Voucher]*", "精锐医疗招募券"], + ["Advanced Vanguard Rec.?[ Voucher]*", "精锐先锋招募券"], + ["Advanced Specialist Rec.?[ Voucher]*", "精锐特种招募券"], + ["Advanced Supporter Rec.?[ Voucher]*", "精锐辅助招募券"], ["6-Star Random Promotion[ Temporary Recruitment Voucher*]", "6星随机直升临时招募券"], ["Portrait of Breogan", "布雷奥甘肖像"], ["Leviathan's Anabolism", "海神的代谢"], @@ -513,7 +513,7 @@ ["Topographical Map[- ]*α", "地形图-α"], ["Universal Key[- ]*γ", "万能钥匙-γ"], ["Originium", "源石"], - ["Ms. *Christine Petting Ticket[- ]*α", "Miss.Christine摸摸券-α"], + ["Ms.? *Christine Petting Ticket[- ]*α", "Miss.Christine摸摸券-α"], ["Universal Key[- ]*β", "万能钥匙-β"], ["Eye", "眼睛"], ["Canopy", "树冠"], @@ -571,8 +571,8 @@ ["Letter of Termination Contract[- ]*β", "解约协议-β"], ["Letter of Termination Contract[- ]*γ", "解约协议-γ"], ["Universal Key[- ]*α", "万能钥匙-α"], - ["Ms. *Christine Petting Ticket[- ]*β", "Miss.Christine摸摸券-β"], - ["Ms. *Christine Petting Ticket[- ]*γ", "Miss.Christine摸摸券-γ"], + ["Ms.? *Christine Petting Ticket[- ]*β", "Miss.Christine摸摸券-β"], + ["Ms.? *Christine Petting Ticket[- ]*γ", "Miss.Christine摸摸券-γ"], ["Comprehensive Operation File[- ]*β", "全局作战文件-β"], ["Comprehensive Operation File[- ]*γ", "全局作战文件-γ"], ["Secret HR Letter[- ]*α", "人事部密信-α"], @@ -652,14 +652,14 @@ ["Tranquil Mystery", "宁静之谜"], ["Banshee's Kiss[- ]*γ", "女妖之吻-γ"], ["Banshee's Kiss[- ]*β", "女妖之吻-β"], - ["Elite Sabotage [Rec. Voucher]*", "精英破坏招募券"], + ["Elite Sabotage [Rec.? Voucher]*", "精英破坏招募券"], ["Prophet Horn", "先知长角"], ["Ten Rings", "十戒"], ["Time and Light", "时与光"], - ["Elite Assault [Rec. Voucher]*", "精英突击招募券"], + ["Elite Assault [Rec.? Voucher]*", "精英突击招募券"], ["Hibernating Kin", "沉眠同胞"], - ["Elite Fortification [Rec. Voucher]*", "精英堡垒招募券"], - ["Elite Ranged [Rec. Voucher]*", "精英远程招募券"], + ["Elite Fortification [Rec.? Voucher]*", "精英堡垒招募券"], + ["Elite Ranged [Rec.? Voucher]*", "精英远程招募券"], ["Silk Bond Mystery", "丝契之谜"], ["Blunt Claws[- ]*Predation", "钝爪-掠食"], ["Bend Spears[- ]*Rending", "折戟-裂岩"], @@ -727,7 +727,7 @@ ["Petal", "片瓣"], ["Lamp of Wishes", "美愿时代的留恋"], ["Rolling Ancestors", "滚动先祖"], - ["Top Operator Rec. Voucher", "高级资深干员招募券"], + ["Top Operator Rec.? Voucher", "高级资深干员招募券"], ["Baby Djall", "笞心魔宝宝"], ["Rhoder's Gate", "罗德之门"], ["Hand of Fireworks", "烟花之手"], @@ -758,14 +758,14 @@ ["Endless Key", "无终之钥"], ["Body of The End", "终结的躯体"], ["Fosterer Genotype", "养育者基因种"], - ["Elite Vanguard [Rec. Voucher \\(Crimson\\)]*", "高级先锋招募券（猩红）"], - ["Elite Supporter [Rec. Voucher \\(Crimson\\)]*", "高级辅助招募券（猩红）"], - ["Elite Sniper [Rec. Voucher \\(Crimson\\)]*", "高级狙击招募券（猩红）"], - ["Elite Guard [Rec. Voucher \\(Crimson\\)]*", "高级近卫招募券（猩红）"], - ["Elite Caster [Rec. Voucher \\(Crimson\\)]*", "高级术师招募券（猩红）"], - ["Elite Defender [Rec. Voucher \\(Crimson\\)]*", "高级重装招募券（猩红）"], - ["Elite Medic [Rec. Voucher \\(Crimson\\)]*", "高级医疗招募券（猩红）"], - ["Elite Specialist [Rec. Voucher \\(Crimson\\)]*", "高级特种招募券（猩红）"], + ["Elite Vanguard [Rec.? Voucher \\(Crimson\\)]*", "高级先锋招募券（猩红）"], + ["Elite Supporter [Rec.? Voucher \\(Crimson\\)]*", "高级辅助招募券（猩红）"], + ["Elite Sniper [Rec.? Voucher \\(Crimson\\)]*", "高级狙击招募券（猩红）"], + ["Elite Guard [Rec.? Voucher \\(Crimson\\)]*", "高级近卫招募券（猩红）"], + ["Elite Caster [Rec.? Voucher \\(Crimson\\)]*", "高级术师招募券（猩红）"], + ["Elite Defender [Rec.? Voucher \\(Crimson\\)]*", "高级重装招募券（猩红）"], + ["Elite Medic [Rec.? Voucher \\(Crimson\\)]*", "高级医疗招募券（猩红）"], + ["Elite Specialist [Rec.? Voucher \\(Crimson\\)]*", "高级特种招募券（猩红）"], ["Metal Expedition Drum", "铿金征鼓"], ["Remnant Flames And Dreams", "旧烽遗梦"], ["Brewed Realm", "酿山河"], @@ -913,7 +913,7 @@ ["Risk:Two-RiverSpring", "厉-两江春"], ["Risk:UniversalChange", "厉-凡物变"], ["Risk:Weiqi Chance", "厉-遇良弈"], - ["Risk:WestLianzhenMt.", "厉-西廉贞"], + ["Risk:WestLianzhenMt.?", "厉-西廉贞"], ["Risk:Wild Passion", "厉-恣狂情"], ["Rusty", "锈色"], ["Survival", "存护"]