From b59d09dc000429b7e7bb521ecab92b631fc4240a Mon Sep 17 00:00:00 2001 From: WWPXX <64907423+WWPXX233@users.noreply.github.com> Date: Thu, 22 Dec 2022 19:20:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=BE=A4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/1.1-详细介绍.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/1.1-详细介绍.md b/docs/1.1-详细介绍.md index 68a9750005..8bc23a8b90 100644 --- a/docs/1.1-详细介绍.md +++ b/docs/1.1-详细介绍.md @@ -109,6 +109,7 @@ - 支持演习模式，不用一直浪费理智测试的 - 欢迎使用作业分享站 www.抄作业.com, www.prts.plus 分享自己的作业！ - 推荐在作业描述里填上你自己的名字（作者名）、参考的攻略视频 url, 其他想说的等等 +- 欢迎与我们一起讨论作业制作等问题 作业企鹅群 [1169188429](https://jq.qq.com/?_wv=1027&k=QZcGcJ9G) ### 一键长草：获取信用及购物 From 1532e15a6756c82ccc7a1b0fcc066479410ed872 Mon Sep 17 00:00:00 2001 From: Pitiedwzr <43533746+Pitiedwzr@users.noreply.github.com> Date: Fri, 23 Dec 2022 01:35:12 +1300 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8DEN=E6=9C=8D=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=9F=BA=E5=BB=BA=E5=8D=A1=E5=9C=A8=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E4=B8=AD=E5=BF=83&=E9=A2=86=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=A4=B1=E8=B4=A5=E4=BB=A5=E5=8F=8A=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=9B=9E=E5=88=B0=E4=B8=8A=E6=AC=A1=E4=BD=9C=E6=88=98?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/global/YoStarEN/resource/tasks.json | 45 ++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/resource/global/YoStarEN/resource/tasks.json b/resource/global/YoStarEN/resource/tasks.json index 39ed5f808f..b72cb6b476 100644 --- a/resource/global/YoStarEN/resource/tasks.json +++ b/resource/global/YoStarEN/resource/tasks.json @@ -1451,6 +1451,51 @@ "Operator" ] }, + "InfrastEnterOperList": { + "text": [ + "Morale", + "Resting", + "Working", + "Assign" + ] + }, + "Award": { + "template": "Task.png", + "action": "ClickSelf", + "roi": [ + 700, + 530, + 200, + 130 + ], + "next": [ + "ReceiveAward", + "DailyTask", + "WeeklyTask", + "Award", + "Award@CloseAnnos#next", + "Award@TodaysSupplies" + ] + }, + "GoLastBattle": { + "algorithm": "OcrDetect", + "text": [ + "To the most recent stage" + ], + "roi": [ + 916, + 479, + 249, + 127 + ], + "action": "ClickSelf", + "next": [ + "UsePrts-Annihilation", + "UsePrts", + "UsePrts-StageSN", + "StartButton1" + ] + }, "BattleStageName": { "Doc": "该任务的 ocrReplace 被所有涉及Rouge-like的English识别任务复用", "ocrReplace": [ From 5e3740451dcae40d354ea8da1cd1cf5515a95203 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Thu, 22 Dec 2022 20:41:46 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8B=89=E8=B5=B7?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=99=A8=E5=A4=B1=E8=B4=A5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/MaaWpfGui.csproj | 11 +++ src/MaaWpfGui/Main/SettingsViewModel.cs | 100 +++++++++++++++--------- 2 files changed, 75 insertions(+), 36 deletions(-) diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index 1508a6ac98..5eb73cc54d 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -495,6 +495,17 @@ + + + {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B} + 1 + 0 + 0 + tlbimp + False + True + + xcopy /e /y /i /c "$(ProjectDir)..\..\3rdparty\tools" "$(TargetDir)" diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs index 262c353223..dffc2fb561 100644 --- a/src/MaaWpfGui/Main/SettingsViewModel.cs +++ b/src/MaaWpfGui/Main/SettingsViewModel.cs @@ -21,8 +21,8 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using System.Windows; +using IWshRuntimeLibrary; using MaaWpfGui.MaaHotKeys; -using Newtonsoft.Json.Linq; using Stylet; using StyletIoC; @@ -402,46 +402,74 @@ namespace MaaWpfGui public void TryToStartEmulator(bool manual = false) { if ((EmulatorPath.Length == 0 - || !File.Exists(EmulatorPath)) + || !System.IO.File.Exists(EmulatorPath)) || !(StartEmulator || manual)) { return; } - ProcessStartInfo startInfo; - if (EmulatorAddCommand.Length != 0) - { - startInfo = new ProcessStartInfo(EmulatorPath, EmulatorAddCommand); - } - else - { - startInfo = new ProcessStartInfo(EmulatorPath); - } - - startInfo.UseShellExecute = false; - Process process = new Process - { - StartInfo = startInfo, - }; - - process.Start(); - process.WaitForInputIdle(); - if (MinimizingStartup) - { - for (int i = 0; !IsIconic(process.MainWindowHandle) && i < 5000; ++i) - { - ShowWindow(process.MainWindowHandle, SWMINIMIZE); - Thread.Sleep(1); - } - } - if (!int.TryParse(EmulatorWaitSeconds, out int delay)) { delay = 60; } - Thread.Sleep(delay * 1000); + try + { + string fileName; + string arguments; + ProcessStartInfo startInfo; + + if (Path.GetExtension(EmulatorPath).ToLower() == ".lnk") + { + WshShell shell = new WshShell(); + WshShortcut shortcut = (WshShortcut)shell.CreateShortcut(EmulatorPath); + fileName = shortcut.TargetPath; + arguments = shortcut.Arguments; + } + else + { + fileName = EmulatorPath; + arguments = EmulatorAddCommand; + } + + if (arguments.Length != 0) + { + startInfo = new ProcessStartInfo(fileName, arguments); + } + else + { + startInfo = new ProcessStartInfo(fileName); + } + + startInfo.UseShellExecute = false; + Process process = new Process + { + StartInfo = startInfo, + }; + process.Start(); + process.WaitForInputIdle(); + if (MinimizingStartup) + { + for (int i = 0; !IsIconic(process.MainWindowHandle) && i < delay * 1000; ++i) + { + ShowWindow(process.MainWindowHandle, SWMINIMIZE); + Thread.Sleep(1); + } + } + } + catch (Exception) + { + if (EmulatorAddCommand.Length != 0) + { + Process.Start(EmulatorPath); + } + else + { + Process.Start(EmulatorPath, EmulatorAddCommand); + Thread.Sleep(delay * 1000); + } + } } /// @@ -1934,13 +1962,13 @@ namespace MaaWpfGui return; } - if (!File.Exists(_bluestacksConfig)) + if (!System.IO.File.Exists(_bluestacksConfig)) { ViewStatusStorage.Set("Bluestacks.Config.Error", "File not exists"); return; } - var all_lines = File.ReadAllLines(_bluestacksConfig); + var all_lines = System.IO.File.ReadAllLines(_bluestacksConfig); foreach (var line in all_lines) { if (line.StartsWith(_bluestacksKeyWord)) @@ -1981,7 +2009,7 @@ namespace MaaWpfGui public async void ReplaceADB() { - if (!File.Exists(AdbPath)) + if (!System.IO.File.Exists(AdbPath)) { Execute.OnUIThread(() => { @@ -1993,7 +2021,7 @@ namespace MaaWpfGui return; } - if (!File.Exists(GoogleAdbFilename)) + if (!System.IO.File.Exists(GoogleAdbFilename)) { var downloadTask = Task.Run(() => { @@ -2022,7 +2050,7 @@ namespace MaaWpfGui process.Kill(); } - File.Copy(AdbPath, AdbPath + ".bak", true); + System.IO.File.Copy(AdbPath, AdbPath + ".bak", true); const string UnzipDir = "adb_unzip"; if (Directory.Exists(UnzipDir)) @@ -2031,7 +2059,7 @@ namespace MaaWpfGui } System.IO.Compression.ZipFile.ExtractToDirectory(GoogleAdbFilename, UnzipDir); - File.Copy(UnzipDir + "/platform-tools/adb.exe", AdbPath, true); + System.IO.File.Copy(UnzipDir + "/platform-tools/adb.exe", AdbPath, true); Directory.Delete(UnzipDir, true); }); await procTask; From e3dc6aa855c90705964a24377a324e7aa14fb6e8 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Thu, 22 Dec 2022 21:35:18 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=94=B5=E8=84=91=E4=B8=8A=E6=97=A5=E6=9C=9F=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Helper/Utils.cs | 4 ++-- src/MaaWpfGui/Main/SettingsViewModel.cs | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/MaaWpfGui/Helper/Utils.cs b/src/MaaWpfGui/Helper/Utils.cs index b95ba5a92d..f7a29922ab 100644 --- a/src/MaaWpfGui/Helper/Utils.cs +++ b/src/MaaWpfGui/Helper/Utils.cs @@ -32,7 +32,7 @@ namespace MaaWpfGui /// yj历时间的字符串表示形式 public static string GetYJTimeNowString() { - return GetYJTimeNow().ToString(); + return GetYJTimeNow().ToString("yyyy/MM/dd HH:mm:ss"); } /// @@ -50,7 +50,7 @@ namespace MaaWpfGui /// yj历日期的字符串表示形式 public static string GetYJTimeDateString() { - return GetYJTimeDate().ToString(); + return GetYJTimeDate().ToString("yyyy/MM/dd HH:mm:ss"); } /// diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs index 262c353223..036350cc40 100644 --- a/src/MaaWpfGui/Main/SettingsViewModel.cs +++ b/src/MaaWpfGui/Main/SettingsViewModel.cs @@ -15,6 +15,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -1070,7 +1071,7 @@ namespace MaaWpfGui } /* 访问好友设置 */ - private string _lastCreditFightTaskTime = ViewStatusStorage.Get("Visit.LastCreditFightTaskTime", Utils.GetYJTimeDate().AddDays(-1).ToString()); + private string _lastCreditFightTaskTime = ViewStatusStorage.Get("Visit.LastCreditFightTaskTime", Utils.GetYJTimeDate().AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); public string LastCreditFightTaskTime { @@ -1091,14 +1092,14 @@ namespace MaaWpfGui { get { - if (DateTime.TryParse(LastCreditFightTaskTime, out DateTime lastCreditFightTaskTime)) + try { - if (Utils.GetYJTimeDate() > lastCreditFightTaskTime.Date) + if (Utils.GetYJTimeDate() > DateTime.ParseExact(_lastCreditFightTaskTime, "yyyy/MM/dd HH:mm:ss", CultureInfo.InvariantCulture)) { return _creditFightTaskEnabled; } } - else + catch { return _creditFightTaskEnabled; } From 2ec6230520a791e7698ae99553cf49c6b806bb96 Mon Sep 17 00:00:00 2001 From: Pitiedwzr <43533746+Pitiedwzr@users.noreply.github.com> Date: Fri, 23 Dec 2022 03:05:18 +1300 Subject: [PATCH 5/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8E=E5=9B=BD?= =?UTF-8?q?=E6=9C=8D=E7=9B=B8=E6=AF=94=E6=97=A0=E5=8F=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/global/YoStarEN/resource/tasks.json | 26 +------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/resource/global/YoStarEN/resource/tasks.json b/resource/global/YoStarEN/resource/tasks.json index b72cb6b476..3ad396d8a4 100644 --- a/resource/global/YoStarEN/resource/tasks.json +++ b/resource/global/YoStarEN/resource/tasks.json @@ -1459,41 +1459,17 @@ "Assign" ] }, - "Award": { - "template": "Task.png", - "action": "ClickSelf", + "Award": { "roi": [ 700, 530, 200, 130 - ], - "next": [ - "ReceiveAward", - "DailyTask", - "WeeklyTask", - "Award", - "Award@CloseAnnos#next", - "Award@TodaysSupplies" ] }, "GoLastBattle": { - "algorithm": "OcrDetect", "text": [ "To the most recent stage" - ], - "roi": [ - 916, - 479, - 249, - 127 - ], - "action": "ClickSelf", - "next": [ - "UsePrts-Annihilation", - "UsePrts", - "UsePrts-StageSN", - "StartButton1" ] }, "BattleStageName": { From a0e0772c0d19744ebc7d837a6f8629909e65360c Mon Sep 17 00:00:00 2001 From: Horror Proton <107091537+horror-proton@users.noreply.github.com> Date: Thu, 22 Dec 2022 23:19:32 +0800 Subject: [PATCH 6/8] fix: fix YoStarJP ocr replace list for recruit fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3128 fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3164 --- resource/global/YoStarJP/resource/tasks.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resource/global/YoStarJP/resource/tasks.json b/resource/global/YoStarJP/resource/tasks.json index 9504ac23a8..2b9b3f3b30 100644 --- a/resource/global/YoStarJP/resource/tasks.json +++ b/resource/global/YoStarJP/resource/tasks.json @@ -1481,35 +1481,35 @@ "远程位" ], [ - "前衛タイ.*", + "前衛.*イ.*", "近卫干员" ], [ - "医療タイ.*", + "医療.*イ.*", "医疗干员" ], [ - "先鋒タイ.*", + "先鋒.*イ.*", "先锋干员" ], [ - "術師タイ.*", + "術師.*イ.*", "术师干员" ], [ - "狙撃タイ.*", + "狙撃.*イ.*", "狙击干员" ], [ - "重装タイ.*", + "重装.*イ.*", "重装干员" ], [ - "補助タイ.*", + "補助.*イ.*", "辅助干员" ], [ - "特殊タイ.*", + "特殊.*イ.*", "特种干员" ], [ From f5118fc3e967c21bebaf416cd658831429c8640a Mon Sep 17 00:00:00 2001 From: vonnoq <121179930+vonnoq@users.noreply.github.com> Date: Thu, 22 Dec 2022 23:34:57 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=9F=BA=E5=BB=BA=E5=9C=96=E6=AA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使基建正常運作 --- .../template/AddOperatorMfgAggressive.png | Bin 0 -> 6239 bytes .../template/AddOperatorTradeAggressive.png | Bin 0 -> 11929 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resource/global/txwy/resource/template/AddOperatorMfgAggressive.png create mode 100644 resource/global/txwy/resource/template/AddOperatorTradeAggressive.png diff --git a/resource/global/txwy/resource/template/AddOperatorMfgAggressive.png b/resource/global/txwy/resource/template/AddOperatorMfgAggressive.png new file mode 100644 index 0000000000000000000000000000000000000000..bebfca72f52fee09dfa780762bdf904c27473ab3 GIT binary patch literal 6239 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 MzJvNjWXJRW1QbyVf&c&j literal 0 HcmV?d00001 diff --git a/resource/global/txwy/resource/template/AddOperatorTradeAggressive.png b/resource/global/txwy/resource/template/AddOperatorTradeAggressive.png new file mode 100644 index 0000000000000000000000000000000000000000..4711484ea1e0559557b2ba172621861213ef6495 GIT binary patch literal 11929 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

-_ev1DcO=yF6Y;PfM`;k)O6^nPAEIIZ?I$tpljMl*;29`UkpmP z;5HBVZ=f0xO66hWnlD+zp!hnoMH*;!yk_qsi%3j1nHhZ*v|riXPTBo}Y8kOAcww+&;rqde-%FL}ekK_06fKO_$zOf7 z^LC-~iKBJ`Q{kW_yu4h`ne+0?=g)Zt{-l5axU8I9<<}Px|^S`(wwL?@`~+4c9z%Zp+#&SC~lkL{;H4rWPhl3yvL2gb78G8a zt%!v~cp(j-AfH{WHx;~VHV_)#y4c?RN;v0xO6M||0u%<2USz2d@2V@hlwVVP1vgEcUBT%Oam48>}LQdPn0m^K) zvvXG7R>jDhl|_9QZfoLmmztdx)_rxGTuHC1S7+viut#vg%hP_^7NdP^iM0`KbZb%3 z!-o$`hHorYN62(_$plmm0OSWRW32y_$;i^fww>{L->|%GptUOqlmv&CUbH`YB112W4>$=22#vBev;Q^sNMhK9oPZC&;D zY=l=ASMSsbD7{{&5^L}3`VR(eo4PgakdQsewRENr6H^NM6voXPp^Vni{ATtt3dv!& z%0~IYEzvNjtkJ&(_1L{9O#x}>Z^FS4?+sL>X(;(YR|}OG(4M>qFlRsWq6FYu9_;|=-?aK#~l-k8$-?qDQ%C6x$8~wK1)k6N?X60xqnJ(q|d!r z_%3h4&E$qohL~)9t7-4(*wbj|@8xx*sjsIebnv;p{^7%0bKQ9^H-5D}J^!ym%?o{^oI{_X;*IEc|cJ|$v zNuQmW0p;8s_H+B|(42x4Dbq4TmSFAc+x7KW72W|WH|U6bTtgWxOc#~BZN3L&)Pr~* zAAmRZ_Mgb)F}2ShN{gRA|BOAs%Uh3`oSZsY`0>`tEHAk~4R4Te%Br)ov%JDr6kUq% z_75kKyu5BiynD^*?al1(@9xG9;t!+`zGVAcy*jx(9SXbnsVRPCWo6Wi?T~f%F6a=N zcTNODqoN+f%MZ@X&OUnhsHv%m7kw{3KmU2Td+^oO<>?F`R9>6Uz)ODs^+7?xe$2{q zKK6luW4Bg7-htcXszCrl_AvfA6m4ZAYTEW=PG^(G|C z_f_bi+9wc^rSzI#paESbkzN!QZWL|{{Mi(su6AS}e7l_d?Heoo!Vz1o^eK<2+|b1$ z6^jIjbw|8Q6@Z+qflbP> z%`Gi3*D8ktjk1M+u9ugWe>or4A(Hop)&MGKS)aST%Kq)Iqsh(+Ip4RL5c0<7{JSG) z=}b6Tm(bqTVY0GZW5SJNt$y<-u3d!PSx zr!8=4DdR_Gza9I-(2#Jar-z4U+r*{K<)TlY4jl>$UeE=}$YNk~k6!ok4lj8Ays)aQ z%vM9;#>TI?A%zd6SBE?A4v&qcZ10Ii)9$`K7B7#p>S`xGdH%deP>(z|W|1f=6UV2C z`ut@gWOaFbu@b!YLV?R;%95?>|EwE zo0gU~Nn$%_NC%b|ePfXyol4}CbLOV|E@(^NF4To-NW(2+E#QsHCASsHW<=8#Wp`ab zoW+$RI|kb2ypc%3M?mI5%G%Y?KLk{wN|~b{Vhi3?(Oq;@4D2?KaC;%SRLeE40WT? z4mkpX_TuLDpX}=JF{6>+9N95Ihbf!cHM6ruEl#q&SRyH1j zP+F>~>j%#BdC&zHO#J*jJkqSH4^()r6$8kAcTlX<&e{3omjuPafXm)N;nUNl{(o=3 zzH3yauBI-wCdPkxsx$X>c=f`Ewnh@Wy7*>W+G^UvCUSG4SfWCi>C3}<*MiRJ7#e== z=~-Uv@KUuzRHoEhSm&?@i!uR%7g{%Q2?gP|m>y*-s2euli?iCN@W zbMbHAkg4hQ_0dsr>Hf5rpi=fb53DIo0}NG7DQR2ie|sgsYvxzm_Op8&PTIW8IUQr; z?w%e49i78i!~XwWv=S1#MVovh?Dg#I>>ts$M*&ZsnVkt<4Ki0O{}_5674t=lLxp77L=VHd#>o**NAV;Cad43^0@C*61T#uZ8fChRGJgI z+S_^lC(sGMi>nsGzT7!`E@GwXDtEF%Kp^%+p&h~>}tACJ{-WCI)^6MSN z@Y-S!^LO9xT{OCda75{3u2rwibWwhO+TM=l{#h?6;f^;aC>Z{U_uU?AO?l*~rXv*e zxvFHVK0a^1ces!R#=d=GO-1cYFN8W~g*%}&RkE!!ylh`^& zMglL(%e_Z9^V7fBKx|5#Yz3h;`an7_-QuGg^cn&92Qz-4#+-#N!%}>Pa--PQO>+c(pJ?CcEGs?b7u0wJ+zFD!abgYDk_eRJOIZw?BLKtkxZPjPiO<(WjB>vAhf6 z{w5!GS=5*67hzvI$<3!;9#+o+>KovB?54m??&g&7_78ATKNc}FGZR_4alP3q$*oIN3Y$xJ+4(qiu=>)%-H?&ZC6}WY4x~G^?bddj z{>`5;G8eX1B)I=*-vJH|0!_pOR1V!)2;Vf9nSVQ*yKr>**ZpUhA~u^{^>oRPTiehu z4$2JYGtd|E>qC3Hb{x*T@5850dN=+o*M1PUMCH))A9@V-{(m7a3p)$TchrV(nwy#u zMH6`d`YH}qhzW~McwGT$dql_Ju!+knKhLg)1~+c4D-5JiS#kBx(K--uA=l9;ALojf z6>Ew&u6udC25Wg#wKTCqZDq9j405~&`g%itO=R{v-2?5OytzuP%RlEc&+%~<;E#nb z#R!G0GEZ5F3Jc@(^{<6o%QZfB#2~04;Xx{oQ4=TL=luEeyChmTwQYjM8Uqv{$Hcxd zxB;A*c-G#dVL!KLwi^Ot6K#hR6k9odfm zekr|ra&z*&MQoy?NnL@6JZ^b8C_W(p?C1$z9e%>&e$KTkVVe&DtMu^jXzlqtu{QTr z&%}hX)nHj0oNt?vnaKx0_z1^WN%p9&p5Eu-&vH=-qKQEv*KBNTR>XvFA%HlYS*!#o z4iwp(?1O}ad3k-#iemV6508f+puN45-@cI>Nk#b=htpO&EMj+8LcM(D%8%(jW1Ubp zFRv$6PY*#A6^(m`%gF%&UaqdCMMXvbp-{N1>xVw9med^V>XpI1&y{1#)6?VQl8F1B zo}NN65Kk3$g9pQ`zOOsMF3HVe5QCutf-S!UXIc}0BTm#tdZK%QwWca<0GxCt+mysw zH~IVg+psL$;hWo>lGWAKtqGUyl@HzDW{sEYPTl;jGP3i>W2%Q2D zJ+kq0PhemmzVh4w>66%|w8_ch;?CBhR+OF|FgJV;NZ$5+yVX%>2Z&eAF_#R1Yd@!7 zt@Iw0iEA9J`JMRgoeG|rkf4po1o=J`Jlk<>c$m95da8!PO@zmgoSoY`^do+M)IYa1 zdP?c~C{?Mev%~+^(~{S_1rCJAoF5mjosNINY$(XG{WLuMxwrSmm*KTz%fHC3(sIDY ziZKcctQ;WZ!_rc_raV17#S{!KWw+lFkq41!ZaTiXDPRd>BJ)9A@BhD0j^2gxvam1X zJw0s)*UF;)UyO0M-l3tM%KPM?pl6kppk$v=Tyz7Hdkk!@R zi6sHieF03Pkk!e6@)&}+!h>*QlS79>?v-=}J3C(i%$EOF0y92dUtez?#2SbDI`r`< zNFfuQSJnCX6%}E@!K=T%Q3EQyEe2uCT_JXa6C#`_3`~^UUl{f*_hd)XKf0b5ffJJ^ zSgO)SLwuK_>oN2Mh5J0HrjTeJswLwK_|YqR>Uqk3>{iK0@JXO8U3SuI_U%1#W4`=L z_|HRM@{UB@2oHxij(h;b7Cg?MmgM&iX7j|}>Cj#WA=Z1dExNyDLwp$C7&G>KME`qbp)9%}UR=!XcRVb^~ zYx@juEK|1T^+7-9u}rU-c#-YZl8iI|=k*^@!|O37l*!DIV}JS%P73jP zBMC4wHNeLfA}BZdv%iK;{TJB#&w7S>dOnwr_5A1tQWjt8Pj)_eGH|3W{m~=Omcv*7 z!)y>J6CIeE3SUeq;AB7${vS@(HMKU^52*Ue;6l2L19MoJdb#et(jgC;mhPdX* z?^Ybk%+wZop!k&QZXPfW{l8$h6`z;csi@f)OusNh*^Tz>!tn}5$E8@h?d|PH z*HdCa_7}hUuBfzLwsv%FOUUTR5nv?P!#q5q4!g4e#p=1?e}Eyn zhc!L38|<1wM{QvCzTKYg7I%OA5m=-Dp@i6*l5+<}BDz9uZmgG_Y*fy?HalYyJ{)Td zewvz_YeKkUl$EFIw;Pqu6j#rjclq;uip-Rdkg!QY%26$ez}k9JRP=V~=O*CY;$_;j z-QdN`>#r&vJ$&fU-wz85E1w27GbA1XknQ8&E3XgQQX*i(!lDEGLTF7I=%wD5eJPhI zBkk?NnXg}Od+F!Rgbj@4t9QZC!QPZW^Xs9ue!Vp zIYr^(^KBL62ndaTJ#>(HF`nSp@;SAxM%&G(OQ(#^1J;-ri_&PkF zt?v@vo%{3WPtUxtpTI&tC>dvW$;46Resir@2>88DZkyvp_7({WK0ZE`u7jL>6^rKPW-6k-7ih9U{kx!44MH)r55vR# zJ+FA_-4g+qgM)uIFo5>8uRK@$C@l6lSeCaC0$5?khR-i8Edf~ulnHS4a6#ih3z+<>jz~Y}pmk^005;k9p#pTpGtA{r595_Ke(9ZkyLld)<}yGT zWjEj4Q0m$$cF+R4=v%!|*ul#6g1CcU2iXyuLqkLNO}LGxl>YPs*1Jo2H{X4^={iz< z5?HUl$JE6Xj;_y@b(yRU35`iea9W8^p0+hlgA*oY%Z=AZ0ke83LPIQWgjb%+%F7do zE|r2LJ?;41(<=>M!e%iayncPeQaiB7;ed1;KynZ|NA0vWcR;}OHp0PrWa7+Gd0nx4 zFVJ90XLj5EO3`s|(J7v+w; zB0gp6W~NtWr41%xI^%fvc!;RoUl`e~w>L|jVHZL#b6;Ou@$Cy~tttuk^gQcX%<1Jo zi3E5uAxRR%mHWkHc%}VNP1rm619I~6fKA$ggG>L$!I9vN?7>0(*sNcp(PB08KE8mF z{&giYJG*L(GF(ZajI88sO^59)KLH{pZ)=%FiP&OfX3BLI6jpA`JS_=d2rIr&adkMP zX03MDHu3cBQa9dVDH?I6mMU9|e#l%1{c#q=e&XHsp--Q>rF(jMar$~b!yj*UH_CwH ztdkW!!+Xi$m$}r<>Ocy&7FCj~=u=j!jPf^b_)9{00*;~jxZ`u;9bL6By2|c|r+wYx z!pbW6??>rNq*^s#{9C$SIK`>UNHs7~R_V0S){%=we1`J>e$DRCO+jkz`7^$fmzjCj z$nRc>!-2u#q9Ui7>WfPct>p&?c3bAzv*}Nt$0tk#Fxfd8cisbo^x)edz)qe#eApDs z#L|AGQ|(RanyRWY()S%$p9`d9WMp`Id++WRDCnQFMnSJAqYbSROG|u%5KqY{+XCF# z!JeL%v-MxkR~w16ZOYIpAiUuxF>19XN|ac-fAy=O@h>_~%zVAh z!dTS{7J&J;J6>0=%+4%!``@fa+^<9VL7d_ARJO_!7z4}>{e!%c;+Ac7{`}pBp`kZy z#h3>?vg#N-a94qcb*F8@uBiQ~CphoNBW=uWA;7u;tf8Ob?m;ELw4Vl1ie7$DD>)jw0~C1s~# z>CD<^4}N}qOH_7uv%qWAT|t2i$VsL(C=d3*si}@}1_IH<%;`(utdsSk4(JpEvB^7z zO)#h+gK2*no@}5`b;>5158i_k>-jCnwlFGi4O5Vw>UK@R4MY+Pi_@q>0)Gah3n>HG z=*qM{A*kEb2d0tA_%Y)r{m}>CoZ+7jo$QXe3e=0mdwdge~zon1&P>;gHpl)8uK=Mxg$|YM!?4 zYtqEmtD)J+p^6L|Pc%_(SLBx;;y6VoVdHwP>FO^PF*Adc?I}JS&pu?37i-}M!_(Sg33LVxT7l)In|K>J}0^&rFENd zJ6z}JiaAce9-gRSM@xmxwtntnlxS^5%U>t5Qnb3Uj*#o8ay!%-A3_%IML8sy)79UL z_e0uXD@U%&?J}+|A5}75;9=iG4Y#B}#VKkbz`6-$5@zOC$4~10C6%f_ z;A&tC=e>@09y06c$$!xz)PF>tO!r6o3Oc5E0r8j1~T+;Bl4ymH!X0TLs>X2S`f#~?# ztW;6S@%@#L1*wl)R5tEG;QBWUHeB$0*D+!==@aJWqOB>nAwj6K0pchKyC>&rwEBCC zfKNGf(9;`)!T{A5En!la1JrYxjRo3#?MQ{_yvMD`uJMzL#H-`Q1`~O+WngPRFnx({2x`e&}V>8%LdSuPcmV3(nO7X`|@mPGP zo6tBu`*sup*21Po;hRxO2VYv9<5y~B3^jgayo(VVw`~)?6*biI$O~uQ%rkCf{5eNL zQFQzShliC|Fu4q!IAN?eMZ@!r#~ekFq;+ngM!JQAS}Ya`X}5V~##suF@2O=gu&Q3A z9C8}Ji^R+b28_SvNCD} z856aL=dFyR6VDl>NPv`(7U%u@^w%er4QeLpXBTZETa?Az;!5b@2hya!M=B&Ya(O>u X_qo@2=AHs0=RB6?HfF^H*Qoymw4Ge4 literal 0 HcmV?d00001 From 7f14675b8390b69f65084de8de06c227eaf8f891 Mon Sep 17 00:00:00 2001 From: vonnoq <121179930+vonnoq@users.noreply.github.com> Date: Thu, 22 Dec 2022 23:47:24 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=BE=84=E9=96=83?= =?UTF-8?q?=E8=AD=98=E5=88=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使基建正常運作 --- resource/global/txwy/resource/tasks.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resource/global/txwy/resource/tasks.json b/resource/global/txwy/resource/tasks.json index 3aa2bd412b..e9083fcdd5 100644 --- a/resource/global/txwy/resource/tasks.json +++ b/resource/global/txwy/resource/tasks.json @@ -721,6 +721,10 @@ [ "“弦驚”", "“弦惊”" + ], + [ + "澄閃", + "澄闪" ] ] },