From d35bfa0f5db07b2f9073df368f5eac5cf0efe81b Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:24:07 +0800 Subject: [PATCH 1/3] Add: War Archives * war_archives_20201012_cn * war_archives_20210422_cn * war_archives_20210916_cn * war_archives_20211111_cn * war_archives_20211229_cn --- campaign/Readme.md | 167 +++++++++--------- campaign/event_20210422_cn/sp.py | 126 ------------- campaign/event_20210916_cn/sp.py | 109 ------------ campaign/event_20211229_cn/sp.py | 107 ----------- .../sp1.py | 2 +- .../sp2.py | 2 +- .../sp3.py | 2 +- .../a1.py | 2 +- .../a2.py | 2 +- .../a3.py | 2 +- .../b1.py | 2 +- .../b2.py | 2 +- .../b3.py | 2 +- .../c1.py | 2 +- .../c2.py | 2 +- .../c3.py | 2 +- .../d1.py | 2 +- .../d2.py | 2 +- .../d3.py | 2 +- .../a1.py | 0 .../a2.py | 0 .../a3.py | 0 .../b1.py | 0 .../b2.py | 0 .../b3.py | 0 .../c1.py | 0 .../c2.py | 0 .../c3.py | 0 .../campaign_base.py | 2 +- .../d1.py | 0 .../d2.py | 0 .../d3.py | 0 .../sp1.py | 2 +- .../sp2.py | 2 +- .../sp3.py | 2 +- .../a1.py | 0 .../a2.py | 0 .../a3.py | 0 .../b1.py | 0 .../b2.py | 0 .../b3.py | 0 .../bs1.py | 0 .../c1.py | 0 .../c2.py | 0 .../c3.py | 0 .../campaign_base.py | 2 +- .../d1.py | 0 .../d2.py | 0 .../d3.py | 0 .../ds1.py | 0 config/template.json | 2 +- module/config/argument/args.json | 15 +- module/config/i18n/en-US.json | 5 + module/config/i18n/ja-JP.json | 5 + module/config/i18n/zh-CN.json | 5 + module/config/i18n/zh-TW.json | 5 + 56 files changed, 137 insertions(+), 449 deletions(-) delete mode 100644 campaign/event_20210422_cn/sp.py delete mode 100644 campaign/event_20210916_cn/sp.py delete mode 100644 campaign/event_20211229_cn/sp.py rename campaign/{event_20201012_cn => war_archives_20201012_cn}/sp1.py (97%) rename campaign/{event_20201012_cn => war_archives_20201012_cn}/sp2.py (96%) rename campaign/{event_20201012_cn => war_archives_20201012_cn}/sp3.py (96%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/a1.py (97%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/a2.py (96%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/a3.py (96%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/b1.py (97%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/b2.py (97%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/b3.py (97%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/c1.py (97%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/c2.py (96%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/c3.py (96%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/d1.py (97%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/d2.py (97%) rename campaign/{event_20210422_cn => war_archives_20210422_cn}/d3.py (97%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/a1.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/a2.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/a3.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/b1.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/b2.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/b3.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/c1.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/c2.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/c3.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/campaign_base.py (90%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/d1.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/d2.py (100%) rename campaign/{event_20210916_cn => war_archives_20210916_cn}/d3.py (100%) rename campaign/{event_20211111_cn => war_archives_20211111_cn}/sp1.py (97%) rename campaign/{event_20211111_cn => war_archives_20211111_cn}/sp2.py (96%) rename campaign/{event_20211111_cn => war_archives_20211111_cn}/sp3.py (97%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/a1.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/a2.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/a3.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/b1.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/b2.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/b3.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/bs1.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/c1.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/c2.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/c3.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/campaign_base.py (91%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/d1.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/d2.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/d3.py (100%) rename campaign/{event_20211229_cn => war_archives_20211229_cn}/ds1.py (100%) diff --git a/campaign/Readme.md b/campaign/Readme.md index 21a734c55..84bc76355 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -22,28 +22,33 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20180119 | war archives 20191010 en | Encircling Graf Spee | 围剿斯佩伯爵 | Encircling Graf Spee | アドミラル・グラーフ・シュペー追撃戦 | 圍剿斯佩伯爵 | | 20180226 | war archives 20190221 en | Winter\'s Crown | 凛冬王冠 | Winter\'s Crown | 凛冽なりし冬の王冠 | 凜冬王冠 | | 20180607 | war archives 20180607 cn | Ink Stained Steel Sakura | 墨染的钢铁之花 | Ink Stained Steel Sakura | 墨染まりし鋼の桜 | 墨染的鋼鐵之花 | -| 20180717 | war archives 20190314 en | Prelude under the Moon | 月光下的序曲 | Prelude under the Moon | 月夜の開幕曲 | 月光下的序曲 | +| 20180717 | war archives 20190314 en | Prelude under the Moon | 月光下的序曲 | Prelude under the Moon | 月夜の開幕曲 | 月光下的序曲 | | 20180726 | war archives 20180726 cn | Iris of Light and Dark | 光与影的鸢尾之华 | Iris of Light and Dark | 光と影のアイリス | 光與影的鳶尾之華 | | 20200312 | war archives 20200312 cn | The Solomon Ranger | 斯图尔特的硝烟 | The Solomon Ranger | 南洋に靡く硝煙 | 斯圖爾特的硝煙 | | 20210121 | war archives 20181227 cn | Crimson Echoes | 苍红的回响 | Crimson Echoes | 縹映る深緋の残響 | 蒼紅的迴響 | -| 20210513 | war archives 20200820 cn | Scherzo of Iron and Blood | 铁血音符誓言 | Scherzo of Iron and Blood | 黒鉄の楽章 誓いの海 | 鐵血音符誓言 | -| 20211014 | war archives 20211014 cn | Crescendo of Polaris | 激奏的Polaris | Crescendo of Polaris | 激奏のポラリス | 激奏的Polaris | -| 20220113 | war archives 20190911 cn | Empyreal Tragicomedy | 神圣的悲喜剧 | Empyreal Tragicomedy | 悲歎せし焔海の詩 | 神聖的悲喜劇 | -| 20220407 | war archives 20210325 cn | Ashen Simulacrum | 箱庭疗法 | Ashen Simulacrum | 開かれし紺碧の砂箱 | 箱庭療法 | -| 20220721 | war archives 20210624 cn | Swirling Cherry Blossoms | 浮樱影华 | Swirling Cherry Blossoms | 翳りし満ちる影の華 | 浮櫻影華 | -| 20220901 | war archives 20200806 cn | The Enigma and the Shark | 最重要的宝物 | The Enigma and the Shark | 鉄血鮫とエニグマ | 最重要的寶物 | -| 20221013 | war archives 20201029 cn | Universe in Unison | 激唱的UNIVERSE | Universe in Unison | 激唱のユニバース | 激唱的UNIVERSE | -| 20221117 | war archives 20200903 cn | Stars of the Shimmering Fjord | 峡湾间的星辰 | Stars of the Shimmering Fjord | 輝ける峡湾の星 | 峽灣間的星辰 | -| 20221117 | war archives 20210819 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | 微層混合 | +| 20210513 | war archives 20200820 cn | Scherzo of Iron and Blood | 铁血音符誓言 | Scherzo of Iron and Blood | 黒鉄の楽章 誓いの海 | 鐵血音符誓言 | +| 20211014 | war archives 20211014 cn | Crescendo of Polaris | 激奏的Polaris | Crescendo of Polaris | 激奏のポラリス | 激奏的Polaris | +| 20220113 | war archives 20190911 cn | Empyreal Tragicomedy | 神圣的悲喜剧 | Empyreal Tragicomedy | 悲歎せし焔海の詩 | 神聖的悲喜劇 | +| 20220407 | war archives 20210325 cn | Ashen Simulacrum | 箱庭疗法 | Ashen Simulacrum | 開かれし紺碧の砂箱 | 箱庭療法 | +| 20220721 | war archives 20210624 cn | Swirling Cherry Blossoms | 浮樱影华 | Swirling Cherry Blossoms | 翳りし満ちる影の華 | 浮櫻影華 | +| 20220901 | war archives 20200806 cn | The Enigma and the Shark | 最重要的宝物 | The Enigma and the Shark | 鉄血鮫とエニグマ | 最重要的寶物 | +| 20221013 | war archives 20201029 cn | Universe in Unison | 激唱的UNIVERSE | Universe in Unison | 激唱のユニバース | 激唱的UNIVERSE | +| 20221117 | war archives 20200903 cn | Stars of the Shimmering Fjord | 峡湾间的星辰 | Stars of the Shimmering Fjord | 輝ける峡湾の星 | 峽灣間的星辰 | +| 20221117 | war archives 20210819 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | 微層混合 | | 20211028 | war archives 20211028 cn | Skybound Oratorio | 穹顶下的圣咏曲 | Skybound Oratorio | 神穹を衝く聖歌 | 穹頂下的聖詠曲 | -| 20230309 | war archives 20200507 cn | The Way Home in the Night | 夜幕下的归途 | The Way Home in the Night | 帰路は海色の陰りへと | 夜幕下的歸途 | -| 20230420 | war archives 20220210 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | 北境序曲 | -| 20230511 | war archives 20220414 cn | Aurora Noctis | 永夜幻光 | Aurora Noctis | 極夜照らす幻光 | 永夜幻光 | -| 20230713 | war archives 20200603 cn | Counterattack Within the Fjord | 峡湾间的反击 | Counterattack Within the Fjord | 峡湾間の反撃 | 峽灣間的反擊 | -| 20230831 | war archives 20201229 cn | Inverted Orthant | 负象限作战 | Inverted Orthant | 虚畳なりし限象 | 負象限作戰 | -| 20240118 | war archives 20200917 cn | Dreamwaker's Butterfly | 蝶海梦花 | Dreamwaker's Butterfly | 刹那觀る胡蝶の夢 | 蝶海夢花 | -| 20240118 | war archives 20210527 cn | Mirror Involution | 镜位螺旋 | Mirror Involution | 照らす螺旋の鏡海 | 鏡位螺旋 | -| 20240222 | war archives 20210225 cn | Khorovod of Dawn's Rime | 破晓冰华 | Khorovod of Dawn's Rime | 暁射す氷華の嵐 | 破曉冰華 | +| 20230309 | war archives 20200507 cn | The Way Home in the Night | 夜幕下的归途 | The Way Home in the Night | 帰路は海色の陰りへと | 夜幕下的歸途 | +| 20230420 | war archives 20220210 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | 北境序曲 | +| 20230511 | war archives 20220414 cn | Aurora Noctis | 永夜幻光 | Aurora Noctis | 極夜照らす幻光 | 永夜幻光 | +| 20230713 | war archives 20200603 cn | Counterattack Within the Fjord | 峡湾间的反击 | Counterattack Within the Fjord | 峡湾間の反撃 | 峽灣間的反擊 | +| 20230831 | war archives 20201229 cn | Inverted Orthant | 负象限作战 | Inverted Orthant | 虚畳なりし限象 | 負象限作戰 | +| 20240118 | war archives 20200917 cn | Dreamwaker's Butterfly | 蝶海梦花 | Dreamwaker's Butterfly | 刹那觀る胡蝶の夢 | 蝶海夢花 | +| 20240118 | war archives 20210527 cn | Mirror Involution | 镜位螺旋 | Mirror Involution | 照らす螺旋の鏡海 | 鏡位螺旋 | +| 20240222 | war archives 20210225 cn | Khorovod of Dawn's Rime | 破晓冰华 | Khorovod of Dawn's Rime | 暁射す氷華の嵐 | 破曉冰華 | +| 20240321 | war archives 20201012 cn | Sundered Blue | 划破海空之翼 | Sundered Blue | 奔る彩帆の青 | 劃破海空之翼 | +| 20240613 | war archives 20211111 cn | The Flame-Touched Dagger | 杰诺瓦的焰火 | The Flame-Touched Dagger | 燈火のシニエ | 杰諾瓦的焰火 | +| 20240718 | war archives 20210916 cn | Upon the Shimmering Blue | 碧海光粼 | Upon the Shimmering Blue | 駆けよ 碧海の吹き風 | 碧海光粼 | +| 20240829 | war archives 20210422 cn | Daedalian Hymn | 复兴的赞美诗 | Daedalian Hymn | 讃える復興の迷路 | 復興的讚美詩 | +| 20241017 | war archives 20211229 cn | Tower of Transcendence | 逆转彩虹之塔 | Tower of Transcendence | 遡望せし虹彩の塔 | 逆轉彩虹之塔 | | 20200227 | event 20200227 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | - | | 20200312 | event 20200312 cn | The Solomon Ranger | 复刻斯图尔特的硝烟 | The Solomon Ranger Rerun | 南洋に靡く硝煙（復刻） | - | | 20200326 | event 20200326 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | - | @@ -143,70 +148,70 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20230118 | raid 20220127 | - | - | - | - | 演習神秘事件調查 | | 20230202 | event 20200806 cn | The Enigma and the Shark | - | - | - | 復刻最重要的寶物 | | 20230216 | event 20220224 cn | Abyssal Refrain | - | - | - | 深度回音 | -| 20230223 | event 20230223 cn | Revelations of Dust | 湮烬尘墟 | Revelations of Dust | 黙示の遺構 | - | +| 20230223 | event 20230223 cn | Revelations of Dust | 湮烬尘墟 | Revelations of Dust | 黙示の遺構 | - | | 20230309 | event 20210624 cn | Swirling Cherry Blossoms | - | - | - | 復刻-浮櫻影華 | -| 20230309 | event 20210422 cn | Daedalian Hymn | 复刻复兴的赞美诗 | Daedalian Hymn Rerun | 讃える復興の迷路（復刻） | - | +| 20230309 | event 20210422 cn | Daedalian Hymn | 复刻复兴的赞美诗 | Daedalian Hymn Rerun | 讃える復興の迷路（復刻） | - | | 20230323 | raid 20220630 | Angel of Iris | - | - | - | 來自鳶尾的天使 | -| 20230323 | coalition 20230323 | Frostfall | 极地风暴 | Frostfall | 星霜海嵐 | - | -| 20230413 | event 20211111 cn | The Flame-Touched Dagger | 复刻杰诺瓦的焰火 | The Flame-Touched Dagger Rerun | 復刻-燈火のシニエ | - | +| 20230323 | coalition 20230323 | Frostfall | 极地风暴 | Frostfall | 星霜海嵐 | - | +| 20230413 | event 20211111 cn | The Flame-Touched Dagger | 复刻杰诺瓦的焰火 | The Flame-Touched Dagger Rerun | 復刻-燈火のシニエ | - | | 20230413 | event 20210819 cn | Microlayer Medley | - | - | - | 復刻-微層混合 | -| 20230427 | event 20201126 cn | Vacation Lane | 假日航线 | Vacation Lane | バケーションレーン | 假日航線 | +| 20230427 | event 20201126 cn | Vacation Lane | 假日航线 | Vacation Lane | バケーションレーン | 假日航線 | | 20230525 | event 20220526 cn | Pledge of the Radiant Court | - | - | - | 泠誓光庭 | -| 20230525 | event 20230525 cn | Confluence of Nothingness | 空相交汇点 | Confluence of Nothingness | 覆天せし万象の塵 | - | -| 20230615 | event 20200603 cn | Counterattack Within the Fjord | - | - | - | 復刻峽灣間的反擊 | -| 20230621 | event 20210527 cn | Mirror Involution Rerun | 复刻镜位螺旋 | Mirror Involution Rerun | 照らす螺旋の鏡海（復刻） | - | -| 20230629 | event 20220428 cn | Rondo at Rainbow's End | - | - | - | 虹彩的終幕曲 | -| 20230629 | raid 20230629 | Reflections of the Oasis | 绿洲往事 | Reflections of the Oasis | 緑地伽話 | - | -| 20230713 | event 20220818 cn | Operation Convergence | - | - | 結像点作戦 | 遠匯點作戰 | -| 20230720 | event 20211125 cn | World-spanning Arclight | 复刻交汇世界的弧光 | World-spanning Arclight Rerun | 弧光は交わる世界にて（復刻） | - | -| 20230727 | event 20200917 cn | Dreamwaker's Butterfly | - | - | - | 復刻-蝶海夢花 | -| 20230803 | event 20211125 cn | World-spanning Arclight | - | - | - | 復刻-交匯世界的弧光 | -| 20230803 | event 20230803 cn | Anthem of Remembrance | 奏响鸢尾之歌 | Anthem of Remembrance | 燃ゆる聖都の回想曲 | - | -| 20230817 | event 20230817 cn | The Fool's Scales | 愚者的天平 | The Fool's Scales | 愚者の天秤 | - | -| 20230817 | event 20220414 cn | Aurora Noctis | - | - | - | 復刻-永夜幻光 | -| 20230824 | coalition 20230323 | Frostfall | - | - | - | 極地風暴 | -| 20230914 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 紫絳槿嵐 | -| 20230914 | event 20230914 cn | Effulgence Before Eclipse | 须臾望月抄 | Effulgence Before Eclipse | 須臾望月抄 | - | -| 20231012 | event 20201229 cn | Inverted Orthant | - | - | - | 復刻-負象限作戰 | -| 20231019 | raid 20221027 | Fight! Royal Maid | - | - | - | 戰鬥！皇家女僕隊3rd | -| 20231026 | event 20231026 cn | Tempesta and the Fountain of Youth | 飓风与青春之泉 | Tempesta and the Fountain of Youth | テンペスタと若返りの泉 | - | -| 20231109 | event 20210916 cn | Upon the Shimmering Blue | 复刻碧海光粼 | Upon the Shimmering Blue Rerun | 駆けよ 碧海の吹き風（復刻） | - | -| 20231109 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 雄鷹的敘事歌 | -| 20231123 | event 20220210 cn | Northern Overture Rerun | - | - | - | 復刻北境序曲 | -| 20231123 | event 20231123 cn | The Ninja Scrolls: Azur Flash | 苍闪忍法帖 | The Ninja Scrolls: Azur Flash | 蒼閃忍法帖 | - | -| 20231130 | event 20231123 cn | The Ninja Scrolls: Azur Flash | - | - | - | 蒼閃忍法帖 | -| 20221222 | event 20221222 cn | Parallel Superimposition | - | - | - | 定向折疊 | -| 20231221 | event 20231221 cn | Light-Chasing Sea of Stars | 星海逐光 | Light-Chasing Sea of Stars | 光追う星の海 | - | -| 20240104 | event 20210225 cn | Khorovod of Dawn's Rime | - | - | - | 復刻破曉冰華 | -| 20240111 | event 20211229 cn | Tower of Transcendence Rerun | 复刻逆转彩虹之塔 | Tower of Transcendence Rerun | 遡望せし虹彩の塔（復刻） 　　 | - | -| 20240111 | event 20230803 cn | Anthem of Remembrance | - | - | - | 奏響鳶尾之歌 | -| 20240125 | event 20210527 cn | Mirror Involution Rerun | - | - | - | 復刻鏡位螺旋 | -| 20240130 | raid 20240130 | Spring Festive Fiasco | 寰昌宇定家事忙 | Spring Festive Fiasco | 新春宴会狂騒曲 | - | -| 20240206 | raid 20230118 | Winter Pathfinder | - | - | - | 冬日的尋路人 | -| 20240229 | event 20230223 cn | Revelations of Dust | - | - | - | 湮燼塵墟 | -| 20240229 | event 20240229 cn | Snowrealm Peregrination | 雪境迷踪 | Snowrealm Peregrination | 銀界遊廻 | - | -| 20240314 | event 20210422 cn | Daedalian Hymn | - | - | - | 復刻復興的讚美詩 | -| 20240314 | event 20220324 cn | Virtual Tower Rerun | 复刻虚像构筑之塔 | Virtual Tower Rerun | 幻像の塔（復刻） | - | -| 20240321 | raid 20230629 | Reflections of the Oasis | - | - | - | 綠洲往事 | -| 20240328 | raid 20240328 | From Zero to Hero | 从零开始的魔王讨伐之旅 | From Zero to Hero | ゼロから頑張る魔王討伐 | - | -| 20240403 | event 20211111 cn | The Flame-Touched Dagger | - | - | - | 復刻杰諾瓦的焰火 | -| 20240411 | event 20220224 cn | Abyssal Refrain Rerun | 复刻深度回音 | Abyssal Refrain Rerun | 鳴動せし星霜の淵（復刻） | - | -| 20240425 | event 20230817 cn | The Fool's Scales | - | - | - | 愚者的天平 | -| 20240425 | event 20240425 cn | Heart-Linking Harmony | 共鸣的PASSION | Heart-Linking Harmony | 共鳴のパッション | - | -| 20240509 | event 20210916 cn | Upon the Shimmering Blue | - | - | - | 復刻碧海光粼 | -| 20240521 | event 20240521 cn | Light of the Martyrium | 绽放于辉光之城 | Light of the Martyrium | 赫輝のマルティリウム | - | -| 20240523 | event 20230525 cn | Confluence of Nothingness | - | - | - | 空相交會點 | -| 20240613 | event 20201012 cn | Sundered Blue | - | - | - | 復刻劃破海空之翼 | -| 20240620 | event 20220428 cn | Rondo at Rainbow's End Rerun | 复刻虹彩的终幕曲 | Rondo at Rainbow's End Rerun | 吟ずる瑠璃の楽章（復刻） | - | -| 20240627 | event 20231026 cn | Tempesta and the Fountain of Youth | - | - | - | 飓風與青春之泉 | -| 20240627 | coalition 20240627 | Welcome to Little Academy | 欢迎来到童心学院 | Welcome to Little Academy | リトル学園へようこそ | - | -| 20240711 | event 20211229 cn | Tower of Transcendence Rerun | - | - | -　 | 復刻逆轉彩虹之塔 | -| 20240718 | event 20220526 cn | Pledge of the Radiant Court Rerun | 复刻泠誓光庭 | Pledge of the Radiant Court Rerun | 復刻诚閃の剣 搖光の城 | - | -| 20240725 | event 20240725 cn | Interlude of Illusions | 幻梦间奏曲 | Interlude of Illusions | 夢幻の間奏曲 | - | -| 20240725 | raid 20240328 | From Zero to Hero | - | - | - | 從零開始的魔王討伐之旅 | -| 20240815 | event 20240815 cn | Windborne Steel Wings | 铁翼擎风 | Windborne Steel Wings | 錬翼空翔 | - | -| 20240815 | event 20240425 cn | Heart-Linking Harmony | - | - | - | 共鳴的PASSION | -| 20240829 | event 20240829 cn | Whence Flowers Bear No Fruit | 埋葬于彼岸之花 | Whence Flowers Bear No Fruit | 徒花咲かす彼岸 | - | -| 20240829 | event 20220324 cn | Virtual Tower | - | - | - | 復刻虛像構築之塔 | -| 20240912 | event 20240912 cn | Ode of Everblooming Crimson | 唤醒苍红之炎 | Ode of Everblooming Crimson | 絳染む丹華の詠歌 | - | -| 20240919 | event 20230914 cn | Effulgence Before Eclipse | - | - | - | 須臾望月抄 | \ No newline at end of file +| 20230525 | event 20230525 cn | Confluence of Nothingness | 空相交汇点 | Confluence of Nothingness | 覆天せし万象の塵 | - | +| 20230615 | event 20200603 cn | Counterattack Within the Fjord | - | - | - | 復刻峽灣間的反擊 | +| 20230621 | event 20210527 cn | Mirror Involution Rerun | 复刻镜位螺旋 | Mirror Involution Rerun | 照らす螺旋の鏡海（復刻） | - | +| 20230629 | event 20220428 cn | Rondo at Rainbow's End | - | - | - | 虹彩的終幕曲 | +| 20230629 | raid 20230629 | Reflections of the Oasis | 绿洲往事 | Reflections of the Oasis | 緑地伽話 | - | +| 20230713 | event 20220818 cn | Operation Convergence | - | - | 結像点作戦 | 遠匯點作戰 | +| 20230720 | event 20211125 cn | World-spanning Arclight | 复刻交汇世界的弧光 | World-spanning Arclight Rerun | 弧光は交わる世界にて（復刻） | - | +| 20230727 | event 20200917 cn | Dreamwaker's Butterfly | - | - | - | 復刻-蝶海夢花 | +| 20230803 | event 20211125 cn | World-spanning Arclight | - | - | - | 復刻-交匯世界的弧光 | +| 20230803 | event 20230803 cn | Anthem of Remembrance | 奏响鸢尾之歌 | Anthem of Remembrance | 燃ゆる聖都の回想曲 | - | +| 20230817 | event 20230817 cn | The Fool's Scales | 愚者的天平 | The Fool's Scales | 愚者の天秤 | - | +| 20230817 | event 20220414 cn | Aurora Noctis | - | - | - | 復刻-永夜幻光 | +| 20230824 | coalition 20230323 | Frostfall | - | - | - | 極地風暴 | +| 20230914 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 紫絳槿嵐 | +| 20230914 | event 20230914 cn | Effulgence Before Eclipse | 须臾望月抄 | Effulgence Before Eclipse | 須臾望月抄 | - | +| 20231012 | event 20201229 cn | Inverted Orthant | - | - | - | 復刻-負象限作戰 | +| 20231019 | raid 20221027 | Fight! Royal Maid | - | - | - | 戰鬥！皇家女僕隊3rd | +| 20231026 | event 20231026 cn | Tempesta and the Fountain of Youth | 飓风与青春之泉 | Tempesta and the Fountain of Youth | テンペスタと若返りの泉 | - | +| 20231109 | event 20210916 cn | Upon the Shimmering Blue | 复刻碧海光粼 | Upon the Shimmering Blue Rerun | 駆けよ 碧海の吹き風（復刻） | - | +| 20231109 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 雄鷹的敘事歌 | +| 20231123 | event 20220210 cn | Northern Overture Rerun | - | - | - | 復刻北境序曲 | +| 20231123 | event 20231123 cn | The Ninja Scrolls: Azur Flash | 苍闪忍法帖 | The Ninja Scrolls: Azur Flash | 蒼閃忍法帖 | - | +| 20231130 | event 20231123 cn | The Ninja Scrolls: Azur Flash | - | - | - | 蒼閃忍法帖 | +| 20221222 | event 20221222 cn | Parallel Superimposition | - | - | - | 定向折疊 | +| 20231221 | event 20231221 cn | Light-Chasing Sea of Stars | 星海逐光 | Light-Chasing Sea of Stars | 光追う星の海 | - | +| 20240104 | event 20210225 cn | Khorovod of Dawn's Rime | - | - | - | 復刻破曉冰華 | +| 20240111 | event 20211229 cn | Tower of Transcendence Rerun | 复刻逆转彩虹之塔 | Tower of Transcendence Rerun | 遡望せし虹彩の塔（復刻） | - | +| 20240111 | event 20230803 cn | Anthem of Remembrance | - | - | - | 奏響鳶尾之歌 | +| 20240125 | event 20210527 cn | Mirror Involution Rerun | - | - | - | 復刻鏡位螺旋 | +| 20240130 | raid 20240130 | Spring Festive Fiasco | 寰昌宇定家事忙 | Spring Festive Fiasco | 新春宴会狂騒曲 | - | +| 20240206 | raid 20230118 | Winter Pathfinder | - | - | - | 冬日的尋路人 | +| 20240229 | event 20230223 cn | Revelations of Dust | - | - | - | 湮燼塵墟 | +| 20240229 | event 20240229 cn | Snowrealm Peregrination | 雪境迷踪 | Snowrealm Peregrination | 銀界遊廻 | - | +| 20240314 | event 20210422 cn | Daedalian Hymn | - | - | - | 復刻復興的讚美詩 | +| 20240314 | event 20220324 cn | Virtual Tower Rerun | 复刻虚像构筑之塔 | Virtual Tower Rerun | 幻像の塔（復刻） | - | +| 20240321 | raid 20230629 | Reflections of the Oasis | - | - | - | 綠洲往事 | +| 20240328 | raid 20240328 | From Zero to Hero | 从零开始的魔王讨伐之旅 | From Zero to Hero | ゼロから頑張る魔王討伐 | - | +| 20240403 | event 20211111 cn | The Flame-Touched Dagger | - | - | - | 復刻杰諾瓦的焰火 | +| 20240411 | event 20220224 cn | Abyssal Refrain Rerun | 复刻深度回音 | Abyssal Refrain Rerun | 鳴動せし星霜の淵（復刻） | - | +| 20240425 | event 20230817 cn | The Fool's Scales | - | - | - | 愚者的天平 | +| 20240425 | event 20240425 cn | Heart-Linking Harmony | 共鸣的PASSION | Heart-Linking Harmony | 共鳴のパッション | - | +| 20240509 | event 20210916 cn | Upon the Shimmering Blue | - | - | - | 復刻碧海光粼 | +| 20240521 | event 20240521 cn | Light of the Martyrium | 绽放于辉光之城 | Light of the Martyrium | 赫輝のマルティリウム | - | +| 20240523 | event 20230525 cn | Confluence of Nothingness | - | - | - | 空相交會點 | +| 20240613 | event 20201012 cn | Sundered Blue | - | - | - | 復刻劃破海空之翼 | +| 20240620 | event 20220428 cn | Rondo at Rainbow's End Rerun | 复刻虹彩的终幕曲 | Rondo at Rainbow's End Rerun | 吟ずる瑠璃の楽章（復刻） | - | +| 20240627 | event 20231026 cn | Tempesta and the Fountain of Youth | - | - | - | 飓風與青春之泉 | +| 20240627 | coalition 20240627 | Welcome to Little Academy | 欢迎来到童心学院 | Welcome to Little Academy | リトル学園へようこそ | - | +| 20240711 | event 20211229 cn | Tower of Transcendence Rerun | - | - | - | 復刻逆轉彩虹之塔 | +| 20240718 | event 20220526 cn | Pledge of the Radiant Court Rerun | 复刻泠誓光庭 | Pledge of the Radiant Court Rerun | 復刻诚閃の剣 搖光の城 | - | +| 20240725 | event 20240725 cn | Interlude of Illusions | 幻梦间奏曲 | Interlude of Illusions | 夢幻の間奏曲 | - | +| 20240725 | raid 20240328 | From Zero to Hero | - | - | - | 從零開始的魔王討伐之旅 | +| 20240815 | event 20240815 cn | Windborne Steel Wings | 铁翼擎风 | Windborne Steel Wings | 錬翼空翔 | - | +| 20240815 | event 20240425 cn | Heart-Linking Harmony | - | - | - | 共鳴的PASSION | +| 20240829 | event 20240829 cn | Whence Flowers Bear No Fruit | 埋葬于彼岸之花 | Whence Flowers Bear No Fruit | 徒花咲かす彼岸 | - | +| 20240829 | event 20220324 cn | Virtual Tower | - | - | - | 復刻虛像構築之塔 | +| 20240912 | event 20240912 cn | Ode of Everblooming Crimson | 唤醒苍红之炎 | Ode of Everblooming Crimson | 絳染む丹華の詠歌 | - | +| 20240919 | event 20230914 cn | Effulgence Before Eclipse | - | - | - | 須臾望月抄 | \ No newline at end of file diff --git a/campaign/event_20210422_cn/sp.py b/campaign/event_20210422_cn/sp.py deleted file mode 100644 index 1205a0310..000000000 --- a/campaign/event_20210422_cn/sp.py +++ /dev/null @@ -1,126 +0,0 @@ -from module.campaign.campaign_base import CampaignBase -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -MAP = CampaignMap('SP') -MAP.shape = 'G10' -MAP.camera_data = ['D2', 'D6', 'D8'] -MAP.camera_data_spawn_point = ['D8'] -MAP.map_data = """ - -- ++ ++ MB ++ ++ -- - ++ ++ ++ -- ++ ++ ++ - ME -- -- -- -- -- ME - ++ ++ ++ -- ++ ++ ++ - ME -- -- -- -- -- ME - ++ ++ ++ -- ++ ++ ++ - MS -- ++ MS ++ -- MS - ++ -- ++ -- ++ -- ++ - -- -- -- __ -- -- -- - -- -- SP -- SP -- -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 -""" -# MAP.maze_data = [('D6', 'B8', 'F8'), ('D4', 'C5', 'E5'), ('D2', 'C3', 'E3', 'D8')] -MAP.spawn_data = [ - {'battle': 0, 'enemy': 4, 'siren': 3}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4}, - {'battle': 5}, - {'battle': 6}, - {'battle': 7, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, \ -A2, B2, C2, D2, E2, F2, G2, \ -A3, B3, C3, D3, E3, F3, G3, \ -A4, B4, C4, D4, E4, F4, G4, \ -A5, B5, C5, D5, E5, F5, G5, \ -A6, B6, C6, D6, E6, F6, G6, \ -A7, B7, C7, D7, E7, F7, G7, \ -A8, B8, C8, D8, E8, F8, G8, \ -A9, B9, C9, D9, E9, F9, G9, \ -A10, B10, C10, D10, E10, F10, G10, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = False - MAP_HAS_AMBUSH = False - STAR_REQUIRE_1 = 0 - STAR_REQUIRE_2 = 0 - STAR_REQUIRE_3 = 0 - # ===== End of generated config ===== - - # MAP_HAS_MAZE = True - MAP_HAS_SIREN = True - MAP_SIREN_TEMPLATE = ['Warspite', 'Formidable', 'Illustrious'] - MAP_SWIPE_MULTIPLY = (0.963, 0.981) - MAP_SWIPE_MULTIPLY_MINITOUCH = (0.932, 0.949) - MAP_SWIPE_MULTIPLY_MAATOUCH = (0.904, 0.921) - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - # EDGE_LINES_HOUGHLINES_THRESHOLD = 40 - - -class Campaign(CampaignBase): - MAP = MAP - - def battle_0(self): - self.clear_chosen_enemy(D7, expected='siren') - return True - - def battle_1(self): - self.goto(C9) - self.goto(B9) - self.clear_chosen_enemy(A7, expected='siren') - return True - - def battle_2(self): - self.clear_chosen_enemy(G7, expected='siren') - return True - - def battle_3(self): - self.goto(D5) - self.clear_chosen_enemy(A5) - return True - - def battle_4(self): - self.clear_chosen_enemy(G5) - return True - - def battle_5(self): - self.goto(D3) - self.clear_chosen_enemy(A3) - return True - - def battle_6(self): - self.clear_chosen_enemy(G3) - return True - - def battle_7(self): - if self.fleet_boss_index == 2: - self.fleet_boss.switch_to() - self.goto(D7) - self.goto(D5) - self.goto(D6) - self.goto(D5) - self.goto(D3) - self.goto(D4) - self.goto(D3) - self.clear_chosen_enemy(D1, expected='boss') - else: - self.clear_chosen_enemy(D1, expected='boss') - return True diff --git a/campaign/event_20210916_cn/sp.py b/campaign/event_20210916_cn/sp.py deleted file mode 100644 index 0cef4a53b..000000000 --- a/campaign/event_20210916_cn/sp.py +++ /dev/null @@ -1,109 +0,0 @@ -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -from .campaign_base import CampaignBase - -MAP = CampaignMap('SP') -MAP.shape = 'H8' -MAP.camera_data = ['C4', 'C5'] -MAP.camera_data_spawn_point = ['C5'] -MAP.map_data = """ - ++ ++ ++ -- -- ++ ++ ++ - ++ ++ -- -- ++ -- ++ ++ - ++ -- -- ++ -- MB -- ++ - -- -- ME -- -- -- ++ -- - -- -- -- ME -- ++ -- -- - -- SP __ -- ME -- -- ++ - ++ -- SP -- -- -- ++ ++ - ++ ++ -- -- -- ++ ++ ++ -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 -""" -MAP.fortress_data = [('D4', 'D6', 'C5', 'E5'), 'E4'] -MAP.spawn_data = [ - {'battle': 0, 'enemy': 3}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4}, - {'battle': 5}, - {'battle': 6}, - {'battle': 7, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, \ -A2, B2, C2, D2, E2, F2, G2, H2, \ -A3, B3, C3, D3, E3, F3, G3, H3, \ -A4, B4, C4, D4, E4, F4, G4, H4, \ -A5, B5, C5, D5, E5, F5, G5, H5, \ -A6, B6, C6, D6, E6, F6, G6, H6, \ -A7, B7, C7, D7, E7, F7, G7, H7, \ -A8, B8, C8, D8, E8, F8, G8, H8, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - # MAP_SIREN_TEMPLATE = ['1564301', '1564302', '1564303'] - # MOVABLE_ENEMY_TURN = (2,) - # MAP_HAS_SIREN = True - # MAP_HAS_MOVABLE_ENEMY = True - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = False - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - STAR_REQUIRE_1 = 0 - STAR_REQUIRE_2 = 0 - STAR_REQUIRE_3 = 0 - # ===== End of generated config ===== - - MAP_IS_ONE_TIME_STAGE = True - MAP_HAS_FORTRESS = True - MAP_SWIPE_PREDICT = False - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - EDGE_LINES_HOUGHLINES_THRESHOLD = 40 - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (80, 255 - 40), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 24, 255), - 'prominence': 10, - 'distance': 50, - # 'width': (0, 7), - 'wlen': 1000 - } - HOMO_CANNY_THRESHOLD = (60, 60) - # MAP_ENEMY_GENRE_DETECTION_SCALING = { - # 'DD': 1.111, - # 'CL': (1, 1.111), - # 'CA': (1, 1.111), - # 'CV': 1.111, - # 'BB': 1.111, - # } - MAP_SWIPE_MULTIPLY = (0.999, 1.018) - MAP_SWIPE_MULTIPLY_MINITOUCH = (0.966, 0.984) - MAP_SWIPE_MULTIPLY_MAATOUCH = (0.938, 0.955) - - -class Campaign(CampaignBase): - MAP = MAP - - def battle_0(self): - if self.clear_siren(): - return True - - return self.battle_default() - - def battle_7(self): - return self.fleet_boss.clear_boss() diff --git a/campaign/event_20211229_cn/sp.py b/campaign/event_20211229_cn/sp.py deleted file mode 100644 index 9b5770f4e..000000000 --- a/campaign/event_20211229_cn/sp.py +++ /dev/null @@ -1,107 +0,0 @@ -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -from .campaign_base import CampaignBase - -MAP = CampaignMap('SP') -MAP.shape = 'I8' -MAP.camera_data = ['E3', 'E5'] -MAP.camera_data_spawn_point = ['E5'] -MAP.map_data = """ - ++ ++ ++ -- -- -- ++ ++ ++ - -- -- -- ++ MB ++ -- -- -- - ++ MS -- ME -- ME -- MS ++ - ++ ++ -- ++ MS ++ -- ++ ++ - ++ ME -- ++ __ ++ -- ME ++ - -- -- -- -- -- -- -- -- -- - ++ ++ -- SP ++ SP -- ++ ++ - ++ ++ -- ++ ++ ++ -- ++ ++ -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 2, 'siren': 2}, - {'battle': 1, 'enemy': 1}, - {'battle': 2, 'enemy': 2, 'siren': 1}, - {'battle': 3, 'enemy': 1}, - {'battle': 4, 'enemy': 2}, - {'battle': 5, 'enemy': 1}, - {'battle': 6}, - {'battle': 7, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Lover'] - MOVABLE_ENEMY_TURN = (2,) - MAP_HAS_SIREN = True - MAP_HAS_MOVABLE_ENEMY = True - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - STAR_REQUIRE_1 = 0 - STAR_REQUIRE_2 = 0 - STAR_REQUIRE_3 = 0 - # ===== End of generated config ===== - - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (150, 255 - 17), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_EDGE_COLOR_RANGE = (0, 17) - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - EDGE_LINES_HOUGHLINES_THRESHOLD = 40 - MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' - - MAP_IS_ONE_TIME_STAGE = True - MAP_HAS_MOVABLE_NORMAL_ENEMY = True - MOVABLE_NORMAL_ENEMY_TURN = (2,) - MAP_SIREN_MOVE_WAIT = 1.0 - - -class Campaign(CampaignBase): - MAP = MAP - ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' - - def battle_0(self): - if self.clear_any_enemy(sort=('cost_2',)): - return True - - return self.battle_default() - - def battle_5(self): - if self.clear_any_enemy(sort=('cost_2',)): - return True - - return self.battle_default() - - def battle_7(self): - return self.fleet_boss.clear_boss() diff --git a/campaign/event_20201012_cn/sp1.py b/campaign/war_archives_20201012_cn/sp1.py similarity index 97% rename from campaign/event_20201012_cn/sp1.py rename to campaign/war_archives_20201012_cn/sp1.py index d0f4ee190..1954a8cc2 100644 --- a/campaign/event_20201012_cn/sp1.py +++ b/campaign/war_archives_20201012_cn/sp1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20201012_cn/sp2.py b/campaign/war_archives_20201012_cn/sp2.py similarity index 96% rename from campaign/event_20201012_cn/sp2.py rename to campaign/war_archives_20201012_cn/sp2.py index 20d5f422b..7637bd53b 100644 --- a/campaign/event_20201012_cn/sp2.py +++ b/campaign/war_archives_20201012_cn/sp2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20201012_cn/sp3.py b/campaign/war_archives_20201012_cn/sp3.py similarity index 96% rename from campaign/event_20201012_cn/sp3.py rename to campaign/war_archives_20201012_cn/sp3.py index f1bab999e..4066b3756 100644 --- a/campaign/event_20201012_cn/sp3.py +++ b/campaign/war_archives_20201012_cn/sp3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/a1.py b/campaign/war_archives_20210422_cn/a1.py similarity index 97% rename from campaign/event_20210422_cn/a1.py rename to campaign/war_archives_20210422_cn/a1.py index a3110952d..270acfde7 100644 --- a/campaign/event_20210422_cn/a1.py +++ b/campaign/war_archives_20210422_cn/a1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/a2.py b/campaign/war_archives_20210422_cn/a2.py similarity index 96% rename from campaign/event_20210422_cn/a2.py rename to campaign/war_archives_20210422_cn/a2.py index f69d82311..a9d2ad7be 100644 --- a/campaign/event_20210422_cn/a2.py +++ b/campaign/war_archives_20210422_cn/a2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/a3.py b/campaign/war_archives_20210422_cn/a3.py similarity index 96% rename from campaign/event_20210422_cn/a3.py rename to campaign/war_archives_20210422_cn/a3.py index df7535581..2e9db9586 100644 --- a/campaign/event_20210422_cn/a3.py +++ b/campaign/war_archives_20210422_cn/a3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/b1.py b/campaign/war_archives_20210422_cn/b1.py similarity index 97% rename from campaign/event_20210422_cn/b1.py rename to campaign/war_archives_20210422_cn/b1.py index 6f6bc775a..8c9613590 100644 --- a/campaign/event_20210422_cn/b1.py +++ b/campaign/war_archives_20210422_cn/b1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/b2.py b/campaign/war_archives_20210422_cn/b2.py similarity index 97% rename from campaign/event_20210422_cn/b2.py rename to campaign/war_archives_20210422_cn/b2.py index e839b064c..5d7785afe 100644 --- a/campaign/event_20210422_cn/b2.py +++ b/campaign/war_archives_20210422_cn/b2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/b3.py b/campaign/war_archives_20210422_cn/b3.py similarity index 97% rename from campaign/event_20210422_cn/b3.py rename to campaign/war_archives_20210422_cn/b3.py index 6d48473b5..b8283ccff 100644 --- a/campaign/event_20210422_cn/b3.py +++ b/campaign/war_archives_20210422_cn/b3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/c1.py b/campaign/war_archives_20210422_cn/c1.py similarity index 97% rename from campaign/event_20210422_cn/c1.py rename to campaign/war_archives_20210422_cn/c1.py index c1811ba10..0bbc6649d 100644 --- a/campaign/event_20210422_cn/c1.py +++ b/campaign/war_archives_20210422_cn/c1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/c2.py b/campaign/war_archives_20210422_cn/c2.py similarity index 96% rename from campaign/event_20210422_cn/c2.py rename to campaign/war_archives_20210422_cn/c2.py index 86e8b078c..c40fc1961 100644 --- a/campaign/event_20210422_cn/c2.py +++ b/campaign/war_archives_20210422_cn/c2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/c3.py b/campaign/war_archives_20210422_cn/c3.py similarity index 96% rename from campaign/event_20210422_cn/c3.py rename to campaign/war_archives_20210422_cn/c3.py index b5b7b3074..c8cf85dba 100644 --- a/campaign/event_20210422_cn/c3.py +++ b/campaign/war_archives_20210422_cn/c3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/d1.py b/campaign/war_archives_20210422_cn/d1.py similarity index 97% rename from campaign/event_20210422_cn/d1.py rename to campaign/war_archives_20210422_cn/d1.py index 32a7541de..50edac244 100644 --- a/campaign/event_20210422_cn/d1.py +++ b/campaign/war_archives_20210422_cn/d1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/d2.py b/campaign/war_archives_20210422_cn/d2.py similarity index 97% rename from campaign/event_20210422_cn/d2.py rename to campaign/war_archives_20210422_cn/d2.py index 05ca78fd9..a5a413ddf 100644 --- a/campaign/event_20210422_cn/d2.py +++ b/campaign/war_archives_20210422_cn/d2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/d3.py b/campaign/war_archives_20210422_cn/d3.py similarity index 97% rename from campaign/event_20210422_cn/d3.py rename to campaign/war_archives_20210422_cn/d3.py index 94cc4d234..c20e7ae8e 100644 --- a/campaign/event_20210422_cn/d3.py +++ b/campaign/war_archives_20210422_cn/d3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210916_cn/a1.py b/campaign/war_archives_20210916_cn/a1.py similarity index 100% rename from campaign/event_20210916_cn/a1.py rename to campaign/war_archives_20210916_cn/a1.py diff --git a/campaign/event_20210916_cn/a2.py b/campaign/war_archives_20210916_cn/a2.py similarity index 100% rename from campaign/event_20210916_cn/a2.py rename to campaign/war_archives_20210916_cn/a2.py diff --git a/campaign/event_20210916_cn/a3.py b/campaign/war_archives_20210916_cn/a3.py similarity index 100% rename from campaign/event_20210916_cn/a3.py rename to campaign/war_archives_20210916_cn/a3.py diff --git a/campaign/event_20210916_cn/b1.py b/campaign/war_archives_20210916_cn/b1.py similarity index 100% rename from campaign/event_20210916_cn/b1.py rename to campaign/war_archives_20210916_cn/b1.py diff --git a/campaign/event_20210916_cn/b2.py b/campaign/war_archives_20210916_cn/b2.py similarity index 100% rename from campaign/event_20210916_cn/b2.py rename to campaign/war_archives_20210916_cn/b2.py diff --git a/campaign/event_20210916_cn/b3.py b/campaign/war_archives_20210916_cn/b3.py similarity index 100% rename from campaign/event_20210916_cn/b3.py rename to campaign/war_archives_20210916_cn/b3.py diff --git a/campaign/event_20210916_cn/c1.py b/campaign/war_archives_20210916_cn/c1.py similarity index 100% rename from campaign/event_20210916_cn/c1.py rename to campaign/war_archives_20210916_cn/c1.py diff --git a/campaign/event_20210916_cn/c2.py b/campaign/war_archives_20210916_cn/c2.py similarity index 100% rename from campaign/event_20210916_cn/c2.py rename to campaign/war_archives_20210916_cn/c2.py diff --git a/campaign/event_20210916_cn/c3.py b/campaign/war_archives_20210916_cn/c3.py similarity index 100% rename from campaign/event_20210916_cn/c3.py rename to campaign/war_archives_20210916_cn/c3.py diff --git a/campaign/event_20210916_cn/campaign_base.py b/campaign/war_archives_20210916_cn/campaign_base.py similarity index 90% rename from campaign/event_20210916_cn/campaign_base.py rename to campaign/war_archives_20210916_cn/campaign_base.py index 7c4649edf..b965041aa 100644 --- a/campaign/event_20210916_cn/campaign_base.py +++ b/campaign/war_archives_20210916_cn/campaign_base.py @@ -1,6 +1,6 @@ from typing import List -from module.campaign.campaign_base import CampaignBase as CampaignBase_ +from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_ from module.logger import logger from module.map_detection.grid import GridInfo diff --git a/campaign/event_20210916_cn/d1.py b/campaign/war_archives_20210916_cn/d1.py similarity index 100% rename from campaign/event_20210916_cn/d1.py rename to campaign/war_archives_20210916_cn/d1.py diff --git a/campaign/event_20210916_cn/d2.py b/campaign/war_archives_20210916_cn/d2.py similarity index 100% rename from campaign/event_20210916_cn/d2.py rename to campaign/war_archives_20210916_cn/d2.py diff --git a/campaign/event_20210916_cn/d3.py b/campaign/war_archives_20210916_cn/d3.py similarity index 100% rename from campaign/event_20210916_cn/d3.py rename to campaign/war_archives_20210916_cn/d3.py diff --git a/campaign/event_20211111_cn/sp1.py b/campaign/war_archives_20211111_cn/sp1.py similarity index 97% rename from campaign/event_20211111_cn/sp1.py rename to campaign/war_archives_20211111_cn/sp1.py index d17cdb26a..2e522efab 100644 --- a/campaign/event_20211111_cn/sp1.py +++ b/campaign/war_archives_20211111_cn/sp1.py @@ -2,7 +2,7 @@ from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'H7' diff --git a/campaign/event_20211111_cn/sp2.py b/campaign/war_archives_20211111_cn/sp2.py similarity index 96% rename from campaign/event_20211111_cn/sp2.py rename to campaign/war_archives_20211111_cn/sp2.py index 3f503c1b3..516632faf 100644 --- a/campaign/event_20211111_cn/sp2.py +++ b/campaign/war_archives_20211111_cn/sp2.py @@ -2,7 +2,7 @@ from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20211111_cn/sp3.py b/campaign/war_archives_20211111_cn/sp3.py similarity index 97% rename from campaign/event_20211111_cn/sp3.py rename to campaign/war_archives_20211111_cn/sp3.py index c45ed4aeb..ab77e5820 100644 --- a/campaign/event_20211111_cn/sp3.py +++ b/campaign/war_archives_20211111_cn/sp3.py @@ -2,7 +2,7 @@ from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20211229_cn/a1.py b/campaign/war_archives_20211229_cn/a1.py similarity index 100% rename from campaign/event_20211229_cn/a1.py rename to campaign/war_archives_20211229_cn/a1.py diff --git a/campaign/event_20211229_cn/a2.py b/campaign/war_archives_20211229_cn/a2.py similarity index 100% rename from campaign/event_20211229_cn/a2.py rename to campaign/war_archives_20211229_cn/a2.py diff --git a/campaign/event_20211229_cn/a3.py b/campaign/war_archives_20211229_cn/a3.py similarity index 100% rename from campaign/event_20211229_cn/a3.py rename to campaign/war_archives_20211229_cn/a3.py diff --git a/campaign/event_20211229_cn/b1.py b/campaign/war_archives_20211229_cn/b1.py similarity index 100% rename from campaign/event_20211229_cn/b1.py rename to campaign/war_archives_20211229_cn/b1.py diff --git a/campaign/event_20211229_cn/b2.py b/campaign/war_archives_20211229_cn/b2.py similarity index 100% rename from campaign/event_20211229_cn/b2.py rename to campaign/war_archives_20211229_cn/b2.py diff --git a/campaign/event_20211229_cn/b3.py b/campaign/war_archives_20211229_cn/b3.py similarity index 100% rename from campaign/event_20211229_cn/b3.py rename to campaign/war_archives_20211229_cn/b3.py diff --git a/campaign/event_20211229_cn/bs1.py b/campaign/war_archives_20211229_cn/bs1.py similarity index 100% rename from campaign/event_20211229_cn/bs1.py rename to campaign/war_archives_20211229_cn/bs1.py diff --git a/campaign/event_20211229_cn/c1.py b/campaign/war_archives_20211229_cn/c1.py similarity index 100% rename from campaign/event_20211229_cn/c1.py rename to campaign/war_archives_20211229_cn/c1.py diff --git a/campaign/event_20211229_cn/c2.py b/campaign/war_archives_20211229_cn/c2.py similarity index 100% rename from campaign/event_20211229_cn/c2.py rename to campaign/war_archives_20211229_cn/c2.py diff --git a/campaign/event_20211229_cn/c3.py b/campaign/war_archives_20211229_cn/c3.py similarity index 100% rename from campaign/event_20211229_cn/c3.py rename to campaign/war_archives_20211229_cn/c3.py diff --git a/campaign/event_20211229_cn/campaign_base.py b/campaign/war_archives_20211229_cn/campaign_base.py similarity index 91% rename from campaign/event_20211229_cn/campaign_base.py rename to campaign/war_archives_20211229_cn/campaign_base.py index 26d2e84a8..a552caaa5 100644 --- a/campaign/event_20211229_cn/campaign_base.py +++ b/campaign/war_archives_20211229_cn/campaign_base.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase as CampaignBase_ +from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_ from module.logger import logger diff --git a/campaign/event_20211229_cn/d1.py b/campaign/war_archives_20211229_cn/d1.py similarity index 100% rename from campaign/event_20211229_cn/d1.py rename to campaign/war_archives_20211229_cn/d1.py diff --git a/campaign/event_20211229_cn/d2.py b/campaign/war_archives_20211229_cn/d2.py similarity index 100% rename from campaign/event_20211229_cn/d2.py rename to campaign/war_archives_20211229_cn/d2.py diff --git a/campaign/event_20211229_cn/d3.py b/campaign/war_archives_20211229_cn/d3.py similarity index 100% rename from campaign/event_20211229_cn/d3.py rename to campaign/war_archives_20211229_cn/d3.py diff --git a/campaign/event_20211229_cn/ds1.py b/campaign/war_archives_20211229_cn/ds1.py similarity index 100% rename from campaign/event_20211229_cn/ds1.py rename to campaign/war_archives_20211229_cn/ds1.py diff --git a/config/template.json b/config/template.json index 7dae1bcc3..112004c49 100644 --- a/config/template.json +++ b/config/template.json @@ -633,7 +633,7 @@ }, "Campaign": { "Name": "D3", - "Event": "war_archives_20210225_cn", + "Event": "war_archives_20211229_cn", "Mode": "normal", "UseClearMode": true, "UseFleetLock": true, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index c2f357b33..e15766f3e 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3441,25 +3441,30 @@ "war_archives_20200820_cn", "war_archives_20200903_cn", "war_archives_20200917_cn", + "war_archives_20201012_cn", "war_archives_20201029_cn", "war_archives_20201229_cn", "war_archives_20210225_cn", "war_archives_20210325_cn", + "war_archives_20210422_cn", "war_archives_20210527_cn", "war_archives_20210624_cn", "war_archives_20210819_cn", + "war_archives_20210916_cn", "war_archives_20211014_cn", "war_archives_20211028_cn", + "war_archives_20211111_cn", + "war_archives_20211229_cn", "war_archives_20220210_cn", "war_archives_20220414_cn" ], "option_bold": [ - "war_archives_20210225_cn" + "war_archives_20211229_cn" ], - "cn": "war_archives_20210225_cn", - "en": "war_archives_20210225_cn", - "jp": "war_archives_20210225_cn", - "tw": "war_archives_20210225_cn" + "cn": "war_archives_20211229_cn", + "en": "war_archives_20211229_cn", + "jp": "war_archives_20211229_cn", + "tw": "war_archives_20211229_cn" }, "Mode": { "type": "select", diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 31cc14958..f139edd9b 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -761,15 +761,20 @@ "war_archives_20200820_cn": "archives Scherzo of Iron and Blood", "war_archives_20200903_cn": "archives Stars of the Shimmering Fjord", "war_archives_20200917_cn": "archives Dreamwakers Butterfly", + "war_archives_20201012_cn": "archives Sundered Blue", "war_archives_20201029_cn": "archives Universe in Unison", "war_archives_20201229_cn": "archives Inverted Orthant", "war_archives_20210225_cn": "archives Khorovod of Dawns Rime", "war_archives_20210325_cn": "archives Ashen Simulacrum", + "war_archives_20210422_cn": "archives Daedalian Hymn", "war_archives_20210527_cn": "archives Mirror Involution", "war_archives_20210624_cn": "archives Swirling Cherry Blossoms", "war_archives_20210819_cn": "archives Microlayer Medley", + "war_archives_20210916_cn": "archives Upon the Shimmering Blue", "war_archives_20211014_cn": "archives Crescendo of Polaris", "war_archives_20211028_cn": "archives Skybound Oratorio", + "war_archives_20211111_cn": "archives The Flame-Touched Dagger", + "war_archives_20211229_cn": "archives Tower of Transcendence", "war_archives_20220210_cn": "archives Northern Overture", "war_archives_20220414_cn": "archives Aurora Noctis" }, diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index f44e45207..7cfe40448 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -761,15 +761,20 @@ "war_archives_20200820_cn": "檔案 黒鉄の楽章 誓いの海", "war_archives_20200903_cn": "檔案 輝ける峡湾の星", "war_archives_20200917_cn": "檔案 刹那觀る胡蝶の夢", + "war_archives_20201012_cn": "檔案 奔る彩帆の青", "war_archives_20201029_cn": "檔案 激唱のユニバース", "war_archives_20201229_cn": "檔案 虚畳なりし限象", "war_archives_20210225_cn": "檔案 暁射す氷華の嵐", "war_archives_20210325_cn": "檔案 開かれし紺碧の砂箱", + "war_archives_20210422_cn": "檔案 讃える復興の迷路", "war_archives_20210527_cn": "檔案 照らす螺旋の鏡海", "war_archives_20210624_cn": "檔案 翳りし満ちる影の華", "war_archives_20210819_cn": "檔案 闇靄払う銀翼", + "war_archives_20210916_cn": "檔案 駆けよ 碧海の吹き風", "war_archives_20211014_cn": "檔案 激奏のポラリス", "war_archives_20211028_cn": "檔案 神穹を衝く聖歌", + "war_archives_20211111_cn": "檔案 燈火のシニエ", + "war_archives_20211229_cn": "檔案 遡望せし虹彩の塔", "war_archives_20220210_cn": "檔案 凍絶の北海", "war_archives_20220414_cn": "檔案 極夜照らす幻光" }, diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 02445b35e..d2f78197d 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -761,15 +761,20 @@ "war_archives_20200820_cn": "档案 铁血音符誓言", "war_archives_20200903_cn": "档案 峡湾间的星辰", "war_archives_20200917_cn": "档案 蝶海梦花", + "war_archives_20201012_cn": "档案 划破海空之翼", "war_archives_20201029_cn": "档案 激唱的UNIVERSE", "war_archives_20201229_cn": "档案 负象限作战", "war_archives_20210225_cn": "档案 破晓冰华", "war_archives_20210325_cn": "档案 箱庭疗法", + "war_archives_20210422_cn": "档案 复兴的赞美诗", "war_archives_20210527_cn": "档案 镜位螺旋", "war_archives_20210624_cn": "档案 浮樱影华", "war_archives_20210819_cn": "档案 微层混合", + "war_archives_20210916_cn": "档案 碧海光粼", "war_archives_20211014_cn": "档案 激奏的Polaris", "war_archives_20211028_cn": "档案 穹顶下的圣咏曲", + "war_archives_20211111_cn": "档案 杰诺瓦的焰火", + "war_archives_20211229_cn": "档案 逆转彩虹之塔", "war_archives_20220210_cn": "档案 北境序曲", "war_archives_20220414_cn": "档案 永夜幻光" }, diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index e6b5cfb4c..11da72d3b 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -761,15 +761,20 @@ "war_archives_20200820_cn": "檔案 鐵血音符誓言", "war_archives_20200903_cn": "檔案 峽灣間的星辰", "war_archives_20200917_cn": "檔案 蝶海夢花", + "war_archives_20201012_cn": "檔案 劃破海空之翼", "war_archives_20201029_cn": "檔案 激唱的UNIVERSE", "war_archives_20201229_cn": "檔案 負象限作戰", "war_archives_20210225_cn": "檔案 破曉冰華", "war_archives_20210325_cn": "檔案 箱庭療法", + "war_archives_20210422_cn": "檔案 復興的讚美詩", "war_archives_20210527_cn": "檔案 鏡位螺旋", "war_archives_20210624_cn": "檔案 浮櫻影華", "war_archives_20210819_cn": "檔案 微層混合", + "war_archives_20210916_cn": "檔案 碧海光粼", "war_archives_20211014_cn": "檔案 激奏的Polaris", "war_archives_20211028_cn": "檔案 穹頂下的聖詠曲", + "war_archives_20211111_cn": "檔案 杰諾瓦的焰火", + "war_archives_20211229_cn": "檔案 逆轉彩虹之塔", "war_archives_20220210_cn": "檔案 北境序曲", "war_archives_20220414_cn": "檔案 永夜幻光" }, From bd0fccbd31ddb2095c0a4fba702390c8a5a47160 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:26:17 +0800 Subject: [PATCH 2/3] Add: event entrance 20241017 * event_20220728_cn rerun in cn/en/jp * coalition_20240627 in tw --- campaign/Readme.md | 4 +- module/config/argument/args.json | 86 ++++++++++++++++---------------- module/config/i18n/en-US.json | 2 +- module/config/i18n/ja-JP.json | 2 +- module/config/i18n/zh-CN.json | 2 +- module/config/i18n/zh-TW.json | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/campaign/Readme.md b/campaign/Readme.md index 84bc76355..f9bc1cbd7 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -214,4 +214,6 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20240829 | event 20240829 cn | Whence Flowers Bear No Fruit | 埋葬于彼岸之花 | Whence Flowers Bear No Fruit | 徒花咲かす彼岸 | - | | 20240829 | event 20220324 cn | Virtual Tower | - | - | - | 復刻虛像構築之塔 | | 20240912 | event 20240912 cn | Ode of Everblooming Crimson | 唤醒苍红之炎 | Ode of Everblooming Crimson | 絳染む丹華の詠歌 | - | -| 20240919 | event 20230914 cn | Effulgence Before Eclipse | - | - | - | 須臾望月抄 | \ No newline at end of file +| 20240919 | event 20230914 cn | Effulgence Before Eclipse | - | - | - | 須臾望月抄 | +| 20241017 | event 20220728 cn | Aquilifer's Ballade Rerun | 复刻雄鹰的叙事歌 | Aquilifer's Ballade Rerun | 鋼鷲の冒険譚（復刻） | - | +| 20241017 | coalition 20240627 | Welcome to Little Academy | - | - | - | 歡迎來到童心學院 | \ No newline at end of file diff --git a/module/config/argument/args.json b/module/config/argument/args.json index e15766f3e..dc235dc93 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1713,12 +1713,12 @@ ], "display": "hide", "option_bold": [ - "event_20230914_cn", - "event_20240912_cn" + "event_20220728_cn", + "event_20230914_cn" ], - "cn": "event_20240912_cn", - "en": "event_20240912_cn", - "jp": "event_20240912_cn", + "cn": "event_20220728_cn", + "en": "event_20220728_cn", + "jp": "event_20220728_cn", "tw": "event_20230914_cn" }, "Mode": { @@ -2052,12 +2052,12 @@ "event_20240912_cn" ], "option_bold": [ - "event_20230914_cn", - "event_20240912_cn" + "event_20220728_cn", + "event_20230914_cn" ], - "cn": "event_20240912_cn", - "en": "event_20240912_cn", - "jp": "event_20240912_cn", + "cn": "event_20220728_cn", + "en": "event_20220728_cn", + "jp": "event_20220728_cn", "tw": "event_20230914_cn" }, "Mode": { @@ -2506,12 +2506,12 @@ "event_20240912_cn" ], "option_bold": [ - "event_20230914_cn", - "event_20240912_cn" + "event_20220728_cn", + "event_20230914_cn" ], - "cn": "event_20240912_cn", - "en": "event_20240912_cn", - "jp": "event_20240912_cn", + "cn": "event_20220728_cn", + "en": "event_20220728_cn", + "jp": "event_20220728_cn", "tw": "event_20230914_cn" }, "Mode": { @@ -3136,13 +3136,12 @@ "coalition_20240627" ], "option_bold": [ - "coalition_20230323", "coalition_20240627" ], "cn": "coalition_20240627", "en": "coalition_20240627", "jp": "coalition_20240627", - "tw": "coalition_20230323" + "tw": "coalition_20240627" }, "Mode": { "type": "select", @@ -3923,12 +3922,12 @@ "event_20240912_cn" ], "option_bold": [ - "event_20230914_cn", - "event_20240912_cn" + "event_20220728_cn", + "event_20230914_cn" ], - "cn": "event_20240912_cn", - "en": "event_20240912_cn", - "jp": "event_20240912_cn", + "cn": "event_20220728_cn", + "en": "event_20220728_cn", + "jp": "event_20220728_cn", "tw": "event_20230914_cn" }, "Mode": { @@ -4394,12 +4393,12 @@ "event_20240912_cn" ], "option_bold": [ - "event_20230914_cn", - "event_20240912_cn" + "event_20220728_cn", + "event_20230914_cn" ], - "cn": "event_20240912_cn", - "en": "event_20240912_cn", - "jp": "event_20240912_cn", + "cn": "event_20220728_cn", + "en": "event_20220728_cn", + "jp": "event_20220728_cn", "tw": "event_20230914_cn" }, "Mode": { @@ -4865,12 +4864,12 @@ "event_20240912_cn" ], "option_bold": [ - "event_20230914_cn", - "event_20240912_cn" + "event_20220728_cn", + "event_20230914_cn" ], - "cn": "event_20240912_cn", - "en": "event_20240912_cn", - "jp": "event_20240912_cn", + "cn": "event_20220728_cn", + "en": "event_20220728_cn", + "jp": "event_20220728_cn", "tw": "event_20230914_cn" }, "Mode": { @@ -5336,12 +5335,12 @@ "event_20240912_cn" ], "option_bold": [ - "event_20230914_cn", - "event_20240912_cn" + "event_20220728_cn", + "event_20230914_cn" ], - "cn": "event_20240912_cn", - "en": "event_20240912_cn", - "jp": "event_20240912_cn", + "cn": "event_20220728_cn", + "en": "event_20220728_cn", + "jp": "event_20220728_cn", "tw": "event_20230914_cn" }, "Mode": { @@ -5797,12 +5796,12 @@ "event_20240912_cn" ], "option_bold": [ - "event_20230914_cn", - "event_20240912_cn" + "event_20220728_cn", + "event_20230914_cn" ], - "cn": "event_20240912_cn", - "en": "event_20240912_cn", - "jp": "event_20240912_cn", + "cn": "event_20220728_cn", + "en": "event_20220728_cn", + "jp": "event_20220728_cn", "tw": "event_20230914_cn" }, "Mode": { @@ -6425,13 +6424,12 @@ "coalition_20240627" ], "option_bold": [ - "coalition_20230323", "coalition_20240627" ], "cn": "coalition_20240627", "en": "coalition_20240627", "jp": "coalition_20240627", - "tw": "coalition_20230323" + "tw": "coalition_20240627" }, "Mode": { "type": "select", diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index f139edd9b..f432ea663 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -713,7 +713,7 @@ "event_20220414_cn": "Aurora Noctis Rerun", "event_20220428_cn": "Rondo at Rainbows End Rerun", "event_20220526_cn": "Pledge of the Radiant Court Rerun", - "event_20220728_cn": "Aquilifers Ballade", + "event_20220728_cn": "Aquilifers Ballade Rerun", "event_20220818_cn": "Operation Convergence", "event_20220915_cn": "Violet Tempest Blooming Lycoris", "event_20221124_cn": "The Alchemist and the Archipelago of Secrets", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 7cfe40448..c37c1436e 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -713,7 +713,7 @@ "event_20220414_cn": "極夜照らす幻光（復刻）", "event_20220428_cn": "吟ずる瑠璃の楽章（復刻）", "event_20220526_cn": "復刻诚閃の剣 搖光の城", - "event_20220728_cn": "鋼鷲の冒険譚", + "event_20220728_cn": "鋼鷲の冒険譚（復刻）", "event_20220818_cn": "結像点作戦", "event_20220915_cn": "赫の涙月 菫の暁風", "event_20221124_cn": "錬金術士と謎の遺跡群島", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index d2f78197d..4ad19f669 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -713,7 +713,7 @@ "event_20220414_cn": "复刻永夜幻光", "event_20220428_cn": "复刻虹彩的终幕曲", "event_20220526_cn": "复刻泠誓光庭", - "event_20220728_cn": "雄鹰的叙事歌", + "event_20220728_cn": "复刻雄鹰的叙事歌", "event_20220818_cn": "远汇点作战", "event_20220915_cn": "紫绛槿岚", "event_20221124_cn": "炼金术士与秘密遗迹群岛", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 11da72d3b..106646944 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -663,7 +663,7 @@ "help": "自動選擇至最新的活動圖", "campaign_main": "主線圖", "coalition_20230323": "極地風暴", - "coalition_20240627": "Welcome to Little Academy", + "coalition_20240627": "歡迎來到童心學院", "event_20200227_cn": "Northern Overture", "event_20200312_cn": "斯圖爾特的硝煙", "event_20200326_cn": "Microlayer Medley", From d4df09d0f4eb74e0e79bd8d6da1e8fa43b8b154b Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Thu, 17 Oct 2024 20:57:28 +0800 Subject: [PATCH 3/3] Upd: [JP] asset QUIT (#4296) --- assets/jp/combat_ui/QUIT.png | Bin 10106 -> 15302 bytes module/combat_ui/assets.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/jp/combat_ui/QUIT.png b/assets/jp/combat_ui/QUIT.png index cd83cf0ae3037a6637c8e8467e391f655b73a5dd..60ffd1a65eacbecb34799b869743bd39ad7c2f20 100644 GIT binary patch literal 15302 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 MVQ*1we*e$^0o4ZPm;e9( diff --git a/module/combat_ui/assets.py b/module/combat_ui/assets.py index 676efa335..bedb63897 100644 --- a/module/combat_ui/assets.py +++ b/module/combat_ui/assets.py @@ -8,6 +8,6 @@ PAUSE = Button(area={'cn': (1158, 40, 1199, 58), 'en': (1155, 38, 1216, 51), 'jp PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, color={'cn': (96, 104, 136), 'en': (83, 98, 118), 'jp': (97, 102, 120), 'tw': (96, 104, 136)}, button={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, file={'cn': './assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png', 'jp': './assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png', 'tw': './assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png'}) PAUSE_Iridescent_Fantasy = Button(area={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, color={'cn': (124, 139, 190), 'en': (124, 139, 190), 'jp': (124, 139, 190), 'tw': (124, 139, 190)}, button={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png', 'tw': './assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png'}) PAUSE_New = Button(area={'cn': (1231, 29, 1253, 56), 'en': (1231, 29, 1253, 56), 'jp': (1231, 29, 1253, 56), 'tw': (1231, 29, 1253, 56)}, color={'cn': (156, 158, 166), 'en': (156, 158, 166), 'jp': (156, 158, 166), 'tw': (156, 158, 166)}, button={'cn': (1231, 29, 1253, 56), 'en': (1231, 29, 1253, 56), 'jp': (1231, 29, 1253, 56), 'tw': (1231, 29, 1253, 56)}, file={'cn': './assets/cn/combat_ui/PAUSE_New.png', 'en': './assets/en/combat_ui/PAUSE_New.png', 'jp': './assets/jp/combat_ui/PAUSE_New.png', 'tw': './assets/tw/combat_ui/PAUSE_New.png'}) -QUIT = Button(area={'cn': (420, 490, 593, 548), 'en': (459, 508, 582, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, color={'cn': (199, 122, 114), 'en': (221, 177, 174), 'jp': (196, 120, 113), 'tw': (200, 126, 118)}, button={'cn': (420, 490, 593, 548), 'en': (459, 508, 582, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, file={'cn': './assets/cn/combat_ui/QUIT.png', 'en': './assets/en/combat_ui/QUIT.png', 'jp': './assets/jp/combat_ui/QUIT.png', 'tw': './assets/tw/combat_ui/QUIT.png'}) +QUIT = Button(area={'cn': (420, 490, 593, 548), 'en': (459, 508, 582, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, color={'cn': (199, 122, 114), 'en': (221, 177, 174), 'jp': (198, 126, 120), 'tw': (200, 126, 118)}, button={'cn': (420, 490, 593, 548), 'en': (459, 508, 582, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, file={'cn': './assets/cn/combat_ui/QUIT.png', 'en': './assets/en/combat_ui/QUIT.png', 'jp': './assets/jp/combat_ui/QUIT.png', 'tw': './assets/tw/combat_ui/QUIT.png'}) QUIT_Iridescent_Fantasy = Button(area={'cn': (391, 522, 464, 540), 'en': (392, 524, 466, 538), 'jp': (391, 522, 464, 540), 'tw': (391, 522, 464, 540)}, color={'cn': (121, 73, 79), 'en': (143, 74, 76), 'jp': (121, 73, 79), 'tw': (121, 73, 79)}, button={'cn': (391, 522, 464, 540), 'en': (392, 524, 466, 538), 'jp': (391, 522, 464, 540), 'tw': (391, 522, 464, 540)}, file={'cn': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/QUIT_Iridescent_Fantasy.png', 'jp': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png', 'tw': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png'}) QUIT_New = Button(area={'cn': (394, 506, 467, 524), 'en': (395, 507, 470, 522), 'jp': (394, 506, 467, 524), 'tw': (394, 506, 467, 524)}, color={'cn': (255, 180, 171), 'en': (255, 211, 206), 'jp': (255, 180, 171), 'tw': (255, 180, 171)}, button={'cn': (394, 506, 467, 524), 'en': (395, 507, 470, 522), 'jp': (394, 506, 467, 524), 'tw': (394, 506, 467, 524)}, file={'cn': './assets/cn/combat_ui/QUIT_New.png', 'en': './assets/en/combat_ui/QUIT_New.png', 'jp': './assets/cn/combat_ui/QUIT_New.png', 'tw': './assets/cn/combat_ui/QUIT_New.png'})