diff --git a/assets/cn/campaign/EVENT_20201126_DETAIL.png b/assets/cn/campaign/EVENT_20201126_DETAIL.png new file mode 100644 index 000000000..e0f1d7c2c Binary files /dev/null and b/assets/cn/campaign/EVENT_20201126_DETAIL.png differ diff --git a/assets/cn/campaign/EVENT_20201126_DETAIL_CHECK.png b/assets/cn/campaign/EVENT_20201126_DETAIL_CHECK.png new file mode 100644 index 000000000..10f9f2916 Binary files /dev/null and b/assets/cn/campaign/EVENT_20201126_DETAIL_CHECK.png differ diff --git a/assets/cn/campaign/EVENT_20201126_DETAIL_WHITE.png b/assets/cn/campaign/EVENT_20201126_DETAIL_WHITE.png new file mode 100644 index 000000000..adbf66b6a Binary files /dev/null and b/assets/cn/campaign/EVENT_20201126_DETAIL_WHITE.png differ diff --git a/assets/cn/campaign/EVENT_20201126_ENTRANCE.png b/assets/cn/campaign/EVENT_20201126_ENTRANCE.png new file mode 100644 index 000000000..7eb3d575d Binary files /dev/null and b/assets/cn/campaign/EVENT_20201126_ENTRANCE.png differ diff --git a/assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png b/assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png deleted file mode 100644 index a040e09df..000000000 Binary files a/assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png and /dev/null differ diff --git a/assets/cn/campaign/EVENT_20201126_PT_ICON.png b/assets/cn/campaign/EVENT_20201126_PT_ICON.png index 9738e3723..4c05bd84a 100644 Binary files a/assets/cn/campaign/EVENT_20201126_PT_ICON.png and b/assets/cn/campaign/EVENT_20201126_PT_ICON.png differ diff --git a/assets/cn/campaign/EVENT_20250424_PT_ICON.png b/assets/cn/campaign/EVENT_20250424_PT_ICON.png new file mode 100644 index 000000000..b3216268a Binary files /dev/null and b/assets/cn/campaign/EVENT_20250424_PT_ICON.png differ diff --git a/assets/cn/campaign/EVENT_20260417_DETAIL.png b/assets/cn/campaign/EVENT_20260417_DETAIL.png new file mode 100644 index 000000000..d357228f5 Binary files /dev/null and b/assets/cn/campaign/EVENT_20260417_DETAIL.png differ diff --git a/assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png b/assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png new file mode 100644 index 000000000..ac3e861ef Binary files /dev/null and b/assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png differ diff --git a/assets/cn/campaign/EVENT_20260417_DETAIL_WHITE.png b/assets/cn/campaign/EVENT_20260417_DETAIL_WHITE.png new file mode 100644 index 000000000..fb7856cb2 Binary files /dev/null and b/assets/cn/campaign/EVENT_20260417_DETAIL_WHITE.png differ diff --git a/assets/cn/campaign/EVENT_20260417_ENTRANCE.png b/assets/cn/campaign/EVENT_20260417_ENTRANCE.png new file mode 100644 index 000000000..ac7ddf357 Binary files /dev/null and b/assets/cn/campaign/EVENT_20260417_ENTRANCE.png differ diff --git a/assets/cn/campaign/EVENT_20260417_PT_ICON.png b/assets/cn/campaign/EVENT_20260417_PT_ICON.png index 5755ff792..85e05d3d7 100644 Binary files a/assets/cn/campaign/EVENT_20260417_PT_ICON.png and b/assets/cn/campaign/EVENT_20260417_PT_ICON.png differ diff --git a/assets/en/campaign/EVENT_20201126_ENTRANCE_TEMP.png b/assets/en/campaign/EVENT_20201126_ENTRANCE_TEMP.png deleted file mode 100644 index 2bfe678b4..000000000 Binary files a/assets/en/campaign/EVENT_20201126_ENTRANCE_TEMP.png and /dev/null differ diff --git a/assets/jp/campaign/EVENT_20201126_ENTRANCE_TEMP.png b/assets/jp/campaign/EVENT_20201126_ENTRANCE_TEMP.png deleted file mode 100644 index 55497c172..000000000 Binary files a/assets/jp/campaign/EVENT_20201126_ENTRANCE_TEMP.png and /dev/null differ diff --git a/assets/jp/commission/REWARD_1.BUTTON.png b/assets/jp/commission/REWARD_1.BUTTON.png index f5567353e..21420c967 100644 Binary files a/assets/jp/commission/REWARD_1.BUTTON.png and b/assets/jp/commission/REWARD_1.BUTTON.png differ diff --git a/assets/jp/tactical/REWARD_2.BUTTON.png b/assets/jp/tactical/REWARD_2.BUTTON.png index 96bd39988..ee5cfed11 100644 Binary files a/assets/jp/tactical/REWARD_2.BUTTON.png and b/assets/jp/tactical/REWARD_2.BUTTON.png differ diff --git a/campaign/Readme.md b/campaign/Readme.md index 53e232961..e72d2ba38 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -290,3 +290,5 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260416 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 復刻紫絳槿嵐 | | 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | 假日航线闪耀海滨 | Vacation Lane – Beachside Brilliance | バケーションレーン・きらめく砂浜 | - | | 20260417 | event 20201126 cn | Vacation Lane Rerun | 复刻假日航线 | Vacation Lane Rerun | バケーションレーン（復刻） | - | +| 20260417 | event 20250424 cn | Toward Tulipa’s Seas Rerun | 复刻扬起郁金之旗 | Toward Tulipa’s Seas Rerun | チュリッパの海へ（復刻） | - | +| 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | - | - | - | 假日航線閃耀海濱 | diff --git a/campaign/campaign_main/campaign_14_4.py b/campaign/campaign_main/campaign_14_4.py index 1952906b3..909676df3 100644 --- a/campaign/campaign_main/campaign_14_4.py +++ b/campaign/campaign_main/campaign_14_4.py @@ -107,9 +107,10 @@ class Campaign(CampaignBase): def map_data_init(self, map_): super().map_data_init(map_) - for override_grid in OVERRIDE: - # Set may_enemy, but keep may_ambush - self.map[override_grid.location].may_enemy = override_grid.may_enemy + if not self.map_is_clear_mode: + for override_grid in OVERRIDE: + # Set may_enemy, but keep may_ambush + self.map[override_grid.location].may_enemy = override_grid.may_enemy def battle_0(self): self.pick_up_light_house(A9) diff --git a/campaign/event_20201126_cn/campaign_base.py b/campaign/event_20201126_cn/campaign_base.py index 0df7d8895..41382e4c2 100644 --- a/campaign/event_20201126_cn/campaign_base.py +++ b/campaign/event_20201126_cn/campaign_base.py @@ -1,9 +1,9 @@ from module.base.button import Button -from module.campaign.assets import EVENT_20201126_ENTRANCE_TEMP, EVENT_20201126_PT_ICON +from module.campaign.assets import EVENT_20201126_PT_ICON, EVENT_20201126_DETAIL, EVENT_20201126_DETAIL_CHECK, EVENT_20201126_DETAIL_WHITE, EVENT_20201126_ENTRANCE from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.exception import CampaignNameError from module.logger import logger -from module.ui.page import page_campaign_menu, page_event, page_main +from module.ui.page import page_campaign_menu, page_event, page_main_white EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400), name='EVENT_ANIMATION') @@ -19,15 +19,18 @@ class CampaignBase(CampaignBase_): """ def ui_goto_event(self): - if self.appear(EVENT_20201126_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event): + if self.appear(EVENT_20201126_PT_ICON, offset=(40, 20)) and self.ui_page_appear(page_event): logger.info('Already at EVENT_20201126') return True self.ui_ensure(page_campaign_menu) if self.is_event_entrance_available(): - self.ui_ensure(page_main) - self.ui_click(EVENT_20201126_ENTRANCE_TEMP, - check_button=EVENT_20201126_PT_ICON, - appear_button=EVENT_20201126_ENTRANCE_TEMP) + self.ui_goto_main() + if self.ui_page_appear(page_main_white): + self.ui_click(EVENT_20201126_DETAIL_WHITE, check_button=EVENT_20201126_DETAIL_CHECK) + else: + self.ui_click(EVENT_20201126_DETAIL, check_button=EVENT_20201126_DETAIL_CHECK) + self.ui_click(EVENT_20201126_ENTRANCE, check_button=EVENT_20201126_PT_ICON, + appear_button=EVENT_20201126_DETAIL_CHECK, offset=(40, 20)) return True diff --git a/campaign/event_20250424_cn/campaign_base.py b/campaign/event_20250424_cn/campaign_base.py index 29a2760cb..c7a4d7a78 100644 --- a/campaign/event_20250424_cn/campaign_base.py +++ b/campaign/event_20250424_cn/campaign_base.py @@ -1,5 +1,7 @@ +from module.campaign.assets import EVENT_20250424_PT_ICON from module.campaign.campaign_base import CampaignBase as CampaignBase_ -from module.ui.page import page_event +from module.logger import logger +from module.ui.page import page_campaign_menu, page_event class CampaignBase(CampaignBase_): @@ -8,3 +10,12 @@ class CampaignBase(CampaignBase_): if self.ui_page_appear(page_event): return False return super().handle_exp_info() + + def ui_goto_event(self): + if self.appear(EVENT_20250424_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event): + logger.info('Already at EVENT_20250424') + return True + self.ui_ensure(page_campaign_menu) + if self.is_event_entrance_available(): + self.ui_goto(page_event) + return True diff --git a/campaign/event_20260417_cn/campaign_base.py b/campaign/event_20260417_cn/campaign_base.py index 598566bf9..666a7dcab 100644 --- a/campaign/event_20260417_cn/campaign_base.py +++ b/campaign/event_20260417_cn/campaign_base.py @@ -1,8 +1,8 @@ from module.base.button import Button -from module.campaign.assets import EVENT_20260417_PT_ICON +from module.campaign.assets import EVENT_20260417_PT_ICON, EVENT_20260417_DETAIL, EVENT_20260417_DETAIL_CHECK, EVENT_20260417_DETAIL_WHITE, EVENT_20260417_ENTRANCE from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.logger import logger -from module.ui.page import page_campaign_menu, page_event +from module.ui.page import page_campaign_menu, page_event, page_main_white EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400), name='EVENT_ANIMATION') @@ -10,12 +10,18 @@ EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button class CampaignBase(CampaignBase_): def ui_goto_event(self): - if self.appear(EVENT_20260417_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event): + if self.appear(EVENT_20260417_PT_ICON, offset=(40, 20)) and self.ui_page_appear(page_event): logger.info('Already at EVENT_20260417') return True self.ui_ensure(page_campaign_menu) if self.is_event_entrance_available(): - self.ui_goto(page_event) + self.ui_goto_main() + if self.ui_page_appear(page_main_white): + self.ui_click(EVENT_20260417_DETAIL_WHITE, check_button=EVENT_20260417_DETAIL_CHECK) + else: + self.ui_click(EVENT_20260417_DETAIL, check_button=EVENT_20260417_DETAIL_CHECK) + self.ui_click(EVENT_20260417_ENTRANCE, check_button=EVENT_20260417_PT_ICON, + appear_button=EVENT_20260417_DETAIL_CHECK, offset=(40, 20)) return True @staticmethod diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index cc68a0bb6..66d09ad07 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,7 +1,7 @@ # docker build -t hgjazhgj/alas:latest . # docker run -v ${PWD}:/app/AzurLaneAutoScript -p 22267:22267 --name alas -it --rm hgjazhgj/alas -FROM python:3.7-slim +FROM python:3.7-slim-bullseye WORKDIR /app/AzurLaneAutoScript @@ -10,7 +10,12 @@ COPY requirements.txt /tmp/requirements.txt # Initial download of UiAutomator2 is slow outside of China using appetizer mirror, switch to GitHub RUN apt update \ && apt install -y git adb libgomp1 openssh-client \ + && apt install -y build-essential pkg-config \ + && apt install -y libavformat-dev libavcodec-dev libavdevice-dev \ + && apt install -y libavutil-dev libswscale-dev libswresample-dev libavfilter-dev \ && git config --global --add safe.directory '*' \ + && pip install Cython==0.29.37 \ + && pip install av==10.0.0 --no-build-isolation \ && pip install -r /tmp/requirements.txt \ && rm /tmp/requirements.txt \ && rm -r ~/.cache/pip diff --git a/deploy/docker/Dockerfile.cn b/deploy/docker/Dockerfile.cn index 2db750c3a..c7d879d4d 100644 --- a/deploy/docker/Dockerfile.cn +++ b/deploy/docker/Dockerfile.cn @@ -14,16 +14,19 @@ deb-src https://mirrors.aliyun.com/debian/ bullseye main non-free contrib\n\ deb https://mirrors.aliyun.com/debian-security/ bullseye-security main\n\ deb-src https://mirrors.aliyun.com/debian-security/ bullseye-security main\n\ deb https://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib\n\ -deb-src https://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib\n\ -deb https://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib\n\ -deb-src https://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" \ +deb-src https://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" \ > /etc/apt/sources.list \ && apt update \ && apt install -y git adb libgomp1 openssh-client \ + && apt install -y build-essential pkg-config \ + && apt install -y libavformat-dev libavcodec-dev libavdevice-dev \ + && apt install -y libavutil-dev libswscale-dev libswresample-dev libavfilter-dev \ && git config --global --add safe.directory '*' \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo 'Asia/Shanghai' > /etc/timezone \ && pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \ + && pip install Cython==0.29.37 \ + && pip install av==10.0.0 --no-build-isolation \ && pip install -r /tmp/requirements.txt \ && rm /tmp/requirements.txt \ && rm -r ~/.cache/pip diff --git a/module/campaign/assets.py b/module/campaign/assets.py index a4ed919d7..886e10bb6 100644 --- a/module/campaign/assets.py +++ b/module/campaign/assets.py @@ -11,12 +11,20 @@ CHAPTER_20241219_SP = Button(area={'cn': (17, 372, 34, 388), 'en': (17, 372, 34, CHAPTER_NEXT = Button(area={'cn': (1216, 362, 1232, 388), 'en': (1216, 362, 1232, 388), 'jp': (1216, 362, 1232, 388), 'tw': (1216, 362, 1232, 388)}, color={'cn': (121, 150, 198), 'en': (121, 150, 198), 'jp': (121, 150, 198), 'tw': (121, 150, 198)}, button={'cn': (1216, 362, 1232, 388), 'en': (1216, 362, 1232, 388), 'jp': (1216, 362, 1232, 388), 'tw': (1216, 362, 1232, 388)}, file={'cn': './assets/cn/campaign/CHAPTER_NEXT.png', 'en': './assets/en/campaign/CHAPTER_NEXT.png', 'jp': './assets/jp/campaign/CHAPTER_NEXT.png', 'tw': './assets/tw/campaign/CHAPTER_NEXT.png'}) CHAPTER_PREV = Button(area={'cn': (42, 360, 58, 387), 'en': (42, 360, 58, 387), 'jp': (42, 360, 58, 387), 'tw': (42, 360, 58, 387)}, color={'cn': (105, 133, 169), 'en': (105, 133, 169), 'jp': (105, 133, 169), 'tw': (105, 133, 169)}, button={'cn': (42, 360, 58, 387), 'en': (42, 360, 58, 387), 'jp': (42, 360, 58, 387), 'tw': (42, 360, 58, 387)}, file={'cn': './assets/cn/campaign/CHAPTER_PREV.png', 'en': './assets/en/campaign/CHAPTER_PREV.png', 'jp': './assets/jp/campaign/CHAPTER_PREV.png', 'tw': './assets/tw/campaign/CHAPTER_PREV.png'}) COMMISSION_NOTICE_AT_CAMPAIGN = Button(area={'cn': (1077, 637, 1083, 643), 'en': (1077, 637, 1083, 643), 'jp': (1077, 637, 1083, 643), 'tw': (1077, 637, 1083, 643)}, color={'cn': (172, 72, 49), 'en': (172, 72, 49), 'jp': (172, 72, 49), 'tw': (172, 72, 49)}, button={'cn': (1077, 637, 1083, 643), 'en': (1077, 637, 1083, 643), 'jp': (1077, 637, 1083, 643), 'tw': (1077, 637, 1083, 643)}, file={'cn': './assets/cn/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'en': './assets/en/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'jp': './assets/jp/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'tw': './assets/tw/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png'}) -EVENT_20201126_ENTRANCE_TEMP = Button(area={'cn': (1023, 368, 1100, 407), 'en': (1025, 367, 1095, 406), 'jp': (1023, 367, 1101, 402), 'tw': (1023, 368, 1100, 407)}, color={'cn': (160, 208, 243), 'en': (156, 206, 243), 'jp': (167, 213, 245), 'tw': (160, 208, 243)}, button={'cn': (1023, 368, 1100, 407), 'en': (1025, 367, 1095, 406), 'jp': (1023, 367, 1101, 402), 'tw': (1023, 368, 1100, 407)}, file={'cn': './assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'en': './assets/en/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'jp': './assets/jp/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'tw': './assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png'}) +EVENT_20201126_DETAIL = Button(area={'cn': (617, 470, 659, 510), 'en': (617, 470, 659, 510), 'jp': (617, 470, 659, 510), 'tw': (617, 470, 659, 510)}, color={'cn': (188, 152, 166), 'en': (188, 152, 166), 'jp': (188, 152, 166), 'tw': (188, 152, 166)}, button={'cn': (617, 470, 659, 510), 'en': (617, 470, 659, 510), 'jp': (617, 470, 659, 510), 'tw': (617, 470, 659, 510)}, file={'cn': './assets/cn/campaign/EVENT_20201126_DETAIL.png', 'en': './assets/cn/campaign/EVENT_20201126_DETAIL.png', 'jp': './assets/cn/campaign/EVENT_20201126_DETAIL.png', 'tw': './assets/cn/campaign/EVENT_20201126_DETAIL.png'}) +EVENT_20201126_DETAIL_CHECK = Button(area={'cn': (1198, 20, 1244, 65), 'en': (1198, 20, 1244, 65), 'jp': (1198, 20, 1244, 65), 'tw': (1198, 20, 1244, 65)}, color={'cn': (176, 138, 121), 'en': (176, 138, 121), 'jp': (176, 138, 121), 'tw': (176, 138, 121)}, button={'cn': (1198, 20, 1244, 65), 'en': (1198, 20, 1244, 65), 'jp': (1198, 20, 1244, 65), 'tw': (1198, 20, 1244, 65)}, file={'cn': './assets/cn/campaign/EVENT_20201126_DETAIL_CHECK.png', 'en': './assets/cn/campaign/EVENT_20201126_DETAIL_CHECK.png', 'jp': './assets/cn/campaign/EVENT_20201126_DETAIL_CHECK.png', 'tw': './assets/cn/campaign/EVENT_20201126_DETAIL_CHECK.png'}) +EVENT_20201126_DETAIL_WHITE = Button(area={'cn': (969, 94, 1030, 156), 'en': (969, 94, 1030, 156), 'jp': (969, 94, 1030, 156), 'tw': (969, 94, 1030, 156)}, color={'cn': (178, 148, 165), 'en': (178, 148, 165), 'jp': (178, 148, 165), 'tw': (178, 148, 165)}, button={'cn': (969, 94, 1030, 156), 'en': (969, 94, 1030, 156), 'jp': (969, 94, 1030, 156), 'tw': (969, 94, 1030, 156)}, file={'cn': './assets/cn/campaign/EVENT_20201126_DETAIL_WHITE.png', 'en': './assets/cn/campaign/EVENT_20201126_DETAIL_WHITE.png', 'jp': './assets/cn/campaign/EVENT_20201126_DETAIL_WHITE.png', 'tw': './assets/cn/campaign/EVENT_20201126_DETAIL_WHITE.png'}) +EVENT_20201126_ENTRANCE = Button(area={'cn': (927, 599, 1054, 631), 'en': (927, 599, 1054, 631), 'jp': (927, 599, 1054, 631), 'tw': (927, 599, 1054, 631)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (927, 599, 1054, 631), 'en': (927, 599, 1054, 631), 'jp': (927, 599, 1054, 631), 'tw': (927, 599, 1054, 631)}, file={'cn': './assets/cn/campaign/EVENT_20201126_ENTRANCE.png', 'en': './assets/cn/campaign/EVENT_20201126_ENTRANCE.png', 'jp': './assets/cn/campaign/EVENT_20201126_ENTRANCE.png', 'tw': './assets/cn/campaign/EVENT_20201126_ENTRANCE.png'}) EVENT_20201126_PT_ICON = Button(area={'cn': (1108, 102, 1133, 127), 'en': (1108, 102, 1133, 127), 'jp': (1108, 102, 1133, 127), 'tw': (1108, 102, 1133, 127)}, color={'cn': (231, 121, 159), 'en': (231, 121, 159), 'jp': (231, 121, 159), 'tw': (231, 121, 159)}, button={'cn': (1108, 102, 1133, 127), 'en': (1108, 102, 1133, 127), 'jp': (1108, 102, 1133, 127), 'tw': (1108, 102, 1133, 127)}, file={'cn': './assets/cn/campaign/EVENT_20201126_PT_ICON.png', 'en': './assets/cn/campaign/EVENT_20201126_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20201126_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20201126_PT_ICON.png'}) EVENT_20221124_ENTRANCE = Button(area={'cn': (1037, 162, 1077, 195), 'en': (1037, 162, 1077, 195), 'jp': (1037, 162, 1077, 195), 'tw': (1037, 162, 1077, 195)}, color={'cn': (207, 168, 148), 'en': (207, 168, 148), 'jp': (207, 168, 148), 'tw': (207, 168, 148)}, button={'cn': (1037, 162, 1077, 195), 'en': (1037, 162, 1077, 195), 'jp': (1037, 162, 1077, 195), 'tw': (1037, 162, 1077, 195)}, file={'cn': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'en': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'jp': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'tw': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png'}) EVENT_20221124_PT_ICON = Button(area={'cn': (1106, 109, 1135, 130), 'en': (1071, 109, 1101, 129), 'jp': (1106, 109, 1135, 130), 'tw': (1106, 109, 1135, 130)}, color={'cn': (151, 116, 139), 'en': (152, 115, 138), 'jp': (151, 116, 139), 'tw': (151, 116, 139)}, button={'cn': (1106, 109, 1135, 130), 'en': (1071, 109, 1101, 129), 'jp': (1106, 109, 1135, 130), 'tw': (1106, 109, 1135, 130)}, file={'cn': './assets/cn/campaign/EVENT_20221124_PT_ICON.png', 'en': './assets/en/campaign/EVENT_20221124_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20221124_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20221124_PT_ICON.png'}) EVENT_20230817_STORY = Button(area={'cn': (610, 320, 670, 380), 'en': (610, 320, 670, 380), 'jp': (610, 320, 670, 380), 'tw': (610, 320, 670, 380)}, color={'cn': (183, 180, 190), 'en': (183, 180, 190), 'jp': (183, 180, 190), 'tw': (183, 180, 190)}, button={'cn': (610, 320, 670, 380), 'en': (610, 320, 670, 380), 'jp': (610, 320, 670, 380), 'tw': (610, 320, 670, 380)}, file={'cn': './assets/cn/campaign/EVENT_20230817_STORY.png', 'en': './assets/en/campaign/EVENT_20230817_STORY.png', 'jp': './assets/jp/campaign/EVENT_20230817_STORY.png', 'tw': './assets/tw/campaign/EVENT_20230817_STORY.png'}) +EVENT_20250424_PT_ICON = Button(area={'cn': (1109, 109, 1133, 131), 'en': (1109, 109, 1133, 131), 'jp': (1109, 109, 1133, 131), 'tw': (1109, 109, 1133, 131)}, color={'cn': (182, 173, 150), 'en': (182, 173, 150), 'jp': (182, 173, 150), 'tw': (182, 173, 150)}, button={'cn': (1109, 109, 1133, 131), 'en': (1109, 109, 1133, 131), 'jp': (1109, 109, 1133, 131), 'tw': (1109, 109, 1133, 131)}, file={'cn': './assets/cn/campaign/EVENT_20250424_PT_ICON.png', 'en': './assets/cn/campaign/EVENT_20250424_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20250424_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20250424_PT_ICON.png'}) EVENT_20250724_PT_ICON = Button(area={'cn': (1102, 106, 1139, 121), 'en': (1067, 108, 1104, 123), 'jp': (1102, 106, 1139, 121), 'tw': (1102, 106, 1139, 121)}, color={'cn': (95, 103, 93), 'en': (97, 101, 94), 'jp': (95, 103, 93), 'tw': (95, 103, 93)}, button={'cn': (1102, 106, 1139, 121), 'en': (1067, 108, 1104, 123), 'jp': (1102, 106, 1139, 121), 'tw': (1102, 106, 1139, 121)}, file={'cn': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'en': './assets/en/campaign/EVENT_20250724_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20250724_PT_ICON.png'}) +EVENT_20260417_DETAIL = Button(area={'cn': (618, 251, 658, 290), 'en': (618, 251, 658, 290), 'jp': (618, 251, 658, 290), 'tw': (618, 251, 658, 290)}, color={'cn': (221, 188, 185), 'en': (221, 188, 185), 'jp': (221, 188, 185), 'tw': (221, 188, 185)}, button={'cn': (618, 251, 658, 290), 'en': (618, 251, 658, 290), 'jp': (618, 251, 658, 290), 'tw': (618, 251, 658, 290)}, file={'cn': './assets/cn/campaign/EVENT_20260417_DETAIL.png', 'en': './assets/cn/campaign/EVENT_20260417_DETAIL.png', 'jp': './assets/cn/campaign/EVENT_20260417_DETAIL.png', 'tw': './assets/cn/campaign/EVENT_20260417_DETAIL.png'}) +EVENT_20260417_DETAIL_CHECK = Button(area={'cn': (439, 216, 535, 293), 'en': (439, 216, 535, 293), 'jp': (439, 216, 535, 293), 'tw': (439, 216, 535, 293)}, color={'cn': (187, 160, 173), 'en': (187, 160, 173), 'jp': (187, 160, 173), 'tw': (187, 160, 173)}, button={'cn': (439, 216, 535, 293), 'en': (439, 216, 535, 293), 'jp': (439, 216, 535, 293), 'tw': (439, 216, 535, 293)}, file={'cn': './assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png', 'en': './assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png', 'jp': './assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png', 'tw': './assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png'}) +EVENT_20260417_DETAIL_WHITE = Button(area={'cn': (1081, 92, 1141, 153), 'en': (1081, 92, 1141, 153), 'jp': (1081, 92, 1141, 153), 'tw': (1081, 92, 1141, 153)}, color={'cn': (211, 173, 175), 'en': (211, 173, 175), 'jp': (211, 173, 175), 'tw': (211, 173, 175)}, button={'cn': (1081, 92, 1141, 153), 'en': (1081, 92, 1141, 153), 'jp': (1081, 92, 1141, 153), 'tw': (1081, 92, 1141, 153)}, file={'cn': './assets/cn/campaign/EVENT_20260417_DETAIL_WHITE.png', 'en': './assets/cn/campaign/EVENT_20260417_DETAIL_WHITE.png', 'jp': './assets/cn/campaign/EVENT_20260417_DETAIL_WHITE.png', 'tw': './assets/cn/campaign/EVENT_20260417_DETAIL_WHITE.png'}) +EVENT_20260417_ENTRANCE = Button(area={'cn': (957, 522, 1091, 573), 'en': (957, 522, 1091, 573), 'jp': (957, 522, 1091, 573), 'tw': (957, 522, 1091, 573)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (957, 522, 1091, 573), 'en': (957, 522, 1091, 573), 'jp': (957, 522, 1091, 573), 'tw': (957, 522, 1091, 573)}, file={'cn': './assets/cn/campaign/EVENT_20260417_ENTRANCE.png', 'en': './assets/cn/campaign/EVENT_20260417_ENTRANCE.png', 'jp': './assets/cn/campaign/EVENT_20260417_ENTRANCE.png', 'tw': './assets/cn/campaign/EVENT_20260417_ENTRANCE.png'}) EVENT_20260417_PT_ICON = Button(area={'cn': (1110, 106, 1133, 130), 'en': (1110, 106, 1133, 130), 'jp': (1110, 106, 1133, 130), 'tw': (1110, 106, 1133, 130)}, color={'cn': (119, 177, 213), 'en': (119, 177, 213), 'jp': (119, 177, 213), 'tw': (119, 177, 213)}, button={'cn': (1110, 106, 1133, 130), 'en': (1110, 106, 1133, 130), 'jp': (1110, 106, 1133, 130), 'tw': (1110, 106, 1133, 130)}, file={'cn': './assets/cn/campaign/EVENT_20260417_PT_ICON.png', 'en': './assets/cn/campaign/EVENT_20260417_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20260417_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20260417_PT_ICON.png'}) OCR_COIN = Button(area={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, color={'cn': (61, 61, 73), 'en': (61, 61, 73), 'jp': (61, 61, 73), 'tw': (61, 61, 73)}, button={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, file={'cn': './assets/cn/campaign/OCR_COIN.png', 'en': './assets/en/campaign/OCR_COIN.png', 'jp': './assets/jp/campaign/OCR_COIN.png', 'tw': './assets/tw/campaign/OCR_COIN.png'}) OCR_EVENT_PT = Button(area={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, color={'cn': (121, 110, 59), 'en': (88, 78, 51), 'jp': (121, 110, 59), 'tw': (121, 110, 59)}, button={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, file={'cn': './assets/cn/campaign/OCR_EVENT_PT.png', 'en': './assets/en/campaign/OCR_EVENT_PT.png', 'jp': './assets/jp/campaign/OCR_EVENT_PT.png', 'tw': './assets/tw/campaign/OCR_EVENT_PT.png'}) diff --git a/module/commission/assets.py b/module/commission/assets.py index 830a4c61a..d775a0927 100644 --- a/module/commission/assets.py +++ b/module/commission/assets.py @@ -11,5 +11,5 @@ COMMISSION_SCROLL_AREA = Button(area={'cn': (1254, 77, 1261, 676), 'en': (1254, COMMISSION_START = Button(area={'cn': (1028, 322, 1156, 383), 'en': (1053, 333, 1134, 361), 'jp': (1033, 340, 1153, 376), 'tw': (1027, 326, 1157, 389)}, color={'cn': (229, 175, 113), 'en': (237, 199, 149), 'jp': (231, 184, 121), 'tw': (231, 180, 120)}, button={'cn': (1028, 322, 1156, 383), 'en': (1053, 333, 1134, 361), 'jp': (1033, 340, 1153, 376), 'tw': (1027, 326, 1157, 389)}, file={'cn': './assets/cn/commission/COMMISSION_START.png', 'en': './assets/en/commission/COMMISSION_START.png', 'jp': './assets/jp/commission/COMMISSION_START.png', 'tw': './assets/tw/commission/COMMISSION_START.png'}) COMMISSION_URGENT = Button(area={'cn': (35, 231, 68, 281), 'en': (28, 221, 76, 283), 'jp': (34, 266, 68, 279), 'tw': (35, 229, 69, 280)}, color={'cn': (215, 188, 124), 'en': (169, 138, 95), 'jp': (216, 190, 111), 'tw': (213, 186, 123)}, button={'cn': (35, 231, 68, 281), 'en': (28, 221, 76, 283), 'jp': (34, 266, 68, 279), 'tw': (35, 229, 69, 280)}, file={'cn': './assets/cn/commission/COMMISSION_URGENT.png', 'en': './assets/en/commission/COMMISSION_URGENT.png', 'jp': './assets/jp/commission/COMMISSION_URGENT.png', 'tw': './assets/tw/commission/COMMISSION_URGENT.png'}) EXP_INFO_S_REWARD = Button(area={'cn': (498, 140, 557, 154), 'en': (1138, 40, 1266, 145), 'jp': (498, 140, 557, 154), 'tw': (498, 140, 557, 154)}, color={'cn': (233, 241, 127), 'en': (89, 115, 159), 'jp': (233, 241, 127), 'tw': (233, 241, 127)}, button={'cn': (498, 140, 557, 154), 'en': (1138, 40, 1266, 145), 'jp': (498, 140, 557, 154), 'tw': (498, 140, 557, 154)}, file={'cn': './assets/cn/commission/EXP_INFO_S_REWARD.png', 'en': './assets/en/commission/EXP_INFO_S_REWARD.png', 'jp': './assets/jp/commission/EXP_INFO_S_REWARD.png', 'tw': './assets/tw/commission/EXP_INFO_S_REWARD.png'}) -REWARD_1 = Button(area={'cn': (383, 285, 503, 297), 'en': (403, 274, 504, 290), 'jp': (432, 273, 476, 294), 'tw': (383, 285, 503, 297)}, color={'cn': (238, 168, 81), 'en': (241, 198, 145), 'jp': (241, 188, 122), 'tw': (238, 168, 81)}, button={'cn': (383, 285, 503, 297), 'en': (392, 262, 515, 303), 'jp': (393, 262, 514, 303), 'tw': (383, 285, 503, 297)}, file={'cn': './assets/cn/commission/REWARD_1.png', 'en': './assets/en/commission/REWARD_1.png', 'jp': './assets/jp/commission/REWARD_1.png', 'tw': './assets/tw/commission/REWARD_1.png'}) +REWARD_1 = Button(area={'cn': (383, 285, 503, 297), 'en': (403, 274, 504, 290), 'jp': (432, 273, 476, 294), 'tw': (383, 285, 503, 297)}, color={'cn': (238, 168, 81), 'en': (241, 198, 145), 'jp': (241, 188, 122), 'tw': (238, 168, 81)}, button={'cn': (383, 285, 503, 297), 'en': (392, 262, 515, 303), 'jp': (403, 271, 514, 303), 'tw': (383, 285, 503, 297)}, file={'cn': './assets/cn/commission/REWARD_1.png', 'en': './assets/en/commission/REWARD_1.png', 'jp': './assets/jp/commission/REWARD_1.png', 'tw': './assets/tw/commission/REWARD_1.png'}) REWARD_SAVE_CLICK = Button(area={'cn': (415, 184, 496, 214), 'en': (415, 184, 496, 214), 'jp': (415, 184, 496, 214), 'tw': (415, 184, 496, 214)}, color={'cn': (152, 150, 168), 'en': (152, 150, 168), 'jp': (152, 150, 168), 'tw': (152, 150, 168)}, button={'cn': (415, 184, 496, 214), 'en': (415, 184, 496, 214), 'jp': (415, 184, 496, 214), 'tw': (415, 184, 496, 214)}, file={'cn': './assets/cn/commission/REWARD_SAVE_CLICK.png', 'en': './assets/en/commission/REWARD_SAVE_CLICK.png', 'jp': './assets/jp/commission/REWARD_SAVE_CLICK.png', 'tw': './assets/tw/commission/REWARD_SAVE_CLICK.png'}) diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 0d9ec8b3a..be047f757 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3583,7 +3583,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -3599,6 +3598,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -3659,7 +3659,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -3675,6 +3674,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -3730,7 +3730,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -3746,6 +3745,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -3821,7 +3821,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -4389,7 +4390,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -4405,6 +4405,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -4465,7 +4466,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -4481,6 +4481,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -4536,7 +4537,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -4552,6 +4552,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -4627,7 +4628,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -5144,7 +5146,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -5160,6 +5161,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -5220,7 +5222,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -5236,6 +5237,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -5291,7 +5293,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -5307,6 +5308,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -5382,7 +5384,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -5899,7 +5902,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -5915,6 +5917,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -5975,7 +5978,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -5991,6 +5993,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -6046,7 +6049,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -6062,6 +6064,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -6137,7 +6140,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -6654,7 +6658,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -6670,6 +6673,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -6730,7 +6734,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -6746,6 +6749,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -6801,7 +6805,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -6817,6 +6820,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -6892,7 +6896,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -7409,7 +7414,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -7425,6 +7429,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -7485,7 +7490,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -7501,6 +7505,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -7556,7 +7561,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -7572,6 +7576,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -7647,7 +7652,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -8164,7 +8170,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -8180,6 +8185,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -8240,7 +8246,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -8256,6 +8261,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -8311,7 +8317,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -8327,6 +8332,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -8402,7 +8408,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -10830,7 +10837,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -10846,6 +10852,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -10906,7 +10913,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -10922,6 +10928,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -10977,7 +10984,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -10993,6 +10999,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -11068,7 +11075,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -11602,7 +11610,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -11618,6 +11625,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -11678,7 +11686,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -11694,6 +11701,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -11749,7 +11757,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -11765,6 +11772,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -11840,7 +11848,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -12374,7 +12383,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -12390,6 +12398,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -12450,7 +12459,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -12466,6 +12474,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -12521,7 +12530,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -12537,6 +12545,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -12612,7 +12621,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -13146,7 +13156,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -13162,6 +13171,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -13222,7 +13232,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -13238,6 +13247,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -13293,7 +13303,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -13309,6 +13318,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -13384,7 +13394,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { @@ -13908,7 +13919,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -13924,6 +13934,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn", "event_general_cn" @@ -13984,7 +13995,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -14000,6 +14010,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -14055,7 +14066,6 @@ "event_20220818_cn", "event_20250227_cn", "event_20230223_cn", - "event_20250424_cn", "event_20250520_cn", "event_20230525_cn", "event_20221124_cn", @@ -14071,6 +14081,7 @@ "event_20260226_cn", "event_20240229_cn", "event_20260326_cn", + "event_20250424_cn", "event_20201126_cn", "event_20260417_cn" ], @@ -14146,7 +14157,8 @@ "event_20260226_cn", "event_20220728_cn", "event_20260326_cn", - "event_20220915_cn" + "event_20220915_cn", + "event_20260417_cn" ] }, "Mode": { diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index b4c654947..835adc31c 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -820,7 +820,7 @@ "event_20241121_cn": "Dangerous Inventions Incoming", "event_20241219_cn": "Substellar Crepuscule", "event_20250227_cn": "Paradiso of Shackled Light", - "event_20250424_cn": "Toward Tulipa’s Seas", + "event_20250424_cn": "Toward Tulipa’s Seas Rerun", "event_20250520_cn": "A Rose on the High Tower", "event_20250724_cn": "The Alchemist and the Tower of Horizons", "event_20250814_cn": "Secrets of the Abyss", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 0e1c8c1b5..2f02379fe 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -820,7 +820,7 @@ "event_20241121_cn": "危険発明接近中", "event_20241219_cn": "星降る夕影の残光", "event_20250227_cn": "籠檻に囚われし神光", - "event_20250424_cn": "チュリッパの海へ", + "event_20250424_cn": "チュリッパの海へ（復刻）", "event_20250520_cn": "高い塔の薔薇", "event_20250724_cn": "錬金術士と天空邂逅の塔", "event_20250814_cn": "淵層界の秘密", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 1a5a17593..441799a10 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -820,7 +820,7 @@ "event_20241121_cn": "危险发明迫近中", "event_20241219_cn": "星光下的余晖", "event_20250227_cn": "樊笼内的神光", - "event_20250424_cn": "扬起郁金之旗", + "event_20250424_cn": "复刻扬起郁金之旗", "event_20250520_cn": "高塔上的蔷薇", "event_20250724_cn": "优米雅的炼金工房", "event_20250814_cn": "奇渊下的秘密", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index e5072a196..69e142c78 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -829,7 +829,7 @@ "event_20251218_cn": "響徹於天穹之音", "event_20260226_cn": "春滿客棧Online", "event_20260326_cn": "漫遊者招募計劃", - "event_20260417_cn": "Vacation Lane – Beachside Brilliance", + "event_20260417_cn": "假日航線閃耀海濱", "event_general_cn": "通用活动图(紧急委托)", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", diff --git a/module/tactical/assets.py b/module/tactical/assets.py index 0c9fb8b81..cb8c451e7 100644 --- a/module/tactical/assets.py +++ b/module/tactical/assets.py @@ -8,7 +8,7 @@ ADD_NEW_STUDENT = Button(area={'cn': (417, 375, 438, 398), 'en': (417, 375, 438, BOOK_EMPTY_POPUP = Button(area={'cn': (880, 180, 908, 209), 'en': (880, 180, 908, 209), 'jp': (880, 180, 908, 209), 'tw': (880, 180, 908, 209)}, color={'cn': (211, 109, 105), 'en': (211, 109, 105), 'jp': (211, 109, 105), 'tw': (211, 109, 105)}, button={'cn': (880, 180, 908, 209), 'en': (880, 180, 908, 209), 'jp': (880, 180, 908, 209), 'tw': (880, 180, 908, 209)}, file={'cn': './assets/cn/tactical/BOOK_EMPTY_POPUP.png', 'en': './assets/en/tactical/BOOK_EMPTY_POPUP.png', 'jp': './assets/jp/tactical/BOOK_EMPTY_POPUP.png', 'tw': './assets/tw/tactical/BOOK_EMPTY_POPUP.png'}) OCR_SKILL_EXP = Button(area={'cn': (771, 191, 951, 209), 'en': (771, 191, 951, 209), 'jp': (728, 189, 950, 211), 'tw': (771, 191, 951, 209)}, color={'cn': (72, 82, 83), 'en': (72, 82, 83), 'jp': (69, 78, 82), 'tw': (72, 82, 83)}, button={'cn': (771, 191, 951, 209), 'en': (771, 191, 951, 209), 'jp': (728, 189, 950, 211), 'tw': (771, 191, 951, 209)}, file={'cn': './assets/cn/tactical/OCR_SKILL_EXP.png', 'en': './assets/en/tactical/OCR_SKILL_EXP.png', 'jp': './assets/jp/tactical/OCR_SKILL_EXP.png', 'tw': './assets/tw/tactical/OCR_SKILL_EXP.png'}) RAPID_TRAINING = Button(area={'cn': (518, 566, 583, 582), 'en': (518, 568, 585, 580), 'jp': (518, 566, 584, 583), 'tw': (518, 566, 583, 582)}, color={'cn': (233, 212, 171), 'en': (229, 205, 156), 'jp': (232, 209, 165), 'tw': (233, 212, 171)}, button={'cn': (518, 566, 583, 582), 'en': (518, 568, 585, 580), 'jp': (518, 566, 584, 583), 'tw': (518, 566, 583, 582)}, file={'cn': './assets/cn/tactical/RAPID_TRAINING.png', 'en': './assets/en/tactical/RAPID_TRAINING.png', 'jp': './assets/jp/tactical/RAPID_TRAINING.png', 'tw': './assets/cn/tactical/RAPID_TRAINING.png'}) -REWARD_2 = Button(area={'cn': (418, 413, 468, 434), 'en': (403, 416, 504, 432), 'jp': (432, 415, 476, 436), 'tw': (418, 413, 468, 434)}, color={'cn': (240, 191, 120), 'en': (240, 201, 145), 'jp': (240, 191, 121), 'tw': (240, 191, 120)}, button={'cn': (383, 404, 503, 444), 'en': (392, 404, 515, 445), 'jp': (399, 415, 520, 450), 'tw': (383, 404, 503, 444)}, file={'cn': './assets/cn/tactical/REWARD_2.png', 'en': './assets/en/tactical/REWARD_2.png', 'jp': './assets/jp/tactical/REWARD_2.png', 'tw': './assets/tw/tactical/REWARD_2.png'}) +REWARD_2 = Button(area={'cn': (418, 413, 468, 434), 'en': (403, 416, 504, 432), 'jp': (432, 415, 476, 436), 'tw': (418, 413, 468, 434)}, color={'cn': (240, 191, 120), 'en': (240, 201, 145), 'jp': (240, 191, 121), 'tw': (240, 191, 120)}, button={'cn': (383, 404, 503, 444), 'en': (392, 404, 515, 445), 'jp': (403, 415, 520, 450), 'tw': (383, 404, 503, 444)}, file={'cn': './assets/cn/tactical/REWARD_2.png', 'en': './assets/en/tactical/REWARD_2.png', 'jp': './assets/jp/tactical/REWARD_2.png', 'tw': './assets/tw/tactical/REWARD_2.png'}) SKILL_CONFIRM = Button(area={'cn': (575, 563, 705, 594), 'en': (600, 558, 681, 581), 'jp': (576, 563, 705, 594), 'tw': (577, 563, 704, 593)}, color={'cn': (147, 177, 216), 'en': (167, 191, 223), 'jp': (136, 170, 213), 'tw': (161, 187, 220)}, button={'cn': (575, 563, 705, 594), 'en': (600, 558, 681, 581), 'jp': (576, 563, 705, 594), 'tw': (577, 563, 704, 593)}, file={'cn': './assets/cn/tactical/SKILL_CONFIRM.png', 'en': './assets/en/tactical/SKILL_CONFIRM.png', 'jp': './assets/jp/tactical/SKILL_CONFIRM.png', 'tw': './assets/tw/tactical/SKILL_CONFIRM.png'}) TACTICAL_CLASS_CANCEL = Button(area={'cn': (818, 591, 990, 647), 'en': (836, 591, 973, 639), 'jp': (840, 606, 969, 637), 'tw': (819, 590, 989, 647)}, color={'cn': (153, 154, 154), 'en': (163, 164, 164), 'jp': (175, 176, 176), 'tw': (152, 153, 154)}, button={'cn': (818, 591, 990, 647), 'en': (836, 591, 973, 639), 'jp': (840, 606, 969, 637), 'tw': (819, 590, 989, 647)}, file={'cn': './assets/cn/tactical/TACTICAL_CLASS_CANCEL.png', 'en': './assets/en/tactical/TACTICAL_CLASS_CANCEL.png', 'jp': './assets/jp/tactical/TACTICAL_CLASS_CANCEL.png', 'tw': './assets/tw/tactical/TACTICAL_CLASS_CANCEL.png'}) TACTICAL_CLASS_START = Button(area={'cn': (1024, 590, 1197, 648), 'en': (1045, 592, 1176, 640), 'jp': (1046, 606, 1176, 637), 'tw': (1026, 590, 1196, 647)}, color={'cn': (96, 139, 194), 'en': (95, 137, 190), 'jp': (132, 165, 208), 'tw': (101, 143, 196)}, button={'cn': (1024, 590, 1197, 648), 'en': (1045, 592, 1176, 640), 'jp': (1046, 606, 1176, 637), 'tw': (1026, 590, 1196, 647)}, file={'cn': './assets/cn/tactical/TACTICAL_CLASS_START.png', 'en': './assets/en/tactical/TACTICAL_CLASS_START.png', 'jp': './assets/jp/tactical/TACTICAL_CLASS_START.png', 'tw': './assets/tw/tactical/TACTICAL_CLASS_START.png'})