LmeSzinc
7630b492e9
Merge branch 'master' into dev
2022-10-25 20:31:20 +08:00
xzjjasper
c495f4dd64
Upd: [TW] EQUIPMENT_OPEN and EQUIPMENT_CLOSE
2022-10-25 12:42:12 +08:00
LmeSzinc
df7a13a39b
Upd: [TW] RESEARCH_UNAVAILABLE ( #1761 )
2022-10-23 22:58:44 +08:00
LmeSzinc
af0b11db40
Upd: [TW] SUBMARINE_MOVE_CANCEL and SUBMARINE_MOVE_CONFIRM ( #1734 )
2022-10-23 22:56:51 +08:00
nEEtdo0d
840eb4dc7f
Mov: re-factor relevant modules and assets into freebies
2022-10-19 21:04:43 -04:00
nEEtdo0d
50e831fa3a
Mov: reward mail support to separate module
...
Del: MAIL_CLICK_SAFE_AREA, MAIL_COLLECT sufficient as substitute
2022-10-16 01:01:15 -04:00
nEEtdo0d
590145616f
Upd: mail delete steps now optional; default does not delete
...
Add: MAIL_CLICK_SAFE_AREA, MAIL_ENTER for all servers
2022-10-12 22:37:33 -04:00
nEEtdo0d
109e8645d9
Upd: alter commit ( c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent ( #1527 )
2022-10-04 00:25:42 -04:00
LmeSzinc
b8d022ab53
Fix: Collect exploration rewards that are ignored by auto search
2022-10-02 17:10:38 +08:00
LmeSzinc
74c200041d
Upd: [TW] INFO_BAR_* ( #1679 )
2022-09-23 01:27:45 +08:00
LmeSzinc
7b2e8636fc
Add: Siren templates in chapter BD
2022-09-16 22:06:13 +08:00
LmeSzinc
dd7e5fd961
Add: Siren templates in chapter AC
2022-09-16 00:31:17 +08:00
LmeSzinc
0bd2cf389b
Merge pull request #1615 from zhou525/pr_1574_bugfix
...
Fix: OneHitMode and call AshBeaconTask time conflicts
2022-09-11 22:02:15 +08:00
zhou525
fa1e5190e0
Fix OneHitMode and call AshBeaconTask time conflicts
2022-09-11 20:46:48 +08:00
LmeSzinc
e8dcdeaf65
Add: Quick retire options fallback to avoid user mistakes
2022-09-10 18:11:07 +08:00
LmeSzinc
056bfb4a1c
Merge branch 'master' into dev
2022-09-10 01:08:40 +08:00
LmeSzinc
7c7121cb78
Upd: [TW] EVENT_LIST_CHECK ( fixed #1617 )
2022-09-09 23:26:54 +08:00
LmeSzinc
ba984ceddf
Merge branch 'master' into dev
2022-09-07 00:10:06 +08:00
LmeSzinc
d48e633f9b
Merge pull request #1574 from zhou525/dev_1375_pr
...
Dossier Beacon and OneHitMode
2022-09-07 00:08:32 +08:00
zhou525
9085ac0b8b
Add: [CN]Dossier Beacon Attack Add: [CN]Ash Beacon OneHitMode
2022-09-06 23:58:37 +08:00
LmeSzinc
5c95717474
Upd: AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT
2022-09-06 22:46:24 +08:00
LmeSzinc
45f1421083
Merge pull request #1598 from LmeSzinc/dev
...
Add error notify and support E sereis research projects
2022-09-03 23:23:28 +08:00
appleapple802
20f862c5f7
Fix: [TW] exercise assets
2022-09-03 15:24:13 +08:00
appleapple802
6237a4850d
Fix:[TW]exercise QUIT_RECONFIRM.png
2022-09-03 15:00:33 +08:00
Bookbug
b26b6c97d1
Add: TaskBalancer ( #1509 )
...
* CoinManagement added, but malfunction
* CoinManagement added, but malfunction
* CoinManagement:Translation complete
* CoinManagement:ready for testing
* CoinManagement:ready for testing
* CoinControl: Almost done, needs optimization/fix
* Add: CoinControl, done with full test.
* Add: TaskBalancer(experimental)
* Add: TaskBalancer(experimental)
* Remove legacy codes
* Upt: Reform codes(Experimental)
* Add:Task Balancer(Experimental)
* Add:Task Balancer(Experimental)
* Upt: config.py
* Fix: Default value of CheckInterval
* Upd: Minor translation adjustment
* Upd: Minor translation adjustment
* Upd: Revert the enable button and remove the CheckInterval
* Fix: minor translation
* Fix: additional trigger message caused by legacy code
* Add: User-defined delay interval
* Opt: Translation and default value of CoinLimit; Remove user-defined CheckInterval; Reform task sorting logic
2022-08-24 23:44:49 +08:00
LmeSzinc
11aea6d4d9
Fix: Cancel researches with unsatisfied requirements
...
Avoid to add into queue
- Refactor: Split out ResearchSelector
2022-08-23 02:47:44 +08:00
LmeSzinc
fa32962de6
Upd: Copy static storage assets to all servers
2022-08-23 01:14:44 +08:00
LmeSzinc
d54d42f0f9
Merge branch 'master' into dev
2022-08-22 12:07:34 +08:00
LmeSzinc
85e459ee3b
Upd: [TW] USE_DATA_KEY and USE_DATA_KEY_NOTIFIED ( fixed #1547 )
2022-08-21 22:05:14 +08:00
freesrz93
faf5a74e56
Add: Use tech box & Disassemble equipments
...
Opt: check GET_ITEMS_CONTINUE to disassemble faster
Fix: material_enter may enter disassemble
Fix: can't select equipments with info bar
Opt: no need to use OCR
Opt: Use less templates
Refactor: StorageHandler
Fix: threshold too low
2022-08-21 08:56:49 +08:00
LmeSzinc
ea28a0cb65
Upd: AUTOMATION_CONFIRM
2022-08-20 23:28:15 +08:00
LmeSzinc
d3f46c843d
Upd: [CN][TW] REWARD_* assets
...
just in case they change it in the future
2022-08-19 00:21:18 +08:00
LmeSzinc
f3f6d19a1f
Add: Event Operation Convergence (event_20220818_cn)
2022-08-18 23:51:30 +08:00
LmeSzinc
3e83b855ca
Fix: [TW] GET_ITEMS_2
...
GET_ITEMS_2 should be 4px lower than GET_ITEMS_3
(cherry picked from commit f83faa13f4cc6ccd5e31615852e18afbc1b970c2)
2022-08-16 00:23:53 +08:00
Horizon101011
07a14849d9
Upd: More accurate asset for enhancement
2022-08-13 19:43:27 +08:00
LmeSzinc
d936a60c65
Merge pull request #1485 from bookbug666/dev_0804
...
Upt: Assets of equipment_change
2022-08-07 15:25:17 +08:00
freesrz93
b68e8abb6a
Fix: Wrong OCR result for build ticket count
...
Fix: Wrong OCR result for build ticket count
Fix: Wrong OCR result for build ticket count (1)
2022-08-06 19:39:57 +08:00
bookbug666
dd8d7f0ec5
Fix: Delete unused ui action; Rename button
2022-08-06 16:40:47 +08:00
chpkq
8e111a24f4
Fix: [TW] OPTS_INFO_D
2022-08-06 16:29:30 +08:00
bookbug666
ae73235b88
Upt: Assets of Equipment_change
2022-08-04 22:50:20 +08:00
bookbug666
a54d5e299f
Upt: Assets of Equipment_change
2022-08-04 22:49:45 +08:00
Zorachristine
e2a55e1b58
Fix: [TW] DORM_INFO
2022-08-04 20:01:23 +08:00
LmeSzinc
431eb9f46f
Merge pull request #1452 from appleapple802/master
...
fix:[TW]GET_ITEMS_3.png
2022-07-29 22:51:34 +08:00
LmeSzinc
af2606dd89
Add: Aquilifers Ballade chapter BD and SP
2022-07-29 22:43:43 +08:00
appleapple802
e50ae32e5b
fix:[TW]GET_ITEMS_3.png
2022-07-29 20:37:01 +08:00
LmeSzinc
5424c93af3
Add: Handle normal enemy transformed to Vestal randomly
2022-07-28 23:08:39 +08:00
LmeSzinc
51df1c4790
Add: Extract additional sirens after auto search
2022-07-28 21:44:46 +08:00
LmeSzinc
5caaacaff7
Upd: TEMPLATE_FORMATION_*
2022-07-28 20:17:10 +08:00
Horizon101011
070f280821
Upd: Retire assets for all servers
2022-07-28 16:57:09 +08:00
LmeSzinc
76881d68d5
Upd: Popup assets for all servers
2022-07-28 14:58:36 +08:00
LmeSzinc
0e7374bf8e
Fix: Another COMBAT_AUTO assets
2022-07-27 01:17:29 +08:00
Zorachristine
985eb2915c
Fix: [TW] Research/TEMPLATE_*.assets
2022-07-26 18:24:04 +08:00
Zorachristine
9188930626
Upd: [TW] Research_queue_*.assets
2022-07-25 22:10:30 +08:00
LmeSzinc
0b5b6f5da8
Merge pull request #1360 from LmeSzinc/dev
...
PR5 and research queue support
2022-07-18 12:47:14 +08:00
LmeSzinc
1be86abd8b
Upd: Copy SHIPYARD_SERIES_SELECT_CHECK to all servers
2022-07-18 01:11:40 +08:00
LmeSzinc
ae1f4b2c6c
Fix: Move RESEARCH_GOTO_QUEUE because status icons can't be clicked
2022-07-17 23:07:15 +08:00
LmeSzinc
d99b70d4f5
Add: Handle the 6th research project
2022-07-17 22:58:29 +08:00
LmeSzinc
f0a2d7c02d
Opt: Reduce swipes when getting only 2 rows of items
2022-07-17 03:03:33 +08:00
LmeSzinc
91c39c8515
Add: Research queue support
2022-07-17 02:56:08 +08:00
LmeSzinc
4c1afd5ea4
Add: Adding projects into research queue
2022-07-17 01:47:26 +08:00
LmeSzinc
ccf1827995
Upd: Update assets for PR5
2022-07-17 01:31:12 +08:00
chpkq
0ce3916f5d
Fix: [TW] BEACON_ENTER, BEACON_EMPTY
2022-07-17 01:05:02 +08:00
LmeSzinc
ffed947dd2
Upd: [TW] BEACON_EMPTY abd BEACON_ENTER ( #1335 )
2022-07-15 21:11:19 +08:00
LmeSzinc
9958c96107
Upd: BEACON_REMAIN for all servers
2022-07-15 02:03:14 +08:00
LmeSzinc
3e9187e770
Upd: [EN] ASH_SHOWDOWN
2022-07-15 00:18:00 +08:00
LmeSzinc
1205b716c2
Upd: OS_CHECK for all servers
2022-07-14 18:53:11 +08:00
LmeSzinc
7b7bcbeee4
Revert "Fix: [JP] Temp fix for game bug on research remain tab ( #1227 )"
...
This reverts commit b5be6454
2022-07-12 18:47:34 +08:00
LmeSzinc
5c93906502
Upd: [TW] EXP_INFO_CF ( fixed #1310 )
2022-07-09 21:49:36 +08:00
LmeSzinc
3dd11e79e5
Merge pull request #1305 from LmeSzinc/bug_fix
...
Bug fix
2022-07-07 01:29:01 +08:00
chpkq
de9a1fb9fd
Fix: [TW] SHOP_MEDAL_SWIPE_END, SHOP_MERIT_SWIPE_END
2022-07-07 01:19:36 +08:00
nEEtdo0d
074489f52f
Fix: Cannot enter buy interface if ship development is in progress
...
Add: SHIPYARD_RESEARCH_IN_PROGRESS for new clause
TODO: [CN, TW, JP] icon should be same across servers but if not will need to update
2022-07-05 23:31:44 -04:00
LmeSzinc
ed69d7b006
Fix: Use the old ORDER_CHECK as its button ( #1290 )
2022-07-05 21:53:57 +08:00
LmeSzinc
e36db6d5c7
Fix: Move ORDER_CHECK to the info button ( #1290 )
2022-07-04 23:06:48 +08:00
LmeSzinc
1f1141a1f5
Fix: Clicked GET_SHIP when exiting page_meowfficer ( #1273 )
...
- Rename MEOWFFICER_GOTO_DORM to MEOWFFICER_GOTO_DORMMENU for clarity
2022-07-02 16:06:24 +08:00
chpkq
91ce67cf23
Upd: [TW] shipyard daily
2022-07-02 01:53:25 +08:00
Zorachristine
fed13405ae
Fix: [TW] raid_ticket_use_confirm assets
2022-07-01 19:53:20 +08:00
LmeSzinc
bb3cbae499
Upd: [EN] Angel of Iris assets
2022-07-01 00:04:49 +08:00
Zorachristine
7794e2ad74
Fix: [TW] raid_check assets
2022-06-30 22:20:10 +08:00
nEEtdo0d
2b217012f6
Fix: re-factor shipyard ui checking ( #1251 ); [EN] asset re-name/adjust
...
TODO: [CN, JP, TW] may want to adjust; otherwise using re-named same asset
2022-06-26 12:23:04 -04:00
LmeSzinc
c6e28b3daf
Merge branch 'master' into dev
...
# Conflicts:
# campaign/Readme.md
# module/config/argument/args.json
# module/config/i18n/zh-TW.json
2022-06-16 21:10:53 +08:00
LmeSzinc
b5be6454e6
Fix: [JP] Temp fix for game bug on research remain tab ( #1227 )
...
Research tab cannot expand after game patch.
Revert this commit when game dev fix it
2022-06-16 20:30:41 +08:00
LmeSzinc
1bd88230a3
Merge pull request #1211 from LmeSzinc/dev
...
Bug fix
2022-06-11 00:03:51 +08:00
LmeSzinc
badb3c7758
Fix: EXP detection in tactical class
2022-06-10 23:44:43 +08:00
LmeSzinc
2ab04cefdb
Merge pull request #1207 from LmeSzinc/dev
...
Fix: Detection of beacon data collected today
2022-06-10 02:10:40 +08:00
LmeSzinc
9e6028685f
Fix: Detection of beacon data collected today
2022-06-10 01:58:24 +08:00
LmeSzinc
26f1e0854a
Merge pull request #1192 from LmeSzinc/dev
...
Add: New medal shop support and bug fixes
2022-06-07 19:30:55 +08:00
appleapple802
38ecf03642
Fix: TW server meowfficer buy
2022-06-06 12:25:46 +08:00
LmeSzinc
ee9cffbb2f
Add: Scrolling medal shop list
2022-06-05 23:54:01 +08:00
LmeSzinc
4ab0a6189a
Merge pull request #1185 from nEEtdo0d/shop_refactor
...
Fix: shop module refactor; medal shop adjustment
2022-06-05 15:34:52 +08:00
LmeSzinc
20fd6fb1df
Upd: Remove dorm zoom-out and minitouch force call ( fixed #981 )
2022-06-05 09:27:59 +08:00
nEEtdo0d
cf8adaff38
Fix: shop_medal refactor UI and route for base functionality
2022-06-04 20:59:06 -04:00
LmeSzinc
7b407a8d4e
Upd: [TW] MEOWFFICER_CANCEL ( fixed #1164 )
2022-06-05 08:52:42 +08:00
LmeSzinc
d51fc8f3eb
Fix: Shop module quick fix except the new medal shop
...
- Fix: Cannot detect AMOUNT_MAX in core shop
- Todo: All servers need to update SHOP_MEDAL_SWIPE_END and SHOP_MERIT_SWIPE_END
2022-06-03 03:20:55 +08:00
LmeSzinc
515beddde5
Fix: Fleet Mechanism detection
...
- Fix: Special whether on opsi map are detected as fleet mechanism
2022-06-03 00:27:49 +08:00
LmeSzinc
f9b673705f
Add: Pledge of the Radiant Court chapter SP
2022-05-27 22:57:51 +08:00
LmeSzinc
adbf2885be
Add: Pledge of the Radiant Court chapter BD
2022-05-27 21:07:16 +08:00
nEEtdo0d
e154484562
Opt: ui_ensure_index approach ocr center number instead of price; prevent overbuying circumstances ( #1133 )
...
Fix: handle game bug stock limit on screen may differ from known wiki values; fallback if read fail (#990 )
2022-05-26 23:46:09 -04:00
LmeSzinc
38f9a0843f
Fix: Wrong OCR_MEOWFFICER_CAPACITY result if user has a capacity of 200 ( fixed #1141 )
2022-05-24 23:04:31 +08:00
LmeSzinc
7b273808bc
Upd: [TW] PAUSE assets ( fixed #1134 )
2022-05-20 13:44:05 +08:00
LmeSzinc
1fbfe450ca
Fix: Revert "Upd: Move PAUSE assets 5px left" except CN
...
This reverts commit 913cc8e9
2022-05-19 22:08:17 +08:00