1
0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-06-27 07:46:48 +08:00

Commit Graph

  • 94e355915e 2. 有一些函数已经改了, 比如 Template.match_result() Template.match_multi() 现在是返回 Button 对象, 而不是坐标点了 Cyunmi 2021-08-12 18:29:34 +08:00
  • e10cb0e042 1. 很多函数直接在 gems_farming 里覆盖就可以了, 不要直接在底层里加 因为只是 gems_farming 自己用的, 不是通用的 Cyunmi 2021-08-12 18:20:35 +08:00
  • e5c9ea54ea clean unuse assert Cyunmi 2021-08-12 08:05:10 +08:00
  • 2f311f1fdd clean debug code Cyunmi 2021-08-12 08:02:19 +08:00
  • ca17b15b75 fix: handle_combat_low_emotion bug Cyunmi 2021-08-12 08:00:53 +08:00
  • 59702082af withdraw when emotion is low Cyunmi 2021-08-12 07:58:03 +08:00
  • a323695cb2 fix auto search continue bug Cyunmi 2021-08-12 07:06:22 +08:00
  • 796556751c add 'name' to level_ocr Cyunmi 2021-08-12 06:35:37 +08:00
  • e61a7b618a finally, it run Cyunmi 2021-08-12 06:14:24 +08:00
  • f930709793 add auto search gems farming Cyunmi 2021-08-12 05:19:39 +08:00
  • 1951a76d65 Fix: [EN] DOCK_SELECTED, for gems_farming module nEEtdo0d 2021-08-11 13:16:13 -04:00
  • c17a22bf33 Fix: shop_*_check_item, because only general shop detects cost LmeSzinc 2021-08-11 11:10:37 +08:00
  • 723f4929d2 Fix: [JP] Price detection in medal shop (#567) LmeSzinc 2021-08-11 02:03:54 +08:00
  • 64f60c9713 Opt: Move shop items all together LmeSzinc 2021-08-10 02:25:42 +08:00
  • a4a2e62c34 Opt: Disable cost detection in shop when it's unnecessary LmeSzinc 2021-08-10 02:15:18 +08:00
  • 1df4f70035 Upd: [CN] SHOP_MEDAL LmeSzinc 2021-08-10 02:11:29 +08:00
  • b1b73023bd Merge pull request #566 from railzy/asset LmeSzinc 2021-08-09 22:31:34 +08:00
  • 54e27c21c0 Fix: [JP] DOCK_SELECTED asset Ray 2021-08-09 19:50:31 +08:00
  • aa4a2d8ef6 Merge branch 'master' into gems_farming Cyunmi 2021-08-09 17:08:25 +08:00
  • d76da5526e Fix: [JP] guild boss EXP_INFO_CF asset Ray 2021-08-09 17:01:39 +08:00
  • 4c4321777d prepare to merge Cyunmi 2021-08-09 16:50:36 +08:00
  • b0ebc690b3 Merge branch 'LmeSzinc/master' into asset Ray 2021-08-09 08:58:38 +08:00
  • bb04db4e1e Fix: [JP] SHOP&BUILD&ACADEMY assets Ray 2021-08-08 23:33:54 +08:00
  • adbb8f974f Merge branch 'master' of github.com:LmeSzinc/AzurLaneAutoScript into asset Ray 2021-08-08 23:14:56 +08:00
  • 8e5e7ecd1e Opt: Guild shop buy and update CN guild shop assets LmeSzinc 2021-08-08 23:00:17 +08:00
  • 4c2669d4de Fix: [EN] sub fleet not handled, map/SUBMARINE_* assets updated nEEtdo0d 2021-08-08 08:39:45 -04:00
  • 769ba66dc4 Merge pull request #565 from railzy/shipyard nEEtdo0d 2021-08-08 07:47:32 -04:00
  • d5a4b7c24b Fix: return right BP count of target index Ray 2021-08-08 19:08:04 +08:00
  • 3f1c8ea451 Fix: [JP] shipyard assets Ray 2021-08-08 18:24:09 +08:00
  • ef1478bcba Fix: [JP] meowfficer reward assets Ray 2021-08-08 17:11:50 +08:00
  • edadb6949c Fix: [JP] retire&gacha assets except DOCK_SELECTED Ray 2021-08-08 17:01:47 +08:00
  • f08ce025d8 Fix: [JP] equipment assets Ray 2021-08-08 16:42:28 +08:00
  • 2b0c3afbe0 Fix: [JP] shipyard assets except RESEARCH_COMPLETE Ray 2021-08-08 15:55:54 +08:00
  • 40e9004808 Fix: [EN] restore previous conditional only for EN, as POPUP_CONFIRM is not the same (uses lowercase and scaling). nEEtdo0d 2021-08-07 19:11:23 -04:00
  • eecb957a04 Add: support to run reward loop during OS nEEtdo0d 2021-08-07 14:42:11 -04:00
  • 6148b5053f Merge remote-tracking branch 'origin/dev' nEEtdo0d 2021-08-07 13:36:36 -04:00
  • 89268f1769 Merge pull request #555 from nEEtdo0d/shop_and_shipyard_dev nEEtdo0d 2021-08-07 12:52:49 -04:00
  • b220d4d8ea Upd: [CN] Assets for shop module, but still having issues in guild shop LmeSzinc 2021-08-08 00:41:21 +08:00
  • 9970eb7818 Upd: shipyard module convert to Navbar for selection, update config interface base parameters nEEtdo0d 2021-08-07 10:52:44 -04:00
  • bf9f54ea6e Opt: Capture all screenshots in commission drop LmeSzinc 2021-08-07 22:11:19 +08:00
  • 6101af90a9 Upd: convert to Navbar for selection of target ship, increment base shipyard_index to adapt to new index range nEEtdo0d 2021-08-07 09:43:08 -04:00
  • 26239da44b Opt: User ensure_no_info_bar() in commission drop waiting LmeSzinc 2021-08-07 15:58:55 +08:00
  • 772bf15f62 Merge branch 'master' into dev LmeSzinc 2021-08-07 14:32:31 +08:00
  • 59a17f59e5 Opt: Return objects instead of index in Filter.apply() LmeSzinc 2021-08-07 14:29:34 +08:00
  • b9d3617c74 Add: Save and upload commission drop screenshots LmeSzinc 2021-08-07 14:26:28 +08:00
  • 1bab25cc50 Merge pull request #562 from railzy/asset LmeSzinc 2021-08-07 14:20:34 +08:00
  • 847b5376b5 Fix: [JP] SHIPYARD_CHECK asset Ray 2021-08-07 13:55:32 +08:00
  • 235c88df96 Fix: base case conditions, lost in merge transit nEEtdo0d 2021-08-06 12:00:13 -04:00
  • 10c14e2160 Fix: Resolve merge conflict, buttons() to buttons nEEtdo0d 2021-08-05 23:24:42 -04:00
  • 060bae3d18 Fix: shop/shop_reward due to refactor, base case correction in shipyard/ui nEEtdo0d 2021-08-05 23:20:33 -04:00
  • c6a53d8dc0 Upd: Refactor module build to module gacha nEEtdo0d 2021-08-05 23:19:23 -04:00
  • 9b6a997de4 Merge remote-tracking branch 'origin/reward_shop_rebirth' into shop_and_shipyard_dev nEEtdo0d 2021-08-01 20:33:48 -04:00
  • 9b94daa68c Fix: split usage of _shipyard_calculate for either information or payment, correct 'start' local variable for 'remain' > 0 nEEtdo0d 2021-08-01 20:29:53 -04:00
  • dc8a2862e3 Fix: module shop missing dict items, module build assets, and etc. nEEtdo0d 2021-07-31 23:28:40 -04:00
  • 9f284d66ea Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into shop_and_shipyard_dev nEEtdo0d 2021-07-31 23:16:39 -04:00
  • 29ef242183 Fix: equipment and guild module imports nEEtdo0d 2021-07-31 23:13:09 -04:00
  • 7ef32b794a Add: [EN] gui interface for module shipyard, shipyard handling into module reward nEEtdo0d 2021-07-31 22:42:08 -04:00
  • af63450d01 Add: shipyard module to buy discounted pr1 bps nEEtdo0d 2021-07-31 22:33:39 -04:00
  • a53da1664b Add: [EN] module shipyard assets nEEtdo0d 2021-07-31 22:29:03 -04:00
  • 21558679aa Add: [EN] dictionary entries for module shop nEEtdo0d 2021-07-31 22:26:20 -04:00
  • a4382e76ee Add: [EN] module build assets nEEtdo0d 2021-07-31 22:23:04 -04:00
  • b28a1fc5d2 Add: research series 4 assets and dict updates for module shop nEEtdo0d 2021-07-31 22:19:17 -04:00
  • f17d6cc221 Merge remote-tracking branch 'origin/master' into reward_shop_rebirth nEEtdo0d 2021-07-31 22:13:23 -04:00
  • 71669f5dcf Merge pull request #554 from cola228/master LmeSzinc 2021-07-29 23:27:31 +08:00
  • 109d41e15b Fix: [TW] Research_* asset Cola 2021-07-29 22:57:52 +08:00
  • 8069e4b50a Merge pull request #552 from Zorachristine/master LmeSzinc 2021-07-29 22:07:57 +08:00
  • bfb655fc88 Add: [TW] Aurora Noctis Zorachristine 2021-07-28 17:45:57 +08:00
  • c87ab49326 Merge pull request #549 from railzy/asset LmeSzinc 2021-07-26 17:47:16 +08:00
  • 943dc8bb2e Fix: [JP] MEOWFFICER_INFO & guild boss assets Ray 2021-07-26 16:01:25 +08:00
  • f30b3676d9 Fix: Guild side bar and equipment side bar Reverted to the original ones, they are different from page_build nEEtdo0d 2021-07-25 19:36:56 -04:00
  • f6cf43960d Merge remote-tracking branch 'origin/master' into reward_shop_rebirth nEEtdo0d 2021-07-25 14:34:36 -04:00
  • 22e8b73570 Merge branch 'master' into dev LmeSzinc 2021-07-25 21:24:30 +08:00
  • 8f80ee34bd Opt: Low cost farming in Azur Anthem LmeSzinc 2021-07-25 20:31:59 +08:00
  • 5e5a7f4ed1 Add: Gems farming entrance in GUI LmeSzinc 2021-07-25 20:08:16 +08:00
  • 5aa75a95a9 Fix: Guild side bar and equipment side bar LmeSzinc 2021-07-25 01:17:53 +08:00
  • b373a38a85 Upd: [CN] Meowfficer fort assets LmeSzinc 2021-07-24 21:03:38 +08:00
  • a0a9de5ecf Merge branch 'master' into dev LmeSzinc 2021-07-24 20:45:50 +08:00
  • 4f9458261d Upd: [CN] BOOK_CHECK_PREP (#538) LmeSzinc 2021-07-24 18:22:04 +08:00
  • 63de5be652 Fix: Conflicts among branches LmeSzinc 2021-07-24 17:47:34 +08:00
  • e918a5db97 Merge branch 'gems_farming' into dev LmeSzinc 2021-07-24 17:33:58 +08:00
  • 83b2b49cd6 Merge pull request #544 from nEEtdo0d/comf_fort LmeSzinc 2021-07-24 17:28:24 +08:00
  • 2685f3ab07 Merge branch 'dev' into comf_fort LmeSzinc 2021-07-24 17:28:15 +08:00
  • e45cd767fd Merge pull request #527 from nEEtdo0d/reward_shop_rebirth LmeSzinc 2021-07-24 17:24:42 +08:00
  • 706ffc8a75 Fix: Wrong fleet to change flagship in gems farming LmeSzinc 2021-07-24 17:22:04 +08:00
  • b0d1ef5697 Fix: Siren templates in Azur Anthem SP LmeSzinc 2021-07-23 23:50:32 +08:00
  • e416b92f7a Fix: Resolve merge conflict ui/assets.py nEEtdo0d 2021-07-23 10:21:26 -04:00
  • 5bd518cbc1 Merge remote-tracking branch 'origin/master' into comf_fort nEEtdo0d 2021-07-23 10:19:27 -04:00
  • 2e74d619a2 Merge pull request #539 from nEEtdo0d/quick_fix LmeSzinc 2021-07-23 21:26:38 +08:00
  • 5b7a31b462 Add: Siren templates in Azur Anthem SP4 LmeSzinc 2021-07-23 21:01:37 +08:00
  • 7ec9e0d88f Add: Siren templates in Azur Anthem SP3 LmeSzinc 2021-07-23 20:15:05 +08:00
  • 6d06346210 Add: Azur Anthem Event maps LmeSzinc 2021-07-23 18:26:24 +08:00
  • 7a56028cfb Add: Event entrance of Azur Anthem (The Idol Master Collaboration) LmeSzinc 2021-07-23 16:39:56 +08:00
  • ecf1a7bdf9 Fix: Daily commissions in The Idol Master Event, according to DOA Event LmeSzinc 2021-07-23 16:34:51 +08:00
  • 4fbfdc7ba2 Revert "Opt: Remove code for DOA commissions to avoid errors in the future" LmeSzinc 2021-07-23 16:17:09 +08:00
  • 9abe459fdc Fix: Lock new ships in auto search combat LmeSzinc 2021-07-23 16:03:52 +08:00
  • 3c7a58c7df Dev: Update research project data extractor and its generated data LmeSzinc 2021-07-23 16:01:36 +08:00
  • ad6a2447ae Del: Comment guild mission auto choose LmeSzinc 2021-07-23 15:59:17 +08:00
  • 5c93d0f9ce Fix: Guild operation BOSS 1/1 detection LmeSzinc 2021-07-23 15:51:21 +08:00
  • 70a327158f Merge pull request #548 from nEEtdo0d/exercise_asset LmeSzinc 2021-07-23 15:50:30 +08:00
  • 9cb12f8a36 Fix: merge conflict reward/assets.py nEEtdo0d 2021-07-22 18:41:57 -04:00