Commit Graph

153 Commits

Author SHA1 Message Date
LmeSzinc
12ffb8348b Merge branch 'master' into dev 2024-05-24 00:57:05 +08:00
LmeSzinc
5a55a5917b Fix: combat_wave_cost was reset in combat again 2024-05-22 19:19:58 +08:00
LmeSzinc
3f291925fa Fix: OBTAIN_* should be moved together 2024-05-21 12:35:45 +08:00
LmeSzinc
cf31bd93af Add: is_approaching_total(), no use yet 2024-05-21 04:44:42 +08:00
LmeSzinc
408971892c Merge branch 'master' into dev 2024-05-21 00:46:11 +08:00
LmeSzinc
de53612530 Fix: Reset combat_wave_cost before every combat 2024-05-20 23:50:27 +08:00
LmeSzinc
616f072a2b Opt: Ignore obtain_frequent_check if combat will be reentered later 2024-05-20 04:28:38 +08:00
Yinhr
384c4302a2
Fix: Obtain position & closed (#464)
* Fix: Obtain position & closed

* Add: find may_obtain to locate obtain_1

* Fix: stupid bug
2024-05-20 01:49:50 +08:00
LmeSzinc
2e05ff729c Fix: Import tasks.planner.scan 2024-05-20 00:21:56 +08:00
LmeSzinc
aacf1650fc Merge branch 'master' into dev 2024-05-20 00:20:03 +08:00
LmeSzinc
a023d49f35 Fix: Remove scroll appear check in support list, no need 2024-05-20 00:08:47 +08:00
LmeSzinc
82f4f255ad Fix: Re-enter dungeon to check obtained items instead of leaving 2024-05-19 17:17:30 +08:00
LmeSzinc
e8dcd8ac95 Add: Do planner requested dungeon first 2024-05-18 02:35:44 +08:00
LmeSzinc
d854a90c4c Chore: Move dungeon/obtain to combat/obtain
Since obtain info is indeed getting before battle
2024-05-18 02:35:13 +08:00
LmeSzinc
ab6aabeefa Opt: Search prioritize characters before scrolling 2024-05-13 16:36:29 +08:00
LmeSzinc
ccf357703e Opt: Re-arrange interval for faster combat support switch 2024-05-13 16:33:56 +08:00
LmeSzinc
f45c8a4dd6 Fix: Check selected arrow left to character avatar 2024-05-13 16:00:04 +08:00
LmeSzinc
45a6cb668f Fix: Handle battle pass after combat 2024-05-13 15:48:25 +08:00
LmeSzinc
3566ff0302 Fix: handle_ascension_dungeon_prepare() is called in weekly 2024-05-13 15:08:28 +08:00
LmeSzinc
442eaf195b Fix: Combat should not reenter if stamina exhausted but wave limit set 2024-05-13 15:02:56 +08:00
LmeSzinc
5eabcbe22d Fix: Check COMBAT_AGAIN color prevent clicking before loaded 2024-05-13 14:59:48 +08:00
LmeSzinc
ba9f2973d2 Fix: Avoid double clicking COMBAT_TEAM_SUPPORT 2024-05-13 12:40:44 +08:00
LmeSzinc
ee3cb4f5ef Fix: Wait current team shown up 2024-05-13 12:38:55 +08:00
LmeSzinc
0135bf9167 Refactor: Set team using next prev buttons instead (#450) 2024-05-12 00:47:35 +08:00
LmeSzinc
9b9e85990a Upd: Combat support assets 2024-05-08 20:38:34 +08:00
LmeSzinc
fa209e1cf5 Fix: Character trial ended at page_main 2024-04-18 23:00:49 +08:00
LmeSzinc
0bb9af7275 Fix: AdaptiveScroll to handle transparent scroll on complex background (#391) 2024-03-30 00:20:28 +08:00
LmeSzinc
bf5f8fd3c7 Fix: COMBAT_TEAM_SUPPORT is clicked before support_set() 2024-03-27 23:13:14 +08:00
LmeSzinc
f93c3cb460 Fix: Use rgb2luma in combat state detection to fit video streaming 2024-03-16 16:13:57 +08:00
LmeSzinc
e0acc9789e Revert: COMBAT_PAUSE 2024-03-16 15:55:29 +08:00
LmeSzinc
cdb2d97c9f Merge branch 'master' into dev
# Conflicts:
#	tasks/combat/state.py
2024-03-11 01:54:56 +08:00
LmeSzinc
94dca8b9ce Refactor: Select next support character 2024-02-24 17:26:22 +08:00
LmeSzinc
14e3a9a73a Fix: Handle character died (#317) 2024-02-24 00:45:34 +08:00
LmeSzinc
60ebf0a3ff Fix: Limit click area of combat states (#339) 2024-02-23 23:51:40 +08:00
LmeSzinc
4d64ec0252 Upd: MAP_LOADING.SEARCH 2024-02-13 01:05:38 +08:00
LmeSzinc
6692b77db4 Fix: Optimize imports (fixed #314) 2024-02-10 01:53:59 +08:00
Zero
da0a1c16ff
Fix: support assets (#307) 2024-02-07 21:10:44 +08:00
LmeSzinc
6e26817e5d Upd: Map interact assets 2024-02-07 08:14:05 +08:00
LmeSzinc
d2fad6bd45 Fix: Combat auto on cloud game 2024-02-06 15:13:00 +08:00
LmeSzinc
34d6019c61 Fix: Raise exception if relics are full 2024-01-17 18:08:17 +08:00
LmeSzinc
576276e2da Fix: Combat auto on cloud game 2024-01-15 03:15:38 +08:00
LmeSzinc
1ba3882eaf Fix: Combat should return wave count 2024-01-02 03:54:54 +08:00
Lo Mu
c45cea69fd
fix: combat support COMBAT_SUPPORT_LIST repeat triggering (#251)
* fix: combat support COMBAT_SUPPORT_LIST repeat triggering

* fix: combat support_set select complete to skip search_support
2023-12-31 01:51:47 +08:00
LmeSzinc
4c65635530 Fix: Refactor team select as having 9 teams now 2023-12-27 23:46:28 +08:00
LmeSzinc
5efeb13728 Fix: Get light cone in combat_finish() 2023-12-25 20:34:44 +08:00
LmeSzinc
44ee643090 Merge branch 'master' into dev 2023-12-19 00:04:01 +08:00
LmeSzinc
c8ddc4a25e Fix: Cache _combat_can_again() as no expected stamina reduce during retry 2023-12-19 00:01:28 +08:00
LmeSzinc
5db9d6897e Merge branch 'master' into dev 2023-11-28 09:11:06 +08:00
LmeSzinc
678a26584a Fix: Limit COMBAT_PAUSE offset or will cause combat state detection error 2023-11-28 08:55:17 +08:00
LmeSzinc
80274ae4c9 Merge remote-tracking branch 'origin/bug_fix' into dev 2023-11-20 02:09:17 +08:00
aaahai00
cbc5d4d786
Update support.py (#200)
对改问题的修复https://github.com/LmeSzinc/StarRailCopilot/issues/195
2023-11-19 19:04:11 +08:00
LmeSzinc
3e530033fa Add: Allow entering rogue from map interact 2023-11-03 01:56:23 +08:00
LmeSzinc
afa94986bc Merge branch 'bug_fix' into dev
# Conflicts:
#	tasks/base/popup.py
#	tasks/base/ui.py
#	tasks/dungeon/state.py
#	tasks/dungeon/ui.py
2023-11-03 01:36:05 +08:00
LmeSzinc
e5c02fd381 Opt: Enter dungeon from map if possible 2023-11-02 18:56:20 +08:00
LmeSzinc
881389efce Fix: Handle light cone drop from Echo of War (#171) 2023-11-02 11:59:05 +08:00
LmeSzinc
25e7b1876c Add: is_map_loading() 2023-10-30 02:21:28 +08:00
LmeSzinc
f7f61549c1 Refactor: Abstract BACK and CLOSE handlers 2023-10-18 12:00:48 +08:00
LmeSzinc
b457e49421 Opt: Shorter combat interact interval
in case missed the door
2023-10-07 12:35:02 +08:00
LmeSzinc
36a452a9d4 Fix: Confirm COMBAT_PREPARE before getting double remain 2023-10-05 05:11:06 +08:00
LmeSzinc
739a4d33b7 Fix: Confirm COMBAT_PREPARE before getting double remain 2023-10-05 05:04:10 +08:00
LmeSzinc
d1abb19982 Add: is_map_loading() 2023-10-03 06:03:53 +08:00
LmeSzinc
96b6bdadf0 Add: Task Echo of War 2023-09-27 03:14:12 +08:00
LmeSzinc
1d7efd424c Fix: Trying to fix use_Q() exit (#108) 2023-09-25 23:01:06 +08:00
LmeSzinc
4cc4647705 Fix: Skill switch is clicked before appeared 2023-09-24 15:58:31 +08:00
LmeSzinc
6eb9317ac4 Add: Use skills in combat 2023-09-24 04:20:45 +08:00
LmeSzinc
e6c19268d6 Add: Do quest Complete_Forgotten_Hall_1_time 2023-09-23 19:22:35 +08:00
LmeSzinc
cd01e1c402 Add: Walk with result expecting 2023-09-22 00:23:00 +08:00
LmeSzinc
a800bdb214 Fix: Retry when joystick contact lost 2023-09-20 01:20:52 +08:00
LmeSzinc
59b3c59f99 Fix: [EN] Handle OCR error on daily quests 2023-09-17 07:36:50 +08:00
LmeSzinc
e426102148 Upd: [EN] Combat assets 2023-09-17 05:18:57 +08:00
LmeSzinc
d0cba894e0 Upd: Language irrelevant assets for base/popup 2023-09-17 05:00:16 +08:00
LmeSzinc
13c7e541f0 Fix: Use language-specific models on OCR_WAVE_COUNT 2023-09-13 01:43:59 +08:00
LmeSzinc
710e8d42df Upd: button_extract 2023-09-12 02:57:22 +08:00
Geniukx
80e99220ef
detector for enemy and item (#63)
* detector for enemy and item

* Add: detector for enemy and items
2023-09-10 22:44:29 +08:00
Zebartin
c9111273b8 Fix: Change of assignment ui in ver 1.3 2023-08-31 14:42:33 +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
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
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
665c112330 Add: Stored trailblaze power 2023-08-28 01:12:10 +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
083a8cbbc9 Opt: Log SupportCharacter objects 2023-08-19 03:07:57 +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
4440523d67 Fix: Handle USER_AGREEMENT_ACCEPT at login 2023-07-19 13:34:46 +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
abfd96a344 Fix: Increase retry interval of COMBAT_AGAIN 2023-07-06 00:37:21 +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
d18d318c9e Add: Enter Cavern of Corrosion 2023-06-27 23:52:53 +08:00
LmeSzinc
25cd87038d Fix: COMBAT_PREPARE and COMBAT_TEAM_PREPARE shares same letters (#24) 2023-06-20 22:07:08 +08:00
LmeSzinc
16d5e447df Fix: Missing file assets_combat_interact.py (fixed #20) 2023-06-18 22:15:37 +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
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
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