Commit Graph

211 Commits

Author SHA1 Message Date
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
ab8e54628e Dep: Update to pywebio==1.8.3 2023-11-03 01:25:37 +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
a1a1142651 Refactor: Abstract DungeonState class to be shared in rogue 2023-11-02 04:08:26 +08:00
LmeSzinc
e1a6b8760f Refactor: Abstract DungeonState class to be shared in rogue 2023-11-02 03:56:01 +08:00
LmeSzinc
28a0d57950 Fix: Handle curio obtained from occurrence 2023-10-31 01:33:11 +08:00
LmeSzinc
103f3b6fbe Merge branch 'master' into dev 2023-10-30 02:40:36 +08:00
LmeSzinc
25e7b1876c Add: is_map_loading() 2023-10-30 02:21:28 +08:00
X-Zero-L
b98be7dc15 Upd: Character 2023-10-28 19:16:19 +08:00
LmeSzinc
0af1805ddb Merge branch 'master' into dev 2023-10-27 17:00:34 +08:00
Hengyu
1cd3e7fde8 Fix: larger REGULAR_GACHA_CHECK.SEARCH & REGULAR_GACHA_CLICK.SEARCH 2023-10-27 16:48:48 +08:00
LmeSzinc
98fb6ea07b Add: Detect and switch characters 2023-10-23 02:24:46 +08:00
LmeSzinc
f383a041d0 Fix: Blessing obtained and lost 2023-10-23 02:19:54 +08:00
LmeSzinc
c0e255e4cc Fix: BLESSING_LOST.2, lost 2 blessings 2023-10-21 02:09:13 +08:00
LmeSzinc
9a113a7b9b Add: claim immersifier rewards 2023-10-20 21:57:32 +08:00
LmeSzinc
fe39645e59 Refactor: Move assets to tasks/rogue/weekly 2023-10-20 03:03:27 +08:00
LmeSzinc
c004af5346 Add: Rogue stop condition: weekly_point_reward 2023-10-19 02:14:29 +08:00
LmeSzinc
0951ba6e9e Add: Check if team prepared 2023-10-19 00:07:17 +08:00
LmeSzinc
6c9678cf87 Fix: Handle blessing randomized by curio 2023-10-18 21:28:17 +08:00
LmeSzinc
8da4644e13 Add: Enter rogue 2023-10-18 21:19:09 +08:00
LmeSzinc
084ada106f Merge branch 'master' into dev
# Conflicts:
#	dev_tools/keyword_extract.py
2023-10-17 19:01:09 +08:00
LmeSzinc
8f1813733a Upd: [EN] PROFILE in freebies 2023-10-16 12:36:33 +08:00
X-Zero-L
315bc261bb
Add: Get Support Reward Everyday (#155)
* Add: Get Support Reward Everyday

* Upd: i18n

* Upd: Instead of using ocr, use template matching

* fix bug

* fix:  remove debug img

* Upd: Character (#157)

* Upd: character

* Upd: Character

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-10-16 12:24:52 +08:00
LmeSzinc
d22efbdf53 Add: Select rogue path (#145) 2023-10-15 04:21:10 +08:00
LmeSzinc
9ec0f9ded0 Merge branch 'bug_fix' into dev 2023-10-15 02:51:51 +08:00
LmeSzinc
4434e12bbe Upd: [EN] Assignment navs without event 2023-10-15 02:18:27 +08:00
LmeSzinc
16b8dc4a1d Add: Claim weekly rogue rewards (#147) 2023-10-15 02:02:06 +08:00
LmeSzinc
7f6bc78ccc Merge branch 'master' into dev 2023-10-14 18:42:55 +08:00
X-Zero-L
5178dedb5b
Upd: Character (#157)
* Upd: character

* Upd: Character
2023-10-11 20:54:40 +08:00
Zebartin
e48eb27fbc Add: Ocr and select rogue event options 2023-10-07 21:55:58 +08:00
LmeSzinc
357c3096c1 Fix: Handle BLESSING_ENHANCED and BLESSING_OBTAINED popups 2023-10-06 17:07:24 +08:00
LmeSzinc
312cc6f617 Add: Detect domain exit and go 2023-10-05 03:30:40 +08:00
LmeSzinc
0dbdd27f9b Add: Simple rogue event handler 2023-10-04 11:06:28 +08:00
LmeSzinc
9b6b9edde8 Merge branch 'master' into dev 2023-10-04 02:26:10 +08:00
Zebartin
77fb8f9026 Fix: Check DungeonDouble before combat 2023-10-03 20:06:44 +08:00
LmeSzinc
d1abb19982 Add: is_map_loading() 2023-10-03 06:03:53 +08:00
Zebartin
f01d2a5648 Fix: OCR of double event 2023-10-02 12:28:51 +08:00
LmeSzinc
fdcd2feb47 Add: Handle rogue reward 2023-10-01 16:24:00 +08:00
LmeSzinc
826d92e40e Add: page_rogue 2023-09-29 18:28:23 +08:00
Zebartin
298a5e3232 Opt: Locked checking 2023-09-28 21:39:13 +08:00
Zebartin
f791265a4b Fix: Ensure exiting assignment report 2023-09-28 17:35:25 +08:00
LmeSzinc
28081361d9
Merge pull request #113 from Zebartin/dev
Add: Event assignments (Space Station Task Force)
2023-09-27 22:38:21 +08:00
Zebartin
cb1dac5955 Fix: ASSIGNMENT_STARTED_CHECK 2023-09-27 13:53:15 +08:00
LmeSzinc
96b6bdadf0 Add: Task Echo of War 2023-09-27 03:14:12 +08:00
Zebartin
818b196e45 Fix: Remove unused OCR asset 2023-09-26 23:01:13 +08:00
Zebartin
a6a6b70c87 Fix: Use match instead of ocr for assignment group 2023-09-26 22:35:55 +08:00
Zebartin
aad72ea533 Fix: EMPTY_SLOT search & undispatched if event 2023-09-26 21:08:17 +08:00
Zebartin
17fc2979ea Fix: Remove ambiguous REPORT and LOCKED 2023-09-26 19:44:06 +08:00
Zebartin
81d785852d Add: Support for event assignments 2023-09-26 15:12:12 +08:00
Zebartin
b92ae0a143 Fix: Use ocr to check assignment groups instead 2023-09-26 15:12:12 +08:00
LmeSzinc
05072925d5 Fix: Start running at Himeko trial (#107) 2023-09-25 12:23:59 +08:00
LmeSzinc
6e00043526 Fix: Handle starting from trial and rogue 2023-09-24 17:43:43 +08:00
LmeSzinc
7a8f9f129e Add: Task to update dashboard 2023-09-24 17:06:41 +08:00
LmeSzinc
6eb9317ac4 Add: Use skills in combat 2023-09-24 04:20:45 +08:00
LmeSzinc
1dcaf5355d Add: UI switching to Himeko trial 2023-09-24 04:20:45 +08:00
LmeSzinc
2c35abc3f6 Refactor: Faster switch to forgotten hall 2023-09-23 01:30:36 +08:00
LmeSzinc
85fbaae4ac Refactor: forgotten_hall.team as standalone file 2023-09-22 23:06:57 +08:00
LmeSzinc
920537a3de Del: Replace EXIT_CONFIRM with enlarged POPUP_*.SEARCH 2023-09-22 22:02:46 +08:00
LmeSzinc
478f187295 Del: Replace EXIT_DUNGEON with MAP_EXIT 2023-09-22 21:43:06 +08:00
LmeSzinc
d3239ac3e5 Fix: Consider abyssal map as page_main 2023-09-22 12:35:38 +08:00
LmeSzinc
ca2d7b4fb5 Opt: Remove "+200Activity" and "Progress0/1" in daily quest OCR 2023-09-20 13:35:27 +08:00
X-Zero-L
5e48c1bd74
Upd: character (#98)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-09-20 13:35:15 +08:00
LmeSzinc
d314bab51c Add: Enemy and item detector 2023-09-19 21:11:15 +08:00
LmeSzinc
0279a8dc4d Fix: Get SimUni points at double event 2023-09-17 09:34:17 +08:00
LmeSzinc
488f6c814d Upd: [EN] assets of daily and item 2023-09-17 05:26:55 +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
f0dd63fa86 Upd: [EN] Assignment assets 2023-09-16 01:35:21 +08:00
LmeSzinc
b4fb7256b0 Upd: Language irravalent assets for assignment/claim 2023-09-16 01:08:26 +08:00
LmeSzinc
c7d09043c2 Upd: [EN] DAILY_QUEST_FULL 2023-09-15 13:31:36 +08:00
LmeSzinc
37e29838c5 Refactor: Get in-game language from plane name 2023-09-15 13:29:22 +08:00
LmeSzinc
c44b5c70d6 Upd: [EN] Battle pass assets 2023-09-13 04:26:36 +08:00
LmeSzinc
b29e95c1ea Fix: Handle slow game startup and game died during startup (#61) 2023-09-13 01:37:06 +08:00
LmeSzinc
e8a38bc1e1
Merge pull request #58 from 5upernova-heng/add/rouge_buff_selector
Add: rogue buff selector
2023-09-10 22:43:22 +08:00
LmeSzinc
3397869195 Add: Replace Alas with SRC on frontend 2023-09-10 01:55:14 +08:00
LmeSzinc
3ac9e264e6 Fix: OCR_ASSIGNMENT_LIMIT 2023-09-03 00:29:01 +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
9aaadc4136 Upd: [CN] DAILY_QUEST_FULL (#76)
And add logs to _get_quest_reward()
2023-08-31 01:25:10 +08:00
LmeSzinc
6c6296651f Upd: DUNGEON_COMBAT_INTERACT 2023-08-30 19:24:15 +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
a087189e54 Add: Dashboard on GUI 2023-08-30 00:45:28 +08:00
Hengyu
2465401d31 Merge remote-tracking branch 'upstream/dev' into add/rouge_buff_selector
# Conflicts:
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
2023-08-28 19:50:20 +08:00
LmeSzinc
361c4c2257 Opt: [ALAS] Checkbox in theme color 2023-08-27 23:09:20 +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
4719d3da60 Add: [ALAS] stored and state widgets 2023-08-27 17:02:11 +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
bc9642772f Add: Dungeon at double relic event 2023-08-21 01:14:40 +08:00
Hengyu
415694ec37 Upd: blessing ocr template 2023-08-21 00:09:21 +08:00
Hengyu
9228b200a5 Upd: assets and Ocr to fit in English ui 2023-08-20 23:53:25 +08:00
Hengyu
19497ebb6a Add: event page 2023-08-18 12:07:02 +08:00