Commit Graph

812 Commits

Author SHA1 Message Date
LmeSzinc
16f4f061c1 Refactor: Migrate to pponnxcr 2023-09-08 22:23:57 +08:00
LmeSzinc
3ac9e264e6 Fix: OCR_ASSIGNMENT_LIMIT 2023-09-03 00:29:01 +08:00
LmeSzinc
438ae6f488 Opt: Reduce click retry when passing by page_main 2023-09-03 00:28:58 +08:00
LmeSzinc
625e9b08f0 Fix: [CN] Handle ocr result with "了" 2023-09-02 21:07:13 +08:00
Hengyu
5eaf67499a Upd: lower threshold for is_curio_selected 2023-08-31 15:56:27 +08:00
Hengyu
d98460144f Upd: logging for bonus and curio selection complete 2023-08-31 15:55:35 +08:00
Hengyu
8ef055626a Add: obtain item popup method 2023-08-31 15:54:52 +08:00
Hengyu
26eba79c3c Upd: CHECK_BLESSING & PAGE_CHOOSE_BUFF 2023-08-31 15:30:48 +08:00
Zebartin
c9111273b8 Fix: Change of assignment ui in ver 1.3 2023-08-31 14:42:33 +08:00
Hengyu
4b1e61d14b Merge remote-tracking branch 'upstream/dev' into add/rouge_buff_selector
# Conflicts:
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
2023-08-31 14:33:55 +08:00
LmeSzinc
320e9395d1 Fix: battle_pass_quests_recognition() returns OcrResultButton 2023-08-31 01:34:16 +08:00
LmeSzinc
9aaadc4136 Upd: [CN] DAILY_QUEST_FULL (#76)
And add logs to _get_quest_reward()
2023-08-31 01:25:10 +08:00
LmeSzinc
51e49e2077 Add: Link task BattlePass to Dungeon, Assignment, DailyQuest 2023-08-31 01:06:24 +08:00
LmeSzinc
6c6296651f Upd: DUNGEON_COMBAT_INTERACT 2023-08-30 19:24:15 +08:00
LmeSzinc
92bbb9204a Upd: Set maximum trailblaze power to 240 2023-08-30 19:14:14 +08:00
LmeSzinc
65527f8100 Upd: Dungeon ui assets 2023-08-30 19:11:21 +08:00
LmeSzinc
b8c0e9cf7c Merge branch 'master' into dev 2023-08-30 18:59:04 +08:00
X-Zero-L
7df2c76dbe
Upd: ui assets (#74)
* Upd: ui assets

* Upd: ui assets

* Fix bug

* Upd: assignment assets
2023-08-30 18:55:39 +08:00
X-Zero-L
6124447a83
Upd: character and i18n (#71)
* Upd: character and i18n

* Upd: i18n

* Fix bug

* Fix bug

* Fix bug

* Fix: bug

* Upd: convert

* Fix bug

* Modify the order
2023-08-30 18:46:18 +08:00
X-Zero-L
eb28485d5d
Fix: support (#64)
* Fix: support

* Upd: support

* Upd: support

* Upd: support

* Upd: support

* Upd: support

* Upd: support

* Upd: support

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-08-30 00:58:32 +08:00
LmeSzinc
246c039dc8 Add: Assigment and Sim.Uni. in dashboard 2023-08-30 00:49:46 +08:00
LmeSzinc
665c112330 Add: Stored trailblaze power 2023-08-28 01:12:10 +08:00
Hengyu
9a17af2d12 Merge remote-tracking branch 'upstream/dev' into add/rouge_buff_selector
# Conflicts:
#	module/config/argument/argument.yaml
2023-08-27 17:38:33 +08:00
LmeSzinc
b5030e0ab1 Add: Link task Assignment with daily tasks 2023-08-27 17:27:47 +08:00
LmeSzinc
a5e2eb0004 Refactor: Link task dungeon with daily quests 2023-08-27 17:13:05 +08:00
LmeSzinc
106455a148 Opt: Enlarge threshold when loading support list for faster 2023-08-27 02:15:50 +08:00
LmeSzinc
610df2af6d Fix: Exit combat status page at startup 2023-08-27 02:14:43 +08:00
LmeSzinc
cf9b261eb5 Fix: handle_map_2x_run() function name in forgotten hall 2023-08-27 02:14:03 +08:00
Hengyu
97ff1c8554 Add: unrecorded preset option 2023-08-23 03:00:45 +08:00
Hengyu
8c0ea40c76 Fix: adjust blessing ocr area 2023-08-23 01:59:22 +08:00
LmeSzinc
674627cfe6 Add: Map movement control 2023-08-21 01:29:28 +08:00
LmeSzinc
bc9642772f Add: Dungeon at double relic event 2023-08-21 01:14:40 +08:00
Hengyu
f9ec1deb2a Upd: move filter_ and ocr_result to __init__ 2023-08-21 00:27:41 +08:00
Hengyu
415694ec37 Upd: blessing ocr template 2023-08-21 00:09:21 +08:00
Hengyu
4ea302a71b Upd: remove cosmic_fragment cache 2023-08-21 00:05:50 +08:00
Hengyu
e32ba643d9 Upd: logging of select_blessing_complete 2023-08-21 00:03:08 +08:00
Hengyu
9228b200a5 Upd: assets and Ocr to fit in English ui 2023-08-20 23:53:25 +08:00
Hengyu
961e225bb1 Upd: remove 'the' in RoguePath keywords 2023-08-20 22:43:07 +08:00
LmeSzinc
af37f4c252 Fix: Accurate search_half and optimize rotation parameters 2023-08-19 03:10:49 +08:00
LmeSzinc
083a8cbbc9 Opt: Log SupportCharacter objects 2023-08-19 03:07:57 +08:00
Hengyu
39f161af10 Add: "enhancement" in blessing filter option 2023-08-18 20:22:46 +08:00
Hengyu
19497ebb6a Add: event page 2023-08-18 12:07:02 +08:00
Hengyu
5a06402d43 Upd: use combination instead of inheritance in RogueSelector 2023-08-15 04:16:21 +08:00
Hengyu
03caaa2855 Add: rogue bonus (Blessings of Trailblaze) 2023-08-14 15:12:02 +08:00
Hengyu
d6bdc286ca Upd: reformat code, extract RogueSelector 2023-08-13 01:30:56 +08:00
Hengyu
039eca2de9 Add: choose curio 2023-08-12 15:15:25 +08:00
Hengyu
14bf3c81b4 Fix: miss judge choose blessing page sometimes;
Add wait until blessing stable function;
2023-08-11 17:37:55 +08:00
Hengyu
16a88bb164 Upd: add MultiLangFilter 2023-08-11 02:43:06 +08:00
Hengyu
958ffb6dbf Upd: count blessing number before recognition 2023-08-11 01:16:25 +08:00
Hengyu
17debdfb5e Add: rogue buff selector 2023-08-10 17:46:18 +08:00
LmeSzinc
bfae03bc19 Add: Set map rotation 2023-08-06 22:19:10 +08:00
Hengyu
28d5c43602
Add: battle pass recognition (#49)
* Add: battle pass mission recognition

* Fix: typo

* Add: version mission recognition

* Fix: typo

* Upd: remove version mission

* Upd: keep ui of version quest
2023-08-02 19:07:46 +08:00
LmeSzinc
7e4c9b0258 Add: Minimap tracking 2023-07-30 23:30:17 +08:00
LmeSzinc
c71dc5296b Fix: MapPlane.has_multiple_floors 2023-07-30 19:33:54 +08:00
LmeSzinc
7e778efa17 Fix: Redundant swipe left after getting reward from daily 2023-07-30 17:18:19 +08:00
LmeSzinc
7ceb9bc4fb Refactor: bigmap_floor_set() 2023-07-30 17:18:19 +08:00
LmeSzinc
57005e6d51 Upd: Map planes in 1.2 2023-07-30 17:18:19 +08:00
LmeSzinc
267c1f7387 Fix: Handle randomly missing battle pass entrance 2023-07-30 17:18:19 +08:00
LmeSzinc
223a8a92cd Fix: Cavern_of_Corrosion keyword extraction (fixed #48) 2023-07-26 12:19:48 +08:00
LmeSzinc
3a372146de Fix: Handle default state of SALVAGE button 2023-07-24 23:53:59 +08:00
LmeSzinc
3f0bdb6aa3 Fix: Handle missing EFFECT_NOTIFICATION when entering forgotten hall 2023-07-24 23:37:22 +08:00
LmeSzinc
3e5a9d4625 Upd: Keywords in 1.1 2023-07-24 22:56:48 +08:00
X-Zero-L
b2ab868351
Add: character and combat support (#38)
* Add: combat support

* Fix: team_set logic when using support in combat

* Add: Support character selection

* Upd: optimize support character get logic

* Fix: bug in get_character_by_name

* Upd: use keywords to generate support config

* Fix: Correct comment language to English

* Fix: Remove debug statements

* Upd: Improve UI icons and positioning

* Upd: Refactor support

* Upd: character keyword extract

* Upd:Character icon

* Upd: Character icon

* Upd: Character icon

* Upd: Optimize the parameter in SupportListScroll

* Upd: Refactor support

* Fix: Bug in Dungeon

* Fix: Corrected comments in Combat and Support

* Upd: Modified parameter

* Refactor: Support logic

* Refactor: Support logic

* Refactor: Support logic

* Upd: Character icon

* Upd: Character icon

* Refactor: Support logic

* Refactor: Support logic
2023-07-24 18:15:22 +08:00
LmeSzinc
0bd94ebecc Upd: ENTRANCE_CHECKED in forgotten hall 2023-07-20 15:33:59 +08:00
LmeSzinc
ea8a143780 Fix: Handle technique animation when it's being used 2023-07-20 15:09:52 +08:00
LmeSzinc
2854593f0c Fix: Checking ACTIVE_POINTS_*_UNLOCK 2023-07-20 15:03:32 +08:00
Hengyu
2ffc19f45b Upd: DUNGEON_ENTER_CHECKED.png 2023-07-20 13:43:34 +08:00
Hengyu
4074f3b5a8 Fix: Teleport to The_Last_Vestiges by changing load order of dungeon keywords 2023-07-20 13:43:34 +08:00
LmeSzinc
ac04e2aace Fix: Check MAIN_GOTO_BATTLE_PASS 2023-07-19 13:36:48 +08:00
LmeSzinc
4440523d67 Fix: Handle USER_AGREEMENT_ACCEPT at login 2023-07-19 13:34:46 +08:00
LmeSzinc
c9ddacfedb Fix: Handle gap between 2 battla pass periods 2023-07-17 13:40:58 +08:00
LmeSzinc
54cd0f7c90 Opt: Faster relic salvage 2023-07-15 01:26:00 +08:00
LmeSzinc
dc4240b198 Fix: Remove debug code and add click interval (#43) 2023-07-15 01:23:35 +08:00
Hengyu
211314aaa1
Add: salvage relic (#40)
* Add: ItemUI

* Add: Salvage relic

* Upd: reuse CONFIRM_POPUP

* Add: wait_until_tab_loaded

* Add: wait_until_tab_loaded

* Fix: Return to item page when finish salvaging

* Add: Salvage relics to daily quest

* Fix typo

* Add: all item tabs' navigation

* Upd: remove unused asset

* Upd: remove item tab keywords' underscore
2023-07-14 12:35:56 +08:00
Zebartin
1c304f2baa Fix: Duration ocr & late stop in assignment 2023-07-11 11:50:15 +08:00
LmeSzinc
d9f9b43b6f Add: Dungeon at double calyx event 2023-07-10 23:45:33 +08:00
LmeSzinc
5467f71b6e Add: wave_limit in combat 2023-07-10 23:45:29 +08:00
LmeSzinc
f12e18107f Refactor: Remove use_fast parameter 2023-07-10 22:24:24 +08:00
LmeSzinc
866612345f Opt: Delay battle pass to exact 04:00 2023-07-09 18:10:50 +08:00
LmeSzinc
59eccac256 Fix: Handle destructible object nearby Stagnant_Shadow_Blaze 2023-07-09 17:48:11 +08:00
Zebartin
1de3741a6e Refactor: remove unused import in assignment 2023-07-09 17:29:38 +08:00
Zebartin
cfdb09f7c3 Opt: delay battle pass to next version if possible 2023-07-09 17:29:38 +08:00
LmeSzinc
ed4b4c78d8 Fix: Wrong condition in DungeonList.is_Forgotten_Hall 2023-07-07 02:25:20 +08:00
LmeSzinc
7cb6b0e999 Fix: Dungeon tab loading is never waited as Survival_Index is selected by default now (#39) 2023-07-07 02:22:20 +08:00
LmeSzinc
95c7b6dd53 Opt: Faster UI navigation to forgotten hall 2023-07-06 22:41:16 +08:00
LmeSzinc
3b11204fd9 Opt: Wait until 80 when farming artifacts 2023-07-06 21:31:16 +08:00
LmeSzinc
abfd96a344 Fix: Increase retry interval of COMBAT_AGAIN 2023-07-06 00:37:21 +08:00
Hengyu
e9a02da75b
Add: Use techniques (#36)
* Add: Use techniques

* Add: Use technique to daily quests task

* Upd: change to use control module

* Upd: handle dungeon popup

* Upd: Make UseTechniqueUI extends from MapControlJoystick & ForgottenUI

* Upd: move _enter_forgotten_hall_dungeon() to ForgottenHallUI; extract choose first character method
2023-07-06 00:15:16 +08:00
X-Zero-L
862a0b7453
Fix: Correct OcrDungeonList result (#37) 2023-07-04 18:20:03 +08:00
LmeSzinc
32f83acafb Add: Switching plane floors 2023-07-02 19:43:40 +08:00
LmeSzinc
53d6bd818f Add: Plane switchings in page_map 2023-07-02 15:33:30 +08:00
LmeSzinc
c2712ab146 Opt: Faster retries on monthly card popups 2023-07-02 15:31:42 +08:00
LmeSzinc
cb7386374d Add: UI swiches to page_map 2023-07-02 00:02:01 +08:00
Hengyu
019215f81d Fix: Duplication at forgotten hall keyword 2023-06-30 12:43:11 +08:00
Hengyu
127306a019 Add: forgotten hall stage goto 2023-06-30 00:32:33 +08:00
Hengyu
d4b53e23b6 Add: forgotten hall page 2023-06-29 22:41:49 +08:00
Hengyu
6e9661401b Upd: extract dungeon_enter check button as a function parameter 2023-06-29 22:28:08 +08:00
Hengyu
4f8c1f89c3 Add: dungeon goto forgotten hall 2023-06-29 12:56:05 +08:00
LmeSzinc
e312ff80f6 Fix: Handle random wave cost OCR errors 2023-06-28 22:55:34 +08:00
LmeSzinc
ad451133d1 Add: Enter Stagnant Shadow dungeons 2023-06-28 02:27:20 +08:00
LmeSzinc
2ae3dac16d Add: Map buttons and technique points 2023-06-28 02:27:19 +08:00
LmeSzinc
8bdb9a4e77 Opt: Readable dungeon names 2023-06-28 01:17:24 +08:00
LmeSzinc
d18d318c9e Add: Enter Cavern of Corrosion 2023-06-27 23:52:53 +08:00
LmeSzinc
d1307fdb65 Upd: Handle double reward banner of simulated universe 2023-06-26 19:30:58 +08:00
LmeSzinc
d9b8c0db08 Opt: Improve log appearance in battle pass 2023-06-26 19:16:19 +08:00
LmeSzinc
a27c6015b8
Merge pull request #23 from Zebartin/assignment
Assignment
2023-06-26 18:32:51 +08:00
Zebartin
7d5bacdbc4 Fix: Friendlier config & details in assignment
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#pullrequestreview-1496702101
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1240852168
2023-06-26 00:07:52 +08:00
Driver-C
ab7351ab2c
Add: Daily synthesize material (#27) 2023-06-23 22:31:00 +08:00
Hengyu
e1954801db
Opt: not go to rewards page if battle pass level is not upgraded (#25) 2023-06-23 09:40:42 +08:00
Zebartin
a64c14648b Fix: DraggableList in dungeon 2023-06-22 17:25:46 +08:00
Zebartin
6c27531dae Fix: TImer of EMPTY_SLOT 2023-06-22 17:16:40 +08:00
Zebartin
e5c57dc9b0 Fix: Character selecting in assignment
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1235537186
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1235549827
2023-06-22 13:51:50 +08:00
Zebartin
c2b935f946 Fix: Unreliable use of Timer
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1235525692
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1235539035
2023-06-21 23:50:45 +08:00
Zebartin
47578306cb Fix: Help text & details of assignment
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1235492724
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1235495266
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1235497216
- https://github.com/LmeSzinc/StarRailCopilot/pull/23#discussion_r1235500507
2023-06-21 22:08:57 +08:00
LmeSzinc
812088d522
Merge pull request #22 from Driver-C/update/synthesize_optimization
Upd: synthesize optimization
2023-06-21 01:07:16 +08:00
Zebartin
0e4ce13b9e Fix: Reset counter after claiming 2023-06-20 22:35:59 +08:00
LmeSzinc
25cd87038d Fix: COMBAT_PREPARE and COMBAT_TEAM_PREPARE shares same letters (#24) 2023-06-20 22:07:08 +08:00
zebartin.wu
cd97951394 Fix: Remove redefinition of dispatched 2023-06-20 21:30:48 +08:00
Zebartin
193d7472bc Opt: Remove interval of REDISPATCH 2023-06-20 21:30:47 +08:00
Zebartin
724610404a Opt: Reduce use of ocr 2023-06-20 21:30:47 +08:00
Zebartin
346e7a1578 Add: Task assignment 2023-06-20 21:30:47 +08:00
LmeSzinc
55f82245b3 Fix: Dungeon entrance is never updated in selece_row() retires 2023-06-20 10:55:32 +08:00
LmeSzinc
514d81b34f Add: Use consumables in daily quests 2023-06-20 00:44:53 +08:00
Driver-C
962ac2d947 Upd: Standardize image path 2023-06-19 23:41:59 +08:00
Driver-C
fe30ba38a5 Upd: Consumable usage function access synthesis 2023-06-19 23:18:12 +08:00
Driver-C
f160949d15 Upd: synthesize consumables optimization 2023-06-19 23:12:36 +08:00
Hengyu
9edd120538
Add: Battle Pass Claim Rewards (#13)
* Add: Battle Pass Claim Rewards

* Upd: comments of public methods

* Fix: Break half way if not waiting for animation change finish

* Fix: set dataclass repr to false

* Add: Tasks BattlePass

* Upd: break get_rewards into two loops
2023-06-19 21:57:19 +08:00
Driver-C
9b05002be6
Add: Daily task 'Consumable usage' (#14) 2023-06-19 17:55:46 +08:00
LmeSzinc
16d5e447df Fix: Missing file assets_combat_interact.py (fixed #20) 2023-06-18 22:15:37 +08:00
LmeSzinc
74562d03e4 Add: Task DailyQuest 2023-06-18 18:41:58 +08:00
LmeSzinc
7e30ba8d9f Add: Task dungeon 2023-06-18 01:09:09 +08:00
LmeSzinc
9928d5b4cc Add: GUI options in task Dungeon 2023-06-18 00:24:00 +08:00
Driver-C
4512aeffa7
Upd: Standardize the directory structure related to the synthesis of consumables (#15) 2023-06-17 22:39:43 +08:00
LmeSzinc
29c83c0d26 Fix: Handle monthly card reward at login 2023-06-17 16:21:01 +08:00
LmeSzinc
45f806be61 Fix: Handle empter trialblaze power before combat 2023-06-17 16:20:01 +08:00
LmeSzinc
6d3f34ef48 Fix: OCR_TRAILBLAZE_POWER length varies by value 2023-06-17 16:19:13 +08:00
LmeSzinc
7cfd305e15 Opt: Log daily quests 2023-06-17 04:28:54 +08:00
LmeSzinc
555a6eb813 Fix: Remove __repr__ method override in keyword classes 2023-06-17 04:28:54 +08:00
LmeSzinc
fc1e1b4971 Add: Combat module 2023-06-17 04:28:51 +08:00
LmeSzinc
d7bc6d82f6 Add: Combat finish assets 2023-06-17 02:39:30 +08:00
LmeSzinc
8080250a49 Add: Get trailblaze power before and after combat 2023-06-17 01:07:47 +08:00
Hengyu
035ab0a778
Upd: return incomplete quests only (#11)
* Upd: return incomplete quests only

* Fix: Typo

* Fix: Use split_and_pair_button
2023-06-17 01:07:34 +08:00
LmeSzinc
173485b2f7 Add: Prepare combat team 2023-06-16 22:31:53 +08:00
LmeSzinc
cec7d1886c Add: Set combat waves 2023-06-15 22:12:47 +08:00
LmeSzinc
4efec361b4 Fix: Peak parameters in combat states (#9) 2023-06-15 13:25:57 +08:00
Hengyu
a54826aa94
Upd: daily quests ocr exceptions (#8) 2023-06-15 12:01:51 +08:00
LmeSzinc
c793a6ad3d Opt: Faster camera module 2023-06-15 01:26:28 +08:00
LmeSzinc
71b02ae767 Add: Goto dungeon from page_guide 2023-06-15 00:15:14 +08:00
LmeSzinc
765eeb5472 Add: Check combat auto and 2X speed 2023-06-13 11:36:54 +08:00
LmeSzinc
c567a773e3 Add: Extract keywords of dungeon list 2023-06-13 00:44:40 +08:00
LmeSzinc
9775c8bac9 Opt: Skip first screenshot when selecting items to synthesize 2023-06-13 00:24:52 +08:00
LmeSzinc
7235996dda Doc: Camera page in and out 2023-06-13 00:24:52 +08:00
Hengyu
012fffbb31
Add: daily_request_recognition; get_daily_rewards (#3)
* Add: daily_request_recognition; get_daily_rewards

* Fix: typo

* Fix: typo

* Upd: delete eval; use one loop to handle 5 active point rewards;

* Upd: change DAILY_QUEST_GOTO/REWARD pattern; update swipe private method name; extract keyword compare method

* Upd: move warning to single page recognition

* Upd: merge from main

* Add: methods that load daily quests keywords from QuestData.json

* Upd: avoid read TextMap twice

* Upd: revert Keyword.find method

* Add: preprocess of keyword extract; after_process of daily quest ocr

* Upd: move assets to daily/reward

* Upd: simplify ocr result replacement
2023-06-13 00:24:38 +08:00
Driver-C
f12f40643b
Add: Synthesize consumables (#2) 2023-06-12 03:20:12 +08:00
Hengyu
77c0e5044c Fix: take picture method 2023-06-08 13:24:51 +08:00
Driver-C
880b254d89 Fix: Resolve the issue of image changes for GET_REWARD 2023-06-08 12:46:26 +08:00
LmeSzinc
35f5d24877 Add: Switching dungeon nav 2023-05-31 02:20:45 +08:00
Hengyu
27c08df0ca
Add: take picture method (#1)
* Add: take picture method

* Upd: CAMERA_CHECK & TAKE_PICTURE template

* Upt: use OCR to detect whether picture was taken

* Upd: move camera to daily; use match template instead of OCR

* Upd: break process into two loops;
2023-05-29 23:08:22 +08:00
LmeSzinc
02b9c96e7b Add: Switching dungeon tabs 2023-05-23 01:00:20 +08:00
LmeSzinc
50e0ddb954 Add: Keyword extract 2023-05-22 22:10:22 +08:00
LmeSzinc
2fbb3c6d0d Fix: Handle monthly card popups 2023-05-21 09:38:41 +08:00
LmeSzinc
82d013ed59 Add: UI switches and login 2023-05-18 00:44:43 +08:00