mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-06 21:00:28 +08:00
Compare commits
12 Commits
v6.3.2
...
feat/mainc
| Author | SHA1 | Date | |
|---|---|---|---|
|
ee566c5fb7 | ||
|
|
40d5bdd560 | ||
|
|
01a2329d18 | ||
|
|
c52cf81b94 | ||
|
|
2a9c963fef | ||
|
|
0817bc1c9f | ||
|
|
c36e5cfd9a | ||
|
|
3fbda5b98d | ||
|
|
50cbc2e10d | ||
|
|
30dd7d0afa | ||
|
|
80280bb62d | ||
|
|
e7362d2d35 |
@@ -30,6 +30,8 @@ typedef enum AsstWin32InputMethodEnum
|
||||
AsstWin32InputMethod_PostThreadMessage = 1 << 4,
|
||||
AsstWin32InputMethod_SendMessageWithCursorPos = 1 << 5,
|
||||
AsstWin32InputMethod_PostMessageWithCursorPos = 1 << 6,
|
||||
AsstWin32InputMethod_SendMessageWithWindowPos = 1 << 7,
|
||||
AsstWin32InputMethod_PostMessageWithWindowPos = 1 << 8,
|
||||
} AsstWin32InputMethodEnum;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -17,73 +17,73 @@
|
||||
"JieGarden@Roguelike@CoppersNameOcrReplace": {
|
||||
"ocrReplace": [
|
||||
[" |-", ""],
|
||||
["[Bb]al:[Bb]i?tt?e?r[Cc]old", "衡-苦寒"],
|
||||
["[Bb]al:[Dd]esir?e[Ff]ul?f+i?ll?ed", "衡-志欲遂"],
|
||||
["[Bb]al:[Dd]ewin[Gg]old", "衡-金寒水衍"],
|
||||
["[Bb]al:[Dd]ownpour", "衡-霖雨"],
|
||||
["[Bb]al:[Dd]ry[Hh]eat", "衡-旱热"],
|
||||
["[Bb]al:[Ff]ierce[Gg]ale", "衡-匪风"],
|
||||
["[Bb]al:[Ff]rontier[Mm]oon", "衡-塞上月"],
|
||||
["[Bb]al:[Ff]rost&[Ss]now", "衡-霜雪"],
|
||||
["[Bb]al:[Gg]arr?ison[Ff]arm", "衡-军屯垦"],
|
||||
["[Bb]al:[Gg]oo?d[Hh]arvest", "衡-庆丰收"],
|
||||
["[Bb]al:[Hh]oarfrost", "衡-雾凇"],
|
||||
["[Bb]al:[Mm]oving[Mm]ounts", "衡-移山繁"],
|
||||
["[Bb]al:[Oo]riginal[Ss]cript", "衡-初有文"],
|
||||
["[Bb]al:[Pp]rimal[Ff]arming", "衡-鸿蒙开荒"],
|
||||
["[Bb]al:[Rr]?ainbow", "衡-虹霓"],
|
||||
["[Bb]al:[Rr]egular[Ee]xercise", "衡-勤运体"],
|
||||
["[Bb]al:[Rr]ogue[Tt]oken", "衡-诡意代币"],
|
||||
["[Bb]al:[Ss]apient[Ee]vasion", "衡-慧避灾"],
|
||||
["[Bb]al:[Ss]o?il[Bb]orn[Mm]etal", "衡-奇土生金"],
|
||||
["[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[Bb]i?tt?e?r[Cc]old", "衡-苦寒"],
|
||||
["[Bb]al[Tt]estee?", "衡-志欲遂"],
|
||||
["[Bb]al[Mm]etalto[Ww]ater", "衡-金寒水衍"],
|
||||
["[Bb]al[Rr]ain", "衡-霖雨"],
|
||||
["[Bb]al[Dd]rought", "衡-旱热"],
|
||||
["[Bb]al[Gg]ale", "衡-匪风"],
|
||||
["[Bb]al[Ff]rontier[Mm]oon", "衡-塞上月"],
|
||||
["[Bb]al[Ff]rost", "衡-霜雪"],
|
||||
["[Bb]al[Ss]tee?land[Ss]oil", "衡-军屯垦"],
|
||||
["[Bb]al[Gg]oo?d[Hh]arvest", "衡-庆丰收"],
|
||||
["[Bb]al[Rr]ime", "衡-雾凇"],
|
||||
["[Bb]al[Tt]o[Mm]ove[Mm]ounts", "衡-移山繁"],
|
||||
["[Bb]al[Aa][Pp]eople[Uu]nited", "衡-初有文"],
|
||||
["[Bb]al[Dd]awnof[Yy][Aa][Nn]", "衡-鸿蒙开荒"],
|
||||
["[Bb]al[Rr]?ainbow", "衡-虹霓"],
|
||||
["[Bb]al[Aa][Bb]ody[Hh]oned", "衡-勤运体"],
|
||||
["[Bb]al[Rr]ogue[Tt]oken", "衡-诡意代币"],
|
||||
["[Bb]al[Pp]revention", "衡-慧避灾"],
|
||||
["[Bb]al[Ss]oilto[Mm]etal", "衡-奇土生金"],
|
||||
["[Bb]al[Tt]hunder", "衡-霹雳"],
|
||||
["[Bb]al[Ww]aterto[Ww]oo?d", "衡-水生木护"],
|
||||
["[Bb]al[Ww]oo?dto[Ff]ire", "衡-投木炎延"],
|
||||
["[Bb]al[Tt]railblazer", "衡-天下先"],
|
||||
["[Dd]ayan[Tt]ongh?bao", "大炎通宝"],
|
||||
["[Ff]antastical", "入幻"],
|
||||
["[Ff]lower:[Bb]ustl?ing[Tt]rade", "花-百业俱兴"],
|
||||
["[Ff]lower:[Cc]hidao[Gg]rowth", "花-驰道长"],
|
||||
["[Ff]lower:[Cc]ocoo?n[Ss]ilk", "花-茧成绢"],
|
||||
["[Ff]lower:[Cc]ohesive[Mm]ight", "花-聚力则强"],
|
||||
["[Ff]lower:[Cc]ultivate[Ss]elf", "花-修性情"],
|
||||
["[Ff]lower:[Dd]uck[Cc]oin", "花-鸭爵金币"],
|
||||
["[Ff]lower:[Ff]ire[Ff]orms[Ss]oil", "花-火灼土沃"],
|
||||
["[Ff]lower:[Gg]odbless?ed", "花-圣诏封神"],
|
||||
["[Ff]lower:[Hh]eavy[Dd]uties", "花-己任重"],
|
||||
["[Ff]lower:[Ll]ong[Dd]istance", "花-载道远"],
|
||||
["[Ff]lower:[Mm]artial[Ff]ight", "花-武人之争"],
|
||||
["[Ff]lower:[Oo]dd[Mm]erchant", "花-神秘商贾"],
|
||||
["[Ff]lower:[Ss]and[Ss]hield", "花-平沙之盾"],
|
||||
["[Ff]lower:[Ss]tove[Aa]light", "花-火上之灶"],
|
||||
["[Ff]lower:[Uu]nclouded[Mm]ind", "花-心无患"],
|
||||
["[Rr]isk?:[Aa]rduous[Tt]rade", "厉-商路难行"],
|
||||
["[Rr]isk?:[Bb]iding[Tt]ime", "厉-待机缘"],
|
||||
["[Rr]isk?:[Bb]loo?dshed[Ss]pill?", "厉-战血流"],
|
||||
["[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]ream[Cc]urio", "厉-梦奇物"],
|
||||
["[Rr]isk?:[Ee]astern[Gg]ap", "厉-东缺角"],
|
||||
["[Rr]isk?:[Ff]irst[Ww]ord[Ff]all?s", "厉-一字落"],
|
||||
["[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?:[Ss]henn?ong[Ww]atches", "厉-神农守"],
|
||||
["[Rr]isk?:[Ss]inister[Ss]tealth", "厉-黑子伏"],
|
||||
["[Rr]isk?:[Ss]outhern[Mm]ounts", "厉-南见山"],
|
||||
["[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]eiq[ij]?[Cc]hance", "厉-遇良弈"],
|
||||
["[Rr]isk?:[Ww]est[Ll]ianzhen[Mm]t.?", "厉-西廉贞"],
|
||||
["[Rr]isk?:[Ww]ild[Pp]ass?ion", "厉-恣狂情"],
|
||||
["[Ff]lower[Tt]rades", "花-百业俱兴"],
|
||||
["[Ff]lower[Ll]ong[Rr]oad", "花-驰道长"],
|
||||
["[Ff]lower[Cc]ocoo?n[Ww]orth", "花-茧成绢"],
|
||||
["[Ff]lower[Uu]nity.?s[Mm]ight", "花-聚力则强"],
|
||||
["[Ff]lower[Mm]indfulness?", "花-修性情"],
|
||||
["[Ff]lower[Dd]uck[Cc]oin", "花-鸭爵金币"],
|
||||
["[Ff]lower[Ff]ireto[Ss]oil", "花-火灼土沃"],
|
||||
["[Ff]lower[Th]e[Aa]scent", "花-圣诏封神"],
|
||||
["[Ff]lower[Hh]eavy[Dd]uties", "花-己任重"],
|
||||
["[Ff]lower[Ii]deas[Cc]arried", "花-载道远"],
|
||||
["[Ff]lower[Mm]artial[Ff]ight", "花-武人之争"],
|
||||
["[Ff]lower[Oo]dd[Mm]erchant", "花-神秘商贾"],
|
||||
["[Ff]lower[Th]e[Bb]ulwark", "花-平沙之盾"],
|
||||
["[Ff]lower[Ss]tove[Aa]light", "花-火上之灶"],
|
||||
["[Ff]lower[Uu]nclouded", "花-心无患"],
|
||||
["[Rr]isk[Tt]ollfor[Rr]oads", "厉-商路难行"],
|
||||
["[Rr]isk[Bb]iding[Tt]ime", "厉-待机缘"],
|
||||
["[Rr]isk[Bb]loodshed", "厉-战血流"],
|
||||
["[Rr]isk[Gg]etaway", "厉-隐市忧"],
|
||||
["[Rr]isk[Tt]aming[Mm]egamus", "厉-安硕鼷"],
|
||||
["[Rr]isk[Dd]arkness?", "厉-无皎之昧"],
|
||||
["[Rr]isk[Ee]nlightenment", "厉-朝闻道"],
|
||||
["[Rr]isk[Dd]reamof[Cc]urio", "厉-梦奇物"],
|
||||
["[Rr]isk[Ee]astern[Gg]ap", "厉-东缺角"],
|
||||
["[Rr]isk[Ff]all?ing[Ww]ord", "厉-一字落"],
|
||||
["[Rr]isk[Gg]iftof[Aa]cc?ord", "厉-合乎礼"],
|
||||
["[Rr]isk[Ll]awand[Rr]itual", "厉-法与律"],
|
||||
["[Rr]isk[Ll]ei[Ff]a.?s[Pp]urge", "厉-诛邪雷法"],
|
||||
["[Rr]isk[Tt]hey[Ww]ho[Ee]ndure", "厉-人间长存"],
|
||||
["[Rr]isk[Uu]nmoved[Mm]ounts", "厉-移山难"],
|
||||
["[Rr]isk[Nn]orthern[Ss]ting", "厉-北刺面"],
|
||||
["[Rr]isk[Pp]ainter.?s[Rr]ealm", "厉-画人间"],
|
||||
["[Rr]isk[Ss]henn?ong[Ww]atch", "厉-神农守"],
|
||||
["[Rr]isk[Hh]idd?en[Gg]ambit", "厉-黑子伏"],
|
||||
["[Rr]isk[Ss]outhern[Mm]ounts", "厉-南见山"],
|
||||
["[Rr]isk[Ss]tudy", "厉-寒窗志"],
|
||||
["[Rr]isk[Ss]ui.?s[Aa]wakening", "厉-岁醒天时"],
|
||||
["[Rr]isk[Ss]pring[Rr]ivers", "厉-两江春"],
|
||||
["[Rr]isk[Cc]onstant[Cc]hange", "厉-凡物变"],
|
||||
["[Rr]isk[Aa][Gg]oo?d[Mm]atch", "厉-遇良弈"],
|
||||
["[Rr]isk[Ww]est[Ss]tones", "厉-西廉贞"],
|
||||
["[Rr]isk[Ww]ild[Pp]ass?ion", "厉-恣狂情"],
|
||||
["[Rr]usty", "锈色"],
|
||||
["[Ss]urvival", "存护"],
|
||||
["rogue_5_copper_buff_F_28_a", "衡-挪移"],
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
["Masquerade Mask", "假面舞会面具"],
|
||||
["Live Rose", "活玫瑰"],
|
||||
["Elite Caster Rec.? *Voucher", "高级术师招募券"],
|
||||
["‘Profound Silence'?", "《大静谧》"],
|
||||
["'?Profound Silence'?", "《大静谧》"],
|
||||
["Medic Rec.? *Voucher", "医疗招募券"],
|
||||
["Defender Rec.? *Voucher", "重装招募券"],
|
||||
["'?Gaulish Toponym Origins'?", "《旧高卢地名源流考》"],
|
||||
@@ -942,7 +942,7 @@
|
||||
"Roguelike@StageEncounterOcr": {
|
||||
"ocrReplace": [
|
||||
["\\s+o+\\s*$", ""],
|
||||
[" |<|>|-", ""],
|
||||
[" |<|>|-|'", ""],
|
||||
["^\\d+", ""],
|
||||
["Disappear\\.\\.\\.", "消失......"],
|
||||
["Disappear\\.", "消失。"],
|
||||
@@ -951,7 +951,6 @@
|
||||
["TheKindPuppet", "善良的木偶"],
|
||||
["TellerofTales", "讲故事的人"],
|
||||
["AdventurerComm[ission]*", "委托冒险者"],
|
||||
["RoyalRumble'?", "皇家争执"],
|
||||
["AdvanceSquad", "先遣小队"],
|
||||
["GaulishVeteran", "高卢老兵"],
|
||||
["HallucinatoryCandlelights", "迷幻烛火"],
|
||||
@@ -1042,15 +1041,15 @@
|
||||
["EmergencyDispatch", "紧急调遣"],
|
||||
["AtaGlance", "瞥视"],
|
||||
["Tulip.*sCommission", "郁金香的委托"],
|
||||
["Bob'sEmporium", "鲍勃杂货店"],
|
||||
["BobsEmporium", "鲍勃杂货店"],
|
||||
["VacationSpot", "度假胜地"],
|
||||
["'?TheSwordintheStone'?", "“石中剑”"],
|
||||
["'?TinMan'?", "“锡人”"],
|
||||
["TheSwordintheStone", "“石中剑”"],
|
||||
["TinMan", "“锡人”"],
|
||||
["MissingMountains", "不见群山"],
|
||||
["Reprieve\\??", "解脱？"],
|
||||
["OnsiteatPublicSignalAmplificationStation756", "在地公共信号放大站756号"],
|
||||
["'?ArtConnoisseur'?", "“鉴赏家”"],
|
||||
["'?RoyalRumble'?", "“皇家争执”"],
|
||||
["ArtConnoisseur", "“鉴赏家”"],
|
||||
["RoyalRumble", "“皇家争执”"],
|
||||
["SearchingForAPathForward", "探寻前路"],
|
||||
["OperationRewards", "行动奖励"],
|
||||
["DuckLordtheLeadActor\\??", "鸭爵主演？"],
|
||||
@@ -1069,7 +1068,7 @@
|
||||
["SobbingintheSwamp", "沼泽里的抽泣声"],
|
||||
["AProfitablePlan", "有利可图"],
|
||||
["Entourage", "随行人员"],
|
||||
["DuckLord'sSinisterPlot", "邪恶计划鸭"],
|
||||
["DuckLordsSinisterPlot", "邪恶计划鸭"],
|
||||
["ChainofCamps", "百里连营"],
|
||||
["OnstageInvitation", "请君入戏"],
|
||||
["NorthwindWitch", "北风女巫"],
|
||||
@@ -1078,10 +1077,10 @@
|
||||
["EntrancetotheAbyss", "深渊入口"],
|
||||
["WoundedPrimeTree", "负伤的主树"],
|
||||
["ResearchOutpost", "科考站"],
|
||||
["Sami'sLanguage", "萨米之语"],
|
||||
["SamisLanguage", "萨米之语"],
|
||||
["Ursus", "乌萨斯"],
|
||||
["UselessItem", "无用之物"],
|
||||
["Clairvoyance'sDirection", "远见所向"],
|
||||
["ClairvoyancesDirection", "远见所向"],
|
||||
["ForwardForest", "前行的林地"],
|
||||
["TrimountsTravelAgencyDispatch", "特里蒙旅行社特派团"],
|
||||
["OnsiteatPublicNomadicStationN6", "在地公共移动站N6号"],
|
||||
@@ -1090,9 +1089,9 @@
|
||||
["UnfreezingRiver", "不冻河"],
|
||||
["FenceofWoodandSnow", "雪与木的笆篱"],
|
||||
["AmmaTal", "安玛塔卢"],
|
||||
["CrossingSami'sArm", "走过萨米的臂膀"],
|
||||
["CrossingSamisArm", "走过萨米的臂膀"],
|
||||
["ShatteredOmen", "木裂前兆"],
|
||||
["Pessimist'sCage", "悲观者囚笼"],
|
||||
["PessimistsCage", "悲观者囚笼"],
|
||||
["Change", "变化"],
|
||||
["Reconstruction", "重构"],
|
||||
["OneSmallStepforExpeditioners", "探索者的一小步"],
|
||||
@@ -1121,7 +1120,7 @@
|
||||
["EmployeeofBabel", "巴别塔雇员"],
|
||||
["SoulExperiences.*TwinGargoyles?", "魂灵见闻：石心双子"],
|
||||
["FinalPage", "尾页"],
|
||||
["TheDissident'sSound", "扣响异音"],
|
||||
["TheDissidentsSound", "扣响异音"],
|
||||
["DecipheringEvolution", "解读变迁"],
|
||||
["TowerofThoughts", "聚思成塔"],
|
||||
["HighestBidderWins", "价高者得"],
|
||||
@@ -1197,9 +1196,6 @@
|
||||
],
|
||||
"roi": [0, 395, 725, 235]
|
||||
},
|
||||
"Roguelike@StageTraderInvestSystem": {
|
||||
"maskRange": [1, 255]
|
||||
},
|
||||
"Roguelike@StageTraderInvestSystemFull": {
|
||||
"text": ["Storage full"]
|
||||
},
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
["Reserve Operator *-* *M[elee]*", "预备干员-近战"],
|
||||
["Angelina", "安洁莉娜"],
|
||||
["Sora", "空"],
|
||||
["Ss?k?ad?i? the Co?rru?pt?ing ?[Heart]*", "浊心斯卡蒂"],
|
||||
["Skadi the Corrupting ?[Heart]*", "浊心斯卡蒂"],
|
||||
["Scene", "稀音"],
|
||||
["Suzuran", "铃兰"],
|
||||
["Mayer", "梅尔"],
|
||||
@@ -1532,7 +1532,7 @@
|
||||
"text": ["All"]
|
||||
},
|
||||
"BattleQuickFormationOCR": {
|
||||
"rectMove": [0, 231, 116, 22],
|
||||
"rectMove": [0, 234, 116, 22],
|
||||
"specialParams": [105, 2, 7, 0, 3, 10]
|
||||
},
|
||||
"BattleStartPre": {
|
||||
@@ -1586,7 +1586,7 @@
|
||||
},
|
||||
"OperBoxNameOCR": {
|
||||
"rectMove_doc": "for overwidth",
|
||||
"rectMove": [0, 265, 128, 22],
|
||||
"rectMove": [0, 264, 133, 24],
|
||||
"specialParams": [160, 4, 0, 0, 3, 10]
|
||||
},
|
||||
"SSSBegin": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"GO-OpenOcr": {
|
||||
"text": ["위대한", "서곡의", "끝", "이벤트", "개방중"]
|
||||
"text": ["위대한", "서곡의", "의끝"]
|
||||
},
|
||||
"GOChapterToGO": {
|
||||
"text": ["무명", "공훈"]
|
||||
|
||||
@@ -1622,7 +1622,8 @@
|
||||
[".*사이언스아카.*", "皇家科学院望远镜"],
|
||||
["보안인재.*", "保全人才合作协议"],
|
||||
["소형조준.*", "轻型瞄准测距仪"],
|
||||
["천공야행세트", "天工夜行套装"]
|
||||
["천공야행세트", "天工夜行套装"],
|
||||
["역제압장갑세트", "反制装甲套组"]
|
||||
]
|
||||
},
|
||||
"SSSBuffChooseConfirm": {
|
||||
|
||||
@@ -1419,8 +1419,8 @@
|
||||
"next": [
|
||||
"Roguelike@StageVerticalConfirmTrader",
|
||||
"Roguelike@StageTraderEnter",
|
||||
"Roguelike@StageTraderRefreshWithDice",
|
||||
"Roguelike@StageTraderInvestSystem",
|
||||
"Roguelike@StageTraderRefreshWithDice",
|
||||
"Roguelike@TraderRandomShopping",
|
||||
"Roguelike@StageTraderLeave",
|
||||
"Roguelike@StageTraderLeaveConfirm"
|
||||
@@ -1556,8 +1556,8 @@
|
||||
"next": [
|
||||
"Roguelike@StageTraderSpecialShoppingAfterRefresh",
|
||||
"Roguelike@StageTraderRefreshWithDice",
|
||||
"Roguelike@TraderRandomShopping",
|
||||
"Roguelike@StageTraderInvestSystem",
|
||||
"Roguelike@TraderRandomShopping",
|
||||
"Roguelike@StageTraderLeave",
|
||||
"Roguelike@StageTraderRefreshWithDiceDoubleConfirm"
|
||||
]
|
||||
@@ -1604,8 +1604,8 @@
|
||||
"baseTask": "Roguelike@StageVerticalConfirm",
|
||||
"next": [
|
||||
"Roguelike@StageTraderEnter",
|
||||
"Roguelike@StageTraderRefreshWithDice",
|
||||
"Roguelike@StageTraderInvestSystem",
|
||||
"Roguelike@StageTraderRefreshWithDice",
|
||||
"Roguelike@TraderRandomShopping",
|
||||
"Roguelike@StageTraderLeave"
|
||||
]
|
||||
|
||||
@@ -85,6 +85,8 @@ constexpr Win32InputMethod LegacyEvent = 1ULL << 3;
|
||||
constexpr Win32InputMethod PostThreadMessage = 1ULL << 4;
|
||||
constexpr Win32InputMethod SendMessageWithCursorPos = 1ULL << 5;
|
||||
constexpr Win32InputMethod PostMessageWithCursorPos = 1ULL << 6;
|
||||
constexpr Win32InputMethod SendMessageWithWindowPos = 1ULL << 7;
|
||||
constexpr Win32InputMethod PostMessageWithWindowPos = 1ULL << 8;
|
||||
} // namespace Win32Input
|
||||
|
||||
#endif // _WIN32
|
||||
|
||||
@@ -93,7 +93,7 @@ public class InfrastTask : BaseTask, IJsonOnDeserialized
|
||||
/// <summary>
|
||||
/// Gets or sets 自定义配置计划编号
|
||||
/// </summary>
|
||||
public int PlanSelect { get; set; }
|
||||
public int PlanSelect { get; set; } = -1;
|
||||
|
||||
public List<RoomInfo> RoomList { get; set; } =
|
||||
[.. typeof(InfrastRoomType).GetEnumValues().OfType<InfrastRoomType>().Select<InfrastRoomType, RoomInfo>(i => new(i, true))];
|
||||
|
||||
@@ -234,7 +234,7 @@ public class ConfigConverter
|
||||
infrastTask.DormTrustEnabled = ConfigurationHelper.GetValue(ConfigurationKeys.DormTrustEnabled, false);
|
||||
infrastTask.OriginiumShardAutoReplenishment = ConfigurationHelper.GetValue(ConfigurationKeys.OriginiumShardAutoReplenishment, true);
|
||||
infrastTask.Filename = ConfigurationHelper.GetValue(ConfigurationKeys.CustomInfrastFile, string.Empty);
|
||||
infrastTask.PlanSelect = ConfigurationHelper.GetValue(ConfigurationKeys.CustomInfrastPlanSelect, 0);
|
||||
infrastTask.PlanSelect = ConfigurationHelper.GetValue(ConfigurationKeys.CustomInfrastPlanSelect, -1);
|
||||
ConfigurationHelper.DeleteValue(ConfigurationKeys.InfrastMode);
|
||||
ConfigurationHelper.DeleteValue(ConfigurationKeys.UsesOfDrones);
|
||||
ConfigurationHelper.DeleteValue(ConfigurationKeys.InfrastReceptionMessageBoardReceive);
|
||||
|
||||
@@ -1254,7 +1254,8 @@ Due to limited development resources within the MAA Team, PC support lacks dedic
|
||||
Before use, please ensure:
|
||||
1. MAA is launched with administrator privileges
|
||||
2. The game window is not minimized
|
||||
3. Arknights Settings → Game → UI Scaling is set to 100%</system:String>
|
||||
3. Arknights Settings → Game → UI Scaling is set to 100%
|
||||
4. Game resolution must be 16:9, recommended settings: 720×1280 or 1080×1920</system:String>
|
||||
<system:String x:Key="AttachWindowScreencapMethod">Screencap Method</system:String>
|
||||
<system:String x:Key="AttachWindowMouseMethod">Mouse Input Method</system:String>
|
||||
<system:String x:Key="AttachWindowKeyboardMethod">Keyboard Input Method</system:String>
|
||||
@@ -1265,6 +1266,8 @@ Before use, please ensure:
|
||||
<system:String x:Key="AttachWindowInputSeize">Seize (Foreground, More Stable)</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithCursor">PostMessageWithCursor (Semi-background)</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithCursor">SendMessageWithCursor (Semi-background, Backup)</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithWindowPos">PostMessageWithWindowPos (Background Window)</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithWindowPos">SendMessageWithWindowPos (Background Window, Backup)</system:String>
|
||||
<!-- !AsstProxy -->
|
||||
<!-- TrayIcon -->
|
||||
<system:String x:Key="ForceShow">Force display of MAA</system:String>
|
||||
|
||||
@@ -1255,7 +1255,8 @@ MAA Team の開発リソースが限られているため、PC 対応は専任
|
||||
使用前にご確認ください：
|
||||
1. MAA を管理者権限で起動してください
|
||||
2. ゲームウィンドウを最小化しないでください
|
||||
3. アークナイツ設定 → ゲーム → UI スケーリングを 100% に設定してください</system:String>
|
||||
3. アークナイツ設定 → ゲーム → UI スケーリングを 100% に設定してください
|
||||
4. ゲーム解像度は 16:9 である必要があります。推奨設定：720×1280 または 1080×1920</system:String>
|
||||
<system:String x:Key="AttachWindowScreencapMethod">スクリーンキャプチャ方式</system:String>
|
||||
<system:String x:Key="AttachWindowMouseMethod">マウス入力方式</system:String>
|
||||
<system:String x:Key="AttachWindowKeyboardMethod">キーボード入力方式</system:String>
|
||||
@@ -1266,6 +1267,8 @@ MAA Team の開発リソースが限られているため、PC 対応は専任
|
||||
<system:String x:Key="AttachWindowInputSeize">Seize（フォアグラウンド、より安定）</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithCursor">PostMessageWithCursor（半バックグラウンド）</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithCursor">SendMessageWithCursor（半バックグラウンド、予備）</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithWindowPos">PostMessageWithWindowPos（バックグラウンドウィンドウ）</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithWindowPos">SendMessageWithWindowPos（バックグラウンドウィンドウ、予備）</system:String>
|
||||
<!-- !AsstProxy -->
|
||||
<!-- TrayIcon -->
|
||||
<system:String x:Key="ForceShow">MAAの強制表示</system:String>
|
||||
|
||||
@@ -1256,7 +1256,8 @@ MAA Team의 개발 인력이 제한되어 있어 PC 지원은 전담 관리가
|
||||
사용 전 확인 사항:
|
||||
1. MAA를 관리자 권한으로 실행해야 합니다
|
||||
2. 게임 창을 최소화하면 안 됩니다
|
||||
3. 명일방주 설정 → 게임 → UI 배율을 100%로 설정해야 합니다</system:String>
|
||||
3. 명일방주 설정 → 게임 → UI 배율을 100%로 설정해야 합니다
|
||||
4. 게임 해상도는 16:9이어야 하며, 권장 설정: 720×1280 또는 1080×1920</system:String>
|
||||
<system:String x:Key="AttachWindowScreencapMethod">스크린샷 방식</system:String>
|
||||
<system:String x:Key="AttachWindowMouseMethod">마우스 입력 방식</system:String>
|
||||
<system:String x:Key="AttachWindowKeyboardMethod">키보드 입력 방식</system:String>
|
||||
@@ -1267,6 +1268,8 @@ MAA Team의 개발 인력이 제한되어 있어 PC 지원은 전담 관리가
|
||||
<system:String x:Key="AttachWindowInputSeize">Seize (포그라운드, 더 안정적)</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithCursor">PostMessageWithCursor (반 백그라운드)</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithCursor">SendMessageWithCursor (반 백그라운드, 백업)</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithWindowPos">PostMessageWithWindowPos (백그라운드 윈도우)</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithWindowPos">SendMessageWithWindowPos (백그라운드 윈도우, 백업)</system:String>
|
||||
<!-- !AsstProxy -->
|
||||
<!-- TrayIcon -->
|
||||
<system:String x:Key="ForceShow">MAA 강제 표시</system:String>
|
||||
|
||||
@@ -1255,7 +1255,8 @@ C:\\leidian\\LDPlayer9。\n
|
||||
使用前请确认：
|
||||
1. 需要以管理员身份启动 MAA
|
||||
2. 游戏窗口不能最小化
|
||||
3. 明日方舟设置 → 游戏 → UI 缩放需设为 100%</system:String>
|
||||
3. 明日方舟设置 → 游戏 → UI 缩放需设为 100%
|
||||
4. 游戏分辨率需为 16:9，推荐设置 720×1280 或 1080×1920</system:String>
|
||||
<system:String x:Key="AttachWindowScreencapMethod">截图方式</system:String>
|
||||
<system:String x:Key="AttachWindowMouseMethod">鼠标输入</system:String>
|
||||
<system:String x:Key="AttachWindowKeyboardMethod">键盘输入</system:String>
|
||||
@@ -1266,6 +1267,8 @@ C:\\leidian\\LDPlayer9。\n
|
||||
<system:String x:Key="AttachWindowInputSeize">Seize（前台，更稳定）</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithCursor">PostMessageWithCursor（半后台）</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithCursor">SendMessageWithCursor（半后台，备用）</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithWindowPos">PostMessageWithWindowPos（后台窗口）</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithWindowPos">SendMessageWithWindowPos（后台窗口，备用）</system:String>
|
||||
<!-- !AsstProxy -->
|
||||
<!-- TrayIcon -->
|
||||
<system:String x:Key="ForceShow">强制显示MAA</system:String>
|
||||
|
||||
@@ -1255,7 +1255,8 @@ C:\\leidian\\LDPlayer9\n
|
||||
使用前請確認：
|
||||
1. 需以系統管理員身分啟動 MAA
|
||||
2. 遊戲視窗不可最小化
|
||||
3. 明日方舟設定 → 遊戲 → UI 縮放需設為 100%</system:String>
|
||||
3. 明日方舟設定 → 遊戲 → UI 縮放需設為 100%
|
||||
4. 遊戲解析度需為 16:9，推薦設定 720×1280 或 1080×1920</system:String>
|
||||
<system:String x:Key="AttachWindowScreencapMethod">截圖方式</system:String>
|
||||
<system:String x:Key="AttachWindowMouseMethod">滑鼠輸入</system:String>
|
||||
<system:String x:Key="AttachWindowKeyboardMethod">鍵盤輸入</system:String>
|
||||
@@ -1266,6 +1267,8 @@ C:\\leidian\\LDPlayer9\n
|
||||
<system:String x:Key="AttachWindowInputSeize">Seize（前台，更穩定）</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithCursor">PostMessageWithCursor（半背景）</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithCursor">SendMessageWithCursor（半背景，備用）</system:String>
|
||||
<system:String x:Key="AttachWindowInputPostWithWindowPos">PostMessageWithWindowPos（後台視窗）</system:String>
|
||||
<system:String x:Key="AttachWindowInputSendWithWindowPos">SendMessageWithWindowPos（後台視窗，備用）</system:String>
|
||||
<!-- !AsstProxy -->
|
||||
<!-- TrayIcon -->
|
||||
<system:String x:Key="ForceShow">強制顯示 MAA</system:String>
|
||||
|
||||
@@ -410,9 +410,9 @@ public class ToolboxViewModel : Screen
|
||||
SelectList = levelList,
|
||||
ConfirmList = [-1], // 仅公招识别时将-1加入comfirm_level
|
||||
SetRecruitTime = RecruitAutoSetTime,
|
||||
ChooseLevel3Time = TaskQueueViewModel.RecruitTask.ChooseLevel3Time,
|
||||
ChooseLevel4Time = TaskQueueViewModel.RecruitTask.ChooseLevel4Time,
|
||||
ChooseLevel5Time = TaskQueueViewModel.RecruitTask.ChooseLevel5Time,
|
||||
ChooseLevel3Time = ChooseLevel3Time,
|
||||
ChooseLevel4Time = ChooseLevel4Time,
|
||||
ChooseLevel5Time = ChooseLevel5Time,
|
||||
ServerType = Instances.SettingsViewModel.ServerType,
|
||||
};
|
||||
var (type, taskParams) = task.Serialize();
|
||||
|
||||
@@ -1243,6 +1243,8 @@ public class ConnectSettingsUserControlModel : PropertyChangedBase
|
||||
new() { Display = LocalizationHelper.GetString("AttachWindowInputSeize"), Value = "1" },
|
||||
new() { Display = LocalizationHelper.GetString("AttachWindowInputPostWithCursor"), Value = "64" },
|
||||
new() { Display = LocalizationHelper.GetString("AttachWindowInputSendWithCursor"), Value = "32" },
|
||||
new() { Display = LocalizationHelper.GetString("AttachWindowInputPostWithWindowPos"), Value = "256" },
|
||||
new() { Display = LocalizationHelper.GetString("AttachWindowInputSendWithWindowPos"), Value = "128" },
|
||||
];
|
||||
|
||||
private string _attachWindowMouseMethod = ConfigurationHelper.GetValue(ConfigurationKeys.AttachWindowMouseMethod, "64"); // 默认 PostMessageWithCursorPos
|
||||
|
||||
@@ -46,7 +46,7 @@ public class GameSettingsUserControlModel : PropertyChangedBase
|
||||
|
||||
public bool StartGame
|
||||
{
|
||||
get => field;
|
||||
get => SettingsViewModel.ConnectSettings.UseAttachWindow ? false : field;
|
||||
set {
|
||||
SetAndNotify(ref field, value);
|
||||
ConfigurationHelper.SetValue(ConfigurationKeys.StartGame, value.ToString());
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
Background="{DynamicResource MdXamlBackground}"
|
||||
Icon="../../newlogo.ico"
|
||||
mc:Ignorable="d">
|
||||
<hc:ScrollViewer Margin="10,5" IsInertiaEnabled="True">
|
||||
<hc:ScrollViewer Margin="10,5" IsInertiaEnabled="True" PanningMode="VerticalOnly">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50" />
|
||||
|
||||
@@ -1230,9 +1230,10 @@ bool ocr_replace_overseas(const fs::path& input_dir, const fs::path& tasks_base_
|
||||
static std::unordered_map</*id*/ std::string, /*base_name*/ std::string> base_totem_names;
|
||||
static std::unordered_map</*id*/ std::string, /*base_name*/ std::string> base_encounter_names;
|
||||
static std::unordered_map</*id*/ std::string, /*base_name*/ std::string> base_char_names;
|
||||
// static std::unordered_map</*id*/ std::string, /*base_name*/ std::string> base_coppers_names;
|
||||
|
||||
if (base_stage_names.empty() || base_item_names.empty() || base_totem_names.empty() ||
|
||||
base_encounter_names.empty()) {
|
||||
base_encounter_names.empty() || base_char_names.empty() /*|| base_coppers_names.empty()*/) {
|
||||
auto rg_opt = json::open(base_dir / "roguelike_topic_table.json");
|
||||
if (!rg_opt) {
|
||||
std::cerr << "Failed to open roguelike_topic_table for" << base_dir << '\n';
|
||||
@@ -1257,6 +1258,10 @@ bool ocr_replace_overseas(const fs::path& input_dir, const fs::path& tasks_base_
|
||||
if (id.starts_with(rogue_index + "_totem")) {
|
||||
base_totem_names.emplace(id, item_obj["name"].as_string());
|
||||
}
|
||||
// if (id.starts_with(rogue_index + "_copper") && !id.starts_with(rogue_index + "_copper_draw") &&
|
||||
// !id.starts_with(rogue_index + "_copper_buff")) {
|
||||
// base_coppers_names.emplace(id, item_obj["name"].as_string());
|
||||
// }
|
||||
}
|
||||
}
|
||||
for (auto&& [id, encounter_obj] : rogue_details["choiceScenes"].as_object()) {
|
||||
@@ -1296,6 +1301,7 @@ bool ocr_replace_overseas(const fs::path& input_dir, const fs::path& tasks_base_
|
||||
std::unordered_map</*id*/ std::string, /*name*/ std::string> totem_names;
|
||||
std::unordered_map</*id*/ std::string, /*name*/ std::string> encounter_names;
|
||||
std::unordered_map</*id*/ std::string, /*name*/ std::string> char_names;
|
||||
// std::unordered_map</*id*/ std::string, /*name*/ std::string> coppers_names;
|
||||
|
||||
bool remove_spaces = input_dir.string().ends_with("kr\\gamedata\\excel");
|
||||
|
||||
@@ -1344,6 +1350,15 @@ bool ocr_replace_overseas(const fs::path& input_dir, const fs::path& tasks_base_
|
||||
}
|
||||
totem_names.emplace(id, name_buffer);
|
||||
}
|
||||
|
||||
// if (id.starts_with(rogue_index + "_copper") && !id.starts_with(rogue_index + "_copper_draw") &&
|
||||
// !id.starts_with(rogue_index + "_copper_buff")) {
|
||||
// name_buffer = item_obj["name"].as_string();
|
||||
// if (remove_spaces) {
|
||||
// name_buffer.erase(std::remove(name_buffer.begin(), name_buffer.end(), ' '), name_buffer.end());
|
||||
// }
|
||||
// coppers_names.emplace(id, name_buffer);
|
||||
// }
|
||||
}
|
||||
|
||||
for (auto&& [id, encounter_obj] : rogue_details["choiceScenes"].as_object()) {
|
||||
@@ -1400,6 +1415,14 @@ bool ocr_replace_overseas(const fs::path& input_dir, const fs::path& tasks_base_
|
||||
}
|
||||
auto& roguelike_sami_json = roguelike_sami_opt.value();
|
||||
|
||||
// auto roguelike_jiegarden_path = tasks_base_path / "Roguelike" / "Jiegarden.json";
|
||||
// auto roguelike_jiegarden_opt = json::open(roguelike_jiegarden_path);
|
||||
// if (!roguelike_jiegarden_opt) {
|
||||
// std::cerr << "Failed to open Roguelike Jiegarden file: " << roguelike_jiegarden_path << '\n';
|
||||
// return false;
|
||||
// }
|
||||
// auto& roguelike_jiegarden_json = roguelike_jiegarden_opt.value();
|
||||
|
||||
auto proc = [](json::array& replace_array,
|
||||
const std::unordered_map<std::string, std::string>& base_map,
|
||||
const std::unordered_map<std::string, std::string>& cur_map) {
|
||||
@@ -1435,6 +1458,7 @@ bool ocr_replace_overseas(const fs::path& input_dir, const fs::path& tasks_base_
|
||||
base_totem_names,
|
||||
totem_names);
|
||||
proc(roguelike_sami_json["Sami@Roguelike@FoldartalUseOcr"]["ocrReplace"].as_array(), base_totem_names, totem_names);
|
||||
// proc(roguelike_jiegarden_json["JieGarden@Roguelike@CoppersNameOcrReplace"]["ocrReplace"].as_array(), base_coppers_names, coppers_names);
|
||||
proc(roguelike_json["Roguelike@StageEncounterOcr"]["ocrReplace"].as_array(), base_encounter_names, encounter_names);
|
||||
|
||||
std::ofstream tasks_ofs(tasks_path, std::ios::out);
|
||||
@@ -1449,6 +1473,10 @@ bool ocr_replace_overseas(const fs::path& input_dir, const fs::path& tasks_base_
|
||||
roguelike_sami_ofs << roguelike_sami_json.format() << '\n';
|
||||
roguelike_sami_ofs.close();
|
||||
|
||||
// std::ofstream roguelike_jiegarden_ofs(roguelike_jiegarden_path, std::ios::out);
|
||||
// roguelike_jiegarden_ofs << roguelike_jiegarden_json.format() << '\n';
|
||||
// roguelike_jiegarden_ofs.close();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user