Merge pull request #354 from EightyDollars/dev_shawn

add:增加图片资源
ArkMowers · Oct 23, 2023 · 97c95bf · 97c95bf
2 parents 59bdc9a + 314e793
commit 97c95bf
Show file tree

Hide file tree

Showing 132 changed files with 2 additions and 3 deletions.
diff --git a/arknights_mower/__main__.py b/arknights_mower/__main__.py
@@ -379,6 +379,7 @@ def simulate():
                     [base_scheduler.tasks[0].type.value.split("_")[1]], one_time=True
                 )
                 continue
+
             base_scheduler.run()
             reconnect_tries = 0
         except ConnectionError or ConnectionAbortedError or AttributeError as e:

diff --git a/arknights_mower/resources/agent_name/char_009_12fce.png b/arknights_mower/resources/agent_name/char_009_12fce.png
diff --git a/arknights_mower/resources/agent_name/char_010_chen.png b/arknights_mower/resources/agent_name/char_010_chen.png
diff --git a/arknights_mower/resources/agent_name/char_017_huang.png b/arknights_mower/resources/agent_name/char_017_huang.png
diff --git a/arknights_mower/resources/agent_name/char_102_texas.png b/arknights_mower/resources/agent_name/char_102_texas.png
diff --git a/arknights_mower/resources/agent_name/char_103_angel.png b/arknights_mower/resources/agent_name/char_103_angel.png
diff --git a/arknights_mower/resources/agent_name/char_107_liskam.png b/arknights_mower/resources/agent_name/char_107_liskam.png
diff --git a/arknights_mower/resources/agent_name/char_108_silent.png b/arknights_mower/resources/agent_name/char_108_silent.png
diff --git a/arknights_mower/resources/agent_name/char_109_fmout.png b/arknights_mower/resources/agent_name/char_109_fmout.png
diff --git a/arknights_mower/resources/agent_name/char_112_siege.png b/arknights_mower/resources/agent_name/char_112_siege.png
diff --git a/arknights_mower/resources/agent_name/char_115_headbr.png b/arknights_mower/resources/agent_name/char_115_headbr.png
diff --git a/arknights_mower/resources/agent_name/char_117_myrrh.png b/arknights_mower/resources/agent_name/char_117_myrrh.png
diff --git a/arknights_mower/resources/agent_name/char_118_yuki.png b/arknights_mower/resources/agent_name/char_118_yuki.png
diff --git a/arknights_mower/resources/agent_name/char_120_hibisc.png b/arknights_mower/resources/agent_name/char_120_hibisc.png
diff --git a/arknights_mower/resources/agent_name/char_121_lava.png b/arknights_mower/resources/agent_name/char_121_lava.png
diff --git a/arknights_mower/resources/agent_name/char_122_beagle.png b/arknights_mower/resources/agent_name/char_122_beagle.png
diff --git a/arknights_mower/resources/agent_name/char_123_fang.png b/arknights_mower/resources/agent_name/char_123_fang.png
diff --git a/arknights_mower/resources/agent_name/char_124_kroos.png b/arknights_mower/resources/agent_name/char_124_kroos.png
diff --git a/arknights_mower/resources/agent_name/char_126_shotst.png b/arknights_mower/resources/agent_name/char_126_shotst.png
diff --git a/arknights_mower/resources/agent_name/char_127_estell.png b/arknights_mower/resources/agent_name/char_127_estell.png
diff --git a/arknights_mower/resources/agent_name/char_128_plosis.png b/arknights_mower/resources/agent_name/char_128_plosis.png
diff --git a/arknights_mower/resources/agent_name/char_129_bluep.png b/arknights_mower/resources/agent_name/char_129_bluep.png
diff --git a/arknights_mower/resources/agent_name/char_130_doberm.png b/arknights_mower/resources/agent_name/char_130_doberm.png
diff --git a/arknights_mower/resources/agent_name/char_133_mm.png b/arknights_mower/resources/agent_name/char_133_mm.png
diff --git a/arknights_mower/resources/agent_name/char_134_ifrit.png b/arknights_mower/resources/agent_name/char_134_ifrit.png
diff --git a/arknights_mower/resources/agent_name/char_136_hsguma.png b/arknights_mower/resources/agent_name/char_136_hsguma.png
diff --git a/arknights_mower/resources/agent_name/char_137_brownb.png b/arknights_mower/resources/agent_name/char_137_brownb.png
diff --git a/arknights_mower/resources/agent_name/char_141_nights.png b/arknights_mower/resources/agent_name/char_141_nights.png
diff --git a/arknights_mower/resources/agent_name/char_143_ghost.png b/arknights_mower/resources/agent_name/char_143_ghost.png
diff --git a/arknights_mower/resources/agent_name/char_144_red.png b/arknights_mower/resources/agent_name/char_144_red.png
diff --git a/arknights_mower/resources/agent_name/char_145_prove.png b/arknights_mower/resources/agent_name/char_145_prove.png
diff --git a/arknights_mower/resources/agent_name/char_147_shining.png b/arknights_mower/resources/agent_name/char_147_shining.png
diff --git a/arknights_mower/resources/agent_name/char_148_nearl.png b/arknights_mower/resources/agent_name/char_148_nearl.png
diff --git a/arknights_mower/resources/agent_name/char_149_scave.png b/arknights_mower/resources/agent_name/char_149_scave.png
diff --git a/arknights_mower/resources/agent_name/char_150_snakek.png b/arknights_mower/resources/agent_name/char_150_snakek.png
diff --git a/arknights_mower/resources/agent_name/char_151_myrtle.png b/arknights_mower/resources/agent_name/char_151_myrtle.png
diff --git a/arknights_mower/resources/agent_name/char_155_tiger.png b/arknights_mower/resources/agent_name/char_155_tiger.png
diff --git a/arknights_mower/resources/agent_name/char_158_milu.png b/arknights_mower/resources/agent_name/char_158_milu.png
diff --git a/arknights_mower/resources/agent_name/char_163_hpsts.png b/arknights_mower/resources/agent_name/char_163_hpsts.png
diff --git a/arknights_mower/resources/agent_name/char_164_nightm.png b/arknights_mower/resources/agent_name/char_164_nightm.png
diff --git a/arknights_mower/resources/agent_name/char_171_bldsk.png b/arknights_mower/resources/agent_name/char_171_bldsk.png
diff --git a/arknights_mower/resources/agent_name/char_172_svrash.png b/arknights_mower/resources/agent_name/char_172_svrash.png
diff --git a/arknights_mower/resources/agent_name/char_173_slchan.png b/arknights_mower/resources/agent_name/char_173_slchan.png
diff --git a/arknights_mower/resources/agent_name/char_174_slbell.png b/arknights_mower/resources/agent_name/char_174_slbell.png
diff --git a/arknights_mower/resources/agent_name/char_179_cgbird.png b/arknights_mower/resources/agent_name/char_179_cgbird.png
diff --git a/arknights_mower/resources/agent_name/char_181_flower.png b/arknights_mower/resources/agent_name/char_181_flower.png
diff --git a/arknights_mower/resources/agent_name/char_183_skgoat.png b/arknights_mower/resources/agent_name/char_183_skgoat.png
diff --git a/arknights_mower/resources/agent_name/char_185_frncat.png b/arknights_mower/resources/agent_name/char_185_frncat.png
diff --git a/arknights_mower/resources/agent_name/char_188_helage.png b/arknights_mower/resources/agent_name/char_188_helage.png
diff --git a/arknights_mower/resources/agent_name/char_190_clour.png b/arknights_mower/resources/agent_name/char_190_clour.png
diff --git a/arknights_mower/resources/agent_name/char_192_falco.png b/arknights_mower/resources/agent_name/char_192_falco.png
diff --git a/arknights_mower/resources/agent_name/char_193_frostl.png b/arknights_mower/resources/agent_name/char_193_frostl.png
diff --git a/arknights_mower/resources/agent_name/char_195_glassb.png b/arknights_mower/resources/agent_name/char_195_glassb.png
diff --git a/arknights_mower/resources/agent_name/char_196_sunbr.png b/arknights_mower/resources/agent_name/char_196_sunbr.png
diff --git a/arknights_mower/resources/agent_name/char_197_poca.png b/arknights_mower/resources/agent_name/char_197_poca.png
diff --git a/arknights_mower/resources/agent_name/char_199_yak.png b/arknights_mower/resources/agent_name/char_199_yak.png
diff --git a/arknights_mower/resources/agent_name/char_2013_cerber.png b/arknights_mower/resources/agent_name/char_2013_cerber.png
diff --git a/arknights_mower/resources/agent_name/char_201_moeshd.png b/arknights_mower/resources/agent_name/char_201_moeshd.png
diff --git a/arknights_mower/resources/agent_name/char_202_demkni.png b/arknights_mower/resources/agent_name/char_202_demkni.png
diff --git a/arknights_mower/resources/agent_name/char_204_platnm.png b/arknights_mower/resources/agent_name/char_204_platnm.png
diff --git a/arknights_mower/resources/agent_name/char_208_melan.png b/arknights_mower/resources/agent_name/char_208_melan.png
diff --git a/arknights_mower/resources/agent_name/char_210_stward.png b/arknights_mower/resources/agent_name/char_210_stward.png
diff --git a/arknights_mower/resources/agent_name/char_211_adnach.png b/arknights_mower/resources/agent_name/char_211_adnach.png
diff --git a/arknights_mower/resources/agent_name/char_212_ansel.png b/arknights_mower/resources/agent_name/char_212_ansel.png
diff --git a/arknights_mower/resources/agent_name/char_213_mostma.png b/arknights_mower/resources/agent_name/char_213_mostma.png
diff --git a/arknights_mower/resources/agent_name/char_215_mantic.png b/arknights_mower/resources/agent_name/char_215_mantic.png
diff --git a/arknights_mower/resources/agent_name/char_218_cuttle.png b/arknights_mower/resources/agent_name/char_218_cuttle.png
diff --git a/arknights_mower/resources/agent_name/char_219_meteo.png b/arknights_mower/resources/agent_name/char_219_meteo.png
diff --git a/arknights_mower/resources/agent_name/char_222_bpipe.png b/arknights_mower/resources/agent_name/char_222_bpipe.png
diff --git a/arknights_mower/resources/agent_name/char_225_haak.png b/arknights_mower/resources/agent_name/char_225_haak.png
diff --git a/arknights_mower/resources/agent_name/char_226_hmau.png b/arknights_mower/resources/agent_name/char_226_hmau.png
diff --git a/arknights_mower/resources/agent_name/char_235_jesica.png b/arknights_mower/resources/agent_name/char_235_jesica.png
diff --git a/arknights_mower/resources/agent_name/char_236_rope.png b/arknights_mower/resources/agent_name/char_236_rope.png
diff --git a/arknights_mower/resources/agent_name/char_237_gravel.png b/arknights_mower/resources/agent_name/char_237_gravel.png
diff --git a/arknights_mower/resources/agent_name/char_240_wyvern.png b/arknights_mower/resources/agent_name/char_240_wyvern.png
diff --git a/arknights_mower/resources/agent_name/char_241_panda.png b/arknights_mower/resources/agent_name/char_241_panda.png
diff --git a/arknights_mower/resources/agent_name/char_242_otter.png b/arknights_mower/resources/agent_name/char_242_otter.png
diff --git a/arknights_mower/resources/agent_name/char_243_waaifu.png b/arknights_mower/resources/agent_name/char_243_waaifu.png
diff --git a/arknights_mower/resources/agent_name/char_248_mgllan.png b/arknights_mower/resources/agent_name/char_248_mgllan.png
diff --git a/arknights_mower/resources/agent_name/char_250_phatom.png b/arknights_mower/resources/agent_name/char_250_phatom.png
diff --git a/arknights_mower/resources/agent_name/char_253_greyy.png b/arknights_mower/resources/agent_name/char_253_greyy.png
diff --git a/arknights_mower/resources/agent_name/char_254_vodfox.png b/arknights_mower/resources/agent_name/char_254_vodfox.png
diff --git a/arknights_mower/resources/agent_name/char_258_podego.png b/arknights_mower/resources/agent_name/char_258_podego.png
diff --git a/arknights_mower/resources/agent_name/char_261_sddrag.png b/arknights_mower/resources/agent_name/char_261_sddrag.png
diff --git a/arknights_mower/resources/agent_name/char_263_skadi.png b/arknights_mower/resources/agent_name/char_263_skadi.png
diff --git a/arknights_mower/resources/agent_name/char_272_strong.png b/arknights_mower/resources/agent_name/char_272_strong.png
diff --git a/arknights_mower/resources/agent_name/char_274_astesi.png b/arknights_mower/resources/agent_name/char_274_astesi.png
diff --git a/arknights_mower/resources/agent_name/char_277_sqrrel.png b/arknights_mower/resources/agent_name/char_277_sqrrel.png
diff --git a/arknights_mower/resources/agent_name/char_278_orchid.png b/arknights_mower/resources/agent_name/char_278_orchid.png
diff --git a/arknights_mower/resources/agent_name/char_279_excu.png b/arknights_mower/resources/agent_name/char_279_excu.png
diff --git a/arknights_mower/resources/agent_name/char_281_popka.png b/arknights_mower/resources/agent_name/char_281_popka.png
diff --git a/arknights_mower/resources/agent_name/char_282_catap.png b/arknights_mower/resources/agent_name/char_282_catap.png
diff --git a/arknights_mower/resources/agent_name/char_283_midn.png b/arknights_mower/resources/agent_name/char_283_midn.png
diff --git a/arknights_mower/resources/agent_name/char_284_spot.png b/arknights_mower/resources/agent_name/char_284_spot.png
diff --git a/arknights_mower/resources/agent_name/char_285_medic2.png b/arknights_mower/resources/agent_name/char_285_medic2.png
diff --git a/arknights_mower/resources/agent_name/char_286_cast3.png b/arknights_mower/resources/agent_name/char_286_cast3.png
diff --git a/arknights_mower/resources/agent_name/char_289_gyuki.png b/arknights_mower/resources/agent_name/char_289_gyuki.png
diff --git a/arknights_mower/resources/agent_name/char_290_vigna.png b/arknights_mower/resources/agent_name/char_290_vigna.png
diff --git a/arknights_mower/resources/agent_name/char_293_thorns.png b/arknights_mower/resources/agent_name/char_293_thorns.png
diff --git a/arknights_mower/resources/agent_name/char_294_ayer.png b/arknights_mower/resources/agent_name/char_294_ayer.png
diff --git a/arknights_mower/resources/agent_name/char_298_susuro.png b/arknights_mower/resources/agent_name/char_298_susuro.png
diff --git a/arknights_mower/resources/agent_name/char_301_cutter.png b/arknights_mower/resources/agent_name/char_301_cutter.png
diff --git a/arknights_mower/resources/agent_name/char_302_glaze.png b/arknights_mower/resources/agent_name/char_302_glaze.png
diff --git a/arknights_mower/resources/agent_name/char_306_leizi.png b/arknights_mower/resources/agent_name/char_306_leizi.png
diff --git a/arknights_mower/resources/agent_name/char_308_swire.png b/arknights_mower/resources/agent_name/char_308_swire.png
diff --git a/arknights_mower/resources/agent_name/char_326_glacus.png b/arknights_mower/resources/agent_name/char_326_glacus.png
diff --git a/arknights_mower/resources/agent_name/char_328_cammou.png b/arknights_mower/resources/agent_name/char_328_cammou.png
diff --git a/arknights_mower/resources/agent_name/char_337_utage.png b/arknights_mower/resources/agent_name/char_337_utage.png
diff --git a/arknights_mower/resources/agent_name/char_340_shwaz.png b/arknights_mower/resources/agent_name/char_340_shwaz.png
diff --git a/arknights_mower/resources/agent_name/char_343_tknogi.png b/arknights_mower/resources/agent_name/char_343_tknogi.png
diff --git a/arknights_mower/resources/agent_name/char_344_beewax.png b/arknights_mower/resources/agent_name/char_344_beewax.png
diff --git a/arknights_mower/resources/agent_name/char_349_chiave.png b/arknights_mower/resources/agent_name/char_349_chiave.png
diff --git a/arknights_mower/resources/agent_name/char_356_broca.png b/arknights_mower/resources/agent_name/char_356_broca.png
diff --git a/arknights_mower/resources/agent_name/char_358_lisa.png b/arknights_mower/resources/agent_name/char_358_lisa.png
diff --git a/arknights_mower/resources/agent_name/char_367_swllow.png b/arknights_mower/resources/agent_name/char_367_swllow.png
diff --git a/arknights_mower/resources/agent_name/char_373_lionhd.png b/arknights_mower/resources/agent_name/char_373_lionhd.png
diff --git a/arknights_mower/resources/agent_name/char_376_therex.png b/arknights_mower/resources/agent_name/char_376_therex.png
diff --git a/arknights_mower/resources/agent_name/char_378_asbest.png b/arknights_mower/resources/agent_name/char_378_asbest.png
diff --git a/arknights_mower/resources/agent_name/char_379_sesa.png b/arknights_mower/resources/agent_name/char_379_sesa.png
diff --git a/arknights_mower/resources/agent_name/char_385_finlpp.png b/arknights_mower/resources/agent_name/char_385_finlpp.png
diff --git a/arknights_mower/resources/agent_name/char_4000_jnight.png b/arknights_mower/resources/agent_name/char_4000_jnight.png
diff --git a/arknights_mower/resources/agent_name/char_400_weedy.png b/arknights_mower/resources/agent_name/char_400_weedy.png
diff --git a/arknights_mower/resources/agent_name/char_401_elysm.png b/arknights_mower/resources/agent_name/char_401_elysm.png
diff --git a/arknights_mower/resources/agent_name/char_4093_frston.png b/arknights_mower/resources/agent_name/char_4093_frston.png
diff --git a/arknights_mower/resources/agent_name/char_500_noirc.png b/arknights_mower/resources/agent_name/char_500_noirc.png
diff --git a/arknights_mower/resources/agent_name/char_501_durin.png b/arknights_mower/resources/agent_name/char_501_durin.png
diff --git a/arknights_mower/resources/agent_name/char_502_nblade.png b/arknights_mower/resources/agent_name/char_502_nblade.png
diff --git a/arknights_mower/resources/agent_name/char_503_rang.png b/arknights_mower/resources/agent_name/char_503_rang.png
diff --git a/arknights_mower/resources/recruit_no_lmb.png b/arknights_mower/resources/recruit_no_lmb.png
diff --git a/arknights_mower/utils/matcher.py b/arknights_mower/utils/matcher.py
@@ -128,7 +128,6 @@ def score(self, query: tp.GrayImage, draw: bool = False, scope: tp.Scope = None,
                     query, qry_kp, self.origin, ori_kp, good, None)
                 plt.imshow(result, 'gray')
                 plt.show()
-
             # if the number of good matches no more than 4
             if len(good) <= 4:
                 logger.debug(

diff --git a/arknights_mower/utils/recognize.py b/arknights_mower/utils/recognize.py
@@ -19,7 +19,6 @@
 class RecognizeError(Exception):
     pass
 
-
 class Recognizer(object):
 
     def __init__(self, device: Device, screencap: bytes = None) -> None:
@@ -296,6 +295,7 @@ def find(self, res: str, draw: bool = False, scope: tp.Scope = None, thres: int
         if thres is not None:
             # 对图像二值化处理
             res_img = thres2(loadimg(res, True), thres)
+
             gray_img = cropimg(self.gray, scope)
             matcher = Matcher(thres2(gray_img, thres))
             ret = matcher.match(res_img, draw=draw, judge=judge,prescore=score)

diff --git a/setup.py b/setup.py
@@ -4,7 +4,6 @@
 
 LONG_DESC = Path('README.md').read_text('utf8')
 VERSION = arknights_mower.__version__
-
 setuptools.setup(
     name='arknights_mower',
     version=VERSION,