Commit Graph

830 Commits

Author SHA1 Message Date
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 8d357abe5b.

* 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
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
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
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
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
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
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
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
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
weeswelai
037f471a21 Upd: [CN] Update meowfficer UI 2023-11-17 19:43:02 +08:00
Jiahao Yuan
1d6bf0547f
Upd: Dorm UI assets (#3275) 2023-11-10 11:27:44 +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
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
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
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
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
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
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
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
霞飛
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
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
a962b13343
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-14 10:59:13 +08:00
LmeSzinc
044038254a Upd: Shop module
- Assume TW is unchanged
2023-07-14 01:43:19 +08:00
LmeSzinc
77cea4d7dd Upd: [CN][EN][JP] Assets of page_munition 2023-07-14 00:31:55 +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
yypsybs
c0b9045909 Add: minigame 2023-07-04 10:06:44 +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
nEEtdo0d
e0f79d13ca Add: Gorizia raid ex ocr clause and remain asset 2023-06-30 17:38:52 -04:00
LmeSzinc
2c39f195f8 Add: [CN] Raid assets of Reflections of the Oasis 2023-06-30 16:05:15 +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
Fisher Tipsy
ab0c8d0b85
Add: Allow auto attack dossier (#2579) 2023-06-08 22:28:44 +08:00
LmeSzinc
454e308702 Upd: [CN][TW] DOCK_SELECTED (#2729) 2023-06-08 16:33:31 +08:00
LmeSzinc
4ff611fec1 Upd: [CN] Shop swipe ends 2023-06-08 16:26:25 +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
8625d19ae9 Fix: [CN] UI switching in shops 2023-05-25 23:04:23 +08:00
LmeSzinc
c6df09e170 Upd: EXP_INFO_* and the exercise one 2023-05-25 21:45:19 +08:00
somegituser
5a717e44ad
add war_archives: Northern Overture & Aurora Noctis, (#2576)
新增作战档案录入:北境序曲&永夜幻光
2023-05-13 19:51:59 +08:00
guoh064
5247bb2c0c Add: Dossier meta_reward receiving 2023-04-30 16:13:17 +08:00
LmeSzinc
dcd542659f Upd: [CN] TEMPLATE_ENCIRCLING_GRAF_SPEE (fixed #2492) 2023-04-14 19:08:44 +08:00
LmeSzinc
f72ab22af8
Merge pull request #2423 from guoh064/dev
Opt: Clear exercise attempts after final recovery (#2184)
2023-04-11 21:51:12 +08:00
guoh064
74c67976cc Del: Unused asset OCR_PERIOD_DAY 2023-04-05 12:29:21 +08:00
guoh064
956543672c New: Asset for exercise period ocr 2023-03-30 21:32:31 +08:00
guoh064
d69af8955f Opt: Clear exercise attempts after final recovery 2023-03-30 20:47:38 +08:00