diff --git a/resource/global/YoStarEN/resource/template/Mail.png b/resource/global/YoStarEN/resource/template/Mail.png deleted file mode 100644 index 28fe33c6ee..0000000000 Binary files a/resource/global/YoStarEN/resource/template/Mail.png and /dev/null differ diff --git a/resource/global/YoStarKR/resource/tasks.json b/resource/global/YoStarKR/resource/tasks.json index b2fb1b07a7..06167b9e3e 100644 --- a/resource/global/YoStarKR/resource/tasks.json +++ b/resource/global/YoStarKR/resource/tasks.json @@ -478,11 +478,7 @@ "Doc": "이 작업의 'ocrReplace'는 오퍼레이터 이름과 관련된 모든 인식 작업에서 사용됩니다", "ocrReplace": [ [ - "실버애쉬", - "银灰" - ], - [ - "실버애춰", + "실버애[쉬춰]", "银灰" ], [ @@ -518,11 +514,15 @@ "棘刺" ], [ - "^스펙터$", - "幽灵鲨" + "쓴죠", + "棘刺" ], [ - "^스페터$", + "쓴즈", + "棘刺" + ], + [ + "^스[펙페]터$", "幽灵鲨" ], [ @@ -542,7 +542,7 @@ "因陀罗" ], [ - "아미야", + "[아마]미야", "阿米娅" ], [ @@ -690,15 +690,7 @@ "空" ], [ - "스카디더커럽팅하트", - "浊心斯卡蒂" - ], - [ - "스카디더커럽팀하트", - "浊心斯卡蒂" - ], - [ - "프카디더커럽팀하트", + "[스프]카디더커럽[팅팀]하트", "浊心斯卡蒂" ], [ @@ -706,11 +698,11 @@ "浊心斯卡蒂" ], [ - "링", + "^링$", "令" ], [ - "씬", + "^씬$", "稀音" ], [ @@ -726,11 +718,7 @@ "麦哲伦" ], [ - "프라마닉스", - "初雪" - ], - [ - "프라마늬스", + "프라마[닉늬]스", "初雪" ], [ @@ -754,19 +742,11 @@ "真理" ], [ - "포덴코", + "포[덴넨텐]코", "波登可" ], [ - "포넨코", - "波登可" - ], - [ - "어스스피릿", - "地灵" - ], - [ - "어스스피린", + "어스스피[릿린]", "地灵" ], [ @@ -774,15 +754,7 @@ "罗比菈塔" ], [ - "딥컬러", - "深海色" - ], - [ - "딥컬러", - "深海色" - ], - [ - "됩컬러", + "[딥됩덥]컬러", "深海色" ], [ @@ -802,19 +774,11 @@ "末药" ], [ - "^가비알$", + "^가비[알말]$", "嘉维尔" ], [ - "^가비말$", - "嘉维尔" - ], - [ - "퍼퓨머", - "调香师" - ], - [ - "퍼퓨며", + "퍼퓨[머며]", "调香师" ], [ @@ -858,11 +822,7 @@ "清流" ], [ - "위스퍼레인", - "絮雨" - ], - [ - "위스페레인", + "위스[퍼페]레인", "絮雨" ], [ @@ -914,15 +874,11 @@ "风笛" ], [ - "리드", + "^리드$", "苇草" ], [ - "머틀", - "桃金娘" - ], - [ - "머를", + "머[틀를]", "桃金娘" ], [ @@ -962,7 +918,7 @@ "香草" ], [ - "팽", + "^팽$", "芬" ], [ @@ -978,23 +934,7 @@ "远牙" ], [ - "첸더홀룽데이", - "假日威龙陈" - ], - [ - "첸더홀룬데이", - "假日威龙陈" - ], - [ - "젠더홀룹데이", - "假日威龙陈" - ], - [ - "첸더홀륭데이", - "假日威龙陈" - ], - [ - "첸더홀쿵데이", + "[첸젠]더홀[룽룬룹륭쿵]데[이0]", "假日威龙陈" ], [ @@ -1070,15 +1010,7 @@ "空爆" ], [ - "엑시아", - "能天使" - ], - [ - "멕시아", - "能天使" - ], - [ - "엘시아", + "[엑멕엘]시아", "能天使" ], [ @@ -1094,23 +1026,11 @@ "陨星" ], [ - "플래티넘", + "플래티[넘념]", "白金" ], [ - "플래티념", - "白金" - ], - [ - "블루포이즌", - "蓝毒" - ], - [ - "블루포이존", - "蓝毒" - ], - [ - "블루포이슨", + "블루포이[즌존슨]", "蓝毒" ], [ @@ -1138,15 +1058,7 @@ "巡林者" ], [ - "샬렘", - "暮落" - ], - [ - "슬렘", - "暮落" - ], - [ - "살렘", + "[샬슬살]렘", "暮落" ], [ @@ -1178,11 +1090,7 @@ "泡泡" ], [ - "유넥티스", - "森蚺" - ], - [ - "유섹티스", + "유[넥섹네]티스", "森蚺" ], [ @@ -1202,15 +1110,11 @@ "拜松" ], [ - "듀나", + "[듀듦]나", "坚雷" ], [ - "듦나", - "坚雷" - ], - [ - "스팟", + "스[팟팠]", "斑点" ], [ @@ -1242,7 +1146,7 @@ "临光" ], [ - "굼", + "^굼$", "古米" ], [ @@ -1274,19 +1178,11 @@ "蚀清" ], [ - "푸딩", + "푸[딩딪]", "布丁" ], [ - "푸딪", - "布丁" - ], - [ - "카넬리안", - "卡涅利安" - ], - [ - "카엘리안", + "카[넬엘]리안", "卡涅利安" ], [ @@ -1318,27 +1214,11 @@ "特米米" ], [ - "비즈왁스", + "비즈[왁확옥와]스", "蜜蜡" ], [ - "비즈확스", - "蜜蜡" - ], - [ - "비즈옥스", - "蜜蜡" - ], - [ - "비즈와스", - "蜜蜡" - ], - [ - "클릭", - "卡达" - ], - [ - "클릴", + "클[릭릴]", "卡达" ], [ @@ -1374,27 +1254,7 @@ "夜魔" ], [ - "에이야퍄들라", - "艾雅法拉" - ], - [ - "메이야퍄들라", - "艾雅法拉" - ], - [ - "메이야프들라", - "艾雅法拉" - ], - [ - "에이야프들라", - "艾雅法拉" - ], - [ - "페이야프들라", - "艾雅法拉" - ], - [ - "페이야퍄들라", + "[에메페]이야[퍄프]들라", "艾雅法拉" ], [ @@ -1414,11 +1274,7 @@ "夜烟" ], [ - "스튜어드", - "史都华德" - ], - [ - "스튜어도", + "스튜어[드도]", "史都华德" ], [ @@ -1470,11 +1326,7 @@ "温蒂" ], [ - "팬텀", - "傀影" - ], - [ - "팬럼", + "팬[텀럼]", "傀影" ], [ @@ -1645,6 +1497,10 @@ "크루스더킨글린트", "寒芒克洛丝" ], + [ + "크루스더킨.*", + "寒芒克洛丝" + ], [ "저주인형", "诅咒娃娃" @@ -1762,19 +1618,7 @@ "无主的财富" ], [ - "스펙터디언체인드", - "归溟幽灵鲨" - ], - [ - "스페터디먼셰인드", - "归溟幽灵鲨" - ], - [ - "스페터디언체인다", - "归溟幽灵鲨" - ], - [ - "스페터디먼체인드", + "스[펙페]터디[언먼][셰체]인[드다]", "归溟幽灵鲨" ], [ @@ -1790,7 +1634,7 @@ "轰隆隆先生" ], [ - "^혼$", + "^혼其?$", "号角" ], [ @@ -2126,19 +1970,11 @@ "污染晶石" ], [ - "예비인원.?디펜더", + "예비인원.?디[펜핀][더터]", "预备干员-重装" ], [ - "예비인원.?스나이퍼", - "预备干员-狙击" - ], - [ - "예비인원.?스나이프", - "预备干员-狙击" - ], - [ - "예비인원.?스나이페", + "예비인원.?스나이[퍼프페]", "预备干员-狙击" ], [ @@ -2154,9 +1990,17 @@ "预备干员-后勤" ], [ - "떼비민원.?근게", + "[예떼]비[인민]원.?근[거게].*", "预备干员-近战" ], + [ + "예비인원.?캐스.*", + "预备干员-术师" + ], + [ + "예비인원.?지.*", + "预备干员-后勤" + ], [ "준비구역송신기", "预备区发讯器" @@ -2213,10 +2057,6 @@ "지난날의잔상", "旧日残影" ], - [ - "스테인리스.?멀티플랫폼", - "白铁™多功能平台" - ], [ "명흔", "溟痕" @@ -2266,11 +2106,11 @@ "石英" ], [ - "주사위", + "^주사위$", "骰子" ], [ - "구급키드", + "구급키[드트]", "急救包" ], [ @@ -2419,6 +2259,23 @@ "크레딜" ] }, + "ExpiringMedicineCheck": { + "ocrReplace": [ + [ + ".+시간", + "시간" + ], + [ + ".+분", + "분" + ] + ], + "text": [ + "1일", + "시간", + "분" + ] + }, "EnterChapterDifficultyHard": { "text": [ "하드모드", @@ -2514,8 +2371,10 @@ "Mizuki@Roguelike@StageEncounterOptionFree": { "templThreshold": 0.87 }, - "Mizuki@Roguelike@StageEncounterOptionUnknown": { - "templThreshold": 0.89 + "Mizuki@Roguelike@StageSafeHouseReuse": { + "text": [ + "안전가옥활용" + ] }, "NoFriends": { "text": [ @@ -2750,11 +2609,11 @@ "术师" ], [ - "메딕", + "메[딕되틱]", "医疗" ], [ - "뱅가드", + "^뱅가[드도]$", "先锋" ], [ @@ -2774,7 +2633,7 @@ "重装" ], [ - "가드", + "^가[드도]$", "近卫" ] ] diff --git a/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@ChooseDifficulty.png b/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@ChooseDifficulty.png new file mode 100644 index 0000000000..1b0b7d75dd Binary files /dev/null and b/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@ChooseDifficulty.png differ diff --git a/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@CommissionedMissionCompleted.png b/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@CommissionedMissionCompleted.png index b03db84b44..267e9989b0 100644 Binary files a/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@CommissionedMissionCompleted.png and b/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@CommissionedMissionCompleted.png differ diff --git a/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@MapObject.png b/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@MapObject.png index afd1ff1a09..f28afd095b 100644 Binary files a/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@MapObject.png and b/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@MapObject.png differ diff --git a/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@StageEncounterOptionUnknown.png b/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@StageEncounterOptionUnknown.png index e8d44291cf..26aa489429 100644 Binary files a/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@StageEncounterOptionUnknown.png and b/resource/global/YoStarKR/resource/template/Mizuki@Roguelike@StageEncounterOptionUnknown.png differ