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,557 Commits 9 Branches 0 Tags 274 MiB
dbc5fe42e8
Commit Graph

206 Commits

Author SHA1 Message Date
nEEtdo0d
02e696937f Fix: handle possible stuck pages during shop operations; buy bulin > 1 for example 2022-10-06 12:45:48 -04:00
LmeSzinc
a9426345ad Revert "Fix: potato pc; use timer as can exit loop prematurely on buy > 1 bulin" 
This reverts commit 15d023b3
 2022-10-06 22:43:24 +08:00
nEEtdo0d
15d023b343 Fix: potato pc; use timer as can exit loop prematurely on buy > 1 bulin 2022-10-03 00:03:27 -04:00
LmeSzinc
24ef0521b3 Refactor: Digit ocr white list 2022-10-02 18:25:07 +08:00
LmeSzinc
4dd2a5a8b5 Refactor: Move del_cached_property to module.base.decorator 2022-09-25 00:31:42 +08:00
LmeSzinc
b6c5498144 Opt: Faster shop swipe on bottom nav bar 2022-08-21 01:23:53 +08:00
LmeSzinc
2c722a9211 Upd: [CN] SHOP_*_SWIPE_END 2022-08-21 01:22:55 +08:00
nEEtdo0d
f9bc1cabfe Add: PR/DR5 shop assets 
Upd: shop regex string
 2022-08-14 12:39:26 -04:00
nEEtdo0d
07dbb1c5c5 Fix: x origin shop medal grid adjusted point maintenance 
Upd: [EN] *SWIPE_END assets location move
 2022-07-23 12:36:41 -04:00
LmeSzinc
fc8bd62de9 Upd: [JP] Use enlarged guild items same as CN 2022-07-18 02:57:48 +08:00
chpkq
de9a1fb9fd Fix: [TW] SHOP_MEDAL_SWIPE_END, SHOP_MERIT_SWIPE_END 2022-07-07 01:19:36 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
LmeSzinc
ee9cffbb2f Add: Scrolling medal shop list 2022-06-05 23:54:01 +08:00
nEEtdo0d
78e15ccdd2 Fix: shop_general currency retry mechanism; no longer at fixed known position 2022-06-04 22:07:59 -04:00
nEEtdo0d
ffc7fadb11 Fix: merge master into branch 2022-06-04 21:13:53 -04:00
nEEtdo0d
6ec480f949 Add: configurations for shop_medals buy scheme for retrofit and plate items 
Upd: shop filter regexp to identify wild plate types; unique to shop_medal
Add: shop_medal new item assets
 2022-06-04 21:06:21 -04:00
nEEtdo0d
cf8adaff38 Fix: shop_medal refactor UI and route for base functionality 2022-06-04 20:59:06 -04:00
nEEtdo0d
b65c729380 Opt: re-factor shop module; move buy select and amount operations to baseline classes, common currency variable as all shop variants are created independently 2022-06-04 00:40:10 -04:00
Cola
6207ce03c3 Upd: [JP] shop module *_SWIPE_END assets 2022-06-04 10:47:06 +08:00
nEEtdo0d
ac73afb23d Upd: [EN] *_SWIPE_END assets; allow shop module to run 2022-06-03 01:00:40 -04:00
LmeSzinc
159e4ac755 Upd: [CN] SHOP_MEDAL_SWIPE_END, SHOP_MERIT_SWIPE_END 2022-06-03 03:20:56 +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
c43b73ba36 Fix: shop can also encounter dock full; re-base to Retirement, UI is ancestor 2022-05-29 15:20:30 -04:00
nEEtdo0d
4643f578eb Opt: re-work approach; imitate tactical_class's SKillExp; use ocr instead of color check for out of stock status 2022-05-27 01:37:12 -04: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
e34ba061a7 Upd: [CN] SHOP_BUY_CONFIRM_SELECT 2022-05-13 21:08:56 +08:00
LmeSzinc
b16049786d Opt: Improve log appearance in shop module 2022-04-18 00:43:44 +08:00
LmeSzinc
adb38feb3a Fix: Handle currency bug in general shop, a bug from game client (#1030) 
A quick fix. Revert this commit when the bug is fixed by game devs
 2022-04-18 00:24:55 +08:00
Egor Nats
d63935f514 Fix: fixed missing imports 2022-04-14 22:44:01 -03:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -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
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
chpkq
b1810baff4 Upd: [TW] assets TACTICAL_CLASS_START and SHOP_BUY_CONFIRM_AMOUNT 2022-04-09 15:45:53 +08:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
54b00c9378 Fix: Don't refresh guild shop if coins not enough 2022-03-29 22:35:51 +08:00
nEEtdo0d
b07d5f2d97 Fix: retry PR series detection; can fail due to lag or potato pc 2022-02-18 15:35:23 -05:00
LmeSzinc
ae048115c1 Fix: [JP] Larger medal icon in medal shop (#938) 2022-02-17 22:16:02 +08:00
LmeSzinc
5d3190373d Opt: Use square area in shop_grid and code clean up 2022-02-03 02:22:29 +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
nEEtdo0d
b96113631b Fix: reduce hit area; conflict with gacha page, may enter build 2022-01-19 22:18:06 -05:00
nEEtdo0d
bd875c9e46 Fix: typo shop_medal_grid to shop_grid 2022-01-19 22:01:12 -05:00
nEEtdo0d
f5a61336e4 Fix: shop_items is callable to utilize @Config 2022-01-19 21:58:02 -05:00
nEEtdo0d
bd4f878504 Fix: unique buy handle helper only returns True; if condition no longer needed 2022-01-19 21:38:33 -05:00
nEEtdo0d
4365ecacdc Opt: re-work shop_reward; no longer combined entity; run as individual components 2022-01-19 21:36:37 -05:00
nEEtdo0d
4c7c42cb86 Opt: shop_medal adopt base infrastructure 
Add: run definition to be run as independent component
 2022-01-19 21:35:00 -05:00
nEEtdo0d
b441b062f4 Opt: shop_core adopt base infrastructure 
Add: run definition to be run as independent component
Del: return back shop grid if failed buy handle; raise exception instead
 2022-01-19 21:33:09 -05:00
nEEtdo0d
b0ce3fa80c Opt: shop_guild adopt base infrastructure 
Add: run definition to be run as independent component
Opt: re-work buy handle mechanism; break into smaller pieces rather than consolidated to one definition; compress previous globals into dictionary
 2022-01-19 21:30:33 -05:00
nEEtdo0d
9ea9d17771 Opt: shop_general, shop_merit adopt base infrastructure 
Add: run definition to be run as independent component
 2022-01-19 21:22:41 -05:00
nEEtdo0d
26509d81f3 Opt: remove shop_type argument; shift to general alias name for functions; convert combined entity infrastructure into separate individual components run independently 
Opt: use regexp and filter to parse items in shop and user configured strings
Del: base_globals; move to base
 2022-01-19 21:19:13 -05:00
LmeSzinc
c78a2db67b Upd: [CN] SHOP_BUY_CONFIRM_AMOUNT 2022-01-02 15:15:42 +08:00
LmeSzinc
3a3b2184b4 Revert "Fix: Wider search area of SHOP_BUY_CONFIRM because it's at the bottom in core shop" 
This reverts commit 199e8a04
 2022-01-02 15:14:45 +08:00
Ray
72e9b8e7e5 Upd: [JP] SHOP_BUY_CONFIRM_AMOUNT asset 2022-01-02 14:56:01 +08:00
LmeSzinc
199e8a042f Fix: Wider search area of SHOP_BUY_CONFIRM because it's at the bottom in core shop 2022-01-02 01:01:04 +08:00
nEEtdo0d
87a4137859 Fix: Resolve merge conflicts; migrate equip skin box price check to appropriate custom_check_item variant 2021-12-29 20:55:46 -05:00
LmeSzinc
80bb113c66 Fix: Not having enough coins to buy skin boxes 2021-12-30 00:14:39 +08:00
nEEtdo0d
26c4dabc0a Fix: Re-work purchase amount adjust through max button click 2021-12-24 13:56:47 -05:00
nEEtdo0d
605ba2f3d7 Add: shop_core config and gui 2021-12-24 12:35:34 -05:00
nEEtdo0d
0872634740 Add: shop_core assets and implementation 2021-12-24 11:52:56 -05:00
nEEtdo0d
a46d643232 Upd: compress shop_buy_execute to single definition; customize via optional companion funcs for specific shop 2021-12-24 11:48:58 -05:00
nEEtdo0d
8b43da9dbb Upd: re-work custom (equip skin box) checking to same methodology as other funcs 2021-12-24 11:43:04 -05:00
nEEtdo0d
2a18fb0936 Fix: move shop_get_items call to shop_buy; load sufficiently before read currency 2021-12-23 18:12:04 -05:00
18870
39bc1ecc13 Upd: [CN] meowfficer assets 
not sure whether other server changed after maintain, so cn only

opt: hide password in deploy log
 2021-12-23 17:53:33 +08:00
LmeSzinc
48bfad1d8b Fix: Check currency > 0 before shop_buy_execute() 2021-12-22 01:16:59 +08:00
LmeSzinc
5ab16ffdcb
Merge pull request #845 from MrGuoRanDuo/master 
Fix: Refresh the shop may using diamonds
 2021-12-22 00:53:06 +08:00
MrGuoRanDuo
ff45193f5c Fix: Refresh the shop may using gems 2021-12-22 00:46:39 +08:00
LmeSzinc
e3dc859954 Fix: Check currency > 0 before shop_buy_execute() 2021-12-21 23:25:25 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
LmeSzinc
a54a6ecc20 Add: Buy equip skin boxes in general shop 2021-11-28 19:28:21 +08:00
LmeSzinc
f1bdf1a5d9 Revert: Continuous shop buy in commit 29e356c6 2021-11-28 17:15:24 +08:00
Cola
cffef972b3 Fix: [TW] update assets 2021-11-25 13:34:18 +08:00
LmeSzinc
9940853817 Fix: Wait too long if all items bought 2021-11-21 17:34:01 +08:00
nEEtdo0d
f9025957bb Fix: can read currency = 0, swap as items loaded has re-capture logic 
Upd: corresponding ssets, no longer have 's' in string
 2021-11-19 17:27:59 -05:00
LmeSzinc
29e356c6f1 Fix: Handle shop items not loaded (#741) 
- Opt: Faster ui switch and purchase in shop
 2021-11-15 01:04:38 +08:00
nEEtdo0d
9e4550aff1 Fix: Split shop task based on check frequency; general shop changes inventory 3 times daily and other shops change inventory 1 time daily 2021-10-29 16:10:49 -04:00
LmeSzinc
2794505bc5 Merge branch 'master' into app 2021-10-22 02:46:06 +08:00
LmeSzinc
eea937845d Upd: SHOP_SELECT_PR1 copied to all servers 2021-10-22 02:45:21 +08:00
LmeSzinc
b1858e5ccb Merge branch 'master' into app 2021-10-18 22:03:14 +08:00
Ray
0a13719c7a Fix: pass key to shop_items_loading_finished 2021-10-17 22:19:31 +08:00
Ray
bb49d99cee Fix: handle shop items loading not finished 2021-10-17 21:35:35 +08:00
LmeSzinc
1a683b02a4 Merge branch 'master' into app 2021-10-15 21:22:41 +08:00
LmeSzinc
5c22b1555e Fix: Timezone awareness in merit guild medal shops (#646) 2021-10-15 20:57:06 +08:00
Ray
2b074cd213 Fix: [JP] VOTE_CANCEL & SHOP_SELECT_PR1 assets 2021-10-15 09:39:57 +08:00
LmeSzinc
976ddb5ec7 Fix: Medal shop not entering gacha page 
- Remove old code of shop reward
 2021-10-07 03:02:45 +08:00
LmeSzinc
77cc097b6f Fix: Line breaks in filters in shop module 2021-09-24 20:33:07 +08:00
LmeSzinc
60f7a64066 Refactor: Shop module 2021-09-24 13:40:43 +08:00
Cola
cf55dcd119 Fix: [TW] Shop module asset 2021-08-12 19:16:27 +08:00
LmeSzinc
c17a22bf33 Fix: shop_*_check_item, because only general shop detects cost 2021-08-11 11:10:37 +08:00
LmeSzinc
723f4929d2 Fix: [JP] Price detection in medal shop (#567) 
- Opt: Adjust price_area in medal shop, should contains all price letters and have a little padding now
 2021-08-11 02:03:54 +08:00
LmeSzinc
64f60c9713 Opt: Move shop items all together 2021-08-10 02:25:42 +08:00
LmeSzinc
a4a2e62c34 Opt: Disable cost detection in shop when it's unnecessary 2021-08-10 02:15:18 +08:00
LmeSzinc
1df4f70035 Upd: [CN] SHOP_MEDAL 2021-08-10 02:11:29 +08:00
Ray
b0ebc690b3 Merge branch 'LmeSzinc/master' into asset 2021-08-09 08:58:38 +08:00
Ray
bb04db4e1e Fix: [JP] SHOP&BUILD&ACADEMY assets 2021-08-08 23:33:54 +08:00
LmeSzinc
8e5e7ecd1e Opt: Guild shop buy and update CN guild shop assets 
- Fix: [CN] Guild shop items. Looks like items of guild shop in EN are downscaled. Other servers need to choose to follow EN or CN.
- Upd: [CN] Guild shop assets
- Del: Delete SHOP_SELECT_CHECK, because SHOP_BUY_CONFIRM_SELECT can do the same job.
- Opt: Simplify MINUS/PLUS in item selection, using the feature of Button class
- Opt: Expand SHOP_CLICK_SAFE_AREA
 2021-08-08 23:00:17 +08:00
Ray
2b0c3afbe0 Fix: [JP] shipyard assets except RESEARCH_COMPLETE 2021-08-08 15:55:54 +08:00
nEEtdo0d
6148b5053f Merge remote-tracking branch 'origin/dev' 2021-08-07 13:36:36 -04:00
LmeSzinc
b220d4d8ea Upd: [CN] Assets for shop module, but still having issues in guild shop 2021-08-08 00:41:21 +08:00
nEEtdo0d
10c14e2160 Fix: Resolve merge conflict, buttons() to buttons 2021-08-05 23:24:42 -04:00
nEEtdo0d
060bae3d18 Fix: shop/shop_reward due to refactor, base case correction in shipyard/ui 2021-08-05 23:20:33 -04:00
nEEtdo0d
dc8a2862e3 Fix: module shop missing dict items, module build assets, and etc. 
Add: module shipyard support for daily buy of discounted bps; interface, config, integrate into reward, and etc.

Fix: Resolve merge conflict
 2021-07-31 23:28:40 -04:00
nEEtdo0d
b28a1fc5d2 Add: research series 4 assets and dict updates for module shop 2021-07-31 22:19:17 -04: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
nEEtdo0d
c5fb8ba140 Upd: func signature predict updated, adapt shop modules respectively 2021-07-20 22:23:13 -04:00
nEEtdo0d
7f6fcaf508 Fix: offset adjust due to no event shops active 2021-07-15 10:00:51 -04:00
nEEtdo0d
c9bfb2d983 Add: shop and build modules 2021-07-10 23:11:32 -04:00
nEEtdo0d
388c3ebb73 Add: [EN] shop module related assets 
TODO: [CN, TW, JP] replace assets as needed for respective server
 2021-07-10 23:05:39 -04:00