iaun

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • a4c0fc6056 Merge nearaura dev through ac712acc for demon entrance recognition Runhey returned Repository not found. Integrate f73072c8..ac712acc (two commits including one merge). Use both upstream entrance PNGs directly, with their new crop dimensions and matching regions in assets.py and image_2025.json. Resolve the right-enter conflicts using the new 32x22 image and rule. The previous local 46x34 metadata correction applied to the replaced PNG, so its exact numbers are obsolete. Both new definitions match their PNGs. All upstream changes are adopted, with other local fixes retained through the normal merge. Validation: 583 tests passed across tests/ and both FrogBoss suites, with three existing deprecation warnings. Verified both PNGs against upstream bytes, both rule/JSON/dimension sets, twelve synthetic positive, blank and out-of-region matches with desktop/emulator ROI padding, Python syntax, two production imports and git diff --check. No emulator run.
  • ac712accdc Merge remote-tracking branch 'origin/dev' into dev
  • 041e8686bb fix(MetaDemon): Update detection images and ROIs
  • Comparer ces 3 commits »

il y a 1 jour

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 2e256d99da Merge nearaura dev through f73072c8 for fatigue summon priority After runhey returned Repository not found, integrate 13221d2c..f73072c8 (three commits including one merge). Adopt the configurable, default-on summon priority when fatigue is 61 through 100 and no own boss exists, plus Chinese labels and help. Adopt the upstream md_enter2 PNG unchanged and its expanded matching region in both the rule and JSON metadata. Normal merge retains the corrected right-enter PNG dimensions, bounded team unlock, local battle hooks and prior exploration and donation fixes. The new behavior was not present locally. No upstream hunk was skipped. Validation: 583 tests passed across tests/ and both FrogBoss suites, with three existing deprecation warnings. Eight new regression cases exercise fatigue boundaries, disabled priority, own boss precedence, full-fatigue exit and legacy config/default/opt-out loading. Checked four Python files, three production imports, two JSON files, source PNG byte identity, two rule/PNG/metadata sets, eight synthetic matches and git diff --check. No emulator run.
  • f73072c875 Merge pull request #11 from allesgutefy/fix/md-fatigue-summon-first feat(MetaDemon): summon demon first when fatigue >= 61 (configurable)
  • b615ec9767 fix(MetaDemon): Update enter2 detection image and ROI
  • f449cb359e feat(MetaDemon): summon demon first when fatigue >= 61 (configurable) Add a new switch md_fatigue_summon_first (default on, configurable from the config GUI). When enabled and fatigue is between 61 and 100 with no own demon online, summon a demon BEFORE the existing own -> shared -> summon judgment chain. Boundaries kept safe: - no duplicate summon when a demon is already online - fatigue > 100 still follows the original buy-tea/exit logic
  • Comparer ces 4 commits »

il y a 2 jours

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 4743e96bed Merge nearaura dev through 13221d2c for collective mission rewards Runhey returned Repository not found. Integrate the single fallback commit f1ba2a5c..13221d2c. Adopt the five-second donation inactivity timeout, reward-button handling and timer resets for reward progress. The patch adds behavior absent from the local implementation. Complete mission-switch click history handling: clear after each eight successful switches, so the actual ten-click guard cannot abort at attempt 18 before the existing 21-attempt limit. Use logger.warning. All previous local fixes are retained by the normal conflict-free merge. Validation: 575 tests passed across tests/ and both FrogBoss suites, with three pre-existing deprecation warnings. Five new replay cases cover absent/single/double rewards, progress timeout resets, late mission selection and retry exhaustion using the real device click guard. Changed Python syntax, production import and git diff --check passed. No image/rule resources changed. No emulator run.
  • 13221d2c0b fix(CollectiveMissions): Handle reward claims and timeout after donation #7
  • Comparer ces 2 commits »

il y a 3 jours

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • cf4d3afc7a fix(Exploration): resume chapter exploration after battle rewards Recognize chapter controls on a single frame and recheck the world map before resetting search progress. Limit the vertical search for the map marker so chapter roof tiles do not match. Replay the reported roof crop and cover scene changes between battle settlement and the next chapter action.

il y a 4 jours

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 74bda95908 Merge nearaura dev through f1ba2a5c and update mall recognition After runhey returned Repository not found, integrate both fallback commits in 09571eb4..f1ba2a5c. Use the upstream mall PNG unchanged and match its 0.6 threshold in the runtime rule and resource JSON. Preserve the search area, alternate purple sign and bounded navigation. Reuse existing automated PRs and the hosted CLI. Keep the fork's Thursday creation and separate five-hour merge delay per 3969a93a: the upstream replacement would immediately promote dev to master twice a week. Retain the separate merge workflow and give the create job read-only contents access. No new promotion or mirror targets. Validation: 556 pytest tests passed, including both FrogBoss suites (three deprecation warnings). Checked PNG bytes, dimensions, rule and JSON agreement, imports, six synthetic matches and git diff --check. Exercised both PR lookup paths offline and verified both workflow schedules. No emulator or hosted workflow run.
  • f1ba2a5c50 fix(GameUi): Update mall page detection image
  • 25cc699b10 feat(workflow): Create and merge sync PR on schedule
  • Comparer ces 3 commits »

il y a 5 jours

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • fc57fbd630 Merge nearaura dev through 09571eb4 for MetaDemon and navigation Runhey returned Repository not found. Merge the authorized fallback range 55c3b151..09571eb4 (22 commits). Adopt the public/shared demon controls, team unlock and preset handling, battle result hooks, UI templates, exploration marker range, mall sign navigation, minitouch pressure range, and updated project documentation. Use the upstream PNGs directly. All 30 changed PNG paths match nearaura, including 16 removals. Align right_enter dimensions in the rule and JSON with the supplied 46x34 PNG. Bound the store sign wait even when both controls are absent, and stop before launching a battle on unlock timeout. Keep the emulator's exact ROI and desktop two-pixel tolerance using the shared clipped expansion helper. Preserve fixed explicit animation crops and the local battle strategy contexts. Limit the upstream mirror workflow to its source repositories so fork pushes do not mirror to third parties. Validation: 556 tests passed (tests and both FrogBoss suites), three deprecation warnings. Checked 14 Python files, 11 production imports, six JSON files, workflow YAML, removed asset references, 15 rules and 60 synthetic matches. git diff --check passed. No emulator run.
  • 09571eb4ee fix(MetaDemon): Ensure team unlock state before boss battle
  • 5a752388e2 refactor(MetaDemon): Migrate battle_boss to battle_wait strategy hooks
  • b066ad8c9c Merge commit '484337f5' into dev
  • 27d0531f72 Merge remote-tracking branch 'origin/dev' into dev
  • Comparer ces 23 commits »

il y a 5 jours

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 096ccf5d71 Merge upstream dev through 55c3b151 with cross-skin defense compatibility Integrate d9c28f51..55c3b151 (17 commits including eight merges). Adopt Xinyu Mingxiao scroll selection and saved-theme migration, a shared masked guild entrance, the main16 town template, Yuehai Youxing multiscale realm matching, the EXP bottle replacement, cross-skin reward regions, and desktop activation-button score comparison. Include upstream offline fixtures and regressions. Expand the shared defense search region to (178,209,292,274), the union of the prior and incoming regions. Upstream's x=260 boundary excludes the cb1 defense template at x=216. Reproduced the missed match and added a regression for all three banner skins at their original positions. Add activation regressions for gray-button false positives and the higher-scoring yellow animation state. Retain the existing WantedQuests syntax fix as equivalent to a3e6e028. Keep RuleGif detachment, task-local battle scene isolation and restoration, and existing RuleImage.refresh cache invalidation (equivalent to upstream replace_img changes). Other historical mail, raid, exploration, activity, dialog and battle fixes remain preserved. No workflow changes in this merge. Validation passed: 547 tests from tests/ and both FrogBoss suites, with three existing dependency deprecation warnings. Fifteen Python syntax checks, eleven production imports, nine JSONs, eight PNGs, 29 changed asset/metadata rules and 116 synthetic matching cases passed. git diff --check passed. No emulator or hosted workflow run.
  • 55c3b1512e Merge pull request #2020 from runhey/master master to dev
  • 1cc1707bf9 fix(KekkaiActivation): Prevent desktop activation button false positives #2013
  • a3e6e028ff fix(WantedQuests): remove invalid characters
  • c37eabcd99 Merge pull request #2008 from Ghostuel/fix/main16-town-template fix: 修复狐栖归处庭院町中入口识别
  • Comparer ces 18 commits »

il y a 1 semaine

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 3969a93ab2 Merge upstream dev through d9c28f51 and retain local navigation fixes Integrate de497a3f..d9c28f51 (12 commits). Track five Moon Sea island markers in the original column, prefer a visible store after activation, and keep bounded entry and click intervals. Count successful AreaBoss fights and skip already defeated reward bosses. Reuse the bounded map return on both skips and battles. Adopt the narrower WantedQuests OCR retry and remove stray characters upstream that prevented imports. Update the SwitchAccount server-selection OCR region. Retain the existing single soul overflow click and metadata, which already match upstream's coordinates. Keep ActivityShikigami boss rules matching the local cropped PNGs and JSON. Costume/SwitchSoul regeneration adds no new behavior. Preserve local mail, realm, exploration, dialog, and battle strategy fixes. Keep the bounded random-entry helper for compatibility. Adopt gh-aw v1.0.1 and review-role restrictions. Retain the fork's existing dev-to-master workflow schedules. The additional upstream Monday master promotion is outside this dev-only sync. 515 pytest tests passed (tests/ and both FrogBoss suites). Checked nine Python files, six production imports, three JSON files, ten workflow YAMLs, seven PNG/rule/metadata sets and 28 synthetic matching cases. Verified the single overflow target, SwitchAccount OCR and git diff --check. No emulator or hosted workflow run.
  • d9c28f51e5 chore(workflow): Upgrade GitHub Agentic Workflows to v1.0.1
  • 5ba75f9b46 fix(GeneralBattle): Add soul overflow cleanup click rule #1979
  • 4a6ad55831 fix(GeneralBattle): Add soul overflow cleanup click rule #1979
  • 9cfb4d2908 feat(workflow): Schedule Monday automated PR creation and merge
  • Comparer ces 13 commits »

il y a 1 semaine

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 4c0161fc24 Merge upstream dev through de497a3f with bounded island entry Integrate 8b4dc669..de497a3f (five commits, including two merges). Adopt SixRealms unknown-island round-robin clicks with a shared one-second interval and a 15-second deadline. Adopt Flower Pass task-tab recognition before reward collection and its updated PNG/ROI. Complete related omissions: recognized-island entry now has the same 15-second deadline, while the random-entry fallback also shares a click interval and handles cancellation without extending the deadline. Three failing offline replays demonstrated these remaining loops/click bursts. Register the task-tab rule in assets.py and its missing JSON metadata, retaining upstream matching coordinates and threshold exactly. Preserve existing local fixes: mail/raid/exploration recovery, cropped confirm/cancel and exit priority, battle isolation, activity navigation, AreaBoss returns, purchase limits, costume caches and desktop cleanup/ first-login restart exemption. No incoming patch skipped wholesale. Validation: 505 pytest tests passed (tests and both FrogBoss suites), including four upstream cases and five added island/task-tab cases. Five Python syntax checks, three production imports, one JSON and PNG, asset metadata and four synthetic image matches passed. Ten sensitive local files/rule sets unchanged; git diff --check passed. Three dependency deprecation warnings. No emulator or desktop game run.
  • de497a3f50 Merge pull request #2000 from leovefy/dev fix(SixRealms): 限制选岛连续点击并增加超时退出
  • f1eff7f389 Merge pull request #1984 from weirj2016-ai/fix/talisman-pass-task-tab-dev 修复花合战任务偶发未跳转领奖界面
  • ea6b92f93b fix(SixRealms): 限制选岛连续点击并增加超时退出
  • c08fe24f95 fix(TalismanPass): update task tab template and ROI
  • Comparer ces 6 commits »

il y a 2 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 990deeb326 Merge upstream dev through 8b4dc669 with desktop recovery and theme updates Integrate 65311c50..8b4dc669 (12 commits, including five merges). Adopt the FindJade scheduler priority, invite-again debounce, updated collaboration invitation PNGs/coordinates, and all 19 dream-flower Shikigami theme assets plus config/mapping/translation. Adopt existing-window login detection, the opt-in desktop force-restart setting, and allow Restart past a missing-window pre-screenshot. Resolve the Restart conflict by preserving the local checked desktop_stop_client path: failed cleanup must stop recovery instead of claiming success. Retain bounded retries, PID ownership/cleanup/rebinding protections, anti-ban idle cleanup, cropped confirmations, mail/raid/exploration, activity/AreaBoss navigation, purchase limits and costume cache behavior. No incoming commit was skipped wholesale. Fix an incoming recovery gap demonstrated by a failing replay: ownership PIDs persist for the whole session, so they cannot alone mean newly launched. Track the first-login exemption explicitly, clear it on login completion/adoption, and do not restore it on later logout. A later stuck owned instance can now be forcibly restarted; a fresh one is reused. Validation: 496 pytest tests passed, including both FrogBoss suites and 12 new desktop recovery/theme cases. 15 Python syntax checks, 12 production imports, 4 JSON files, 23 PNGs and 23 rule metadata pairs passed, with 92 synthetic image matching cases. Nine sensitive files and 115 methods outside targeted changes retained; config defaults and priority checked. git diff --check passed after trimming new upstream comment whitespace. Six existing deprecation warnings (Pydantic, imp, docstring escapes). No emulator or desktop game run.
  • 8b4dc669b4 fix(FindJade): Add task to scheduler priority list #1979
  • 8307b20a57 Merge pull request #1994 from Hurry2/dev fix(script):适配桌面版空闲策略关闭游戏,修复桌面版关闭游戏后无法重启的问题
  • a57891b874 fix(script):修复桌面版关闭游戏后重启 桌面版窗口不在时 Script.run 预截图必抛 GameNotRunningError, Restart 任务永远跑不到,恢复循环空转;command=Restart 时放行预截图。
  • 92d2dbd830 feat(desktop_device):适配桌面版空闲策略关闭游戏
  • Comparer ces 13 commits »

il y a 2 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • a4f921da18 Merge upstream dev through 65311c50 with both mall appearances Integrate c6c724a4..65311c50 (eddc6171 and its upstream merge). Recognize both existing and purple mall signs through the page matcher. Use fresh-screen navigation when DailyTrifles and RichMan return to the mall, preventing repeated exits/re-entry and handling unknown rooms. Adopt the matching PNG/JSON rule and six offline navigation regression cases covering both signs, stale frames, entry/return and timeout failure. Resolve the GameUi asset conflict by adding only the new purple rule and retaining local whitespace cleanup and every existing asset definition. Retain local navigator recovery/exit priority, cropped confirmation rules, mail/raid/exploration fixes, battle isolation, activity and AreaBoss navigation, purchase limits and costume cache fixes. No equivalent new patch was skipped; no additional behavior gap was found in this range. Validation: 484 pytest tests passed (tests and both FrogBoss suites). Five Python syntax checks, four production imports, one JSON and PNG passed. New rule metadata and four synthetic matching checks passed; local sensitive files and confirm/cancel definitions retained. git diff --check passed. Three dependency deprecation warnings only. No emulator or desktop game run.
  • 65311c5033 Merge pull request #1977 from leovefy/dev fix(GameUi): 兼容商店两种招牌图片,修复反复进出商店的问题
  • eddc6171a5 fix(GameUi): 兼容商店两种招牌图片,修复反复进出商店的问题
  • Comparer ces 3 commits »

il y a 2 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • d9dfb669eb Merge upstream dev through c6c724a4 with UI and task-flow updates Integrate 62957654..c6c724a4 (12 commits including merge commits). Adopt Dokan creation once at finding-screen entry on each eligible run, including refreshed scene detection after navigation; keep its retry interval. Apply EternitySea layer/lock preparation to both leaders and members. Adopt updated GlobalGame accept/reject/reward-icon regions and WantedQuests invitation, tracking, destination and OCR resources, red-back navigation, substring monster exclusions and removal of two unreferenced images. Adopt one-batch sea-soul purchasing when game auto-selection is enabled. The costume cache fix already existed locally with additional GIF detach, method dispatch, mask and result-state safeguards. Resolve the conflict by moving the complete local cache reset into upstream's RuleImage.refresh API, preserving method copy, GIF detach and task-scoped costume isolation. Two regression cases exposed the new auto-purchase path ignoring configured quantity and affordability. Cap the batch by requested amount, stock and balance, and use buy-all only when that bounded count equals remaining stock. Retain the existing 084bae21 AreaBoss navigation fix and all local mail, raid, exploration, cropped confirm/cancel, battle strategy, overflow, purchase, desktop and anti-ban cleanup safeguards. Preserve all upstream history with a normal merge; no commit was skipped wholesale. Validation: 478 pytest cases passed (tests/ and both FrogBoss test modules), including 12 new Dokan entry, EternitySea member and sea purchase cases. Existing costume/GIF/mask/dispatch regression cases passed. 11 Python syntax checks, 8 production imports, 5 JSON files, 17 PNG verifications, 46 changed UI rules and 144 synthetic matching checks with ROI padding 0/2 passed. Both deleted images have no remaining references; 10 sensitive local files and cropped global confirm/cancel definitions remain unchanged. git diff --check passed. Three dependency deprecation warnings; some upstream PNGs emit non-fatal sBIT metadata warnings while decoding/matching succeeds. No live emulator, desktop game or game purchase test was performed.
  • c6c724a4ab Merge pull request #1976 from weirj2016-ai/fix/dokan-create-on-entry-dev 道馆开启尝试移到查找循环之前
  • 1e18c251ab 道馆开启尝试移出查找循环
  • 63b0d6d33e Merge remote-tracking branch 'origin/dev' into dev
  • 506564c669 fix(Costume): Refresh cached template image when replacing costume assets #1972
  • Comparer ces 13 commits »

il y a 2 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 084bae212e Fix AreaBoss post-battle navigation stalls Recover boss detail overlays during battle return, filter navigation and return home. Handle transitional frames, honor close cooldowns and bound each stage with a timeout. Add 24 navigation regression cases and update battle return tests. Validation: 30 AreaBoss tests passed; reported screenshots replayed offline; git diff --check passed.

il y a 3 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • affce19e6e Merge upstream dev through 62957654 with legacy overflow coverage Integrate cc65d55d..62957654 (4 commits including two merges). Adopt the legacy battle reward-loop soul overflow dismissal and Dokan's server=False on the first-attack retry, so the requested failure interval is not overridden by server-time scheduling. Resolve the modern battle_wait.py conflict by retaining local interrupt-based overflow handling. The existing interrupt safely dismisses the popup and returns to a fresh frame before settling; upstream's inline handling is an equivalent fix for its different code path. Keep the entire local module AST unchanged, including cleanup-button exclusion, bounded completion and context-local strategies/options. Complete gaps demonstrated by four failing overflow replays: dismiss the popup on entry to the old runner, during its reward wait (before treating missing rewards as completion), and on entry/settlement in battle_wait_v2. Keep the upstream old reward-loop fix. All earlier local mail, raid, exploration, cropped UI, activity, purchase, AreaBoss, desktop and anti-ban cleanup fixes are retained. Validation: 442 pytest cases passed (tests/ and both FrogBoss test modules). Seven new cases cover five overflow stages and two real Dokan scheduling paths through set_next_run/task_delay (09:00 and 19:00 server times). Four Python syntax checks, three production imports, unchanged modern battle AST and git diff --check passed. No PNG, asset-rule or metadata changes. Warnings: two existing Pydantic deprecations and dependency imp deprecation. No live emulator or desktop game test was performed.
  • 629576545a Merge pull request #1970 from davidyangkunlong/SoulOverflowOnOldGeneralBattle 御魂溢出处理升级
  • 0b1c1a02c4 Merge pull request #1969 from weirj2016-ai/fix/dokan-first-attack-failure-interval-dev 修复道馆两次攻打间的任务调度时间
  • cacc2af314 御魂溢出处理升级 1 增加了旧版调用通用战斗的御魂溢出处理。(如果任务重写了battle_wait,比如御魂战斗的,需要单独修改,目前只修改了御魂战斗,其他重新了battle_wait的喂修改) 2 新版战斗处理中,不去interupt事件里面处理。原因是如果去新函数inerupt事件里面处理,再重新进入success该函数的时候,低概率出现战斗结束了,因检测不到几种奖励标志,在success处理函数中进入不到后续处理,不停循环。
  • 6360d6a947 修复道馆首次攻击后的任务间隔
  • Comparer ces 5 commits »

il y a 3 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 675f4911c3 Merge upstream dev through cc65d55d with purchase and AreaBoss safeguards Integrate 4e3528a6..cc65d55d (5 commits including one merge). Adopt blue-ticket single/multiple dialog detection, jade price OCR and the 85-jade ceiling, affordable full-quantity purchases and partial-budget one-at-a-time purchases. Include the jade PNG and image/OCR metadata. Adopt AreaBoss's new battle settlement flow, repeat-challenge behavior, battle long-wait refreshes, non-Windows desktop import guard and hook cleanup. Regression replays exposed gaps in the incoming changes; complete them: - Use actual dialog price for affordability, allowing a discounted 50-jade ticket with a 60-jade balance; keep fixed-price callers' existing gate. - Check balance and remaining count for single-item dialogs too. - Cancel unknown/non-one default quantities instead of falling back to the legacy increment-first buy_more(1), which can buy more than intended. - Apply the configured AreaBoss strategy context as well as its options. - Accept an already-returned filter screen after settlement instead of waiting indefinitely for a red close button that is no longer present. Preserve local context-isolated strategy/options, bounded battle completion, desktop initialization/recovery and ROI handling. Existing mail, raid, exploration, cropped UI, activity and anti-ban idle cleanup fixes are unchanged. No equivalent local replacement existed for the incoming new functionality; normal merge retains every upstream commit without conflicts or skipped parts. Validation: 435 pytest cases passed (tests/ and both FrogBoss test modules), including 28 new purchase/AreaBoss cases. Nine failing incoming-path replays were fixed; adapted the prepare mock to verify the new long-wait refresh. 10 Python syntax checks, 7 production imports, 2 JSON files, image/OCR rule consistency, 42x52 PNG verification, 8 synthetic matching cases, 4 retained AST checks and git diff --check passed. Two existing Pydantic warnings. The upstream PNG emits a non-fatal invalid sBIT ancillary-metadata warning; PIL/OpenCV decode and matching succeed, and the upstream pixels are retained. No live emulator, game purchase or desktop game test was performed.
  • cc65d55dae Merge pull request #1966 from kunkun008/fix/mysteryshop-blue-buy-more fix(MysteryShop): 蓝票改用 buy_more,并按单价判断,高于 85 勾玉不买
  • 8563207769 fix(AreaBoss): Handle fox battle scene settlement #1967
  • 47b9064b2f fix(MysteryShop): 蓝票余额不够买满时逐张购买 避免 buy_more(n) 在点加号时超过目标数量。
  • be5f3c9785 fix(MysteryShop): 蓝票按单价判断,高于 85 勾玉不买 读取购买按钮上的勾玉单价;单价高于 85、低于 40(视为识别错误)或不是勾玉支付时取消购买。 购买数量 = min(剩余次数, 余额 // 单价)。
  • Comparer ces 6 commits »

il y a 3 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • f1ec903395 fix: honor idle cleanup settings during anti-ban rest

il y a 3 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • d07027ac79 Merge upstream dev through 4e3528a6 with Dokan leader recognition fixes Integrate 6e425254..4e3528a6 (3 commits including one merge). Adopt the corrected 48x36 leader-name template from 4354df46 and the 0.7 matching threshold from 8bbf87b8 in both assets.py and image.json. The prior template included the rank suffix; the new template recognizes the leader label. Preserve the existing full-screen search and runtime template-size/position update used by this rule. PNG reference, method, threshold and declared ROIs agree between runtime and JSON metadata. No duplicate local implementation or missing companion change was found. Only the three upstream Dokan asset files change, exactly as upstream; all existing local mail, raid, exploration, UI, battle-context, activity and desktop fixes are retained unchanged. Merge completed without conflicts. Validation: 392 tests passed (tests/ and both FrogBoss test modules), with two pre-existing Pydantic deprecation warnings. Python syntax and both Dokan module imports passed; PNG decoding and metadata checks passed. Eight synthetic matching checks covered center, screen corners and blank screens with ROI padding 0/2. git diff --check passed. No live emulator or desktop game test was performed. Both target dev branches were independently rechecked before commit/push and remained at 4c0fe0ec; upstream remained at 4e3528a6.
  • 4e3528a60b Merge pull request #1963 from weirj2016-ai/fix/dokan-guanzhu-xiuxi-dev 更新道馆馆主识别图
  • 8bbf87b80d fix(Dokan): lower leader template threshold
  • 4354df4695 fix(Dokan): correct dojo leader name template
  • Comparer ces 4 commits »

il y a 3 semaines

iaun a commité dans dev sur iaun/OnmyojiAutoScript

  • 4c0fe0ec5e Merge upstream dev through 6e425254, retaining mail and activity safeguards Integrate b1c7186c..6e425254 (4 commits including 2 merges). Adopt fe98ffef's updated boss entry and boss-screen PNGs/search regions. Fill omitted JSON metadata for both resources and correct declared sizes to the actual PNG dimensions (96x26 and 18x99); retain upstream search bounds. Resolve 77bd7fd7's mail 3-to-6-second timeout change with the existing local 30-second bounded collection flow: popup-first handling, confirmation retries, reward collection and resettable idle wait remain intact. Do not regress to the upstream read-before-claim flow or shorten the existing total timeout. Resolve fe98ffef's completion check with the existing mode-specific boss/main marker, which already handles boss return while preventing an unrelated mode from completing the battle. Keep both reward styles and context-local battle strategies. Both conflicted modules are AST-identical to pre-merge dev. Other retained local raid, exploration, UI-crop and desktop fixes are untouched. Validation: 392 pytest cases passed (tests/ and both FrogBoss test modules), including 14 new boss resource cases. Initial metadata checks exposed both upstream size mismatches; fixed and reran the full suite successfully. 2 Python syntax checks, 3 production imports, 2 PNG decodes, 7 metadata rules, 12 synthetic matching cases with ROI padding 0/2, and git diff --check passed. Two pre-existing Pydantic deprecation warnings. No live game/emulator test.
  • 6e4252544e Merge pull request #1956 from weirj2016-ai/fix/restart-mail-harvest-timeout-dev 修复 Restart 邮件领取确认偶发失败
  • dcfc6de662 Merge pull request #1959 from davidyangkunlong/UpdateClimbBossResources UpdateClimbBossResources
  • fe98ffef27 UpdateClimbBossResources 1 更新爬塔活动boss战斗的图片资源 2 更正爬塔boss战斗不能正常结束的bug
  • 77bd7fd7bf fix(Restart): 延长邮件领取确认等待时间
  • Comparer ces 5 commits »

il y a 3 semaines

iaun a commité dans main sur iaun/ms-teams-tools

  • fdcfe48e95 Initial import of Teams local collector

il y a 4 semaines

iaun nouvelle branche créée main sur iaun/ms-teams-tools

il y a 4 semaines