Tipsy Fisher
78259e8037
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr
2023-08-12 12:22:10 +08:00
RilyLC
cc92d60b0a
[TW]Fix ash beacons and shipyard ( #2999 )
...
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-08-11 19:06:10 +08:00
yypsybs
cbd8bac236
Opt: Choose minigame by scroll
2023-08-08 00:03:41 +08:00
guoh064
dd7b454459
Rev: Old Dossier Meta Reward(LmeSzinc#2544)
2023-08-07 17:33:51 +08:00
Tipsy Fisher
1e0f45e189
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr
2023-08-07 09:32:50 +08:00
LmeSzinc
073d11cf89
Fix: get_research_series() ( #2975 )
2023-08-06 17:40:43 +08:00
yypsybs
89e40134b4
Merge branch 'master' into dev-minigame-for-pr
2023-08-04 11:53:54 +08:00
LmeSzinc
d389f75c5f
Add: handle_map_walk_speedup()
2023-08-03 22:59:37 +08:00
Tipsy Fisher
6fca29e79c
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr
2023-07-21 00:07:41 +08:00
LmeSzinc
c2f744c5ff
Upd: [JP] SERIES_DETAIL ( #2900 )
2023-07-20 22:35:28 +08:00
Tipsy Fisher
f30c265a62
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr
2023-07-17 16:00:25 +08:00
xzjjasper
c892b3be22
Fix: [TW] SHOP_CHECK
2023-07-16 16:23:58 +08:00
xzjjasper
065d4a8bce
Upd: [TW] assets of shop module
2023-07-14 12:03:38 +08:00
Tipsy Fisher
a962b13343
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr
2023-07-14 10:59:13 +08:00
LmeSzinc
85bea51b60
Upd: Assets for entering supply pack
2023-07-14 00:31:52 +08:00
yypsybs
28cae91564
Opt: minigame
...
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
2023-07-11 18:00:03 +08:00
Tarin_Chan
b9e5134464
Fix: add RAID_REWARDS.png to fix raid reward problem ( #2829 )
...
* Add files via upload
* Update raid.py
更改了逻辑
特别感谢Alas群 莱森·何Horizon101011 的帮助
* Update raid.py
趁没人看见修点丢人bug
---------
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-07-02 15:38:44 +08:00
LmeSzinc
b3f1461e37
Upd: [EN] Raid assets of Reflections of the Oasis
2023-06-30 16:16:24 +08:00
iceynano
ffe3988e72
Fix: Error caused by empty build queue ( #2816 )
...
* Fix: Error caused by empty build queue
* feat: add BUILD_QUEUE_EMPTY assets
* fix: use image_color_count() for identify images
* chore: remove useless asset
* fix: Avoid info_bar and use appear()
---------
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: SaarChaffee <saarchaffee@qq.com>
2023-06-30 15:32:41 +08:00
lwhzbyz
055260a23c
Fix asset for SHOP_SELECT_PR1 ( #2771 )
2023-06-15 02:08:09 +08:00
lwhzbyz
1789d8a7bd
Bug fix: Guild shop PR SELECT ( #2740 )
...
* Change SHOP_SELECT_PR for all servers.
* Change SHOP_SELECT_PR for all servers.
---------
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-06-11 01:40:48 +08:00
LmeSzinc
e94a54daed
Upd: [CN] BATTLE_STATUS_CF, EXP_INFO_CF
2023-06-09 00:19:01 +08:00
LmeSzinc
454e308702
Upd: [CN][TW] DOCK_SELECTED ( #2729 )
2023-06-08 16:33:31 +08:00
LmeSzinc
d98f04d5bf
Add: Siren templates
2023-05-27 18:56:49 +08:00
LmeSzinc
f9e9824c55
Fix: Stage entrance extraction in Confluence of Nothingness
2023-05-26 17:34:21 +08:00
LmeSzinc
ee6602a1fe
Upd: BATTLE_STATUS_*
2023-05-26 00:55:35 +08:00
LmeSzinc
c6df09e170
Upd: EXP_INFO_* and the exercise one
2023-05-25 21:45:19 +08:00
guoh064
a26e15675e
Add: TEMPLATE_META_DOCK_RED_DOT for other servers
2023-05-07 22:21:20 +08:00
LmeSzinc
ed02e89bc0
Opt: Code formatting
2023-04-11 22:08:38 +08:00
LmeSzinc
ff8c80863a
Upd: [TW] MAP_AMBUSH_EVADE ( fixed #2444 )
2023-04-04 01:40:23 +08:00
LmeSzinc
8c4526b0c0
Fix: Handle appear animation in coalition page ( #2397 )
2023-03-24 23:18:16 +08:00
LmeSzinc
d5ba9bbc83
Revert: [TW] Revert IRIS_OCR_PT
2023-03-24 05:14:03 +08:00
LmeSzinc
b2de4b83d7
Merge branch 'master' into dev
...
# Conflicts:
# campaign/Readme.md
# module/config/argument/args.json
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
# module/config/i18n/zh-TW.json
2023-03-24 05:11:15 +08:00
LmeSzinc
7ecf3ac502
Add: Coalition task
2023-03-24 04:41:13 +08:00
LmeSzinc
25c7380684
Add: UI switches in coalition battles
2023-03-24 03:06:46 +08:00
xzjjasper
802bb6c26e
Upd: [TW] raid assets
2023-03-23 21:52:41 +08:00
xzjjasper
7175b3969e
Upd:[TW] Angel of Iris
2023-03-23 20:36:48 +08:00
LmeSzinc
89c36597b2
Add: Emergency module development daily
2023-03-17 00:34:02 +08:00
LmeSzinc
4610d9babf
Upd: [TW] FLEET_*_ADVICE
2023-03-11 03:56:46 +08:00
LmeSzinc
cb1d4f24d3
Opt: Raise error when user running a hard mode but haven't prepared the fleets
2023-03-10 23:10:19 +08:00
LmeSzinc
b9d2b264a1
Upd: EQUIP_CONFIRM
2023-02-26 20:53:56 +08:00
LmeSzinc
db0431994c
Fix: Handle another STORY_SKIP ( #2284 )
2023-02-24 21:25:36 +08:00
LmeSzinc
29bcd00590
Add: Revelations of Dust chapter AC
2023-02-23 22:15:39 +08:00
LmeSzinc
01e71513a2
Fix: Use template matching on MAP_AMBUSH_ATTACK and MAP_AMBUSH_EVADE
2023-02-18 16:38:08 +08:00
LmeSzinc
b02069fd7f
Fix: Handle game tips when entering mewofficer enhance
2023-02-14 00:21:32 +08:00
LmeSzinc
305ba80c7d
Fix: Check meowfficer level before enhancing ( #2211 )
2023-02-14 00:11:36 +08:00
LmeSzinc
785e34ed92
Upd: [CN][TW] SHIPYARD_LEVEL_NOT_ENOUGH_FATE
2023-02-11 16:41:16 +08:00
LmeSzinc
c3ee7c442e
Refactor: enemy_searching_appear() using template matching
2023-01-29 14:48:56 +08:00
LmeSzinc
ee710904a9
Fix: Delay task Dorm according to number of ships in dorm ( fixed #2119 )
2023-01-28 18:11:28 +08:00
LmeSzinc
e60fae44cc
Fix: Limit button area of LOGIN_ANNOUNCE ( #1779 )
2023-01-28 16:29:44 +08:00
chpkq
c2b0ebe792
Upd: [TW] TICKET_USE_CONFIRM
2023-01-28 00:05:18 +08:00
xzjjasper
a7cbb3faa6
Upd: [TW] Mystery Investigation Assets ( #2155 )
2023-01-20 14:03:33 +08:00
LmeSzinc
186e3305ad
Upd: [JP] BATTLE_PREPARATION
...
cause JP has a bad localization, they dont know the difference between 击 and 擊
2023-01-18 23:17:49 +08:00
LmeSzinc
5f760b779b
Upd: [TW] QUEUE_CHECK ( #2141 )
2023-01-18 22:23:30 +08:00
LmeSzinc
9cd81ab1ae
Upd: [TW] OS_FLEET_LOCKED and OS_FLEET_UNLOCKED
2023-01-17 23:03:38 +08:00
LmeSzinc
55020f2752
Upd: BEACON_REWARD to handle poor english on buttons ( #2109 )
2023-01-13 23:45:41 +08:00
LmeSzinc
e750c44c18
Upd: [TW] SKILL_CONFIRM
2023-01-09 21:01:45 +08:00
LmeSzinc
05f8c102d3
Upd: [TW] META_CHECK
2023-01-09 00:40:51 +08:00
LmeSzinc
264a34683f
Merge branch 'bug_fix' into dev
2023-01-03 03:19:36 +08:00
LmeSzinc
db7199f730
Fix: [TW] MAP_NAME, it should as long as CN
2023-01-03 02:33:45 +08:00
LmeSzinc
332f6b87d3
Merge branch 'master' into dev
2023-01-01 17:17:53 +08:00
LmeSzinc
951592b9f2
Upd: [EN] Another MAIL_EMPTY
2023-01-01 17:04:39 +08:00
LmeSzinc
c8818e3fb5
Merge branch 'bug_fix' into dev
2022-12-31 22:56:18 +08:00
LmeSzinc
b8bddfeb47
Fix: Handle guild commander change mails
2022-12-31 22:49:04 +08:00
LmeSzinc
ed25ce48ae
Fix: Add support to 150% scaling combat joystick
2022-12-29 20:56:36 +08:00
LmeSzinc
09f69f5938
Upd: BACK_ARROW for template matching
2022-12-29 18:04:30 +08:00
LmeSzinc
ffbac284dd
Refactor: info_bar_count() for poor image quality
2022-12-29 17:50:49 +08:00
LmeSzinc
8baf402b1f
Upd: OS_ADAPTABILITY_* for all servers
2022-12-23 20:24:14 +08:00
LmeSzinc
0a598247ab
Add: Siren templates
2022-12-23 16:12:58 +08:00
下面我簡單喵兩句
8572665af5
fix:research assets v4 ( #2025 )
2022-12-23 12:13:03 +08:00
下面我簡單喵兩句
fb853c5684
fix:research assets v3 ( #2024 )
2022-12-23 03:53:25 +08:00
下面我簡單喵兩句
e81cf56877
fix:research assets v2 ( #2023 )
2022-12-23 02:58:38 +08:00
LmeSzinc
f2e016a60f
Upd: [TW] STRATEGIC_SEARCH_TAB_SECURED
2022-12-20 19:25:18 +08:00
LmeSzinc
d621a48ebc
Merge pull request #1992 from LmeSzinc/bug_fix
...
Add: OpSi Archive Zones
2022-12-12 00:04:34 +08:00
下面我簡單喵兩句
da7efd102c
Add: [TW] asset support for voucher shop ( #1982 )
2022-12-11 14:52:19 +08:00
下面我簡單喵兩句
873a6da0e2
Add: [TW]Assets update for strategic search ( #1981 )
2022-12-11 13:49:28 +08:00
xzjjasper
ae7bf32da2
Upd: [TW] Mail collect ( #1975 )
2022-12-11 13:47:37 +08:00
LmeSzinc
cb2abd107f
Merge branch 'master' into dev
2022-12-07 01:50:32 +08:00
LmeSzinc
47f820b7fd
Merge pull request #1951 from LmeSzinc/bug_fix
...
Bug fix
2022-12-07 01:49:40 +08:00
LmeSzinc
2168329e07
Fix: [EN] Confirm button in SOS signal search list
...
- Re-arrange SOS templates
2022-12-07 01:38:57 +08:00
LmeSzinc
54d5874b9d
Upd: [CN] Voucher shop assets and translation
2022-12-05 22:31:53 +08:00
下面我簡單喵兩句
1046ba258a
Fix:handler assets ( #1944 )
2022-12-04 22:43:51 +08:00
xzjjasper
2854b8efb2
Upd: [TW] GET_ITEMS_1_RYZA
2022-12-01 23:57:07 +08:00
nEEtdo0d
bc3376e191
Fix: merge LmeSzinc/dev into branch, resolve conflicts
2022-11-29 15:04:47 -05:00
LmeSzinc
1687133d46
Upd: [EN] GET_ITEMS_1_RYZA
2022-11-25 04:27:56 +08:00
LmeSzinc
e0feea2366
Add: The Alchemist and the Archipelago of Secrets chapter T
2022-11-24 22:24:20 +08:00
nEEtdo0d
3b37e4afa0
Add: shop module support voucher shop (os supply / exchange)
2022-11-14 12:00:13 -05:00
appleapple802
fe79137d03
fix:[tw]os_combat assets
2022-11-08 11:55:39 +08:00
LmeSzinc
fa8d84fd87
Merge pull request #1815 from xzjjasper/master
...
Add: [TW] The Flame-Touched Dagger
2022-11-04 00:06:57 +08:00
xzjjasper
ce551574b5
Upd: [TW] MISSION_MONTHLY_BOSS
2022-11-03 19:06:35 +08:00
LmeSzinc
e847f76256
Merge branch 'master' into dev
...
# Conflicts:
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
2022-10-28 03:09:41 +08:00
LmeSzinc
ff99d80b5a
Upd: [EN] ALBION raid assets
2022-10-28 02:54:09 +08:00
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
