0O0o0oOoO00
171520adfb
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# config/template.json
# module/config/argument/args.json
# module/config/argument/menu.json
# module/config/argument/task.yaml
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
# module/ui/ui.py
2025-06-28 23:09:47 +08:00
LmeSzinc
b65932b404
Fix: Mute handle_exp_info in META combat
2025-06-26 01:03:18 +08:00
ZuoSiZhu
dee0c1484f
Merge branch 'master_lme' into dev
...
# Conflicts:
# campaign/Readme.md
# module/base/utils.py
# module/coalition/assets.py
# module/config/argument/args.json
# 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/handler/login.py
# module/retire/dock.py
# module/retire/enhancement.py
# module/shop/shop_reward.py
2025-05-21 04:17:08 +08:00
LmeSzinc
dc78ee8d2a
Fix: Handle help popup without black-blurred background
2025-05-12 19:58:00 +08:00
LmeSzinc
6876b5e4ae
Fix: _handle_ash_beacon_reward early ended when retrying BEACON_REWARD
2025-05-09 01:35:06 +08:00
ZuoSiZhu
39c18d8103
Merge remote-tracking branch 'lme/master' into dev
...
# Conflicts:
# deploy/AidLux/0.92/requirements.txt
# module/campaign/campaign_event.py
# module/os/map.py
# module/os_ash/ash.py
# module/webui/config.py
2025-02-28 11:01:23 +08:00
ZuoSiZhu
ad5564cf2f
Add: Meta record
2025-02-19 01:24:46 +08:00
LmeSzinc
c3464e52b1
Make some random changes
...
to fix
error: unable to read sha1 file of module/os_ash/ash.py (aeee4e621d
2025-02-04 01:26:34 +08:00
guoh064
09b6bc179b
Upd: [JP] ash_collect_status ( #4554 )
2025-02-03 22:53:24 +08:00
xhqss
baa8d2ccd7
Merge branch 'master_lme'
...
# Conflicts:
# README.md
# module/ui_white/assets.py
2025-01-19 15:59:20 +08:00
dragonheart107
40961382f9
remove outdated EN -Mail assets, enable EN AUTO-Dossier ( #4478 )
...
* Add files via upload
* Delete assets/cn/freebies/assets.py
* Delete assets/cn/freebies/campaign_14_4.py
* Add files via upload
* Add files via upload
* fix mail
* replaced/removed old EN Mail assets; add EN for AUTO-Dossier; need assets for JP (maybe TW?)
* Better differentiation between META_AUTO-ATTACK_START and META_AUTO-ATTACKING for EN
* revert 14-4 changes due to further testing needed
* Add missing picture for the new UI py function
* updated button extract
---------
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2025-01-15 23:28:41 +08:00
xhqss
e7f93d8efe
Merge branch 'master_lme'
...
# Conflicts:
# module/equipment/equipment.py
2024-12-20 23:51:48 +08:00
LmeSzinc
ba5b853cb9
Refactor: Standardize the use of match_template_color()
2024-12-09 16:09:34 +08:00
xhqss
fad84bb0fa
Merge branch 'master_lme'
2024-11-15 17:14:11 +08:00
guoh064
51c84fc231
tmp: ocr_collect in jp
2024-10-30 12:18:09 +08:00
guoh064
4f79fba2c2
upd: [JP] opsi beacon page color
2024-10-30 12:18:09 +08:00
guoh064
74e241d9ef
Revert "tmp: [JP] opsi beacon page color and assets"
...
This reverts commit 402a0083ef
2024-10-30 12:18:09 +08:00
LA_DI_DA
a2e6986dcd
Merge branch 'refs/heads/LmeSzinc/master' into dev
...
# Conflicts:
# module/campaign/campaign_status.py
# module/exercise/combat.py
# module/retire/dock.py
# module/retire/enhancement.py
2024-10-25 12:01:29 +08:00
guoh064
99363a3c14
upd: [JP] opsi beacon page color
2024-10-21 11:20:34 +08:00
guoh064
d3eb5fa774
Revert "tmp: [JP] opsi beacon page color and assets"
...
This reverts commit 402a0083ef
2024-10-21 10:14:53 +08:00
guoh064
402a0083ef
tmp: [JP] opsi beacon page color and assets
2024-10-16 12:48:21 +08:00
LmeSzinc
9508f7957e
Fix: Handle missing / in BEACON_REMAIN ocr
2024-10-13 17:22:17 +08:00
guoh064
e89063bade
Jp font 20241011 ( #4272 )
...
* tmp: [JP] commission assets
* tmp: [JP] asset RESEARCH_COST_CHECKER
* tmp: [JP] assets in mail batch
* tmp: [JP] opsi get_zone_name color
* tmp: [JP] get_coin and get_oil color
* tmp: [JP] ash_collect_status and get_yellow_coins color
* upd: [JP] resize commission assets recognize size
2024-10-12 14:29:01 +08:00
Zuosizhu
ddcfbb0a97
Merge branch 'master_lme'
...
# Conflicts:
# README.md
# deploy/adb.py
# deploy/pip.py
# module/daily/equipment.py
2024-05-23 02:31:29 +08:00
LmeSzinc
ecfd5d50bf
Upd: [CN] Support UI in 2024.05.21
2024-05-23 01:16:41 +08:00
Zuosizhu
56686833c6
Fix: Ash power limit not safe enough
2023-12-28 01:19:55 +08:00
Zuosizhu
4d4d2377dc
Merge branch 'master_lme'
...
# Conflicts:
# module/device/method/droidcast.py
2023-09-28 18:09:13 +08:00
LmeSzinc
550798bdbb
Merge pull request #2996 from guoh064/meta_reward
...
Add: Dossier Meta Reward Receive
2023-09-25 18:29:46 +08:00
guoh064
5ac54884c8
Opt: Change bit operation to string and list in meta.py
2023-09-09 08:48:42 +08:00
guoh064
179541a1f8
Add: skip_first_screenshot in ensure_dossier_page
2023-09-09 08:48:01 +08:00
Zuosizhu
78d8ed1c5b
Merge branch 'master_lme'
...
# Conflicts:
# assets/gui/css/light-alas.css
# module/config/argument/args.json
# 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/webui/app.py
2023-09-02 17:47:24 +08:00
LmeSzinc
ba03a9c870
Fix: META_AUTO_ATTACK_START is missing after entering _dossier_auto_attack()
2023-08-24 12:36:16 +08:00
guoh064
5032e26240
Fix: Dossier Reward Receive at 70000 pts
2023-08-17 08:03:43 +08:00
Zuosizhu
af06355a75
Merge branch 'LmeSzinc:master' into 20230309
2023-08-13 00:02:41 +08:00
guoh064
a3af072035
Merge branch 'dev' into meta_reward
2023-08-12 14:29:31 +08:00
guoh064
e74df69b29
Add: Dossier Meta Reward Receive
2023-08-12 09:02:21 +08:00
RilyLC
cc92d60b0a
[TW]Fix ash beacons and shipyard ( #2999 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2023-08-11 19:06:10 +08:00
guoh064
73dbbfb714
Opt: Meta category memorization
2023-08-07 18:48:23 +08:00
guoh064
dd7b454459
Rev: Old Dossier Meta Reward(LmeSzinc#2544)
2023-08-07 17:33:51 +08:00
Zuosizhu
68a2ba7c12
Merge branch 'LmeSzinc:master' into 20230309
2023-07-01 20:57:27 +08:00
nEEtdo0d
e88ae341f1
Upd: [EN] various assets for server; war_archive, os_ash, template, and handler
2023-06-30 18:00:33 -04:00
Zuosizhu
1acc700629
Merge branch 'LmeSzinc:master' into 20230309
2023-06-10 02:53:17 +08:00
LmeSzinc
e9d372cefb
Fix: Reverse meta assist help clicks ( #2496 )
2023-06-08 23:22:26 +08:00
Fisher Tipsy
ab0c8d0b85
Add: Allow auto attack dossier ( #2579 )
2023-06-08 22:28:44 +08:00
Zuosizhu
987423a96f
Merge branch 'LmeSzinc:master' into 20230309
2023-05-27 20:30:22 +08:00
LmeSzinc
fa4e8b956c
Fix: META specific BATTLE_STATUS should be prior to general ones ( #2635 )
2023-05-27 18:46:17 +08:00
Zuosizhu
72e5e200ed
Merge branch 'master_lme'
...
# Conflicts:
# README.md
2023-05-26 00:26:23 +08:00
LmeSzinc
df2496824c
Fix: BATTLE_STATUS in META combats
2023-05-25 22:36:57 +08:00
Zuosizhu
4d1fd01511
Merge branch 'master_lme'
...
# Conflicts:
# assets/jp/gacha/BUILD_CUBE_COUNT.png
# module/campaign/run.py
# module/gacha/assets.py
2023-05-15 17:22:33 +08:00
guoh064
5247bb2c0c
Add: Dossier meta_reward receiving
2023-04-30 16:13:17 +08:00
