0O0o0oOoO00
45ac6bdf45
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/retire/assets.py
# module/retire/dock.py
2025-06-05 23:53:43 +08:00
LmeSzinc
6d7e43974a
Fix: handle game tips that infos skin feature when entering dock
2025-05-29 22:48:01 +08:00
ZuoSiZhu
3c63b8d65d
adj: GemsFarming allow low vanguard level when hook is enabled
2025-05-12 23:28:44 +08:00
ZuoSiZhu
7e3e97a5d9
Fix: Shit from deep_get
2025-03-28 01:20:07 +08:00
ZuoSiZhu
df7937ce05
Fix: Spellings
2025-03-14 09:05:18 +08:00
ZuoSiZhu
b82b79988d
Merge remote-tracking branch 'lme/master' into dev
...
# Conflicts:
# module/config/argument/override.yaml
2025-03-14 00:57:23 +08:00
guoh064
edb8bcb5c7
Fix: vanguard_change logic ( #4636 )
...
* Add: support list types limitations in Ship class
* Opt: get_common_rarity_dd logic
get_common_rarity_dd should always check all available
ships and not just the ones in the current fleet.
2025-03-10 23:30:02 +08:00
qinsgit
c857ed4e22
Fix: spelling mistakes ( #4648 )
...
Co-authored-by: qinsgit <123123123@qq.com >
2025-03-10 23:28:12 +08:00
LA_DI_DA
803e96c14e
feat: use higher emotion ship when changing vanguard
2025-02-16 13:43:58 +08:00
LA_DI_DA
3fb870b605
fix: call __init__ of parent classes in GemsFarming
2025-02-14 18:55:10 +08:00
LA_DI_DA
39b4783723
fix: do not use original GemsFarming
2025-02-14 18:18:14 +08:00
LA_DI_DA
791c62d455
opt(GemsFarming): use self-inherit to override functions from original class
2025-02-14 13:47:54 +08:00
xhqss
066d2acb24
Rollback the version of gems_farming.py to the state before merging on 2025/01/16.
2025-01-19 20:17:11 +08:00
xhqss
2ddc7fff1c
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/gems_farming.py
# module/config/config_manual.py
# module/handler/assets.py
# module/retire/retirement.py
# module/tactical/tactical_class.py
2025-01-16 08:52:42 +08:00
sui_feng
9b61faf308
Fix: z20_or_z21 should be filtered by any ship ( #4494 )
2025-01-07 11:19:21 +08:00
LmeSzinc
4a2eb4470c
Opt: Combine dock filter operations to skip waiting dock loaded
2025-01-04 00:02:29 +08:00
Zuosizhu
784f1c8aff
Merge Lme/Master into dev
2024-07-21 14:51:18 +08:00
Zuosizhu
87b44b2f57
Fix: Auto prepare ships for hard GemsFarming
2024-07-21 04:26:49 +08:00
Zuosizhu
ae45257731
Adj: Fuck FleetNumberInHardMode Setting, bind it with FleetOrder
2024-07-20 15:10:27 +08:00
guoh064
11e3580c61
Opt: always keep common cv at retirement if GemsFarming enabled
2024-07-19 12:33:50 +08:00
LA_DI_DA
573210af2b
Merge branch 'refs/heads/lme-alas/master' into dev
...
# Conflicts:
# alas.py
# module/os/fleet.py
2024-06-22 20:31:35 +08:00
Air111
a70d4c4675
Upd: add CommonDD option ( #3786 )
...
* Upd: add dd combination z20_or_z21
* Upd: add dd option favourite
* Opt: use fation to filter Z20 or Z21
2024-06-14 03:39:20 +08:00
LmeSzinc
58202c6a40
Pref: Reuse image array to improve memory performance
2024-06-05 01:15:41 +08:00
LA_DI_DA
7b81250ec9
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# campaign/Readme.md
# module/config/argument/args.json
2024-04-27 15:56:34 +08:00
Air111
194ec3e234
Fix: lower SIM_VALUE in ship matching of GemsFarming
2024-04-19 21:48:50 +08:00
Air111
0eee91a891
Fix: scan ships in correct fleet
2024-04-19 21:46:26 +08:00
Air111
cddfea680d
Fix: rename equip_enter
2024-04-19 14:13:18 +08:00
Zuosizhu
0b2f9ed81c
Merge branch 'dev'
...
# Conflicts:
# campaign/campaign_main/campaign_15_1.py
# campaign/campaign_main/campaign_15_2.py
# campaign/campaign_main/campaign_15_3.py
# campaign/campaign_main/campaign_15_4.py
2024-04-19 02:17:51 +08:00
Air111
2507b0fa6b
Upd: Flagship changing ( #3556 )
...
* Upd: Flagship changing asset
* Upd: Equipment enter
* Upd: Fleet detail check
* Refactor: equipment changing
* Upd: asset exercise/EQUIP_ENTER
* Refactor: rename equipment functions
* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears
* Upd: [CN] assets EQUIP_1/2/3
* Fix: skip first screenshot in equipment.py
2024-04-19 01:40:40 +08:00
guoh064
9388666d1d
Fix: fall back to all union DDs when not specifying DD ( #3648 )
2024-04-18 12:14:57 +08:00
Zuosizhu
8aba12c7a5
Fix: Unable to retire when retire method set to enhance when entering hard event
2024-04-12 23:46:14 +08:00
xhqss
7e1fd52ba6
Merge branch '20230309' into smallkai
2024-04-12 18:48:45 +08:00
Zuosizhu
07e9d88b71
Fix: Merge mistakes(Stuck when changing flagship at hard event)
2024-04-12 13:50:55 +08:00
xhqss
765eeed754
Merge branch '20230309' into smallkai
2024-04-11 22:12:34 +08:00
Zuosizhu
69aebdcf30
Merge branch 'master_lme'
...
# Conflicts:
# config/template.json
# deploy/Windows/app.py
# deploy/Windows/config.py
# deploy/Windows/emulator.py
# deploy/Windows/git.py
# deploy/Windows/logger.py
# deploy/Windows/template.yaml
# module/campaign/gems_farming.py
# module/config/argument/args.json
# module/config/argument/argument.yaml
# module/config/config_generated.py
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
# module/config/i18n/zh-TW.json
# module/device/device.py
# module/device/emulator.py
# module/device/method/droidcast.py
# module/device/platform/emulator_base.py
# module/device/platform/emulator_windows.py
# module/device/platform/platform_windows.py
# module/handler/auto_search.py
2024-04-10 12:22:40 +08:00
LmeSzinc
010d4aa812
Chore: Raise error when receiving invalid CommonDD setting
2024-04-08 22:54:44 +08:00
ygrzxc
7d574dde8b
Add: Change the designated vanguard combination ( #3520 )
...
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Translation for change the designated vanguard combination
* Add: Translation for change the designated vanguard combination
* Upd:Update dev's args.json
* Upd:Update dev's args.json
* Upd:Reduce template image size and Implement function
* Upd:Reduce template image size and Implement function
* Upd:Reduce template image size and Implement function
---------
Co-authored-by: y y <jaxvuav@163.com >
2024-04-08 22:49:30 +08:00
Air111
1decd3d6a1
Fix: Reset dock sorting after changing ship ( #3608 )
2024-04-04 19:31:26 +08:00
LmeSzinc
31462288bd
Opt: Reset dock sorting after changing flagship ( #3532 )
2024-04-04 00:02:19 +08:00
LA_DI_DA
3dba1cf7f9
Add: ship filter for GemsFarming
2024-03-04 22:35:19 +08:00
LA-DI-DA
0252b8bcc0
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
2024-01-12 10:31:19 +08:00
Zuosizhu
c6f1e43f8b
Fix: Handle retirement while changing ships in Hard Gems farming
2024-01-12 09:50:21 +08:00
LA-DI-DA
c921b04fe0
Merge branch 'zuosizhu-alas/20230309' into smallkai-dev
2024-01-02 23:06:15 +08:00
Zuosizhu
0a6d26ed66
Fix: Catch errors during handling RequestHumanTakeover in GemsFarming
2023-12-29 14:38:30 +08:00
Zuosizhu
9d7d0474ce
Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming ( #3387 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2023-12-29 09:59:09 +08:00
Zuosizhu
9a2dd88b80
Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming
2023-12-28 15:52:21 +08:00
Zuosizhu
bcb6c20ce9
Fix: Raise RequestHumanTakeover too fast when retiring ships
...
at hard entry
2023-12-25 12:42:05 +08:00
Zuosizhu
252c021a49
Fix: Handle retirement when changing ships in hard mode. Handle no flagships after retirement.
2023-12-25 01:10:30 +08:00
Zuosizhu
50aef0ec0f
Fix: Same ships are black when changing hard mode flagships
2023-12-24 18:57:53 +08:00
LA-DI-DA
b05dc58c11
Merge branch 'zuosizhu-alas/20230309' into smallkai
2023-11-19 23:34:44 +08:00
