1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

2049 Commits

Author SHA1 Message Date
8eee5994c3 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-01-02 01:19:37 +08:00
LmeSzinc
f434784c6e Add: Do event story, not added to GUI yet
run with `python -m module.eventstory.eventstory`
2025-01-02 00:38:28 +08:00
LmeSzinc
b23ff47c50 Fix: Expand search area of MISSION_WEEKLY_RED_DOT 2025-01-01 21:39:54 +08:00
56c748c6ff Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-12-29 12:15:01 +08:00
LmeSzinc
9b69de459d Upd: [EN] QUIT_Christmas 2024-12-27 21:28:06 +08:00
LmeSzinc
76fcfdf42a Upd: Battle UI Christmas, Cyber, Neon
- TODO: [EN][JP][TW] add QUIT_Christmas
2024-12-27 02:26:15 +08:00
LmeSzinc
1e7aaf5628 Fix: Handle BATTLE_PASS_NEW_SEASON 2024-12-27 00:58:07 +08:00
d2273a94d2 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-12-21 02:56:19 +08:00
LmeSzinc
cc2cf0d046 Refactor: Abstract chapter switches from 20240725 to 20241219 2024-12-20 22:24:47 +08:00
62b84f4a23 Fix: gemsfarming ship change 2024-12-19 17:07:05 +08:00
08cdb30553 Fix: update offset and EN assets of rewards 2024-12-19 14:51:29 +08:00
686128c858 Upd: GemsFarming hardmode 2024-12-13 21:50:44 +08:00
1828c5f105 Fix: interval for MISSION_OVERVIEW_ACCEPT(_SINGLE) too short 2024-12-11 12:10:56 +08:00
77774b6e93 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-12-10 12:01:21 +08:00
guoh064
934c249ad3
upd: [JP] asset COMMISSION_START (#4353)
* upd: [JP] asset COMMISSION_START

* Fix: check color for COMMISSION_START
2024-12-09 12:44:54 +08:00
fbd3c23ea7 Upd: Flagship changing 2024-12-05 10:57:04 +08:00
LmeSzinc
9efe590776 Fix: [CN] POPUP_CONFIRM_WHITE_BATTLEPASS
as popup confirm is different in battle pass
2024-12-04 17:56:54 +08:00
684888c5a8 Merge branch 'master' of LmeSzinc 2024-11-22 23:31:24 +08:00
LmeSzinc
c7908073b2 Upd: [JP] USE_DATA_KEY (fixed #4344) 2024-11-22 22:22:07 +08:00
LmeSzinc
64b3122127 Add: Chapter T 2024-11-22 21:25:41 +08:00
7b7e44f9ee Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-11-14 22:11:00 +08:00
Compeador
56a9df03d2
Add: JP iridescent fantasy ui quit button (#4369)
* Add: [JP] rainbow combat ui quit

* fix: minor displacement of quit btn
2024-11-12 11:26:48 +08:00
Hao Guo
4b6a9566a4
Revert "Upd: [JP] asset QUIT" (#4370)
This reverts commit bdd081f501a6f60a54b43a96c72ab6284d444915.
2024-11-11 15:29:04 +08:00
guoh064
74e241d9ef Revert "tmp: [JP] opsi beacon page color and assets"
This reverts commit 402a0083ef.
2024-10-30 12:18:09 +08:00
87133a765c Merge branch 'master' of LmeSzinc 2024-10-26 01:36:36 +08:00
LmeSzinc
47a85ab7e8
Merge pull request #4326 from LmeSzinc/dev
Event Tempesta and the Sleeping Sea (event_20241024_cn)
2024-10-25 23:10:34 +08:00
LmeSzinc
1024f5063d Add: CHAPTER_SWITCH_20241024 2024-10-25 22:31:20 +08:00
LmeSzinc
847dcd847b Add: Chapter T 2024-10-25 19:37:55 +08:00
GH Action - Upstream Sync
8e5f2c678e Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-10-22 02:52:02 +00:00
254cb3d3c4 Upd: war archives entrance 2024-10-21 18:54:51 +08:00
481d89e229 Merge branch 'master' of LmeSzinc 2024-10-21 18:50:15 +08:00
guoh064
d3eb5fa774 Revert "tmp: [JP] opsi beacon page color and assets"
This reverts commit 402a0083ef.
2024-10-21 10:14:53 +08:00
Air111
98e6d1397c Upd: [TW] Assets for COALITION_ACADEMY 2024-10-20 22:36:01 +08:00
guoh064
cc957fe92e upd: [JP] SKILL_EXP 2024-10-20 21:58:34 +08:00
guoh064
17a6da533e upd: [JP] OCR_DOCK_AMOUNT 2024-10-20 21:58:34 +08:00
guoh064
d13e852b92 upd: [JP] retire assets 2024-10-20 21:58:34 +08:00
guoh064
168338b4aa Upd: [JP] asset OCR_REMAIN 2024-10-20 21:58:34 +08:00
guoh064
12096e5fd5 Upd: war archives entrance 2024-10-20 21:58:34 +08:00
f19a0bf795 Merge branch 'master' of LmeSzinc 2024-10-19 01:50:08 +08:00
LmeSzinc
560a747a75 Upd: [EN] QUIT assets 2024-10-18 22:09:12 +08:00
a901d48c8f Upd: War archive Tower of Transcendence
Upd: [JP] asset QUIT (#4296)

Add: event entrance 20241017

* event_20220728_cn rerun in cn/en/jp
* coalition_20240627 in tw

Merge branch 'master' of LmeSzinc

Add: War Archives

* war_archives_20201012_cn
* war_archives_20210422_cn
* war_archives_20210916_cn
* war_archives_20211111_cn
* war_archives_20211229_cn
2024-10-18 00:44:05 +08:00
guoh064
d4df09d0f4
Upd: [JP] asset QUIT (#4296) 2024-10-17 20:57:28 +08:00
GH Action - Upstream Sync
68cc9cc409 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-10-16 05:19:26 +00:00
Air111
b5dd289e44
Opt: search archives entrance (#4284)
* Upd: re-crop war_archives templates to reduce height

* Opt: full scan archives_entrance twice
2024-10-16 12:50:23 +08:00
guoh064
7e471388e2 upd: [JP] dorm assets 2024-10-16 12:48:21 +08:00
guoh064
402a0083ef tmp: [JP] opsi beacon page color and assets 2024-10-16 12:48:21 +08:00
8192f17266 Merge branch 'master' of https://github.com/sui-feng-cb/AzurLaneAutoScript 2024-10-15 17:29:01 +08:00
87e7094811 Upd: re-crop war_archives templates to reduce height 2024-10-15 17:26:20 +08:00
GH Action - Upstream Sync
b8e54798d6 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-10-13 10:18:42 +00:00
yulu901107
5ebada5c7e
Upd: [JP] assets of storage module (#4276) 2024-10-13 15:44:44 +08:00
f11a199072 Merge branch 'master' of LmeSzinc 2024-10-12 17:56:41 +08:00
guoh064
e89063bade
Jp font 20241011 (#4272)
* tmp: [JP] commission assets

* tmp: [JP] asset RESEARCH_COST_CHECKER

* tmp: [JP] assets in mail batch

* tmp: [JP] opsi get_zone_name color

* tmp: [JP] get_coin and get_oil color

* tmp: [JP] ash_collect_status and get_yellow_coins color

* upd: [JP] resize commission assets recognize size
2024-10-12 14:29:01 +08:00
55c03a86a3 Merge branch 'master' of LmeSzinc 2024-10-02 19:42:15 +08:00
LmeSzinc
8f83c07eb9 Upd: Battle pass assets 2024-10-01 17:34:13 +08:00
GH Action - Upstream Sync
2446006d87 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-09-25 11:17:16 +00:00
LmeSzinc
32f118f653 Upd: Exercise HP daemon on new battle UI theme
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2024-09-25 14:27:49 +08:00
LmeSzinc
cf7b208a4f Upd: [TW] MISSION_POPUP_ACK MISSION_POPUP_GO (#fixed 4228)
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2024-09-25 11:44:31 +08:00
9ebf40fa72 Upd: Gear code for GemsFarming 2024-09-21 18:02:26 +08:00
d6dd8cc167 Add: War Archives Sundered Blue, The Flame-Touched Dagger, Upon the
Shimmering Blue, Daedalian Hymn
2024-09-21 01:38:55 +08:00
GH Action - Upstream Sync
76f64e7343 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-09-20 15:20:29 +00:00
guoh064
4852d66be0
Upd: [JP] asset TEMPLATE_IN_COMMISSION (#4211) 2024-09-20 22:35:00 +08:00
GH Action - Upstream Sync
d6ef37e818 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-09-15 18:25:12 +00:00
LmeSzinc
4a6087c431 Upd: [EN] Combat quit assets 2024-09-16 02:13:59 +08:00
e2235d78f8 Merge branch 'master' of LmeSzinc 2024-09-15 14:05:38 +08:00
LmeSzinc
d1eeb02bd2 Add: Support Battle UI theme 2024-09-15 04:34:14 +08:00
37cb1ce508 Merge branch 'master' of LmeSzinc 2024-09-13 19:53:54 +08:00
LmeSzinc
3e6bd999e2 Upd: [EN] QUIT_CONFIRM 2024-09-13 18:47:41 +08:00
weeswelai
1c9534d7a4 Upd: Update event Ode of Everblooming Crimson(event_20240912_cn) 2024-09-13 18:38:43 +08:00
9e4e25ab20 Merge branch 'master' of LmeSzinc 2024-09-13 07:43:13 +08:00
LmeSzinc
14b01ff9a0 Upd: [EN] PAUSE 2024-09-13 02:09:12 +08:00
GH Action - Upstream Sync
7a8b73d2ae Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-09-10 18:25:56 +00:00
LmeSzinc
9350273533 Upd: [TW] EXP_INFO_CF (#4164) 2024-09-11 01:42:47 +08:00
GH Action - Upstream Sync
99c70e7b63 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-09-09 17:17:37 +00:00
guoh064
34acf7ed3a
Add: mask for ui_white_main (#4145) 2024-09-09 23:44:48 +08:00
8b52b94676 Fix: GemsFarming fleet_detail_check 2024-08-27 17:48:41 +08:00
0c0f0c3c81 Upd: GemsFarming assets 2024-08-27 11:19:33 +08:00
8fd4cf8c41 Fix: BATTLE_STATUS_D withdraw 2024-08-27 02:36:09 +08:00
39de58f36e Merge branch 'master' of LmeSzinc 2024-08-23 11:26:05 +08:00
LmeSzinc
7eadaa7d8a Fix: [JP] Handle mail empty (#4114) 2024-08-23 02:34:40 +08:00
ff1e247f57 Merge branch 'master' of LmeSzinc 2024-08-20 09:57:23 +08:00
guoh064
6a10ddf8df
Fix: current ap blocked by info bar (#4100) 2024-08-20 02:25:44 +08:00
c9edec1895 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-08-17 10:04:56 +08:00
LmeSzinc
626e265d8b Add: Chapter B 2024-08-17 00:29:53 +08:00
8f787b01a8 Merge branch 'master' of LmeSzinc 2024-07-29 00:42:14 +08:00
guoh064
5ef353a507
Fix: unrecognized ui page after empty mail receive (#4039)
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Fix: unrecognized ui page after empty mail receive

* Upd: [JP] Asset MAIL_CHECK

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
2024-07-28 13:32:03 +08:00
LmeSzinc
a15e18c75e Fix: Select all mails to delete 2024-07-27 01:35:13 +08:00
LmeSzinc
9cc9835e27 Fix: Add another frame of TEMPLATE_STAGE_CLEAR_20240725 (#4033) 2024-07-27 01:13:54 +08:00
b1e80fbeb5 Merge branch 'master' of LmeSzinc 2024-07-26 06:54:28 +08:00
LmeSzinc
34265d966d Upd: [JP] Mail assets 2024-07-26 03:01:04 +08:00
LmeSzinc
4a000745cc Upd: [JP] POPUP_CANCEL_WHITE and POPUP_CONFIRM_WHITE 2024-07-26 02:53:15 +08:00
LmeSzinc
19ba250bd4 Add: Chapter SP 2024-07-26 02:46:17 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
LmeSzinc
96647e6300 Add: Chapter T 2024-07-26 02:20:15 +08:00
LmeSzinc
2da2d58297 Fix: Handle yet another CLEAR icon 2024-07-26 02:20:05 +08:00
LmeSzinc
e2d1d2ff8a Upd: Handle yet another mode switch in event_20240725_cn 2024-07-26 00:23:57 +08:00
5fbc779c3f Merge remote-tracking branch 'guoh064/gems_farming_gearcode' 2024-07-23 12:53:31 +08:00
286efb4ce5 Merge branch 'master' of LmeSzinc 2024-07-23 08:51:11 +08:00
LmeSzinc
39fceddb52 Upd: [EN] POPUP_CANCEL_WHITE and POPUP_CONFIRM_WHITE 2024-07-21 02:27:04 +08:00
guoh064
a2ebcbef1b Add: scroll retire comfirm page to find more common cv 2024-07-19 12:33:50 +08:00
LmeSzinc
eeb516146c Revert "Fix: [TW] Keep SHIPYARD_SERIES_SELECT_CHECK in series 6"
This reverts commit 9a920233
2024-07-19 12:27:34 +08:00
9b86aa81f3 Merge branch 'master' of LmeSzinc 2024-07-19 00:46:09 +08:00
LmeSzinc
06143434a8 Add: Claim mail rewards 2024-07-18 22:20:50 +08:00
LmeSzinc
1f20da207b Upd: [JP] Research blueprint assets 2024-07-12 21:23:52 +08:00
LmeSzinc
c05e5f9d72 Fix: [JP] Invalid resolution on REWARD_*_WHITE 2024-07-12 21:17:30 +08:00
LmeSzinc
9a92023308 Fix: [TW] Keep SHIPYARD_SERIES_SELECT_CHECK in series 6 2024-07-12 12:48:30 +08:00
b119655c58 Merge branch 'master' of LmeSzinc 2024-07-12 03:15:15 +08:00
LmeSzinc
d161fc8cbf Upd: Series selecting page in shipyard 2024-07-12 00:31:34 +08:00
LmeSzinc
aeab621087 Upd: Detect research series 7 2024-07-12 00:07:25 +08:00
LmeSzinc
87cd4a5dd1 Upd: [TW] BATTLE_STATUS_CF (#3975) 2024-07-11 23:00:16 +08:00
bc7bb915ca Change title and icon 2024-07-10 17:17:47 +08:00
4d9b59fbbd Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-07-06 10:43:02 +08:00
LmeSzinc
6105801737 Upd: [EN][JP] RETIRE_SETTING_* 2024-07-06 02:07:05 +08:00
LmeSzinc
095c51d2f8 Upd: [CN] RETIRE_SETTING_* 2024-07-03 22:55:10 +08:00
LmeSzinc
67073bad07 Fix: Leave memories tab (fixed #3956) 2024-07-03 22:46:41 +08:00
zuak110
4333b97d36
Add: Quick collection of coins and loves in the Dorm. (#3837)
* Add: Quick collection of coins and loves in the Dorm.

* Upd: dorm coins and loves quick collect.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

---------

Co-authored-by: Yoshino <zuak.8235790@gmail.com>
2024-07-03 22:27:22 +08:00
0feb33cb43 Merge branch 'master' of LmeSzinc 2024-07-02 02:23:26 +08:00
霞飛
cb9114c7bd
Fix: none cost (#3947)
* fix: none cost

* upd: assets
2024-07-01 13:45:21 +08:00
65761a2c8b Merge branch 'master' of LmeSzinc 2024-06-28 14:40:37 +08:00
guoh064
3f0a6908c6 Upd: [JP] Assets for page_coalition 2024-06-28 12:16:25 +08:00
guoh064
ee8e2ff57f Add: [JP] Assets for coalition_20240627 2024-06-28 12:16:25 +08:00
LmeSzinc
ec5f0f92a6 Upd: [EN] MOB_MOVE_CANCEL 2024-06-28 09:12:18 +08:00
5ffd84a61e Merge branch 'master' of LmeSzinc 2024-06-28 03:15:29 +08:00
LmeSzinc
c45c80c147 Add: [EN] Assets for coalition_20240627 2024-06-28 03:00:47 +08:00
LmeSzinc
7fba50035c Upd: [EN] Assets for page_coalition 2024-06-28 02:42:38 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
LmeSzinc
752d4ea043 Add: UI switches to page_coalition 2024-06-28 00:28:03 +08:00
LmeSzinc
3958373fc4 Upd: [TW] MOB_MOVE_CANCEL (#3922) 2024-06-27 22:51:59 +08:00
938ba056e3 Merge branch 'master' of LmeSzinc 2024-06-27 17:51:35 +08:00
guoh064
aa2e985fe8 Feature: Gear code for GemsFarming 2024-06-26 19:32:28 +08:00
霞飛
38b549a9e5
fix: add asset (#3894) 2024-06-17 17:55:24 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
SevCrane
f05b61ed8e Merge remote-tracking branch 'LmeSzinc:master' 2024-06-13 11:45:38 +08:00
LmeSzinc
b5a9816782 Fix: Re-crop OPSI IN_MAP, leave letters only (#3871) 2024-06-11 23:56:31 +08:00
LmeSzinc
863458a23a Fix: Trying to handle books empty (#3753) 2024-06-11 23:38:43 +08:00
SevCrane
2796c85486 Merge remote-tracking branch 'upstream/master' 2024-06-07 18:00:59 +08:00
SevCrane
162ec3d14d AlasGG 2024-06-06 00:27:00 +08:00
SevCrane
abfbbe5064 merge alas 2024-06-05 23:57:58 +08:00
SevCrane
3cb29a9a37 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-06-05 23:53:03 +08:00
SevCrane
5e482958f6 AlasGG 2024-06-05 23:20:28 +08:00
LmeSzinc
77d48937fc Fix: Handle mail full popup 2024-06-03 10:22:06 +08:00
Air111
1e793295e8 Fix: mob move optimization 2024-06-03 00:04:42 +08:00
rilylc
445e6c61e7 Upd:[TW]dorm assets 2024-05-30 21:45:08 +08:00
Air111
fdf28b2032 Fix: update offset and EN assets of rewards 2024-05-27 00:33:24 +08:00
LmeSzinc
234fd8d00a Upd: MISSION_NOTICE_WHITE 2024-05-24 15:59:56 +08:00
LmeSzinc
9ba3d2e732 Upd: [TW] Dorm menu assets 2024-05-24 03:02:51 +08:00
LmeSzinc
0bb086c7c7 Upd: [TW] Dock favourite assets 2024-05-24 02:55:32 +08:00
LmeSzinc
d4dec4ed55 Upd: [TW] UI assets 2024-05-24 02:49:39 +08:00
LmeSzinc
b8613b30fb Upd: [JP] UI assets 2024-05-24 02:35:35 +08:00
LmeSzinc
e2bf7e2997 Upd: [EN] UI assets 2024-05-24 02:33:40 +08:00
LmeSzinc
f5f2112442 Upd: [CN][EN][JP] Dock favourite assets 2024-05-23 01:42:19 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
339530c5d3 Add: Chapter B 2024-05-23 01:16:41 +08:00
LmeSzinc
a79562aebc Add: Chapter AC 2024-05-22 02:29:23 +08:00
LmeSzinc
ffe2a213ca Fix: Handle idle page 2024-05-22 01:44:45 +08:00
LmeSzinc
36f786ca53 Upd: [EN][JP] Assets in page_reward 2024-05-22 01:15:18 +08:00
下面我簡單喵兩句
81b8ae1512
Upd:[TW]research assets (#3721) 2024-05-03 14:49:42 +08:00
LmeSzinc
7a45fed67f Fix: Duplicated SheffieldIdol template 2024-04-26 04:01:06 +08:00
LmeSzinc
fbf7bc02c6 Add: Heart-Linking Harmony chapter SP 2024-04-26 02:45:10 +08:00
guoh064
6f030373f6
Upd: asset FLEET_DETAIL_CHECK (#3674) 2024-04-24 09:03:49 +08:00
LmeSzinc
a365f82d2e
Merge pull request #3658 from Air111/fix_equipment
Fix: bugs in equipment
2024-04-21 17:45:54 +08:00
LmeSzinc
89aa1ad7dc Fix: W15 optimizations
- Upd: [CN] MOB_MOVE_CANCEL
- Opt: MAP_SWIPE_MULTIPLY
- Fix: 15-1 did not inherit ConfigBase
2024-04-20 01:57:27 +08:00
Air111
932cd6c370 Fix: update [CN/JP/TW] asset EQUIPPING_ON to handle cat claw 2024-04-19 17:55:56 +08:00
Air111
2507b0fa6b
Upd: Flagship changing (#3556)
* Upd: Flagship changing asset

* Upd: Equipment enter

* Upd: Fleet detail check

* Refactor: equipment changing

* Upd: asset exercise/EQUIP_ENTER

* Refactor: rename equipment functions

* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears

* Upd: [CN] assets EQUIP_1/2/3

* Fix: skip first screenshot in equipment.py
2024-04-19 01:40:40 +08:00
guoh064
27693a6762
Add: 15图开荒/周回 (#3563)
* Add: W15 maps extracted

* Add: template for Special Carrier in W15

* Add: method mob_move

* Fix: MapDetectionError in strategy mob move

* Fix: adjacent grid judge condition

* Fix: should focus on location before moving

* Fix: should update view before further operation

* Fix: wait for STRATEGY_OPENED after executing mob move

* Fix: offset for assets in _mob_move()

* Opt: judge if movable before moving camera

* Add: W15 mechanism

* Opt: Rename Special Carrier asset name

* Fix: offset for MOB_MOVE_1/MOB_MOVE_2

* Fix: separate MOB_MOVE_1 and MOB_MOVE_2

* Fix: should use appear_then_click in strategy_mob_move_enter

* Fix: function import in campaign_15_base.py

* Fix: missing assets import

* Fix: missing offset in strategy_mob_move_cancel()

* Fix: should move only once in a campaign

* Temp: modify special carrier filter string to 3E

* Fix: missing self. before 'moved' variable

* Revert "Fix: missing self. before 'moved' variable"

This reverts commit 00f70e0ab55e422898cb90c5d5e54d4e7c989511.

* Revert "Fix: should move only once in a campaign"

This reverts commit b588f5bb07dfc4511f39fa0797fbe160f356d604.

* Fix: force goto special carrier

* Fix: missing return True in battle function

* Fix: enlarge offset of MOB_MOVE_ICON

* Fix: typo in campaing_15_3

* Fix: update view after moving mob

* Fix: should use full_scan_movable since mob moved

* Fix: missing map_data_init() in campaign_15_4.py

* Fix: battle 4 should be done by mob fleet

* Revert "Fix: battle 4 should be done by mob fleet"

This reverts commit 0e2af1ec817b7bc89fe123f03a33ea9ad955973f.

* Fix: should switch to fleet_1 after battle_3

* Add: battle function when using clear mode

* Fix: missing import

* Fix: colliding Config class

* Fix: Config.when should contain all cases

* Opt: pick ammo after third battle in clear mode of 15-4

* Del: old assets CarrierSpecial

* Fix: remake of CarrierSpecial template

* Add: UI mask for W15

* Fix: missing ASSETS import

* Fix: change full_scan_movable() to predict()

* Fix: predict should be done after each move

* Opt: camera_data in W15

* Del: remove predict

* Add: map info process after mob move

* Add: support for multi bosses in _expected_end() for W15

* Opt: show map after moving

* Del: remove redundant import in fleet.py

* Opt: using clear_chosen_enemy() instead of goto() directly

* Fix: should first take screenshot before strategy enter/confirm/cancel

* Add: asset TEMPLATE_SIREN_BOSS

* Opt: Handle first stages of BOSS as Siren in 15-3/15-4

* Fix: missing override map_data

* Add: ignore is_boss prediction for siren boss in 15-3/15-4

* Fix: should not use decorator Config with battle_x functions

* Opt: camera data in 15-4

* Opt: directly overwrite map info into original map_data

* Fix: missing indent block in campaign_15_4.py

* Fix: expect 15-3/15-4 first bosses as siren

* Revert "Add: ignore is_boss prediction for siren boss in 15-3/15-4"

This reverts commit 1104631f92e5df0672dce8c7acaa1eb122731746.

* Revert "Add: asset TEMPLATE_SIREN_BOSS"

This reverts commit a29d6b6b9bfb9d79963adb404ce2091cbfafb810.

* Revert "Add: support for multi bosses in _expected_end() for W15"

This reverts commit 8d357abe5bab79a643e23e8513cefa87d31cb3e8.

* Del: redundent map config

* Fix: recover boss grids

* Del: redundant clear_siren()

* Del: redundant clear_siren() in battle_6

* Add: template for mob move icon

* Opt: enlarge reinforcement fleet mask area for W15

* Opt: method _mob_move

* Upd: TEMPLATE_MOB_MOVE_ICON

* Fix: should have cool time between clicks of grid

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit b3f2dcbc88dbe166470905f33d041b91c2192f57.

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: predict_mob_move_icon

* Fix: 15-2 camera spawn point

* Fix: should update view using self.device.image

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit 92a12596a8f271ec64e249ecb58779d9b64ecea6.

* Del: redundant assets MOB_MOVE_ICON.png

* Fix: using map_is_clear_mode to get real value of clear mode

* Opt: check mob_movable before moving

* Opt: Refactor _mob_move

* Fix: camera_sight in W15

* Opt: move sight to further point in _mob_move
2024-04-19 01:29:17 +08:00
guoh064
87c466f55a
Add: Medal Shop item SpecializedCore (#3637) 2024-04-13 23:42:53 +08:00
LmeSzinc
dba2309f9d Upd: [CN] Add TEMPLATE_STAGE_CLEAR_SMALL to handle bugged game client 2024-04-11 21:59:29 +08:00
LmeSzinc
92a9761d1b Upd: [CN] Smaller SWITCH_2_EX to handle game client bug 2024-04-11 21:48:58 +08:00
霞飛
09fe301597
fix: ship template assets bit error (#3618) 2024-04-09 11:23:16 +08:00
ygrzxc
7d574dde8b
Add: Change the designated vanguard combination (#3520)
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
2024-04-08 22:49:30 +08:00
LmeSzinc
df408fad9d Upd: [EN] DORM_FEED_ENTER 2024-04-05 17:48:34 +08:00
guoh064
894e0c4c82
Opt: reset dorm view before dorm_collect (#3510) 2024-04-03 23:42:20 +08:00
guoh064
555fb2ad29 Upd: Assets FORMATION to adapt to W15 2024-04-03 17:24:40 +08:00
LmeSzinc
de1bcde054 Upd: [EN] BATTLE_PREPARATION 2024-03-29 09:23:46 +08:00
LmeSzinc
c98a5a7ad9 Upd: [EN] BATTLE_PREPARATION
it's 5 frames now - -
2024-03-29 03:23:20 +08:00
LmeSzinc
fe223d70bf Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL 2024-03-29 03:21:10 +08:00
LmeSzinc
e8909f4d59 Add: UI switches in RPG raid 2024-03-29 02:17:47 +08:00
LmeSzinc
32e4571afc Upd: LOGIN_ANNOUNCE 2024-03-28 23:43:18 +08:00
RilyLC
7a01eadcd2
Upd:[TW]Event:Reflections of the Oasis (#3574)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-03-21 19:33:21 +08:00
LmeSzinc
d1a9ce771d Upd: [CN] MISSION_POPUP_ACK and MISSION_POPUP_GO (#3530) 2024-03-21 18:44:49 +08:00
LmeSzinc
ceca042afc Fix: [CN][JP] Handle bugged AUTO_SEARCH_OS_MAP_OPTION_OFF button
- TODO: [EN][TW] Update AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED
2024-03-21 18:35:48 +08:00
LmeSzinc
c59bddfc7e Upd: [TW] MAP_OFFENSIVE and SWITCH_OVER (#3544) 2024-03-21 18:21:15 +08:00
guoh064
b0b54a4b68 Add: War Archives The Way Home in the Night 2024-03-11 22:57:37 +08:00
guoh064
4ba1d50ec7 Add: War Archives The Solomon Ranger 2024-03-11 22:47:32 +08:00
guoh064
0ddd253514 Add: War Archives Prelude under the Moon 2024-03-11 22:26:33 +08:00
guoh064
caeb091ce6 Add: War Archives Counterattack within the Fjord 2024-03-11 21:26:35 +08:00
LmeSzinc
0a59b8efb5 Add: Chapter SP 2024-03-02 03:34:24 +08:00
guoh064
56a93de7b0
Upd: [CN, EN, JP] dorm asset DORM_RED_DOT (#3506) 2024-02-23 21:59:15 +08:00
somegituser
4f779f66b2
add: war archive Khorovod of Dawn's Rime (#3505)
新增作战档案:破晓冰华
2024-02-23 21:58:52 +08:00
RilyLC
adaf2a6160
Upd:[TW]war_archives assets (#3490) 2024-02-18 01:37:15 +08:00
RilyLC
7968771265
Upd:[TW]Event assets (#3479) 2024-02-07 00:00:41 +08:00
LmeSzinc
a8a5f5b888 Upd: [EN][JP] Sync DORMMENU assets 2024-02-06 19:22:22 +08:00
yypsybs
8156a60b0c Upd: Dorm menu assets CN 2024-02-06 19:18:57 +08:00
yypsybs
40825c0a42 Upd: Dorm menu assets CN 2024-02-06 18:56:46 +08:00
weeswelai
01dadb5456 Upd: Update raid_20240130 assets for CN sever. 2024-01-31 22:06:43 +08:00
LmeSzinc
c651c250ec Merge branch 'dev'
# Conflicts:
#	campaign/Readme.md
2024-01-31 12:17:49 +08:00
weeswelai
b04b349206 Add: Add raid event Spring Festive Fiasco(raid_20240130) 2024-01-31 10:57:34 +08:00
somegituser
d29f93c1c1 add: wararchive Dreamwaker's Butterfly & Mirror Involution
新增作战档案: 蝶海梦花&镜位螺旋
2024-01-23 14:05:05 +08:00
LmeSzinc
9e135993ce Upd: [EN] ACADEMY_CHECK 2024-01-12 18:00:35 +08:00
LmeSzinc
944190c46e Upd: [EN] ACADEMY_CHECK 2024-01-06 01:51:48 +08:00
LmeSzinc
94348e7b9f Revert "Upd: [EN] ACADEMY_CHECK"
Well I hate them changing things back and forth
2023-12-29 00:21:35 +08:00
LmeSzinc
f9340f1326 Fix: Accidentally entered dorm manage and shop 2023-12-23 00:50:25 +08:00
LmeSzinc
4512b9ece0 Upd: Siren templates 2023-12-23 00:38:13 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
LmeSzinc
432f61b892 Upd: [EN] ACADEMY_CHECK 2023-12-22 02:33:03 +08:00
LmeSzinc
ed9921799e Upd: [JP] SUBMARINE_MOVE_* 2023-12-14 19:16:23 +08:00
RilyLC
14847de755
Upd:[TW]Update Meowfficer assets (#3341)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-12-08 18:02:31 +08:00
LmeSzinc
02bff7e1da Upd: Shop item templates 2023-11-24 03:24:14 +08:00
LmeSzinc
8a8fcaf56f Add: Chapter T 2023-11-24 00:45:23 +08:00
weeswelai
01d2b4b6ce Upd: Update CN assets which have been omitted 2023-11-19 21:45:25 +08:00
LmeSzinc
7a55451cde
Merge branch 'dev' into ui_update_20231116_en 2023-11-19 18:57:48 +08:00
Jiahao Yuan
cdca3237e9
Upd: [JP] Meowfficer assets (#3291)
* Upd: [CN] Update meowfficer UI

* Upd: Update JP same assets

* Add: Appear MEOWFFICER_BUY_ENTER to ensure UI loading completed

* Upd: Update TW same assets

* Upd: Update meowfficer UI for EN

* Upd: [JP] Meowfficer assets

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: weeswelai <52352067+weeswelai@users.noreply.github.com>
2023-11-19 18:55:51 +08:00
weeswelai
19a9d93aa8 Upd: Update EN meowfficer assets 2023-11-18 14:37:43 +08:00
weeswelai
671c14a2fc Upd: Update meowfficer UI for EN 2023-11-17 20:09:55 +08:00
weeswelai
3308be9a7e Upd: Update TW same assets 2023-11-17 20:03:22 +08:00
weeswelai
8202516552 Upd: Update JP same assets 2023-11-17 19:57:08 +08:00
weeswelai
037f471a21 Upd: [CN] Update meowfficer UI 2023-11-17 19:43:02 +08:00
Tipsy Fisher
b1c638d995
FIx: Dorm mask error (#3288)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-11-15 18:29:17 +08:00
RilyLC
d84010bfb1
Fix:[TW]support server_support_status_fleet in campaign\gems_farming (#3285)
* Fix:[TW]support server_support_status_fleet in campaign\gems_farming

* Fix:[TW]ship scan asset

* Fix:[TW]remove server_support in retirement and gems_farming

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-11-15 18:28:47 +08:00
LmeSzinc
3ce8665f0f Fix: Collect coins and loves in dorm 2023-11-10 12:00:30 +08:00
Jiahao Yuan
1d6bf0547f
Upd: Dorm UI assets (#3275) 2023-11-10 11:27:44 +08:00
hephooey
99a4478563
[TW]: Update WITHDRAW and IN_MAP assets (#3276) 2023-11-10 10:53:29 +08:00
kahojyun
a236144eae Upd: [JP] MEOWFFICER_GOLD/PURPLE_CHECK (#3259) 2023-11-10 00:14:52 +08:00
guoh064
4ae8438338
Upd: [JP] RETIRE_COIN (#3267) 2023-11-09 15:35:31 +08:00
LmeSzinc
5eee8f35a7 Upd: [EN] CAMPAIGN_CHECK in W15 2023-11-04 18:43:13 +08:00
RilyLC
a44ffa8c75
Upd: [TW]update dorm assets (#3256)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-11-03 03:32:15 +08:00
weeswelai
99fc5e6744 Upd: Update EN‘s assets DORM_INFO 2023-10-29 01:54:13 +08:00
LmeSzinc
f7cf9e3bd2 Add: [ALAS] stored and state widgets 2023-10-28 22:03:45 +08:00
LmeSzinc
3b0ac0917a
Merge pull request #3231 from LmeSzinc/dev
Bug fix
2023-10-27 17:29:17 +08:00
weeswelai
d0f4d982a9
Upd: Update some part dorm ui for cn, jp, en (#3226)
* Upd: Update dorm ui for cn, jp, en

* Add: Add specialized FILL ocr, update assets

* Upd: Update OCR_DORM_SLOT height, del en _dorm_food
2023-10-27 16:53:24 +08:00
alexan-ded
7eb02e1ed9 Upd: [EN] EQUIPMENT_OPEN 2023-10-27 07:35:19 +08:00
下面我簡單喵兩句
dcb0c5eca7
Upd: [TW] handler assets (#3219) 2023-10-23 16:08:36 +08:00
LmeSzinc
fb3d736bbb Fix: [JP] SUBMARINE_BAR 2023-10-22 21:51:52 +08:00
hephooey
12c3dfd159
[tw] Update WITHDRAW asset (#3217) 2023-10-22 16:14:17 +08:00
appleapple802
d7c748f420 Upd: [TW] Raid event Fight On, Royal Maids! 2023-10-21 15:39:44 +08:00
appleapple802
c5bd99ff4c Upd: [TW] map and handler assets 2023-10-21 12:34:05 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +08:00
LmeSzinc
c5efe8e380 Upd: [EN] AUTO_SEARCH_SET_* 2023-10-20 01:09:01 +08:00
LmeSzinc
d2302836ec Upd: [EN] Fleet preparation 2023-10-20 01:02:47 +08:00
LmeSzinc
0c93da2373 Upd: Sync FLEET_PREPARATION_CHECK 2023-10-20 00:03:28 +08:00
LmeSzinc
bfea966cb8 Upd: [JP] AUTO_SEARCH_SET_* 2023-10-20 00:03:28 +08:00
LmeSzinc
cc60e701fc Upd: [JP] Fleet preparation 2023-10-20 00:03:25 +08:00
LmeSzinc
ec7facb7c1 Upd: Strategy open&close&switch 2023-10-19 22:42:53 +08:00
LmeSzinc
ce13aaa8b7 Upd: [CN] _fleet_sidebar 2023-10-19 22:30:06 +08:00
LmeSzinc
51d4efd4a6 Upd: [CN] AUTO_SEARCH_SET_* 2023-10-19 22:02:53 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
5e6ec95b37 Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT 2023-10-17 18:27:14 +08:00
LmeSzinc
44197dba56 Upd: [EN] RETIRE_COIN (#3124) 2023-10-14 21:45:49 +08:00
LmeSzinc
3c3462174a Upd: [JP] AUTO_SEARCH_SET_SUB_AUTO and AUTO_SEARCH_SET_SUB_STANDBY 2023-10-01 00:54:13 +08:00
LmeSzinc
28c52ac7b2
Merge pull request #2840 from yypsybs/dev-minigame-for-pr
Add: minigame
2023-09-25 18:49:25 +08:00
LmeSzinc
550798bdbb
Merge pull request #2996 from guoh064/meta_reward
Add: Dossier Meta Reward Receive
2023-09-25 18:29:46 +08:00
Tipsy Fisher
78a7830f36
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-22 10:19:02 +08:00
LmeSzinc
9a7c79732f Fix: [EN] Update AUTO_SEARCH_MENU_*.BUTTON.png 2023-09-22 02:28:01 +08:00
Tipsy Fisher
15f930a6a4
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-20 18:32:09 +08:00
LmeSzinc
802c1b6a08 Fix: Handle STORY_CLOSE after B3 2023-09-15 21:37:56 +08:00
Tipsy Fisher
dcf5075926
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 09:55:03 +08:00
LmeSzinc
b52da42d71 Add: TEMPLATE_SIREN_Zuiho 2023-09-15 02:37:23 +08:00
LmeSzinc
16ecea7163 Add: Effulgence Before Eclipse chapter AC 2023-09-15 01:49:53 +08:00
Tipsy Fisher
c2551f5c8e
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 01:07:00 +08:00
LmeSzinc
7627a40bee Upd: [EN] AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT 2023-09-15 00:03:33 +08:00
LmeSzinc
14c92519f8 Upd: [JP] FLEET_PREPARATION 2023-09-14 23:40:09 +08:00
LmeSzinc
c204aca18e Fix: Story skip 2023-09-14 23:32:18 +08:00
yypsybs
369c80d991 Merge branch 'master' into dev-minigame-for-pr
# Conflicts:
#	module/ui/assets.py
2023-09-11 10:29:52 +08:00
LmeSzinc
cb9a4a71a7 Add: shop/os templates 2023-09-10 15:24:06 +08:00
霞飛
6a1f3f574e
Fix(JP): Asset of SHOP_BUY_CONFIRM (#3097)
* Fix(JP): asset of SHOP_BUY_CONFIRM

* fix: use gif template instead
2023-09-10 14:44:47 +08:00
guoh064
8a3ed1dcf8 Del: unused DOSSIER_REWARD_NOTICE.png 2023-09-09 08:53:51 +08:00
guoh064
f12e04a277 Del: redundant assets in meta_reward.py 2023-09-09 08:52:04 +08:00
somegituser
17b13f6c6c
add war_archive: Inverted orthant (#3089)
新增作战档案:负象限作战
2023-09-08 01:14:18 +08:00
LmeSzinc
078c6bb606 Revert "Upd: [EN] ACADEMY_CHECK"
This reverts commit 6f2ea47c
2023-09-08 01:10:52 +08:00
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr
# Conflicts:
#	module/ui/assets.py
2023-09-01 17:58:39 +08:00
LmeSzinc
63c879f90c Upd: [EN] PAUSE and PAUSE_DOUBLE_CHECK 2023-09-01 02:16:05 +08:00
LmeSzinc
471d77d6a3 Upd: [JP] STORAGE_USE 2023-09-01 01:22:01 +08:00
LmeSzinc
6f2ea47c70 Upd: [EN] ACADEMY_CHECK 2023-09-01 01:21:55 +08:00
guoh064
37e852aadc
Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
LmeSzinc
e8e23ecf0c Fix: pywebio-scope-scheduler-bar has scroll on desktop 2023-08-31 03:06:09 +08:00
LmeSzinc
9feae24109 Opt: [ALAS] Checkbox in theme color 2023-08-27 23:07:04 +08:00
hephooey
dfce73e8d3
Update tw assets for Frostfall (#3051)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-08-25 12:38:19 +08:00
Tipsy Fisher
0e5bebd25f
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-19 15:47:51 +08:00
LmeSzinc
24f29391a0 Add: Siren templates in SP 2023-08-19 02:34:19 +08:00
LmeSzinc
68571e67d9 Add: Siren templates in chapter A 2023-08-18 22:29:25 +08:00
LmeSzinc
b451096fb8 Add: Handle stories before event maps in chapter BD 2023-08-18 22:23:20 +08:00
LmeSzinc
b3c59c0cca Add: Handle stories before event maps 2023-08-18 13:25:51 +08:00
Tarin_Chan
ae7d801187
updata EN box button (fix#3015) (#3017)
* Add files via upload

* Add files via upload

* Add files via upload

* Delete assets.py

* Add files via upload

* Add files via upload

* Add files via upload

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-08-15 18:40:55 +08:00
Tipsy Fisher
8cbffecd0f
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-15 09:18:13 +08:00
Tarin_Chan
9d7b0de26e
Update EN box button (#3015)
* Add files via upload

* Add files via upload

* Add files via upload

* Delete assets.py

* Add files via upload
2023-08-14 20:22:51 +08:00
guoh064
a3af072035
Merge branch 'dev' into meta_reward 2023-08-12 14:29:31 +08:00
Tipsy Fisher
78259e8037
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-12 12:22:10 +08:00
guoh064
e74df69b29 Add: Dossier Meta Reward Receive 2023-08-12 09:02:21 +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
霞飛
30600ae68a
fix: shop confirm amount buttom (#3001) 2023-08-11 19:05:52 +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
Alexan-ded
c2a6c1a389
Upd: [EN] DISASSEMBLE_CANCEL (#2978)
* Upd: [EN] DISASSEMBLE_CANCEL

* Upd: [EN] DISASSEMBLE_CONFIRM
2023-08-06 15:23:37 +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
ae51eaf811 Upd: Shop templates 2023-07-20 22:50:49 +08:00
LmeSzinc
c2f744c5ff Upd: [JP] SERIES_DETAIL (#2900) 2023-07-20 22:35:28 +08:00
LmeSzinc
7460deb799 Upd: Merge shop/guild and shop/guild_cn 2023-07-19 00:12:30 +08:00