Merge branch 'dev' of https://github.com/Horizon101011/AzurLaneAutoScript into dev

2026-03-25 20:35:03 +08:00 · 2022-05-12 03:39:21 +08:00
parent 36ae64be9f 8c644c9a4f
commit f9a15be768
142 changed files with 2203 additions and 542 deletions
--- a/assets/cn/template/TEMPLATE_SIREN_August.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_August.gif
--- a/assets/cn/template/TEMPLATE_SIREN_Compiler.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_Compiler.gif
--- a/assets/cn/template/TEMPLATE_SIREN_Leipzig.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_Leipzig.gif
--- a/assets/cn/template/TEMPLATE_SIREN_Mainz.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_Mainz.gif
--- a/assets/cn/template/TEMPLATE_SIREN_Odin.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_Odin.gif
--- a/assets/cn/template/TEMPLATE_SIREN_PrinzEugen.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_PrinzEugen.gif
--- a/assets/cn/template/TEMPLATE_SIREN_Roon.gif
+++ b/assets/cn/template/TEMPLATE_SIREN_Roon.gif
--- a/assets/en/guild/BATTLE_STATUS_CF.png
+++ b/assets/en/guild/BATTLE_STATUS_CF.png
--- a/assets/en/guild/EXP_INFO_CF.png
+++ b/assets/en/guild/EXP_INFO_CF.png
--- a/assets/en/template/TEMPLATE_SIREN_August.gif
+++ b/assets/en/template/TEMPLATE_SIREN_August.gif
--- a/assets/en/template/TEMPLATE_SIREN_Compiler.gif
+++ b/assets/en/template/TEMPLATE_SIREN_Compiler.gif
--- a/assets/en/template/TEMPLATE_SIREN_Leipzig.gif
+++ b/assets/en/template/TEMPLATE_SIREN_Leipzig.gif
--- a/assets/en/template/TEMPLATE_SIREN_Mainz.gif
+++ b/assets/en/template/TEMPLATE_SIREN_Mainz.gif
--- a/assets/en/template/TEMPLATE_SIREN_Odin.gif
+++ b/assets/en/template/TEMPLATE_SIREN_Odin.gif
--- a/assets/en/template/TEMPLATE_SIREN_PrinzEugen.gif
+++ b/assets/en/template/TEMPLATE_SIREN_PrinzEugen.gif
--- a/assets/en/template/TEMPLATE_SIREN_Roon.gif
+++ b/assets/en/template/TEMPLATE_SIREN_Roon.gif
--- a/assets/gui/css/alas.css
+++ b/assets/gui/css/alas.css
@@ -135,6 +135,11 @@ label {
    height: auto !important;
 }

+.form-control[readonly] {
+    pointer-events: none;
+    border-bottom-color: transparent;
+}
+
 .form-control:focus {
    border-color: unset;
 }
--- a/assets/jp/os_handler/EXCHANGE_CHECK.png
+++ b/assets/jp/os_handler/EXCHANGE_CHECK.png
--- a/assets/jp/os_handler/MISSION_OVERVIEW_ACCEPT_SINGLE.png
+++ b/assets/jp/os_handler/MISSION_OVERVIEW_ACCEPT_SINGLE.png
--- a/assets/jp/os_handler/RESET_FLEET_PREPARATION.BUTTON.png
+++ b/assets/jp/os_handler/RESET_FLEET_PREPARATION.BUTTON.png
--- a/assets/jp/os_handler/RESET_FLEET_PREPARATION.png
+++ b/assets/jp/os_handler/RESET_FLEET_PREPARATION.png
--- a/assets/jp/os_handler/RESET_TICKET_POPUP.BUTTON.png
+++ b/assets/jp/os_handler/RESET_TICKET_POPUP.BUTTON.png
--- a/assets/jp/os_handler/RESET_TICKET_POPUP.png
+++ b/assets/jp/os_handler/RESET_TICKET_POPUP.png
--- a/assets/jp/tactical/TACTICAL_CLASS_CANCEL.png
+++ b/assets/jp/tactical/TACTICAL_CLASS_CANCEL.png
--- a/assets/jp/tactical/TACTICAL_CLASS_START.png
+++ b/assets/jp/tactical/TACTICAL_CLASS_START.png
--- a/assets/jp/template/TEMPLATE_SIREN_August.gif
+++ b/assets/jp/template/TEMPLATE_SIREN_August.gif
--- a/assets/jp/template/TEMPLATE_SIREN_Compiler.gif
+++ b/assets/jp/template/TEMPLATE_SIREN_Compiler.gif
--- a/assets/jp/template/TEMPLATE_SIREN_Leipzig.gif
+++ b/assets/jp/template/TEMPLATE_SIREN_Leipzig.gif
--- a/assets/jp/template/TEMPLATE_SIREN_Mainz.gif
+++ b/assets/jp/template/TEMPLATE_SIREN_Mainz.gif
--- a/assets/jp/template/TEMPLATE_SIREN_Odin.gif
+++ b/assets/jp/template/TEMPLATE_SIREN_Odin.gif
--- a/assets/jp/template/TEMPLATE_SIREN_PrinzEugen.gif
+++ b/assets/jp/template/TEMPLATE_SIREN_PrinzEugen.gif
--- a/assets/jp/template/TEMPLATE_SIREN_Roon.gif
+++ b/assets/jp/template/TEMPLATE_SIREN_Roon.gif
--- a/assets/tw/meowfficer/MEOWFFICER_APPLY_LOCK.png
+++ b/assets/tw/meowfficer/MEOWFFICER_APPLY_LOCK.png
--- a/assets/tw/meowfficer/MEOWFFICER_APPLY_UNLOCK.png
+++ b/assets/tw/meowfficer/MEOWFFICER_APPLY_UNLOCK.png
--- a/assets/tw/meowfficer/MEOWFFICER_CANCEL.png
+++ b/assets/tw/meowfficer/MEOWFFICER_CANCEL.png
--- a/assets/tw/meowfficer/MEOWFFICER_ENHANCE_CONFIRM.png
+++ b/assets/tw/meowfficer/MEOWFFICER_ENHANCE_CONFIRM.png
--- a/assets/tw/meowfficer/MEOWFFICER_FEED_CANCEL.png
+++ b/assets/tw/meowfficer/MEOWFFICER_FEED_CANCEL.png
--- a/assets/tw/meowfficer/MEOWFFICER_FEED_CONFIRM.png
+++ b/assets/tw/meowfficer/MEOWFFICER_FEED_CONFIRM.png
--- a/assets/tw/meowfficer/MEOWFFICER_PURPLE_CHECK.png
+++ b/assets/tw/meowfficer/MEOWFFICER_PURPLE_CHECK.png
--- a/assets/tw/os_ash/BEACON_ENTER.png
+++ b/assets/tw/os_ash/BEACON_ENTER.png
--- a/assets/tw/raid/ESSEX_RAID_EASY.png
+++ b/assets/tw/raid/ESSEX_RAID_EASY.png
--- a/assets/tw/raid/ESSEX_RAID_HARD.png
+++ b/assets/tw/raid/ESSEX_RAID_HARD.png
--- a/assets/tw/raid/ESSEX_RAID_NORMAL.png
+++ b/assets/tw/raid/ESSEX_RAID_NORMAL.png
--- a/assets/tw/tactical/TACTICAL_CLASS_CANCEL.png
+++ b/assets/tw/tactical/TACTICAL_CLASS_CANCEL.png
--- a/assets/tw/tactical/TACTICAL_CLASS_START.png
+++ b/assets/tw/tactical/TACTICAL_CLASS_START.png
--- a/assets/tw/template/TEMPLATE_SIREN_August.gif
+++ b/assets/tw/template/TEMPLATE_SIREN_August.gif
--- a/assets/tw/template/TEMPLATE_SIREN_Compiler.gif
+++ b/assets/tw/template/TEMPLATE_SIREN_Compiler.gif
--- a/assets/tw/template/TEMPLATE_SIREN_Leipzig.gif
+++ b/assets/tw/template/TEMPLATE_SIREN_Leipzig.gif
--- a/assets/tw/template/TEMPLATE_SIREN_Mainz.gif
+++ b/assets/tw/template/TEMPLATE_SIREN_Mainz.gif
--- a/assets/tw/template/TEMPLATE_SIREN_Odin.gif
+++ b/assets/tw/template/TEMPLATE_SIREN_Odin.gif
--- a/assets/tw/template/TEMPLATE_SIREN_PrinzEugen.gif
+++ b/assets/tw/template/TEMPLATE_SIREN_PrinzEugen.gif
--- a/assets/tw/template/TEMPLATE_SIREN_Roon.gif
+++ b/assets/tw/template/TEMPLATE_SIREN_Roon.gif
--- a/assets/tw/ui/RAID_CHECK.png
+++ b/assets/tw/ui/RAID_CHECK.png