1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-18 14:57:17 +08:00

Commit Graph

  • f6327b655d Fix: Handle guild popup in login LmeSzinc 2021-02-04 00:02:45 +08:00
  • 55b0a08044 Merge branch 'dev' LmeSzinc 2021-02-03 17:25:02 +08:00
  • 59a488c0c1 Opt: GUI description of OS functions to prevent incorrect usage LmeSzinc 2021-02-03 17:24:23 +08:00
  • 6cad5429ee Opt: GUI description of hard settings, since daily hard use auto search now LmeSzinc 2021-02-03 17:07:40 +08:00
  • bccd5650d0 Fix: Move STORY_SKIP to avoid clicking on HOME button LmeSzinc 2021-02-03 16:59:38 +08:00
  • dc4b2a5026 Fix: Handle camera refocus after ash attack LmeSzinc 2021-02-03 15:08:14 +08:00
  • d8f4d4338c Merge branch 'master' into dev LmeSzinc 2021-02-03 01:10:27 +08:00
  • 41abcb780c Fix: Handle guild exchange refresh bug when running across days LmeSzinc 2021-02-03 01:05:17 +08:00
  • 9032f07185 Opt: Use auto search in daily hard LmeSzinc 2021-02-02 17:11:49 +08:00
  • 8af17fe1f9 Fix: Wait expected emotion reduce of the whole map if auto search disabled LmeSzinc 2021-02-02 16:34:33 +08:00
  • 7d4b36dde0 Merge branch 'master' into dev LmeSzinc 2021-02-01 17:43:11 +08:00
  • 05ecbe682a Upd: [CN] MAP_WORLD in os_handler LmeSzinc 2021-02-01 17:37:35 +08:00
  • ae681d7af3 Merge pull request #327 from nEEtdo0d/revised_enhance Kyo 2021-01-31 22:55:40 -03:00
  • 374002eb8a Del: Filter assets all servers, effectively moved to new filter set system nEEtdo0d 2021-01-31 20:27:20 -05:00
  • d2d4e23391 Del: Old switch objects and methods relating to their usage nEEtdo0d 2021-01-31 19:53:55 -05:00
  • 5a33291944 Fix: Update handler assets.py, forgot in last PR nEEtdo0d 2021-01-31 19:50:55 -05:00
  • fc64b2fa48 Add: Asset-less set filter implementation using color count nEEtdo0d 2021-01-31 19:22:26 -05:00
  • 4797565148 Merge branch 'master' into dev LmeSzinc 2021-02-01 00:14:36 +08:00
  • 3d27c5b94d Fix: Auto search finish check LmeSzinc 2021-01-31 23:50:30 +08:00
  • d521cd051a Add: enable_os_ash_attack to GUI LmeSzinc 2021-01-31 18:28:54 +08:00
  • 7b69aaf320 Add: Do ash beacon attack in os_clear_map LmeSzinc 2021-01-31 18:12:34 +08:00
  • d8fce2b1e1 Merge pull request #326 from nEEtdo0d/my_neet Kyo 2021-01-30 13:55:58 -03:00
  • fd61568ad0 Add: USE_DATA_KEY_NOTIFIED action to remove pop up in subsequent runs nEEtdo0d 2021-01-30 11:52:04 -05:00
  • 4d356b27d9 Fix: war_archives triggered_stop_condition inheritance argument oil_check nEEtdo0d 2021-01-30 11:49:07 -05:00
  • c1bcfa60e7 Fix: Combat detection if fleet lock enabled in OS clear map LmeSzinc 2021-01-30 20:25:36 +08:00
  • 1e5813ddb3 Merge branch 'master' into dev LmeSzinc 2021-01-30 10:54:13 +08:00
  • bae2ee8a64 Fix: Change equipment for the first fleet if multiple daily fleets are set (#324) LmeSzinc 2021-01-30 10:34:05 +08:00
  • 26c484bd87 Fix: auto search in event daily AB LmeSzinc 2021-01-28 14:11:06 +08:00
  • 14c3dc9b0c Merge branch 'master' into dev LmeSzinc 2021-01-28 12:29:13 +08:00
  • 8e84099073 Fix: [EN] Fleet side bar server difference LmeSzinc 2021-01-28 12:27:00 +08:00
  • 7873c87c9b Merge pull request #321 from nEEtdo0d/update_asset Kyo 2021-01-27 22:38:18 -03:00
  • 153ce2a884 Merge pull request #322 from nEEtdo0d/auto_search Kyo 2021-01-27 22:37:46 -03:00
  • b2f1b21e9b Add: [EN] AUTO_SEARCH_* assets, Verified AUTO_SEARCH_SET_* are at the same location as CN for EN, likely other servers share this same trait nEEtdo0d 2021-01-27 18:28:18 -05:00
  • eabede70e1 Fix: Merge latest and resolve conflict in module/campaign/run.py nEEtdo0d 2021-01-27 15:34:37 -05:00
  • 47ab56713f Opt: Transfer of detection status for hard campaign Ensure if already True, does not get overwritten If SP/AB enabled, their run will do handle_guild and reset the global configuration when executed If disabled, reward_when_finished will do so instead nEEtdo0d 2021-01-27 15:16:31 -05:00
  • f6fdb1e5ec Fix: Auto fallback to original mode if a map don't have auto search LmeSzinc 2021-01-28 02:58:25 +08:00
  • cc5972365d Opt: Add additional parameter to select ui_click calls during daily Transfer detection status to ensure reward_when_finished or continuing campaign run will execute handle_guild nEEtdo0d 2021-01-27 13:50:26 -05:00
  • c244575c94 Fix: _emotion_expected_reduce when using one fleet to clear all LmeSzinc 2021-01-28 00:43:06 +08:00
  • 16217c8f98 Revert "Opt: Add notice for enable_auto_search (#317)" LmeSzinc 2021-01-28 00:36:58 +08:00
  • 5ac50e6910 Add: Support auto search LmeSzinc 2021-01-28 00:35:15 +08:00
  • ec227a039b Merge remote-tracking branch 'origin/master' into update_asset nEEtdo0d 2021-01-27 04:58:47 -05:00
  • 68398860f7 Add: predict_meowfficer in OS LmeSzinc 2021-01-27 15:33:36 +08:00
  • d6ed48ad4c Merge branch 'master' into dev LmeSzinc 2021-01-27 14:48:25 +08:00
  • c6d5438408 Fix: Cover ENABLE_MAP_FLEET_LOCK in daily hard only, not effect event daily LmeSzinc 2021-01-27 14:45:37 +08:00
  • acd4d6c55a Del: combat already calls combat_status however may end too early, look into further at another time nEEtdo0d 2021-01-26 15:10:22 -05:00
  • b4dd5b2d96 Opt: Daily can also trigger guild pop up, cancel when encountered nEEtdo0d 2021-01-26 14:43:16 -05:00
  • bb9ebc524e Opt: Match guild pop up handling to predecessor handle_popup_* calls nEEtdo0d 2021-01-26 13:55:21 -05:00
  • e6549510f5 Fix: Move switch action into loop to ensure able to select beacon nEEtdo0d 2021-01-26 13:48:38 -05:00
  • c040a551ef Fix: Guild logistics can't start guild mission because exiting too fast LmeSzinc 2021-01-26 18:39:03 +08:00
  • f26fe7b750 Fix: Handle ash popup LmeSzinc 2021-01-26 18:17:52 +08:00
  • 711fcf76a5 Add: Add os_clear_map to GUI LmeSzinc 2021-01-26 17:40:14 +08:00
  • 0077eb4d9c Add: Operation siren clear full map LmeSzinc 2021-01-26 17:07:34 +08:00
  • 7dbb832ecc Fix: Add missing assets AUTO_SEARCH_SET_* LmeSzinc 2021-01-26 16:00:15 +08:00
  • 4c81593a3c Fix: Empyreal Tragicomedy SP LmeSzinc 2021-01-26 14:45:40 +08:00
  • af1984fb59 Merge pull request #320 from railzy/master LmeSzinc 2021-01-26 14:44:13 +08:00
  • fb7e62593c update jp ui assets Ray 2021-01-26 14:22:01 +08:00
  • 5ff51be75a Merge pull request #319 from railzy/master LmeSzinc 2021-01-26 13:15:31 +08:00
  • b089097d30 update assets of jp os_ash Ray 2021-01-26 11:02:12 +08:00
  • cebb785e14 Merge pull request #318 from noname94/patch1 LmeSzinc 2021-01-24 15:53:45 +08:00
  • 7031594850 Revert "Fix: [JP] Camera positioning after fleet switch" noname94 2021-01-24 16:13:37 +09:00
  • 27b49b736a Fix: [JP] MAP_STAR_n assets fixed noname94 2021-01-24 15:54:08 +09:00
  • e7bbcb9e56 Fix: Reduce detection area of ASH_ENTRANCE in os ash assistant LmeSzinc 2021-01-24 01:47:36 +08:00
  • 8d96f7eff2 Opt: Add notice for enable_auto_search (#317) LmeSzinc 2021-01-23 23:21:14 +08:00
  • 8e9e62bb27 Add: Entrance of auto search, but not fully supported yet LmeSzinc 2021-01-22 23:50:44 +08:00
  • 237c871d7d Opt: Add logging STOP_IF_MAP_REACH when parsing map info LmeSzinc 2021-01-22 20:50:02 +08:00
  • 45c50bda29 Fix: Fleet choosing, since AL has changed its logic LmeSzinc 2021-01-22 18:51:15 +08:00
  • c2f23ab5fd Del: Delete spare fleet LmeSzinc 2021-01-22 17:02:35 +08:00
  • 7f6cb62ac2 Add: Empyreal Tragicomedy chapter SP LmeSzinc 2021-01-22 16:40:15 +08:00
  • 8893167dd1 Merge pull request #314 from nEEtdo0d/update_asset Kyo 2021-01-21 16:03:37 -03:00
  • 2e511493cc Opt: Already checked in guild_reward.py, unneeded guard nEEtdo0d 2021-01-21 12:59:08 -05:00
  • 55b7e801cb Add: [EN] AUTO_SEARCH_* assets nEEtdo0d 2021-01-21 12:56:00 -05:00
  • d49bfd1c95 Fix: Empyreal Tragicomedy chapter D LmeSzinc 2021-01-22 00:04:56 +08:00
  • b83067e7d9 Fix: Illustrious on A5 can't be reached in Empyreal Tragicomedy A2 C2 (#313) LmeSzinc 2021-01-21 23:22:55 +08:00
  • 1b28451f98 Fix: 2-4 perspective parameters LmeSzinc 2021-01-21 23:03:59 +08:00
  • 1d20dd8827 Add: Empyreal Tragicomedy chapter B LmeSzinc 2021-01-21 22:43:50 +08:00
  • 9f5a1f05c1 Add: Empyreal Tragicomedy chapter C LmeSzinc 2021-01-21 22:20:54 +08:00
  • 20bea7a112 Add: Empyreal Tragicomedy A3 LmeSzinc 2021-01-21 20:05:10 +08:00
  • 453b38f15c Fix: Handle auto search, disable it currently LmeSzinc 2021-01-21 19:54:36 +08:00
  • 191274c10c Add: Empyreal Tragicomedy A2 AS2 LmeSzinc 2021-01-21 17:25:25 +08:00
  • 4855cab4a2 Add: Empyreal Tragicomedy A1 AS1 LmeSzinc 2021-01-21 15:33:44 +08:00
  • 75aac75009 Add: Event entrance of Empyreal Tragicomedy LmeSzinc 2021-01-21 14:46:29 +08:00
  • e21b3546a1 Fix: Clicking get items when is in map in OS semi auto LmeSzinc 2021-01-21 11:30:43 +08:00
  • 7a9828e26b Merge pull request #312 from nEEtdo0d/guild_unfilled LmeSzinc 2021-01-21 11:10:17 +08:00
  • de5f74211c Opt: From Info template check to red color count check nEEtdo0d 2021-01-20 21:54:07 -05:00
  • b60dea9bb9 Merge pull request #311 from nEEtdo0d/guild_unfilled Kyo 2021-01-20 16:03:54 -03:00
  • 3739b3045a Fix: Exit too early to join operation Ensure if join operation is present, click Ensure if unable to join operation click safe area to exit to reach page that can exit nEEtdo0d 2021-01-20 13:48:32 -05:00
  • 62082f3081 Del: Clean up unused code and assets in guild module LmeSzinc 2021-01-20 22:40:20 +08:00
  • f7528eea58 Opt: guild reward for less clicking LmeSzinc 2021-01-20 22:21:55 +08:00
  • 46d1430860 Merge branch 'master' into dev LmeSzinc 2021-01-20 21:53:08 +08:00
  • 93503951c6 Opt: Rework fleet switching in guild operation dispatch LmeSzinc 2021-01-20 21:51:11 +08:00
  • d5512cffa4 Merge pull request #310 from noname94/patch1 Kyo 2021-01-19 14:58:48 -03:00
  • 5426dfc295 Fix: [JP] Location of HP bar and ship level noname94 2021-01-20 02:36:52 +09:00
  • e85be55bc1 Add: [JP] GUILD_POPUP_* assets added. noname94 2021-01-20 02:33:07 +09:00
  • 4c60eeb9e6 Merge pull request #309 from nEEtdo0d/guild_unfilled LmeSzinc 2021-01-20 01:12:13 +08:00
  • e513b63907 Add: [EN] GUILD_DISPATCH_FLEET_UNFILLED asset nEEtdo0d 2021-01-19 11:53:48 -05:00
  • 343b5b4613 Fix: Reset GUILD_POPUP_TRIGGERED in campaign object LmeSzinc 2021-01-20 00:21:35 +08:00
  • 5dd017bb7d Opt: Reset interval to avoid logging exchange info frequently LmeSzinc 2021-01-20 00:10:57 +08:00
  • 328810219a Opt: Guild operation dispatch LmeSzinc 2021-01-20 00:07:46 +08:00
  • 136a7d23f7 Upd: [CN][TW] Allow choosing guild operation in GUI LmeSzinc 2021-01-19 23:45:09 +08:00
  • 9100113ce9 Fix: guild_interval reset before use LmeSzinc 2021-01-19 17:09:18 +08:00