Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] mydev from LmeSzinc:master #684

Open
wants to merge 224 commits into
base: mydev
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 14, 2024

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

LmeSzinc and others added 9 commits October 10, 2024 22:13
* Upd:Adds the Meowfficer maximum level option for enhance

* Upd:Move ocr and judgment logic out of the loop

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: yx800 <yoyo.duan@cfnet.com.cn>
* 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
because random ship background triggers GET_SHIP
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Oct 14, 2024
zhenghan123 and others added 30 commits February 6, 2025 22:25
* Update Readme.md

* Update args.json

* Update zh-CN.json

* Update args.json

* Update ja-JP.json

* Update en-US.json

* Update Readme.md

* Update Readme.md

* Update en-US.json
Fix: asset name of PAUSE_HolyLight
* fix: add PAUSE_HolyLight at `_at_low_hp`

* fix: handle map file name
* Fix bugs (#4569)

* fix: add PAUSE_HolyLight at `_at_low_hp`

* fix: handle map file name

* Bugfix
Resolved misrecognition of EXP_INFO_B in campaign_main_2 and campaign_main_3.
Refer to issue #4553.
Reason was the background map was similar to the exp info page.
Recognition also appears in-stage since the chapter name flashes past but this will have no adverse affects.

* Remove mistakenly ctrl-c-ed override

---------

Co-authored-by: 霞飛 <saarchaffee@qq.com>
Corrected scroll action: should scroll to next page, not the bottom.
- TODO: [EN][JP][TW] Update OCR_GUILD_OPERATIONS_PROGRESS
- TODO: [EN][JP][TW] Update SYNC_ENTER SYNC_TAP
to satisfy current code standard
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.