sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code
8,321 Commits 9 Branches 0 Tags 274 MiB
076996a76a
Commit Graph

445 Commits

Author SHA1 Message Date
LmeSzinc
e750c44c18 Upd: [TW] SKILL_CONFIRM 2023-01-09 21:01:45 +08:00
bookbug666
a290d9d902 Add:Changing temporality asset to simulate ongoing event 2023-01-09 13:15:50 +08:00
LmeSzinc
0249927d3e Fix: Use retry interval instead of bare sleep 2023-01-09 01:10:48 +08:00
LmeSzinc
05f8c102d3 Upd: [TW] META_CHECK 2023-01-09 00:40:51 +08:00
bookbug666
033d7486df Add:Check event availability before event tasks, using temporality asset. 2023-01-07 12:01:57 +08:00
LmeSzinc
1b5d3b0beb Fix: NavBar failed on random pure black screenshot 2023-01-05 20:46:02 +08:00
LmeSzinc
09f69f5938 Upd: BACK_ARROW for template matching 2022-12-29 18:04:30 +08:00
LmeSzinc
3691fd95cd Fix: Setting retrying on slow devices 2022-12-28 17:59:10 +08:00
bookbug666
941da49fc2 Merge branch 'dev' into storage_jp 2022-12-20 10:05:42 +08:00
LmeSzinc
98c2e980d5 Fix: Subtracting None in NavBar.get_total() 2022-12-15 01:52:07 +08:00
bookbug666
3c1a03b61c Upd:[JP]Assets of storage module, missing STORAGE_CHECK.png fixed 2022-12-10 19:47:09 +08:00
LmeSzinc
bab2cb1df1 Fix: GET_SHIP being clicked after MEOWFFICER_INFO 2022-12-07 20:14:04 +08:00
SarContDeli
1b47e69496 Upd: Refactored part of hazard 1 leveling 2022-11-15 17:23:34 +08:00
LmeSzinc
383b8893c2 Merge branch 'master' into dev 2022-11-02 00:22:03 +08:00
LmeSzinc
2edde3b50e Upd: [EN] RAID_CHECK 2022-10-28 03:19:44 +08:00
LmeSzinc
bb61f2f9b6
Merge branch 'dev' into mail_reward 2022-10-23 17:03:32 +08:00
nEEtdo0d
840eb4dc7f Mov: re-factor relevant modules and assets into freebies 2022-10-19 21:04:43 -04:00
LmeSzinc
95738436b7 Fix: Handle GET_ITEMS when switching from guild lobby to logistics 2022-10-15 23:55:20 +08:00
LmeSzinc
2b16698d57 Fix: Missing argument in _shop_obstruct_handle() 2022-10-09 00:18:23 +08:00
LmeSzinc
8c93437829
Merge pull request #1714 from LmeSzinc/bug_fix 
Bug fix
 2022-10-09 00:02:59 +08:00
LmeSzinc
b2533c19b2 Merge branch 'master' into dev 2022-10-07 01:23:22 +08:00
nEEtdo0d
02e696937f Fix: handle possible stuck pages during shop operations; buy bulin > 1 for example 2022-10-06 12:45:48 -04:00
LmeSzinc
9474034210 Upd: [JP] DORM_FEED_ENTER (#1707) 2022-10-06 17:06:31 +08:00
LmeSzinc
775717d77e Fix: Starting ALAS at AUTO_SEARCH_REWARD 2022-10-06 14:15:03 +08:00
LmeSzinc
7fb8092950 Refactor: Reuse ui_page_main_popups in LoginHandler 2022-10-02 21:29:56 +08:00
LmeSzinc
8653f07e1c Fix: Conflict interval of GET_MISSION in ui switching 2022-09-30 11:27:10 +08:00
LmeSzinc
b1d08b1325 Opt: Try user settings first in quick retire setting fallback 2022-09-25 17:26:50 +08:00
LmeSzinc
cc922d798e Fix: [EN] Unable to detect META skill list 2022-09-25 02:39:45 +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
67e7eb04a5 Refactor: Abstract filter_set to Setting class 2022-09-08 12:27:50 +08:00
nEEtdo0d
b7c9443ee1 Add: [EN] storage assets 
Fix: [EN] storage OCR position differs, exclude ':' on read
 2022-09-01 21:07:41 -04:00
LmeSzinc
f1ef87ca50 Merge branch 'master' into dev 
# Conflicts:
#	module/device/emulator.py
 2022-09-02 00:13:11 +08:00
LmeSzinc
6641aa8200 Upd: [JP] MAIN_GOTO_CAMPAIGN 
following the new assets requirements
 2022-08-28 23:21:51 +08:00
LmeSzinc
038e2096d0 Add: Provide wrapped methods to handle StorageFull in storage 
- Faster UI switching in storage
- More logs in storage
 2022-08-22 21:07:30 +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
d3f46c843d Upd: [CN][TW] REWARD_* assets 
just in case they change it in the future
 2022-08-19 00:21:18 +08:00
LmeSzinc
bad3c2b180 Upd: [JP] REWARD_* assets 2022-08-19 00:14:32 +08:00
LmeSzinc
f0426236c8 Upd: [EN] REWARD_* assets 2022-08-19 00:09:44 +08:00
LmeSzinc
e8bfd08eba Merge branch 'bug_fix' into dev 
# Conflicts:
#	module/config/config_generated.py
 2022-08-04 21:18:04 +08:00
Zorachristine
e2a55e1b58 Fix: [TW] DORM_INFO 2022-08-04 20:01:23 +08:00
LmeSzinc
a4cfe89476 Fix: Handle skin and item expired (fixed #1309) 2022-08-01 00:39:27 +08:00
LmeSzinc
e7b9615f10 Fix: Handle battle pass PURCHASE_POPUP at main page 2022-08-01 00:30:53 +08:00
LmeSzinc
f7d50a5306 Fix: Shinano event may be detected as raid 2022-07-17 01:20:25 +08:00
LmeSzinc
1205b716c2 Upd: OS_CHECK for all servers 2022-07-14 18:53:11 +08:00
LmeSzinc
96e4e75854 Fix: Ignore swipe distance check in SOS 
fix when sos maps haven't fully unlocked
 2022-07-09 13:19:06 +08:00
LmeSzinc
e4904c977f Fix: Mis-detect GET_SHIP after clicking MAIN_GOTO_CAMPAIGN (fixed #1231) 2022-07-09 13:03:48 +08:00
LmeSzinc
c58e7a8359 Fix: [JP] EXCHANGE_CHECK is detected when goto page_supply_pack 2022-07-02 16:16:25 +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
LmeSzinc
d9b5392b58 Upd: [EN][JP] RAID_CHECK 2022-07-01 03:02:29 +08:00
LmeSzinc
858be97b2e
Merge pull request #1271 from Zorachristine/master 
Fix: [TW] raid_check assets
 2022-06-30 22:28:42 +08:00
LmeSzinc
c6a4c13038 Add: Support PT limit in Raid 
- Fix: Disable RAID_FLEET_PREPARATION at startup
- TODO: EN and JP need to update IRIS_OCR_PT
 2022-06-30 22:26:54 +08:00
Zorachristine
7794e2ad74 Fix: [TW] raid_check assets 2022-06-30 22:20:10 +08:00
LmeSzinc
a1d1e0695d Fix: Check rotation if ui unrecognised 2022-06-13 01:24:04 +08:00
LmeSzinc
ee9cffbb2f Add: Scrolling medal shop list 2022-06-05 23:54:01 +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
nEEtdo0d
f1e5420cc8 Fix: [EN] move os monthly reset check to top; clashes with reset ticket popup confirm 
Add: explicit return bool for ui_page_main_popups
 2022-05-29 15:49:28 -04:00
LmeSzinc
6d18798f2c Opt: Add UI switch details in log 2022-05-16 22:33:03 +08:00
Zorachristine
98de926afc Fix:[TW] RAID_CHECK assets 2022-05-05 22:01:30 +08:00
LmeSzinc
b3a85f9ba5 Fix: Handle popups after exiting from page_tactical to page_reward (#1018) 2022-04-17 19:52:21 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
Egor Nats
1101d01a0d Fix: [EN] Fixed Dorm stuck after XP screen 2022-04-14 13:33:28 -03:00
LmeSzinc
a21fce7788 Fix: Lower the threshold of DORM_INFO to 0.75 2022-04-14 00:46:36 +08:00
nEEtdo0d
e57309d888 Upd: [EN] additional post update assets 
Add: restore select partial commits; 1e13eab, c3c0ba4, 1cc28f5
 2022-04-12 22:55:49 -04:00
Egor Nats
2166bf9066 Fix: [EN] Fix Tactical Class and Dorm Feature. 2022-04-12 13:21:08 -03:00
Egor Nats
1ebe64950a Fix: [EN] Revert to old assets 
- Tactical class and Dorm feature still broken, please disable until fix.
 2022-04-12 11:20:34 -03:00
LmeSzinc
987b7b7b4e Fix: Handle game freeze at the first retreat after client start 2022-04-12 18:17:48 +08:00
nEEtdo0d
6f7699b0d5 Upd: gem farming module assets (#1003) 2022-04-10 17:34:40 -04:00
LmeSzinc
c7f62b8b19 Fix: Increase UI search range to 30px 2022-04-11 02:31:20 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
nEEtdo0d
7779bc7672 Upd: [EN] remaining post major update assets 
Upd: [EN] adopt same style as other servers for MAIN_GOTO*

TODO: other uncommon assets updated when available; debug tactical class, stuck frequently
 2022-04-08 19:09:08 -04:00
Zorachristine
4b0ade4801 Upd: [TW] MAIN_GOTO_* assets 2022-04-08 19:30:57 +08:00
Zorachristine
ebdf4fa6a3 Upd: [TW] TACTICAL_CLASS_CANCEL & DORM_INFO 2022-04-08 19:05:13 +08:00
LmeSzinc
1e13eaba08 Del: Redundant assets WAR_ARCHIVES_GOTO_CAMPAIGN 2022-04-08 17:37:15 +08:00
LmeSzinc
c3c0ba4443 Upd: [CN] CAMPAIGN_MENU_GOTO_CAMPAIGN to handle random shifting (#993) 2022-04-08 17:31:56 +08:00
nEEtdo0d
73ddcd9b7f Upd: [EN] post major app update bulk assets; WIP part 2 2022-04-08 00:57:15 -04:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
71e325e1a2 Upd: [JP] DORM_INFO 2022-04-07 20:46:28 +08:00
LmeSzinc
9720cec0c6 Fix: Exit from OpSi exchange shop 2022-04-01 00:09:18 +08:00
LmeSzinc
8d25e709c3 Fix: Handle battle pass notice 2022-03-31 21:32:34 +08:00
LmeSzinc
7979d8e7c7 Opt: handle OpSi monthly reset for quality of life 2022-03-31 21:32:34 +08:00
LmeSzinc
af3e402c49 Fix: Handle monthly pass notice 2022-03-31 21:32:17 +08:00
LmeSzinc
095eec9a92 Fix: Handle login at startup (#976) 2022-03-20 16:34:31 +08:00
LmeSzinc
40396b21fe Fix: [EN] Move MEOWFFICER_CHECK to upper-left to be compatible with meow_menu_close() 2022-03-20 16:25:34 +08:00
LmeSzinc
dbfbd294ff Fix: Confirm unknown ui page; 5 seconds timeout (#956) 2022-03-07 22:18:10 +08:00
LmeSzinc
526d85bf14 Merge branch 'dev' 2022-03-07 20:32:55 +08:00
railzy
16c4a72f90 Upd: [JP] assets for meta reward 2022-03-07 11:57:58 +08:00
LmeSzinc
7e0cd13410 Opt: Increase speed in meowfficer module by reusing screenshots 
- Fix: Page transaction and ui_additional() run at the same time in ui_goto()
 2022-03-06 20:47:29 +08:00
LmeSzinc
3bfa8d00ed Fix: Scroll disappear when trying to drag it 
A random issue in commission scanning
 2022-03-01 23:20:24 +08:00
Zorachristine
12badf6c35 Upd: [TW] supply_pack assets 2022-02-21 21:28:08 +08:00
nEEtdo0d
6e82e6800e Add: [EN] meta_reward assets 2022-02-15 19:31:23 -05:00
LmeSzinc
9266f3b3fc Add: Receive META rewards (#863) 2022-02-12 23:05:23 +08:00
LmeSzinc
f891689bee Fix: Increase interval of GET_SHIP to stagger clicks 2022-02-07 23:28:36 +08:00
LmeSzinc
ef173788a5 Merge branch 'dev' 
# Conflicts:
#	module/meowfficer/assets.py
 2022-02-06 12:31:54 +08:00
Zorachristine
20aee8fdf7 Fix: [TW] BATTLE_PASS_CHECK & OCR_GUILD_EXCHANGE_LIMIT assets 2022-02-05 10:11:08 +08:00
LmeSzinc
893dc62afb Opt: [CN] Handle user agreement in pure image detection 
- Add image_color_button()
- Remove unused assets in login
 2022-02-02 19:44:58 +08:00
LmeSzinc
df310b9d09 Opt: Remove unnecessary use of drags, fallback to swipe+click if drag is a must 2022-02-01 21:49:57 +08:00
LmeSzinc
b54b2fe036 Merge branch 'master' into dev 2022-01-28 21:32:35 +08:00
LmeSzinc
e037b2040b Upd: [EN] Joint Battle Mystery Investigation assets 2022-01-28 01:47:51 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
ec4fec4f6d Opt: Remove STAGE_SHOWN_WAIT for faster 2022-01-10 23:54:02 +08:00
LmeSzinc
50b5b49365 Opt: Faster Switch.set(), replace click-wait with click interval 2022-01-10 20:35:07 +08:00
LmeSzinc
84f5e86077 Fix: Hunt zone view re-enabled by game 
- Fix: Validate switch status
 2022-01-10 01:27:03 +08:00
LmeSzinc
394bc195af Upd: [CN] META_CHECK 2022-01-05 18:12:36 +08:00
LmeSzinc
3c483885e1 Revert "Fix: Add counter to retry timer for slower retries on slow PCs", increase retry interval instead 
This reverts commit e0bb6123
 2021-12-24 00:25:25 +08:00
Cola
850c93d31d Fix: [JP] Battle pass & os fleets assets 2021-12-10 19:00:01 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
nEEtdo0d
bc9eb2f6d8 Add: ui_additional handling for shipyard and meta lab as can be routed from confirm click 2021-12-03 22:56:03 -05:00
nEEtdo0d
04e89faa08 Add: [EN] battle pass assets 2021-12-03 09:46:27 -05:00
LmeSzinc
ff7c875f3f Add: Collect battle pass rewards 2021-12-03 17:32:10 +08:00
Ray
f4805a8ff1 Upd: [JP] assets for guild operations & weekly... 
free pack & TEMPLATE_CRIMSON_ECHOES
TODO:
- GUILD_MISSION_NEW
 2021-11-30 22:39:33 +08:00
nEEtdo0d
32e24814b6 Add: [EN] assets to support weekly free supply pack purchasing 2021-11-29 22:46:28 -05:00
LmeSzinc
9d3917677e Add: Buy free weekly supplies pack 2021-11-27 15:23:13 +08:00
Zorachristine
ba1ae30a04 Fix: [TW] guild, os, research, ui assets 2021-11-20 22:21:06 +08:00
julystone
08f13bc2b3 Fix[tw]: Asserts replace RESHMENU_GOTO_RESEARCH 2021-11-19 16:33:43 +08:00
LmeSzinc
5e2d5d7444 Upd: [EN] CAMPAIGN_CHECK.gif 
Use "hapter" instead of "Chapter", because letter "C" may be outside
 2021-11-13 17:31:51 +08:00
LmeSzinc
593855f629 Upd: [EN] CAMPAIGN_CHECK.gif for W14 2021-11-09 00:14:08 +08:00
nEEtdo0d
62a950c539 Fix: [EN] re-cut to not overlap with BUILD_SUBMIT_ORDERS 2021-11-06 11:00:40 -04:00
nEEtdo0d
75d6203b9a Fix: [EN] PLAYER_CHECK page has no GOTO_MAIN, only BACK_ARROW 2021-11-03 20:48:15 -04:00
LmeSzinc
a964f4e068 Merge branch 'master' into app 2021-10-23 14:53:06 +08:00
Zorachristine
3b8083ec0c Fix: [TW] MAIN_GOTO_RAID.BUTTON asset reset 2021-10-22 18:34:40 +08:00
LmeSzinc
6bf5f9fa92 Add: TaskHoardingDuration and CloseGameDuringWait (#643) 2021-10-18 21:36:22 +08:00
LmeSzinc
1481a9b582 Fix: Compatible with FLEET_2, SUBMARINE set 
- Add Story handler to ui_additional
 2021-10-16 11:46:32 +08:00
nEEtdo0d
616b66564e Merge branch 'master' into app 
# Migrate handle vote popup check from app to master as common code
# [TW] MAIN_GOTO_RAID asset
 2021-10-15 16:27:39 -04:00
Zorachristine
5ea1fa372c Fix: [TW] MAIN_GOTO_RAID.BUTTON asset for now 2021-10-15 22:56:01 +08:00
LmeSzinc
1a683b02a4 Merge branch 'master' into app 2021-10-15 21:22:41 +08:00
Zorachristine
f3f815df1e Upd:[TW] Raid_SURUGA assets 2021-10-15 18:59:27 +08:00
nEEtdo0d
d9cec4134e Add: war archives support for app 2021-10-10 23:38:10 -04:00
LmeSzinc
0e4159c06d Merge branch 'master' into app 2021-10-06 17:04:40 +08:00
Cola
c76954a32a Fix: [JP] Fleet_check asset 2021-10-06 11:37:33 +08:00
LmeSzinc
38f55a3a26 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/reward/reward.py
 2021-09-30 21:26:25 +08:00
LmeSzinc
98f1657476 Upd: REWARD_GOTO_MAIN 2021-09-30 20:06:56 +08:00
LmeSzinc
b0f6798596 Merge branch 'master' into app 
# Conflicts:
#	module/reward/assets.py
 2021-09-30 16:09:42 +08:00
LmeSzinc
e01b2d49e8 Upd: Reward assets for all servers and add EXP 2021-09-30 16:05:04 +08:00
LmeSzinc
e1f6df02bd Opt: Faster switch between page_event and page_campaign 
- Fix: Unable to run dev_tools because task not bind
 2021-09-26 17:11:22 +08:00
LmeSzinc
4fd1147a40 Opt: Remove ensure main after task finishes 
- Clear offset of GOTO_MAIN to avoid clicking outside of screen
 2021-09-20 17:30:29 +08:00
LmeSzinc
8db4dd628b Fix: Clicking outside of screen in GOTO_MAIN 2021-09-20 09:02:54 +08:00
LmeSzinc
f71a151678 Merge branch 'master' into app 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config.py
 2021-09-19 23:34:30 +08:00
Ray
505d34f2bb Fix: [JP] META_CHECK asset 2021-09-18 14:29:20 +08:00
LmeSzinc
5ed75c8de5 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/map/fleet.py
#	module/ui/ui.py
 2021-09-17 23:53:15 +08:00
LmeSzinc
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09:00 +08:00
LmeSzinc
abdfbb713a Refactor: Rename auto search configs 
- Refactor device/app configs
- Fix: Research finish detection
 2021-09-15 23:50:30 +08:00
LmeSzinc
eb045242c3 Refactor: Rename retire configs 
- Fix combat drop screenshot missed because clicking too fast
- Close campaign preparation at start
 2021-09-15 23:33:06 +08:00
LmeSzinc
46d8d2fadb Refactor: Rename main configs 
- Faster chapter selection and page_campaign
- Rename some old Chinglish variables in map info
 2021-09-15 23:32:31 +08:00
nEEtdo0d
0d1c9729e4 Add: META_CHECK into ui_additional_page_reward, enter via popup skill at max level 2021-09-14 18:21:06 -04:00
LmeSzinc
071eec530a Move commission to a new module, also faster 2021-09-14 14:56:28 +08:00
LmeSzinc
cca5657004 Faster UI switching 2021-09-14 14:56:28 +08:00
LmeSzinc
b19fd32cc5 Scroll next and prev page 2021-09-14 14:56:25 +08:00
LmeSzinc
2210ec23e8 Research get duration remain 2021-09-14 14:53:13 +08:00
LmeSzinc
a0d823bcd0 Rename configs in device, and research 2021-09-14 14:43:14 +08:00
nEEtdo0d
63722cb342 Fix: [EN] GOTO_MAIN with no appear call defaults to .BUTTON position, can fail to transition for some pages in this case 2021-09-03 23:09:32 -04:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
Cola
cf55dcd119 Fix: [TW] Shop module asset 2021-08-12 19:16:27 +08:00
Ray
bb04db4e1e Fix: [JP] SHOP&BUILD&ACADEMY assets 2021-08-08 23:33:54 +08:00
Ray
2b0c3afbe0 Fix: [JP] shipyard assets except RESEARCH_COMPLETE 2021-08-08 15:55:54 +08:00
LmeSzinc
b220d4d8ea Upd: [CN] Assets for shop module, but still having issues in guild shop 2021-08-08 00:41:21 +08:00
LmeSzinc
772bf15f62 Merge branch 'master' into dev 
# Conflicts:
#	module/ui/assets.py
 2021-08-07 14:32:31 +08:00
Ray
847b5376b5 Fix: [JP] SHIPYARD_CHECK asset 2021-08-07 13:55:32 +08:00
Cola
109d41e15b Fix: [TW] Research_* asset 2021-07-29 22:57:52 +08:00
Ray
943dc8bb2e Fix: [JP] MEOWFFICER_INFO & guild boss assets 2021-07-26 16:01:25 +08:00
LmeSzinc
63de5be652 Fix: Conflicts among branches 
- [CN][TW] Fix option name
- Change ButtonGrids.buttons() to ButtonGrids.buttons
 2021-07-24 17:53:45 +08:00
LmeSzinc
e918a5db97 Merge branch 'gems_farming' into dev 
# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py
 2021-07-24 17:33:58 +08:00
nEEtdo0d
e416b92f7a Fix: Resolve merge conflict ui/assets.py 2021-07-23 10:21:26 -04:00
LmeSzinc
2e74d619a2
Merge pull request #539 from nEEtdo0d/quick_fix 
Fix: [EN] change MEOWFFICER_CHECK asset
 2021-07-23 21:26:38 +08:00
LmeSzinc
4fbfdc7ba2 Revert "Opt: Remove code for DOA commissions to avoid errors in the future" 
This reverts commit 2e05de02
 2021-07-23 16:17:09 +08:00
Cola
6d30da59f6 Fix: [TW] Dorm_Feed_Cancel&Ambush asset 2021-07-21 11:07:33 +08:00
nEEtdo0d
75cd81e7a1 Upd: commented with explanation 2021-07-18 10:07:44 -04:00
nEEtdo0d
0477870c41 Fix: Resolve merge conflict ui/ui.py and ui/assets.py 2021-07-18 10:05:21 -04:00
LmeSzinc
c459a014db Merge branch 'master' into gems_farming 2021-07-18 20:16:44 +08:00
nEEtdo0d
e2ab0b4a0d Fix: [EN] change to different asset for MEOWFFICER_INFO delayed appearance 2021-07-17 21:18:43 -04:00
LmeSzinc
b3f42bfd7e Upd: [CN] SHIPYARD_CHECK 2021-07-16 21:41:43 +08:00
LmeSzinc
444eb56be1
Merge pull request #531 from nEEtdo0d/quick_fix 
Fix: [EN] stuck in research/shipyard after popup_confirm
 2021-07-16 19:26:52 +08:00
nEEtdo0d
4fcb3cc250 Upd: [EN] page_research transitions same as others, now has unique titles across all reshmenu pages after last update 2021-07-15 21:58:21 -04:00
nEEtdo0d
b28027f135 Fix: [EN] use normal appear for innate interval option 2021-07-12 22:25:23 -04:00
nEEtdo0d
e6bd972188 Fix: [EN] stuck in shipyard with research popup_confirm 2021-07-12 22:19:59 -04:00
nEEtdo0d
5a26228082 Add: [EN] page support shipyard 
TODO: [CN, JP, TW] update SHIPYARD_CHECK for respective server
 2021-07-12 22:11:44 -04:00
nEEtdo0d
166b486fc7 Add: Navbar module 
Opt: Replace sidebar mechanism to Navbar for equipment and guild modules
 2021-07-10 22:58:11 -04:00
nEEtdo0d
c1f299137b Add: [EN] shop related pages support 
TODO: [CN, TW, JP] replace with respective for their server
 2021-07-10 22:52:29 -04:00
LmeSzinc
5931c01a49 Merge branch 'master' into gems_farming 2021-07-10 15:47:33 +08:00
LmeSzinc
1bb93d3d1c Upd: Button extract 2021-07-10 10:56:11 +08:00
cola228
717b7a84f9
Merge branch 'master' into Fix-TW]-Tatical_Check,Auto_Search_Menu-update,add-Meowfficer_Info 2021-07-10 00:18:16 +08:00
Ray
83e2189ffd Upd: [JP] SURUGA_* and MEOWFFICER_INFO assets 2021-07-09 23:09:23 +08:00
Cola
81fe29efab Update 2021-07-09 22:41:50 +08:00
LmeSzinc
292c5d12be Merge branch 'master' into gems_farming 2021-07-09 14:53:14 +08:00
LmeSzinc
f00adbfc76 Upd: [CN] MEOWFFICER_INFO assets 2021-07-09 13:39:46 +08:00
LmeSzinc
214e0f4ab9
Merge pull request #515 from nEEtdo0d/update_assets 
Add: [EN] raid, meowfficer, 2x book, and auto search assets
 2021-07-09 13:36:11 +08:00
Cola
22ace76fbc Fix: [TW] Meowfficer buying not working 2021-07-09 11:31:29 +08:00
nEEtdo0d
3a2c473f69 Add: [EN] meowfficer comf-forts info handling for page_meowfficer 2021-07-08 16:09:07 -04:00
LmeSzinc
97980d1681 Fix: Able to do over scrolling 2021-06-29 23:01:44 +08:00
LmeSzinc
9405165b94 Add: Scroll handler 2021-06-26 21:48:16 +08:00
noname94
7ebe6fc361 Add: [JP] assets update 2021-05-12 10:57:36 +09:00
nEEtdo0d
990e9365c5 Fix: [EN] ui page assets changed after update 2021-04-22 16:33:47 -04:00
noname94
f92234614d Fix: [JP] assets fix 2 after font changed 
Many assets with words need fixes after the font changed. Most functions should work now.
 2021-04-16 13:58:57 +09:00
noname94
b8e2321140 Fix: [JP] assets fix after font changed 
Many assets with words need fixes after the font changed. This commit is not complete yet.
 2021-04-16 02:47:31 +09:00
nEEtdo0d
94efd9d85d Fix: [CN, TW, JP] OS_CHECK asset 2021-04-09 10:49:36 -04:00
nEEtdo0d
fb1bf1165e Fix: OS Ash Daily Assist page transitions 2021-04-09 01:16:37 -04:00
Zorachristine
b9e4df458b Fix: [TW] exercise and campaign assets 2021-03-15 23:33:31 +08:00