mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-16 12:47:23 +08:00
Merge pull request #1844 from LmeSzinc/dev
Add: Event Ininverted Orthant Rerun (event_20221110_cn)
This commit is contained in:
@@ -10,109 +10,110 @@ To add a new event, add a new row in here, and run `python -m dev_tools.event_ex
|
|||||||
|
|
||||||
**CN, EN, JP, TW** Event names in GUI. If an event is not aired on some servers, use `-`.
|
**CN, EN, JP, TW** Event names in GUI. If an event is not aired on some servers, use `-`.
|
||||||
|
|
||||||
| Aired Date | Directory | Event Name | CN | EN | JP | TW |
|
| Aired Date | Directory | Event Name | CN | EN | JP | TW |
|
||||||
|------------|--------------------------|---------------------------------|-------------|-------------------------------------|--------------------| -------------------- |
|
|------------|--------------------------|---------------------------------|-------------|--------------------------------------|--------------------| -------------------- |
|
||||||
| 20170607 | war archives 20181020 en | Strive, Wish, and Strategize | 努力、希望和计划 | Strive, Wish, and Strategize | 努力、希望と計画 | 努力、希望和計劃 |
|
| 20170607 | war archives 20181020 en | Strive, Wish, and Strategize | 努力、希望和计划 | Strive, Wish, and Strategize | 努力、希望と計画 | 努力、希望和計劃 |
|
||||||
| 20170802 | war archives 20191031 en | Divergent Chessboard | 异色格 | Divergent Chessboard | 鏡写されし異色 | 異色格 |
|
| 20170802 | war archives 20191031 en | Divergent Chessboard | 异色格 | Divergent Chessboard | 鏡写されし異色 | 異色格 |
|
||||||
| 20170928 | war archives 20190321 en | Visitors Dyed in Red | 红染的参访者 | Visitors Dyed in Red | 紅染の来訪者 | 紅染的參訪者 |
|
| 20170928 | war archives 20190321 en | Visitors Dyed in Red | 红染的参访者 | Visitors Dyed in Red | 紅染の来訪者 | 紅染的參訪者 |
|
||||||
| 20171026 | war archives 20190620 en | Glorious Battle | 光荣的一战 | Glorious Battle | 栄光なる最終戦 | 光榮的一戰 |
|
| 20171026 | war archives 20190620 en | Glorious Battle | 光荣的一战 | Glorious Battle | 栄光なる最終戦 | 光榮的一戰 |
|
||||||
| 20171228 | war archives 20181026 en | Fallen Wings | 坠落之翼 | Fallen Wings | 闇に堕ちた青き翼 | 墜落之翼 |
|
| 20171228 | war archives 20181026 en | Fallen Wings | 坠落之翼 | Fallen Wings | 闇に堕ちた青き翼 | 墜落之翼 |
|
||||||
| 20180119 | war archives 20191010 en | Encircling Graf Spee | 围剿斯佩伯爵 | Encircling Graf Spee | アドミラル・グラーフ・シュペー追撃戦 | 圍剿斯佩伯爵 |
|
| 20180119 | war archives 20191010 en | Encircling Graf Spee | 围剿斯佩伯爵 | Encircling Graf Spee | アドミラル・グラーフ・シュペー追撃戦 | 圍剿斯佩伯爵 |
|
||||||
| 20180226 | war archives 20190221 en | Winter\'s Crown | 凛冬王冠 | Winter\'s Crown | 凛冽なりし冬の王冠 | 凜冬王冠 |
|
| 20180226 | war archives 20190221 en | Winter\'s Crown | 凛冬王冠 | Winter\'s Crown | 凛冽なりし冬の王冠 | 凜冬王冠 |
|
||||||
| 20180607 | war archives 20180607 cn | Ink Stained Steel Sakura | 墨染的钢铁之花 | Ink Stained Steel Sakura | 墨染まりし鋼の桜 | 墨染的鋼鐵之花 |
|
| 20180607 | war archives 20180607 cn | Ink Stained Steel Sakura | 墨染的钢铁之花 | Ink Stained Steel Sakura | 墨染まりし鋼の桜 | 墨染的鋼鐵之花 |
|
||||||
| 20180726 | war archives 20180726 cn | Iris of Light and Dark | 光与影的鸢尾之华 | Iris of Light and Dark | 光と影のアイリス | 光與影的鳶尾之華 |
|
| 20180726 | war archives 20180726 cn | Iris of Light and Dark | 光与影的鸢尾之华 | Iris of Light and Dark | 光と影のアイリス | 光與影的鳶尾之華 |
|
||||||
| 20210121 | war archives 20181227 cn | Crimson Echoes | 苍红的回响 | Crimson Echoes | 縹映る深緋の残響 | 蒼紅的迴響 |
|
| 20210121 | war archives 20181227 cn | Crimson Echoes | 苍红的回响 | Crimson Echoes | 縹映る深緋の残響 | 蒼紅的迴響 |
|
||||||
| 20210513 | war archives 20200820 cn | Scherzo of Iron and Blood | 铁血音符誓言 | Scherzo of Iron and Blood | 黒鉄の楽章 誓いの海 | - |
|
| 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 | 激奏のポラリス | - |
|
| 20211014 | war archives 20211014 cn | Crescendo of Polaris | 激奏的Polaris | Crescendo of Polaris | 激奏のポラリス | - |
|
||||||
| 20220113 | war archives 20190911 cn | Empyreal Tragicomedy | 神圣的悲喜剧 | Empyreal Tragicomedy | 悲歎せし焔海の詩 | - |
|
| 20220113 | war archives 20190911 cn | Empyreal Tragicomedy | 神圣的悲喜剧 | Empyreal Tragicomedy | 悲歎せし焔海の詩 | - |
|
||||||
| 20220407 | war archives 20210325 cn | Ashen Simulacrum | 箱庭疗法 | Ashen Simulacrum | 開かれし紺碧の砂箱 | - |
|
| 20220407 | war archives 20210325 cn | Ashen Simulacrum | 箱庭疗法 | Ashen Simulacrum | 開かれし紺碧の砂箱 | - |
|
||||||
| 20220721 | war archives 20210624 cn | Swirling Cherry Blossoms | 浮樱影华 | Swirling Cherry Blossoms | 翳りし満ちる影の華 | - |
|
| 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 | 鉄血鮫とエニグマ | - |
|
| 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 | 激唱のユニバース | - |
|
| 20221013 | war archives 20201029 cn | Universe in Unison | 激唱的UNIVERSE | Universe in Unison | 激唱のユニバース | - |
|
||||||
| 20200227 | event 20200227 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | - |
|
| 20200227 | event 20200227 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | - |
|
||||||
| 20200312 | event 20200312 cn | The Solomon Ranger | 复刻斯图尔特的硝烟 | The Solomon Ranger Rerun | 南洋に靡く硝煙(復刻) | - |
|
| 20200312 | event 20200312 cn | The Solomon Ranger | 复刻斯图尔特的硝烟 | The Solomon Ranger Rerun | 南洋に靡く硝煙(復刻) | - |
|
||||||
| 20200326 | event 20200326 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | - |
|
| 20200326 | event 20200326 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | - |
|
||||||
| 20200423 | event 20200423 cn | Crimson Echoes | 复刻苍红的回响 | Crimson Echoes Rerun | 縹映る深緋の残響(復刻) | - |
|
| 20200423 | event 20200423 cn | Crimson Echoes | 复刻苍红的回响 | Crimson Echoes Rerun | 縹映る深緋の残響(復刻) | - |
|
||||||
| 20200507 | event 20200507 cn | The Way Home in the Night | 夜幕下的归途 | The Way Home in the Night | 帰路は海色の陰りへと | - |
|
| 20200507 | event 20200507 cn | The Way Home in the Night | 夜幕下的归途 | The Way Home in the Night | 帰路は海色の陰りへと | - |
|
||||||
| 20200521 | event 20200521 cn | Skybound Oratorio | 穹顶下的圣咏曲 | - | 神穹を衝く聖歌 | - |
|
| 20200521 | event 20200521 cn | Skybound Oratorio | 穹顶下的圣咏曲 | - | 神穹を衝く聖歌 | - |
|
||||||
| 20200521 | event 20200521 en | Iris of Light and Dark | - | Iris of Light and Dark Rerun | - | - |
|
| 20200521 | event 20200521 en | Iris of Light and Dark | - | Iris of Light and Dark Rerun | - | - |
|
||||||
| 20200603 | event 20200603 cn | Counterattack Within the Fjord | 峡湾间的反击 | - | 峡湾間の反撃 | - |
|
| 20200603 | event 20200603 cn | Counterattack Within the Fjord | 峡湾间的反击 | - | 峡湾間の反撃 | - |
|
||||||
| 20200603 | event 20200603 en | Prelude under the Moon | - | Prelude under the Moon Rerun | - | - |
|
| 20200603 | event 20200603 en | Prelude under the Moon | - | Prelude under the Moon Rerun | - | - |
|
||||||
| 20200611 | event 20200611 en | Skybound Oratorio | - | Skybound Oratorio | - | - |
|
| 20200611 | event 20200611 en | Skybound Oratorio | - | Skybound Oratorio | - | - |
|
||||||
| 20200624 | raid 20200624 | Air Raid Drills with Essex | 复刻特别演习埃塞克斯级 | Air Raid Drills with Essex Rerun | 特別演習超空強襲波(復刻) | 特別演習埃塞克斯級 |
|
| 20200624 | raid 20200624 | Air Raid Drills with Essex | 复刻特别演习埃塞克斯级 | Air Raid Drills with Essex Rerun | 特別演習超空強襲波(復刻) | 特別演習埃塞克斯級 |
|
||||||
| 20200716 | event 20200716 en | Ink Stained Steel Sakura | - | Ink Stained Steel Sakura Rerun | - | - |
|
| 20200716 | event 20200716 en | Ink Stained Steel Sakura | - | Ink Stained Steel Sakura Rerun | - | - |
|
||||||
| 20200723 | event 20200723 cn | Aurora Noctis | 永夜幻光 | Aurora Noctis | 極夜照らす幻光 | - |
|
| 20200723 | event 20200723 cn | Aurora Noctis | 永夜幻光 | Aurora Noctis | 極夜照らす幻光 | - |
|
||||||
| 20200806 | event 20200806 cn | The Enigma and the Shark | 复刻最重要的宝物 | - | 鉄血鮫とエニグマ(復刻) | - |
|
| 20200806 | event 20200806 cn | The Enigma and the Shark | 复刻最重要的宝物 | - | 鉄血鮫とエニグマ(復刻) | - |
|
||||||
| 20200820 | event 20200820 cn | Scherzo of Iron and Blood | 复刻铁血音符誓言 | Scherzo of Iron and Blood Rerun | 黒鉄の楽章 誓いの海(復刻) | - |
|
| 20200820 | event 20200820 cn | Scherzo of Iron and Blood | 复刻铁血音符誓言 | Scherzo of Iron and Blood Rerun | 黒鉄の楽章 誓いの海(復刻) | - |
|
||||||
| 20200903 | event 20200903 en | Stars of the Shimmering Fjord | - | Stars of the Shimmering Fjord | - | - |
|
| 20200903 | event 20200903 en | Stars of the Shimmering Fjord | - | Stars of the Shimmering Fjord | - | - |
|
||||||
| 20200917 | event 20200917 cn | Dreamwaker's Butterfly | 蝶海梦花 | Dreamwaker's Butterfly | 刹那觀る胡蝶の夢 | - |
|
| 20200917 | event 20200917 cn | Dreamwaker's Butterfly | 蝶海梦花 | Dreamwaker's Butterfly | 刹那觀る胡蝶の夢 | - |
|
||||||
| 20201002 | event 20201002 en | Counterattack Within the Fjord | - | Counterattack Within the Fjord | - | - |
|
| 20201002 | event 20201002 en | Counterattack Within the Fjord | - | Counterattack Within the Fjord | - | - |
|
||||||
| 20201012 | event 20201012 cn | Sundered Blue | 划破海空之翼 | - | 奔る彩帆の青 | - |
|
| 20201012 | event 20201012 cn | Sundered Blue | 划破海空之翼 | - | 奔る彩帆の青 | - |
|
||||||
| 20201029 | event 20201029 cn | Universe in Unison | 激唱的UNIVERSE | Universe in Unison | 激唱のユニバース | - |
|
| 20201029 | event 20201029 cn | Universe in Unison | 激唱的UNIVERSE | Universe in Unison | 激唱のユニバース | - |
|
||||||
| 20201105 | event 20200312 cn | The Solomon Ranger | - | - | - | 斯圖爾特的硝煙 |
|
| 20201105 | event 20200312 cn | The Solomon Ranger | - | - | - | 斯圖爾特的硝煙 |
|
||||||
| 20201112 | event 20200903 en | Stars of the Shimmering Fjord | 复刻峡湾间的星辰 | - | 輝ける峡湾の星(復刻) | - |
|
| 20201112 | event 20200903 en | Stars of the Shimmering Fjord | 复刻峡湾间的星辰 | - | 輝ける峡湾の星(復刻) | - |
|
||||||
| 20201112 | event 20201012 cn | Sundered Blue | - | Sundered Blue | - | - |
|
| 20201112 | event 20201012 cn | Sundered Blue | - | Sundered Blue | - | - |
|
||||||
| 20201126 | event 20201126 cn | Vacation Lane | 假日航线 | Vacation Lane | バケーションレーン | - |
|
| 20201126 | event 20201126 cn | Vacation Lane | 假日航线 | Vacation Lane | バケーションレーン | - |
|
||||||
| 20201210 | event 20200806 cn | The Enigma and the Shark | - | The Enigma and the Shark Rerun | - | - |
|
| 20201210 | event 20200806 cn | The Enigma and the Shark | - | The Enigma and the Shark Rerun | - | - |
|
||||||
| 20201229 | event 20201229 cn | Inverted Orthant | 负象限作战 | Inverted Orthant | 虚畳なりし限象 | - |
|
| 20201229 | event 20201229 cn | Inverted Orthant | 负象限作战 | Inverted Orthant | 虚畳なりし限象 | - |
|
||||||
| 20210121 | event 20210121 cn | Empyreal Tragicomedy | 复刻神圣的悲喜剧 | Empyreal Tragicomedy Rerun | 悲歎せし焔海の詩(復刻) | - |
|
| 20210121 | event 20210121 cn | Empyreal Tragicomedy | 复刻神圣的悲喜剧 | Empyreal Tragicomedy Rerun | 悲歎せし焔海の詩(復刻) | - |
|
||||||
| 20210225 | event 20210225 cn | Khorovod of Dawn's Rime | 破晓冰华 | Khorovod of Dawn's Rime | 暁射す氷華の嵐 | - |
|
| 20210225 | event 20210225 cn | Khorovod of Dawn's Rime | 破晓冰华 | Khorovod of Dawn's Rime | 暁射す氷華の嵐 | - |
|
||||||
| 20210225 | event 20210225 tw | Northern Overture | - | - | - | 北境序曲 |
|
| 20210225 | event 20210225 tw | Northern Overture | - | - | - | 北境序曲 |
|
||||||
| 20210325 | event 20210325 cn | Ashen Simulacrum | 复刻箱庭疗法 | Ashen Simulacrum Rerun | 開かれし紺碧の砂箱(復刻) | - |
|
| 20210325 | event 20210325 cn | Ashen Simulacrum | 复刻箱庭疗法 | Ashen Simulacrum Rerun | 開かれし紺碧の砂箱(復刻) | - |
|
||||||
| 20210415 | event 20210415 tw | Encircling Graf Spee | - | - | - | 復刻圍剿施佩伯爵 |
|
| 20210415 | event 20210415 tw | Encircling Graf Spee | - | - | - | 復刻圍剿施佩伯爵 |
|
||||||
| 20210422 | event 20210422 cn | Daedalian Hymn | 复兴的赞美诗 | Daedalian Hymn | 讃える復興の迷路 | - |
|
| 20210422 | event 20210422 cn | Daedalian Hymn | 复兴的赞美诗 | Daedalian Hymn | 讃える復興の迷路 | - |
|
||||||
| 20210429 | event 20210429 tw | Ink Stained Steel Sakura | - | - | - | 復刻墨染的鋼鐵之花 |
|
| 20210429 | event 20210429 tw | Ink Stained Steel Sakura | - | - | - | 復刻墨染的鋼鐵之花 |
|
||||||
| 20210527 | event 20210527 tw | Microlayer Medley | - | - | - | 微層混合 |
|
| 20210527 | event 20210527 tw | Microlayer Medley | - | - | - | 微層混合 |
|
||||||
| 20210527 | event 20210527 cn | Mirror Involution | 镜位螺旋 | Mirror Involution | 照らす螺旋の鏡海 | - |
|
| 20210527 | event 20210527 cn | Mirror Involution | 镜位螺旋 | Mirror Involution | 照らす螺旋の鏡海 | - |
|
||||||
| 20210610 | event 20210610 tw | The Way Home in the Night | - | - | - | 夜幕下的歸途 |
|
| 20210610 | event 20210610 tw | The Way Home in the Night | - | - | - | 夜幕下的歸途 |
|
||||||
| 20210624 | event 20210624 tw | Skybound Oratorio | - | - | - | 穹頂下的聖詠曲 |
|
| 20210624 | event 20210624 tw | Skybound Oratorio | - | - | - | 穹頂下的聖詠曲 |
|
||||||
| 20210624 | event 20210624 cn | Swirling Cherry Blossoms | 复刻浮樱影华 | Swirling Cherry Blossoms Rerun | 翳りし満ちる影の華(復刻) | - |
|
| 20210624 | event 20210624 cn | Swirling Cherry Blossoms | 复刻浮樱影华 | Swirling Cherry Blossoms Rerun | 翳りし満ちる影の華(復刻) | - |
|
||||||
| 20210708 | raid 20210708 | Cross Wave | 复刻穿越彼方的水线 | Cross Wave rerun | 交錯する新たな波 (復刻) | - |
|
| 20210708 | raid 20210708 | Cross Wave | 复刻穿越彼方的水线 | Cross Wave rerun | 交錯する新たな波 (復刻) | - |
|
||||||
| 20210708 | event 20200903 en | Stars of the Shimmering Fjord | - | - | - | 峽灣間的星辰 |
|
| 20210708 | event 20200903 en | Stars of the Shimmering Fjord | - | - | - | 峽灣間的星辰 |
|
||||||
| 20210722 | event 20210722 cn | Azur Anthem | 响彻碧海的偶像歌 | Azur Anthem | 海に響くアイドルの歌 | - |
|
| 20210722 | event 20210722 cn | Azur Anthem | 响彻碧海的偶像歌 | Azur Anthem | 海に響くアイドルの歌 | - |
|
||||||
| 20210729 | event 20200723 cn | Aurora Noctis | - | - | - | 永夜幻光 |
|
| 20210729 | event 20200723 cn | Aurora Noctis | - | - | - | 永夜幻光 |
|
||||||
| 20210812 | event 20200806 cn | The Enigma and the Shark | - | - | - | 最重要的寶物 |
|
| 20210812 | event 20200806 cn | The Enigma and the Shark | - | - | - | 最重要的寶物 |
|
||||||
| 20210819 | event 20210819 cn | Microlayer Medley | 复刻微层混合 | Microlayer Medley Rerun | 闇靄払う銀翼(復刻) | - |
|
| 20210819 | event 20210819 cn | Microlayer Medley | 复刻微层混合 | Microlayer Medley Rerun | 闇靄払う銀翼(復刻) | - |
|
||||||
| 20210826 | event 20210722 cn | Azur Anthem | - | - | - | 響徹碧海的偶像歌 |
|
| 20210826 | event 20210722 cn | Azur Anthem | - | - | - | 響徹碧海的偶像歌 |
|
||||||
| 20210916 | event 20210916 cn | Upon the Shimmering Blue | 碧海光粼 | Upon the Shimmering Blue | 駆けよ 碧海の吹き風 | - |
|
| 20210916 | event 20210916 cn | Upon the Shimmering Blue | 碧海光粼 | Upon the Shimmering Blue | 駆けよ 碧海の吹き風 | - |
|
||||||
| 20210923 | event 20200917 cn | Dreamwaker's Butterfly | - | - | - | 蝶海夢花 |
|
| 20210923 | event 20200917 cn | Dreamwaker's Butterfly | - | - | - | 蝶海夢花 |
|
||||||
| 20211008 | event 20201012 cn | Sundered Blue | - | - | - | 劃破海空之翼 |
|
| 20211008 | event 20201012 cn | Sundered Blue | - | - | - | 劃破海空之翼 |
|
||||||
| 20211014 | raid 20210708 | Cross Wave | - | - | - | 穿越彼方的水線 |
|
| 20211014 | raid 20210708 | Cross Wave | - | - | - | 穿越彼方的水線 |
|
||||||
| 20211028 | event 20211028 cn | Skybound Oratorio | 复刻穹顶下的圣咏曲 | Skybound Oratorio Rerun | 神穹を衝く聖歌(復刻) | - |
|
| 20211028 | event 20211028 cn | Skybound Oratorio | 复刻穹顶下的圣咏曲 | Skybound Oratorio Rerun | 神穹を衝く聖歌(復刻) | - |
|
||||||
| 20211028 | event 20211028 tw | Iris of Light and Dark | - | - | - | 復刻光與影的鳶尾之華 |
|
| 20211028 | event 20211028 tw | Iris of Light and Dark | - | - | - | 復刻光與影的鳶尾之華 |
|
||||||
| 20211111 | event 20211111 cn | The Flame-Touched Dagger | 杰诺瓦的焰火 | The Flame-Touched Dagger | 燈火のシニエ | - |
|
| 20211111 | event 20211111 cn | The Flame-Touched Dagger | 杰诺瓦的焰火 | The Flame-Touched Dagger | 燈火のシニエ | - |
|
||||||
| 20211125 | event 20211125 cn | World-spanning Arclight | 交汇世界的弧光 | World-spanning Arclight | 弧光は交わる世界にて | - |
|
| 20211125 | event 20211125 cn | World-spanning Arclight | 交汇世界的弧光 | World-spanning Arclight | 弧光は交わる世界にて | - |
|
||||||
| 20211130 | event 20211125 cn | World-spanning Arclight | - | - | - | 交匯世界的弧光 |
|
| 20211130 | event 20211125 cn | World-spanning Arclight | - | - | - | 交匯世界的弧光 |
|
||||||
| 20211214 | event 20200603 cn | Counterattack Within the Fjord | - | - | - | 峽灣間的反擊 |
|
| 20211214 | event 20200603 cn | Counterattack Within the Fjord | - | - | - | 峽灣間的反擊 |
|
||||||
| 20211229 | event 20211229 cn | Tower of Transcendence | 逆转彩虹之塔 | Tower of Transcendence | 遡望せし虹彩の塔 | - |
|
| 20211229 | event 20211229 cn | Tower of Transcendence | 逆转彩虹之塔 | Tower of Transcendence | 遡望せし虹彩の塔 | - |
|
||||||
| 20211230 | event 20201229 cn | Inverted Orthant | - | - | - | 負象限作戰 |
|
| 20211230 | event 20201229 cn | Inverted Orthant | - | - | - | 負象限作戰 |
|
||||||
| 20220127 | raid 20220127 | Mystery Investigation | 演习神秘事件调查 | Mystery Investigation | 秘密事件調査 | - |
|
| 20220127 | raid 20220127 | Mystery Investigation | 演习神秘事件调查 | Mystery Investigation | 秘密事件調査 | - |
|
||||||
| 20220210 | event 20220210 cn | Northern Overture Rerun | 复刻北境序曲 | Northern Overture Rerun | 凍絶の北海(復刻) | - |
|
| 20220210 | event 20220210 cn | Northern Overture Rerun | 复刻北境序曲 | Northern Overture Rerun | 凍絶の北海(復刻) | - |
|
||||||
| 20220224 | event 20210225 cn | Khorovod of Dawn's Rime | - | - | - | 破曉冰華 |
|
| 20220224 | event 20210225 cn | Khorovod of Dawn's Rime | - | - | - | 破曉冰華 |
|
||||||
| 20220224 | event 20220224 cn | Abyssal Refrain | 深度回音 | Abyssal Refrain | 鳴動せし星霜の淵 | - |
|
| 20220224 | event 20220224 cn | Abyssal Refrain | 深度回音 | Abyssal Refrain | 鳴動せし星霜の淵 | - |
|
||||||
| 20220310 | event 20200603 cn | Counterattack Within the Fjord | 复刻峡湾间的反击 | Counterattack Within the Fjord Rerun | 峡湾間の反撃(復刻) | - |
|
| 20220310 | event 20200603 cn | Counterattack Within the Fjord | 复刻峡湾间的反击 | Counterattack Within the Fjord Rerun | 峡湾間の反撃(復刻) | - |
|
||||||
| 20220310 | event 20220310 tw | The Solomon Ranger | - | - | - | 復刻斯圖爾特的硝煙 |
|
| 20220310 | event 20220310 tw | The Solomon Ranger | - | - | - | 復刻斯圖爾特的硝煙 |
|
||||||
| 20220324 | event 20220324 cn | Virtual Tower | 虚像构筑之塔 | Virtual Tower | 幻像の塔 | - |
|
| 20220324 | event 20220324 cn | Virtual Tower | 虚像构筑之塔 | Virtual Tower | 幻像の塔 | - |
|
||||||
| 20220324 | event 20210422 cn | Daedalian Hymn | - | - | - | 復興的讚美詩 |
|
| 20220324 | event 20210422 cn | Daedalian Hymn | - | - | - | 復興的讚美詩 |
|
||||||
| 20220407 | event 20220407 tw | Crimson Echoes | - | - | - | 蒼紅的迴響(復刻) |
|
| 20220407 | event 20220407 tw | Crimson Echoes | - | - | - | 蒼紅的迴響(復刻) |
|
||||||
| 20220414 | event 20220414 cn | Aurora Noctis | 复刻永夜幻光 | Aurora Noctis Rerun | 極夜照らす幻光(復刻) | - |
|
| 20220414 | event 20220414 cn | Aurora Noctis | 复刻永夜幻光 | Aurora Noctis Rerun | 極夜照らす幻光(復刻) | - |
|
||||||
| 20220428 | event 20220428 cn | Rondo at Rainbow's End | 虹彩的终幕曲 | Rondo at Rainbow's End | 吟ずる瑠璃の楽章 | - |
|
| 20220428 | event 20220428 cn | Rondo at Rainbow's End | 虹彩的终幕曲 | Rondo at Rainbow's End | 吟ずる瑠璃の楽章 | - |
|
||||||
| 20220505 | raid 20200624 | Air Raid Drills with Essex | - | - | - | 特別演習埃塞克斯級(復刻) |
|
| 20220505 | raid 20200624 | Air Raid Drills with Essex | - | - | - | 特別演習埃塞克斯級(復刻) |
|
||||||
| 20220526 | event 20220526 cn | Pledge of the Radiant Court | 泠誓光庭 | Pledge of the Radiant Court | 诚閃の剣 搖光の城 | - |
|
| 20220526 | event 20220526 cn | Pledge of the Radiant Court | 泠誓光庭 | Pledge of the Radiant Court | 诚閃の剣 搖光の城 | - |
|
||||||
| 20220526 | event 20210527 cn | Mirror Involution | - | - | - | 鏡位螺旋 |
|
| 20220526 | event 20210527 cn | Mirror Involution | - | - | - | 鏡位螺旋 |
|
||||||
| 20220616 | event 20201012 cn | Sundered Blue | 复刻划破海空之翼 | Sundered Blue Rerun | 奔る彩帆の青(復刻) | - |
|
| 20220616 | event 20201012 cn | Sundered Blue | 复刻划破海空之翼 | Sundered Blue Rerun | 奔る彩帆の青(復刻) | - |
|
||||||
| 20220616 | event 20200820 cn | Scherzo of Iron and Blood | - | - | - | 復刻鐵血音符誓言 |
|
| 20220616 | event 20200820 cn | Scherzo of Iron and Blood | - | - | - | 復刻鐵血音符誓言 |
|
||||||
| 20220630 | raid 20210708 | Cross Wave | - | - | - | 復刻穿越彼方的水線 |
|
| 20220630 | raid 20210708 | Cross Wave | - | - | - | 復刻穿越彼方的水線 |
|
||||||
| 20220630 | raid 20220630 | Angel of Iris | 来自鸢尾的天使 | Angel of Iris | アイリスの天使 | - |
|
| 20220630 | raid 20220630 | Angel of Iris | 来自鸢尾的天使 | Angel of Iris | アイリスの天使 | - |
|
||||||
| 20220714 | event 20201029 cn | Universe in Unison | - | - | - | 激唱的UNIVERSE |
|
| 20220714 | event 20201029 cn | Universe in Unison | - | - | - | 激唱的UNIVERSE |
|
||||||
| 20220714 | event 20200917 cn | Dreamwaker's Butterfly | 复刻蝶海梦花 | Dreamwaker's Butterfly Rerun | 刹那觀る胡蝶の夢(復刻) | - |
|
| 20220714 | event 20200917 cn | Dreamwaker's Butterfly | 复刻蝶海梦花 | Dreamwaker's Butterfly Rerun | 刹那觀る胡蝶の夢(復刻) | - |
|
||||||
| 20220728 | event 20220728 cn | Aquilifer's Ballade | 雄鹰的叙事歌 | Aquilifer's Ballade | 鋼鷲の冒険譚 | - |
|
| 20220728 | event 20220728 cn | Aquilifer's Ballade | 雄鹰的叙事歌 | Aquilifer's Ballade | 鋼鷲の冒険譚 | - |
|
||||||
| 20220804 | event 20211028 cn | Skybound Oratorio Rerun | - | - | - | 復刻穹頂下的聖詠曲 |
|
| 20220804 | event 20211028 cn | Skybound Oratorio Rerun | - | - | - | 復刻穹頂下的聖詠曲 |
|
||||||
| 20220818 | event 20220324 cn | Virtual Tower | - | - | - | 虛像構築之塔 |
|
| 20220818 | event 20220324 cn | Virtual Tower | - | - | - | 虛像構築之塔 |
|
||||||
| 20220818 | event 20220818 cn | Operation Convergence | 远汇点作战 | Operation Convergence | 結像点作戦 | - |
|
| 20220818 | event 20220818 cn | Operation Convergence | 远汇点作战 | Operation Convergence | 結像点作戦 | - |
|
||||||
| 20220901 | event 20200903 en | Stars of the Shimmering Fjord | - | - | - | 復刻峽灣間的星辰 |
|
| 20220901 | event 20200903 en | Stars of the Shimmering Fjord | - | - | - | 復刻峽灣間的星辰 |
|
||||||
| 20220915 | event 20210916 cn | Upon the Shimmering Blue | - | - | - | 碧海光粼 |
|
| 20220915 | event 20210916 cn | Upon the Shimmering Blue | - | - | - | 碧海光粼 |
|
||||||
| 20220915 | event 20220915 cn | Violet Tempest Blooming Lycoris | 紫绛槿岚 | Violet Tempest Blooming Lycoris | 赫の涙月 菫の暁風 | - |
|
| 20220915 | event 20220915 cn | Violet Tempest Blooming Lycoris | 紫绛槿岚 | Violet Tempest Blooming Lycoris | 赫の涙月 菫の暁風 | - |
|
||||||
| 20221021 | event 20210121 cn | Empyreal Tragicomedy | - | - | - | 復刻神聖的悲喜劇 |
|
| 20221021 | event 20210121 cn | Empyreal Tragicomedy | - | - | - | 復刻神聖的悲喜劇 |
|
||||||
| 20221027 | raid 20221027 | Fight! Royal Maid | 战斗!皇家女仆队3rd | Fight On, Royal Maids!(Part 3) | 戦え!ロイヤルメイド隊3rd | - |
|
| 20221027 | raid 20221027 | Fight! Royal Maid | 战斗!皇家女仆队3rd | Fight On, Royal Maids!(Part 3) | 戦え!ロイヤルメイド隊3rd | - |
|
||||||
| 20221103 | event 20211111 cn | The Flame-Touched Dagger | - | - | - | 杰諾瓦的焰火 |
|
| 20221103 | event 20211111 cn | The Flame-Touched Dagger | - | - | - | 杰諾瓦的焰火 |
|
||||||
|
| 20221110 | event 20221110 cn | Inverted Orthant | 复刻负象限作战 | Inverted Orthant Rerun | 虚畳なりし限象(復刻) | - |
|
||||||
|
|||||||
@@ -73,6 +73,8 @@ class Config:
|
|||||||
'CV': 1.111,
|
'CV': 1.111,
|
||||||
'BB': 1.111,
|
'BB': 1.111,
|
||||||
}
|
}
|
||||||
|
HOMO_EDGE_HOUGHLINES_THRESHOLD = 180
|
||||||
|
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
|
||||||
|
|
||||||
|
|
||||||
class Campaign(CampaignBase):
|
class Campaign(CampaignBase):
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ class Config:
|
|||||||
'CV': 1.111,
|
'CV': 1.111,
|
||||||
'BB': 1.111,
|
'BB': 1.111,
|
||||||
}
|
}
|
||||||
|
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
|
||||||
|
|
||||||
|
|
||||||
class Campaign(CampaignBase):
|
class Campaign(CampaignBase):
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ class Config:
|
|||||||
MAP_SWIPE_MULTIPLY = 1.579
|
MAP_SWIPE_MULTIPLY = 1.579
|
||||||
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.527
|
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.527
|
||||||
MAP_ENEMY_TEMPLATE = ['LightInvertedOrthant', 'MainInvertedOrthant', 'CarrierInvertedOrthant']
|
MAP_ENEMY_TEMPLATE = ['LightInvertedOrthant', 'MainInvertedOrthant', 'CarrierInvertedOrthant']
|
||||||
|
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
|
||||||
|
|
||||||
|
|
||||||
class Campaign(CampaignBase):
|
class Campaign(CampaignBase):
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ class Config:
|
|||||||
HOMO_EDGE_HOUGHLINES_THRESHOLD = 180
|
HOMO_EDGE_HOUGHLINES_THRESHOLD = 180
|
||||||
MAP_SWIPE_MULTIPLY = 1.445
|
MAP_SWIPE_MULTIPLY = 1.445
|
||||||
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.397
|
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.397
|
||||||
|
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
|
||||||
|
|
||||||
|
|
||||||
class Campaign(CampaignBase):
|
class Campaign(CampaignBase):
|
||||||
|
|||||||
@@ -18,82 +18,82 @@ from tqdm.contrib.concurrent import process_map
|
|||||||
"""
|
"""
|
||||||
# 索引,期数,名称,出现权重,彩图纸掉落,彩图纸掉落,金图纸掉落,金图纸掉落,金图纸掉落,彩装备掉落
|
# 索引,期数,名称,出现权重,彩图纸掉落,彩图纸掉落,金图纸掉落,金图纸掉落,金图纸掉落,彩装备掉落
|
||||||
PROJECT_TABLE = """
|
PROJECT_TABLE = """
|
||||||
0 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
0 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
1 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
1 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
2 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
2 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
3 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
3 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
4 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
4 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
5 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
5 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
6 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
6 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
7 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
7 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
8 4 B-4 58.42861987 0 0 0.549 0.549 0.549 0.0588
|
8 4 B-4 58.42861987 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
9 4 B-4 29.21430994 0 0 0.549 0.549 0.549 0.0588
|
9 4 B-4 29.21430994 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
10 4 B-4 29.21430994 0 0 0.549 0.549 0.549 0.0588
|
10 4 B-4 29.21430994 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
11 4 C-6 303.3660224 0 0 0 0 0 0.0559
|
11 4 C-6 303.3660224 0 0 0 0 0 0.06
|
||||||
12 4 C-8 205.3100712 0.0471 0.0471 0.17 0.17 0.17 0.0959
|
12 4 C-8 205.3100712 0.0645 0.0645 0.151 0.151 0.151 0.08
|
||||||
13 4 C-12 155.8916073 0.077 0.077 0.245666667 0.245666667 0.245666667 0.122
|
13 4 C-12 155.8916073 0.079 0.079 0.245333333 0.245333333 0.245333333 0.12
|
||||||
14 4 C-6 303.3660224 0 0 0 0 0 0.0559
|
14 4 C-6 303.3660224 0 0 0 0 0 0.06
|
||||||
15 4 C-8 205.3100712 0.0471 0.0471 0.17 0.17 0.17 0.0959
|
15 4 C-8 205.3100712 0.0645 0.0645 0.151 0.151 0.151 0.08
|
||||||
16 4 C-12 155.8916073 0.077 0.077 0.245666667 0.245666667 0.245666667 0.122
|
16 4 C-12 155.8916073 0.079 0.079 0.245333333 0.245333333 0.245333333 0.12
|
||||||
17 4 Agir-0.5 25.39955239 4.443 0 0 0 0 0.113
|
17 4 Agir-0.5 25.39955239 6 0 0 0 0 0.14
|
||||||
18 4 Agir-2.5 766.6697864 1.119 0 0 0 0 0.0395
|
18 4 Agir-2.5 766.6697864 1.2 0 0 0 0 0.04
|
||||||
19 4 Agir-5 485.7871007 1.95 0 0 0 0 0.0586
|
19 4 Agir-5 485.7871007 2.5 0 0 0 0 0.06
|
||||||
20 4 Agir-8 200.3313937 3.195 0 0 0 0 0.0842
|
20 4 Agir-8 200.3313937 4 0 0 0 0 0.096
|
||||||
21 4 Hakuryu-0.5 25.39955239 0 4.443 0 0 0 0.113
|
21 4 Hakuryu-0.5 25.39955239 0 6 0 0 0 0.14
|
||||||
22 4 Hakuryu-2.5 766.6697864 0 1.119 0 0 0 0.0395
|
22 4 Hakuryu-2.5 766.6697864 0 1.2 0 0 0 0.04
|
||||||
23 4 Hakuryu-5 485.7871007 0 1.95 0 0 0 0.0586
|
23 4 Hakuryu-5 485.7871007 0 2.5 0 0 0 0.06
|
||||||
24 4 Hakuryu-8 200.3313937 0 3.195 0 0 0 0.0842
|
24 4 Hakuryu-8 200.3313937 0 4 0 0 0 0.096
|
||||||
25 4 Anchorage-0.5 25.39955239 0 0 8.631 0 0 0.0383
|
25 4 Anchorage-0.5 25.39955239 0 0 9 0 0 0.14
|
||||||
26 4 Anchorage-2.5 766.6697864 0 0 2.177 0 0 0.0508
|
26 4 Anchorage-2.5 766.6697864 0 0 2.25 0 0 0.04
|
||||||
27 4 Anchorage-5 485.7871007 0 0 3.669 0 0 0.0893
|
27 4 Anchorage-5 485.7871007 0 0 3.75 0 0 0.06
|
||||||
28 4 Anchorage-8 200.3313937 0 0 5.753 0 0 0.354
|
28 4 Anchorage-8 200.3313937 0 0 6 0 0 0.096
|
||||||
29 4 August-0.5 25.39955239 0 0 0 8.631 0 0.133
|
29 4 August-0.5 25.39955239 0 0 0 9 0 0.14
|
||||||
30 4 August-2.5 766.6697864 0 0 0 2.177 0 0.0383
|
30 4 August-2.5 766.6697864 0 0 0 2.25 0 0.04
|
||||||
31 4 August-5 485.7871007 0 0 0 3.669 0 0.0508
|
31 4 August-5 485.7871007 0 0 0 3.75 0 0.06
|
||||||
32 4 August-8 200.3313937 0 0 0 5.753 0 0.0893
|
32 4 August-8 200.3313937 0 0 0 6 0 0.096
|
||||||
33 4 Marcopolo-0.5 25.39955239 0 0 0 0 8.631 0.133
|
33 4 Marcopolo-0.5 25.39955239 0 0 0 0 9 0.14
|
||||||
34 4 Marcopolo-2.5 766.6697864 0 0 0 0 2.177 0.0383
|
34 4 Marcopolo-2.5 766.6697864 0 0 0 0 2.25 0.04
|
||||||
35 4 Marcopolo-5 485.7871007 0 0 0 0 3.669 0.0508
|
35 4 Marcopolo-5 485.7871007 0 0 0 0 3.75 0.06
|
||||||
36 4 Marcopolo-8 200.3313937 0 0 0 0 5.753 0.0893
|
36 4 Marcopolo-8 200.3313937 0 0 0 0 6 0.096
|
||||||
37 4 E-2 203.9216684 0 0 0 0 0 0.0253
|
37 4 Z-2 203.9216684 0 0 0 0 0 0.024
|
||||||
38 4 E-2 203.9216684 0 0 0 0 0 0.0253
|
38 4 A-2 203.9216684 0 0 0 0 0 0.06
|
||||||
39 4 G-1.5 582.001119 0.075 0.075 0.274 0.274 0.274 0.0195
|
39 4 G-1.5 582.001119 0.104 0.104 0.299 0.299 0.299 0.025
|
||||||
40 4 G-2.5 402.5500509 0.1125 0.1125 0.384666667 0.384666667 0.384666667 0.0337
|
40 4 G-2.5 402.5500509 0.135 0.135 0.403333333 0.403333333 0.403333333 0.04
|
||||||
41 4 G-4 305.1449135 0.1855 0.1855 0.691333333 0.691333333 0.691333333 0.119
|
41 4 G-4 305.1449135 0.2585 0.2585 0.723333333 0.723333333 0.723333333 0.12
|
||||||
42 4 G-1.5 582.001119 0.075 0.075 0.274 0.274 0.274 0.0195
|
42 4 G-1.5 582.001119 0.104 0.104 0.299 0.299 0.299 0.025
|
||||||
43 4 G-2.5 402.5500509 0.1125 0.1125 0.384666667 0.384666667 0.384666667 0.0337
|
43 4 G-2.5 402.5500509 0.135 0.135 0.403333333 0.403333333 0.403333333 0.04
|
||||||
44 4 G-4 305.1449135 0.1855 0.1855 0.691333333 0.691333333 0.691333333 0.119
|
44 4 G-4 305.1449135 0.2585 0.2585 0.723333333 0.723333333 0.723333333 0.12
|
||||||
45 4 H-0.5 13.18982706 0.46 0.46 1.638666667 1.638666667 1.638666667 0
|
45 4 H-0.5 13.18982706 0.555 0.555 1.616666667 1.616666667 1.616666667 0
|
||||||
46 4 H-1 608.5109359 0.3035 0.3035 0.914666667 0.914666667 0.914666667 0
|
46 4 H-1 608.5109359 0.33 0.33 0.97 0.97 0.97 0
|
||||||
47 4 H-2 394.3497965 0.4425 0.4425 1.355 1.355 1.355 0
|
47 4 H-2 394.3497965 0.4765 0.4765 1.423333333 1.423333333 1.423333333 0
|
||||||
48 4 H-4 151.9433367 0.608 0.608 1.794333333 1.794333333 1.794333333 0
|
48 4 H-4 151.9433367 0.665 0.665 1.906666667 1.906666667 1.906666667 0
|
||||||
49 4 H-0.5 13.18982706 0.46 0.46 1.638666667 1.638666667 1.638666667 0
|
49 4 H-0.5 13.18982706 0.555 0.555 1.616666667 1.616666667 1.616666667 0
|
||||||
50 4 H-1 608.5109359 0.3035 0.3035 0.914666667 0.914666667 0.914666667 0
|
50 4 H-1 608.5109359 0.33 0.33 0.97 0.97 0.97 0
|
||||||
51 4 H-2 394.3497965 0.4425 0.4425 1.355 1.355 1.355 0
|
51 4 H-2 394.3497965 0.4765 0.4765 1.423333333 1.423333333 1.423333333 0
|
||||||
52 4 H-4 151.9433367 0.608 0.608 1.794333333 1.794333333 1.794333333 0
|
52 4 H-4 151.9433367 0.665 0.665 1.906666667 1.906666667 1.906666667 0
|
||||||
53 4 Q-0.5 35.35220753 0 0 0 0 0 0.354
|
53 4 Q-0.5 35.35220753 0 0 0 0 0 0.34
|
||||||
54 4 Q-1 204.8414852 0 0 0 0 0 0.0418
|
54 4 Q-1 204.8414852 0 0 0 0 0 0.04
|
||||||
55 4 Q-2 104.3558291 0 0 0 0 0 0.0754
|
55 4 Q-2 104.3558291 0 0 0 0 0 0.08
|
||||||
56 4 Q-4 51.26677518 0 0 0 0 0 0.156
|
56 4 Q-4 51.26677518 0 0 0 0 0 0.16
|
||||||
57 4 Q-0.5 35.35220753 0 0 0 0 0 0.354
|
57 4 Q-0.5 35.35220753 0 0 0 0 0 0.34
|
||||||
58 4 Q-1 204.8414852 0 0 0 0 0 0.0418
|
58 4 Q-1 204.8414852 0 0 0 0 0 0.04
|
||||||
59 4 Q-2 104.3558291 0 0 0 0 0 0.0754
|
59 4 Q-2 104.3558291 0 0 0 0 0 0.08
|
||||||
60 4 Q-4 51.26677518 0 0 0 0 0 0.156
|
60 4 Q-4 51.26677518 0 0 0 0 0 0.16
|
||||||
61 4 Q-0.5 35.35220753 0 0 0 0 0 0.354
|
61 4 Q-0.5 35.35220753 0 0 0 0 0 0.34
|
||||||
62 4 Q-1 204.8414852 0 0 0 0 0 0.0418
|
62 4 Q-1 204.8414852 0 0 0 0 0 0.04
|
||||||
63 4 Q-2 104.3558291 0 0 0 0 0 0.0754
|
63 4 Q-2 104.3558291 0 0 0 0 0 0.08
|
||||||
64 4 Q-4 51.26677518 0 0 0 0 0 0.156
|
64 4 Q-4 51.26677518 0 0 0 0 0 0.16
|
||||||
65 4 Q-0.5 35.35220753 0 0 0 0 0 0.354
|
65 4 Q-0.5 35.35220753 0 0 0 0 0 0.34
|
||||||
66 4 Q-1 204.8414852 0 0 0 0 0 0.0418
|
66 4 Q-1 204.8414852 0 0 0 0 0 0.04
|
||||||
67 4 Q-2 104.3558291 0 0 0 0 0 0.0754
|
67 4 Q-2 104.3558291 0 0 0 0 0 0.08
|
||||||
68 4 Q-4 51.26677518 0 0 0 0 0 0.156
|
68 4 Q-4 51.26677518 0 0 0 0 0 0.16
|
||||||
69 4 Q-0.5 35.35220753 0 0 0 0 0 0.354
|
69 4 Q-0.5 35.35220753 0 0 0 0 0 0.34
|
||||||
70 4 Q-1 204.8414852 0 0 0 0 0 0.0418
|
70 4 Q-1 204.8414852 0 0 0 0 0 0.04
|
||||||
71 4 Q-2 104.3558291 0 0 0 0 0 0.0754
|
71 4 Q-2 104.3558291 0 0 0 0 0 0.08
|
||||||
72 4 Q-4 51.26677518 0 0 0 0 0 0.156
|
72 4 Q-4 51.26677518 0 0 0 0 0 0.16
|
||||||
73 4 T-3 261.8007121 0 0 0 0 0 0.0333
|
73 4 T-3 261.8007121 0 0 0 0 0 0.045
|
||||||
74 4 T-4 182.1410987 0 0 0 0 0 0.037
|
74 4 T-4 182.1410987 0 0 0 0 0 0.06
|
||||||
75 4 T-6 107.3408952 0 0 0 0 0 0.19
|
75 4 T-6 107.3408952 0 0 0 0 0 0.09
|
||||||
76 2 B-4 63.85544525 0 0 0 0 0 0
|
76 2 B-4 63.85544525 0 0 0 0 0 0
|
||||||
77 2 B-4 63.85544525 0 0 0 0 0 0
|
77 2 B-4 63.85544525 0 0 0 0 0 0
|
||||||
78 2 B-4 63.85544525 0 0 0 0 0 0
|
78 2 B-4 63.85544525 0 0 0 0 0 0
|
||||||
@@ -111,8 +111,8 @@ PROJECT_TABLE = """
|
|||||||
90 2 C-6 331.5425296 0 0 0 0 0 0
|
90 2 C-6 331.5425296 0 0 0 0 0 0
|
||||||
91 2 C-8 224.3791833 0 0 0 0 0 0
|
91 2 C-8 224.3791833 0 0 0 0 0 0
|
||||||
92 2 C-12 170.3707535 0 0 0 0 0 0
|
92 2 C-12 170.3707535 0 0 0 0 0 0
|
||||||
93 2 E-2 222.8618262 0 0 0 0 0 0
|
93 2 Z-2 222.8618262 0 0 0 0 0 0
|
||||||
94 2 E-2 222.8618262 0 0 0 0 0 0
|
94 2 A-2 222.8618262 0 0 0 0 0 0
|
||||||
95 2 G-1.5 636.0571355 0 0 0 0 0 0
|
95 2 G-1.5 636.0571355 0 0 0 0 0 0
|
||||||
96 2 G-2.5 439.9387285 0 0 0 0 0 0
|
96 2 G-2.5 439.9387285 0 0 0 0 0 0
|
||||||
97 2 G-4 333.4866434 0 0 0 0 0 0
|
97 2 G-4 333.4866434 0 0 0 0 0 0
|
||||||
@@ -167,8 +167,8 @@ PROJECT_TABLE = """
|
|||||||
146 3 C-6 328.1807665 0 0 0 0 0 0
|
146 3 C-6 328.1807665 0 0 0 0 0 0
|
||||||
147 3 C-8 222.1040313 0 0 0 0 0 0
|
147 3 C-8 222.1040313 0 0 0 0 0 0
|
||||||
148 3 C-12 168.6432343 0 0 0 0 0 0
|
148 3 C-12 168.6432343 0 0 0 0 0 0
|
||||||
149 3 E-2 220.6020598 0 0 0 0 0 0
|
149 3 Z-2 220.6020598 0 0 0 0 0 0
|
||||||
150 3 E-2 220.6020598 0 0 0 0 0 0
|
150 3 A-2 220.6020598 0 0 0 0 0 0
|
||||||
151 3 G-1.5 629.6076661 0 0 0 0 0 0
|
151 3 G-1.5 629.6076661 0 0 0 0 0 0
|
||||||
152 3 G-2.5 435.4778534 0 0 0 0 0 0
|
152 3 G-2.5 435.4778534 0 0 0 0 0 0
|
||||||
153 3 G-4 330.1051674 0 0 0 0 0 0
|
153 3 G-4 330.1051674 0 0 0 0 0 0
|
||||||
@@ -208,82 +208,82 @@ PROJECT_TABLE = """
|
|||||||
187 3 T-6 116.1211694 0 0 0 0 0 0
|
187 3 T-6 116.1211694 0 0 0 0 0 0
|
||||||
"""
|
"""
|
||||||
PROJECT_TABLE_S4 = """
|
PROJECT_TABLE_S4 = """
|
||||||
0 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
0 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
1 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
1 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
2 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
2 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
3 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
3 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
4 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
4 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
5 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
5 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
6 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
6 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
7 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
7 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
8 4 B-4 185.4920312 0 0 0.549 0.549 0.549 0.0588
|
8 4 B-4 185.4920312 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
9 4 B-4 92.7460156 0 0 0.549 0.549 0.549 0.0588
|
9 4 B-4 92.7460156 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
10 4 B-4 92.7460156 0 0 0.549 0.549 0.549 0.0588
|
10 4 B-4 92.7460156 0 0 0.346666667 0.346666667 0.346666667 0.0588
|
||||||
11 4 C-6 963.0893184 0 0 0 0 0 0.0559
|
11 4 C-6 963.0893184 0 0 0 0 0 0.06
|
||||||
12 4 C-8 651.7932859 0.0471 0.0471 0.17 0.17 0.17 0.0959
|
12 4 C-8 651.7932859 0.0645 0.0645 0.151 0.151 0.151 0.08
|
||||||
13 4 C-12 494.9055951 0.077 0.077 0.245666667 0.245666667 0.245666667 0.122
|
13 4 C-12 494.9055951 0.079 0.079 0.245333333 0.245333333 0.245333333 0.12
|
||||||
14 4 C-6 963.0893184 0 0 0 0 0 0.0559
|
14 4 C-6 963.0893184 0 0 0 0 0 0.06
|
||||||
15 4 C-8 651.7932859 0.0471 0.0471 0.17 0.17 0.17 0.0959
|
15 4 C-8 651.7932859 0.0645 0.0645 0.151 0.151 0.151 0.08
|
||||||
16 4 C-12 494.9055951 0.077 0.077 0.245666667 0.245666667 0.245666667 0.122
|
16 4 C-12 494.9055951 0.079 0.079 0.245333333 0.245333333 0.245333333 0.12
|
||||||
17 4 Agir-0.5 25.39955239 4.443 0 0 0 0 0.113
|
17 4 Agir-0.5 25.39955239 6 0 0 0 0 0.14
|
||||||
18 4 Agir-2.5 766.6697864 1.119 0 0 0 0 0.0395
|
18 4 Agir-2.5 766.6697864 1.2 0 0 0 0 0.04
|
||||||
19 4 Agir-5 485.7871007 1.95 0 0 0 0 0.0586
|
19 4 Agir-5 485.7871007 2.5 0 0 0 0 0.06
|
||||||
20 4 Agir-8 200.3313937 3.195 0 0 0 0 0.0842
|
20 4 Agir-8 200.3313937 4 0 0 0 0 0.096
|
||||||
21 4 Hakuryu-0.5 25.39955239 0 4.443 0 0 0 0.113
|
21 4 Hakuryu-0.5 25.39955239 0 6 0 0 0 0.14
|
||||||
22 4 Hakuryu-2.5 766.6697864 0 1.119 0 0 0 0.0395
|
22 4 Hakuryu-2.5 766.6697864 0 1.2 0 0 0 0.04
|
||||||
23 4 Hakuryu-5 485.7871007 0 1.95 0 0 0 0.0586
|
23 4 Hakuryu-5 485.7871007 0 2.5 0 0 0 0.06
|
||||||
24 4 Hakuryu-8 200.3313937 0 3.195 0 0 0 0.0842
|
24 4 Hakuryu-8 200.3313937 0 4 0 0 0 0.096
|
||||||
25 4 Anchorage-0.5 25.39955239 0 0 8.631 0 0 0.0383
|
25 4 Anchorage-0.5 25.39955239 0 0 9 0 0 0.14
|
||||||
26 4 Anchorage-2.5 766.6697864 0 0 2.177 0 0 0.0508
|
26 4 Anchorage-2.5 766.6697864 0 0 2.25 0 0 0.04
|
||||||
27 4 Anchorage-5 485.7871007 0 0 3.669 0 0 0.0893
|
27 4 Anchorage-5 485.7871007 0 0 3.75 0 0 0.06
|
||||||
28 4 Anchorage-8 200.3313937 0 0 5.753 0 0 0.354
|
28 4 Anchorage-8 200.3313937 0 0 6 0 0 0.096
|
||||||
29 4 August-0.5 25.39955239 0 0 0 8.631 0 0.133
|
29 4 August-0.5 25.39955239 0 0 0 9 0 0.14
|
||||||
30 4 August-2.5 766.6697864 0 0 0 2.177 0 0.0383
|
30 4 August-2.5 766.6697864 0 0 0 2.25 0 0.04
|
||||||
31 4 August-5 485.7871007 0 0 0 3.669 0 0.0508
|
31 4 August-5 485.7871007 0 0 0 3.75 0 0.06
|
||||||
32 4 August-8 200.3313937 0 0 0 5.753 0 0.0893
|
32 4 August-8 200.3313937 0 0 0 6 0 0.096
|
||||||
33 4 Marcopolo-0.5 25.39955239 0 0 0 0 8.631 0.133
|
33 4 Marcopolo-0.5 25.39955239 0 0 0 0 9 0.14
|
||||||
34 4 Marcopolo-2.5 766.6697864 0 0 0 0 2.177 0.0383
|
34 4 Marcopolo-2.5 766.6697864 0 0 0 0 2.25 0.04
|
||||||
35 4 Marcopolo-5 485.7871007 0 0 0 0 3.669 0.0508
|
35 4 Marcopolo-5 485.7871007 0 0 0 0 3.75 0.06
|
||||||
36 4 Marcopolo-8 200.3313937 0 0 0 0 5.753 0.0893
|
36 4 Marcopolo-8 200.3313937 0 0 0 0 6 0.096
|
||||||
37 4 E-2 647.3855544 0 0 0 0 0 0.0253
|
37 4 Z-2 647.3855544 0 0 0 0 0 0.024
|
||||||
38 4 E-2 647.3855544 0 0 0 0 0 0.0253
|
38 4 A-2 647.3855544 0 0 0 0 0 0.06
|
||||||
39 4 G-1.5 1847.665921 0.075 0.075 0.274 0.274 0.274 0.0195
|
39 4 G-1.5 1847.665921 0.104 0.104 0.299 0.299 0.299 0.025
|
||||||
40 4 G-2.5 1277.966633 0.1125 0.1125 0.384666667 0.384666667 0.384666667 0.0337
|
40 4 G-2.5 1277.966633 0.135 0.135 0.403333333 0.403333333 0.403333333 0.04
|
||||||
41 4 G-4 968.7367243 0.1855 0.1855 0.691333333 0.691333333 0.691333333 0.119
|
41 4 G-4 968.7367243 0.2585 0.2585 0.723333333 0.723333333 0.723333333 0.12
|
||||||
42 4 G-1.5 1847.665921 0.075 0.075 0.274 0.274 0.274 0.0195
|
42 4 G-1.5 1847.665921 0.104 0.104 0.299 0.299 0.299 0.025
|
||||||
43 4 G-2.5 1277.966633 0.1125 0.1125 0.384666667 0.384666667 0.384666667 0.0337
|
43 4 G-2.5 1277.966633 0.135 0.135 0.403333333 0.403333333 0.403333333 0.04
|
||||||
44 4 G-4 968.7367243 0.1855 0.1855 0.691333333 0.691333333 0.691333333 0.119
|
44 4 G-4 968.7367243 0.2585 0.2585 0.723333333 0.723333333 0.723333333 0.12
|
||||||
45 4 H-0.5 41.87344863 0.46 0.46 1.638666667 1.638666667 1.638666667 0
|
45 4 H-0.5 41.87344863 0.555 0.555 1.616666667 1.616666667 1.616666667 0
|
||||||
46 4 H-1 1931.826043 0.3035 0.3035 0.914666667 0.914666667 0.914666667 0
|
46 4 H-1 1931.826043 0.33 0.33 0.97 0.97 0.97 0
|
||||||
47 4 H-2 1251.933469 0.4425 0.4425 1.355 1.355 1.355 0
|
47 4 H-2 1251.933469 0.4765 0.4765 1.423333333 1.423333333 1.423333333 0
|
||||||
48 4 H-4 482.3711089 0.608 0.608 1.794333333 1.794333333 1.794333333 0
|
48 4 H-4 482.3711089 0.665 0.665 1.906666667 1.906666667 1.906666667 0
|
||||||
49 4 H-0.5 41.87344863 0.46 0.46 1.638666667 1.638666667 1.638666667 0
|
49 4 H-0.5 41.87344863 0.555 0.555 1.616666667 1.616666667 1.616666667 0
|
||||||
50 4 H-1 1931.826043 0.3035 0.3035 0.914666667 0.914666667 0.914666667 0
|
50 4 H-1 1931.826043 0.33 0.33 0.97 0.97 0.97 0
|
||||||
51 4 H-2 1251.933469 0.4425 0.4425 1.355 1.355 1.355 0
|
51 4 H-2 1251.933469 0.4765 0.4765 1.423333333 1.423333333 1.423333333 0
|
||||||
52 4 H-4 482.3711089 0.608 0.608 1.794333333 1.794333333 1.794333333 0
|
52 4 H-4 482.3711089 0.665 0.665 1.906666667 1.906666667 1.906666667 0
|
||||||
53 4 Q-0.5 112.2318616 0 0 0 0 0 0.354
|
53 4 Q-0.5 112.2318616 0 0 0 0 0 0.34
|
||||||
54 4 Q-1 650.3056765 0 0 0 0 0 0.0418
|
54 4 Q-1 650.3056765 0 0 0 0 0 0.04
|
||||||
55 4 Q-2 331.2961139 0 0 0 0 0 0.0754
|
55 4 Q-2 331.2961139 0 0 0 0 0 0.08
|
||||||
56 4 Q-4 162.7554832 0 0 0 0 0 0.156
|
56 4 Q-4 162.7554832 0 0 0 0 0 0.16
|
||||||
57 4 Q-0.5 112.2318616 0 0 0 0 0 0.354
|
57 4 Q-0.5 112.2318616 0 0 0 0 0 0.34
|
||||||
58 4 Q-1 650.3056765 0 0 0 0 0 0.0418
|
58 4 Q-1 650.3056765 0 0 0 0 0 0.04
|
||||||
59 4 Q-2 331.2961139 0 0 0 0 0 0.0754
|
59 4 Q-2 331.2961139 0 0 0 0 0 0.08
|
||||||
60 4 Q-4 162.7554832 0 0 0 0 0 0.156
|
60 4 Q-4 162.7554832 0 0 0 0 0 0.16
|
||||||
61 4 Q-0.5 112.2318616 0 0 0 0 0 0.354
|
61 4 Q-0.5 112.2318616 0 0 0 0 0 0.34
|
||||||
62 4 Q-1 650.3056765 0 0 0 0 0 0.0418
|
62 4 Q-1 650.3056765 0 0 0 0 0 0.04
|
||||||
63 4 Q-2 331.2961139 0 0 0 0 0 0.0754
|
63 4 Q-2 331.2961139 0 0 0 0 0 0.08
|
||||||
64 4 Q-4 162.7554832 0 0 0 0 0 0.156
|
64 4 Q-4 162.7554832 0 0 0 0 0 0.16
|
||||||
65 4 Q-0.5 112.2318616 0 0 0 0 0 0.354
|
65 4 Q-0.5 112.2318616 0 0 0 0 0 0.34
|
||||||
66 4 Q-1 650.3056765 0 0 0 0 0 0.0418
|
66 4 Q-1 650.3056765 0 0 0 0 0 0.04
|
||||||
67 4 Q-2 331.2961139 0 0 0 0 0 0.0754
|
67 4 Q-2 331.2961139 0 0 0 0 0 0.08
|
||||||
68 4 Q-4 162.7554832 0 0 0 0 0 0.156
|
68 4 Q-4 162.7554832 0 0 0 0 0 0.16
|
||||||
69 4 Q-0.5 112.2318616 0 0 0 0 0 0.354
|
69 4 Q-0.5 112.2318616 0 0 0 0 0 0.34
|
||||||
70 4 Q-1 650.3056765 0 0 0 0 0 0.0418
|
70 4 Q-1 650.3056765 0 0 0 0 0 0.04
|
||||||
71 4 Q-2 331.2961139 0 0 0 0 0 0.0754
|
71 4 Q-2 331.2961139 0 0 0 0 0 0.08
|
||||||
72 4 Q-4 162.7554832 0 0 0 0 0 0.156
|
72 4 Q-4 162.7554832 0 0 0 0 0 0.16
|
||||||
73 4 T-3 831.1328586 0 0 0 0 0 0.0333
|
73 4 T-3 831.1328586 0 0 0 0 0 0.045
|
||||||
74 4 T-4 578.2392675 0 0 0 0 0 0.037
|
74 4 T-4 578.2392675 0 0 0 0 0 0.06
|
||||||
75 4 T-6 340.7727365 0 0 0 0 0 0.19
|
75 4 T-6 340.7727365 0 0 0 0 0 0.09
|
||||||
"""
|
"""
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@@ -646,7 +646,7 @@ FILTER_REGEX = re.compile('([s\!][1234])?'
|
|||||||
'|gascogne|champagne|cheshire|drake|mainz|odin'
|
'|gascogne|champagne|cheshire|drake|mainz|odin'
|
||||||
'|anchorage|hakuryu|agir|august|marcopolo)?'
|
'|anchorage|hakuryu|agir|august|marcopolo)?'
|
||||||
'(dr|pry)?'
|
'(dr|pry)?'
|
||||||
'([bcdeghqt])?'
|
'([bcdeghqtaz])?'
|
||||||
'-?'
|
'-?'
|
||||||
'(\d.\d|\d\d?)?')
|
'(\d.\d|\d\d?)?')
|
||||||
FILTER_ATTR = ('series', 'ship', 'ship_rarity', 'genre', 'duration')
|
FILTER_ATTR = ('series', 'ship', 'ship_rarity', 'genre', 'duration')
|
||||||
@@ -968,6 +968,8 @@ class FilterSimulator:
|
|||||||
target = np.array([513, 513, 343, 343, 343, 150])
|
target = np.array([513, 513, 343, 343, 343, 150])
|
||||||
|
|
||||||
def __init__(self, string):
|
def __init__(self, string):
|
||||||
|
string = string.replace('E-315', 'A2')
|
||||||
|
string = string.replace('E-031', 'Z2')
|
||||||
self.string = string
|
self.string = string
|
||||||
self.pool = ResearchPool(string)
|
self.pool = ResearchPool(string)
|
||||||
|
|
||||||
@@ -1007,15 +1009,20 @@ def join_filter(selection):
|
|||||||
return ' > '.join(selection)
|
return ' > '.join(selection)
|
||||||
|
|
||||||
|
|
||||||
def beautify_filter(string):
|
def beautify_filter(list_filter):
|
||||||
if isinstance(string, str):
|
if isinstance(list_filter, str):
|
||||||
string = split_filter(string)
|
list_filter = split_filter(list_filter)
|
||||||
out = ''
|
|
||||||
for index in range(0, len(string), 8):
|
out = []
|
||||||
row = string[index:index + 8]
|
length = 0
|
||||||
out += ' > ' + join_filter(row) + '\n'
|
for selection in list_filter:
|
||||||
out = '\n ' + out.strip('> ')
|
if length + len(selection) + 3 > 70:
|
||||||
return out
|
out.append('\n')
|
||||||
|
length = 0
|
||||||
|
out.append(selection)
|
||||||
|
length += len(selection) + 3
|
||||||
|
string = ' > '.join(out).strip('\n >').replace(' > \n', '\n').replace('\n ', '\n')
|
||||||
|
return string
|
||||||
|
|
||||||
|
|
||||||
def position_change(string, position):
|
def position_change(string, position):
|
||||||
@@ -1118,7 +1125,7 @@ class BruteForceOptimizer:
|
|||||||
# 切魔方:'B > T > E'
|
# 切魔方:'B > T > E'
|
||||||
# 只做0.5h魔方:'B > T > E > H1 > H2 > H4'
|
# 只做0.5h魔方:'B > T > E > H1 > H2 > H4'
|
||||||
# 不切魔方:'B > T > E > H'
|
# 不切魔方:'B > T > E > H'
|
||||||
ResearchPool.remove_projects = 'B > T > E > H1 > H2 > H4'
|
ResearchPool.remove_projects = 'B > T > H1 > H2 > H4'
|
||||||
# 每日活跃时间,按天计算
|
# 每日活跃时间,按天计算
|
||||||
# 超出活跃时间后,仍在挂项目,但不再开始新项目
|
# 超出活跃时间后,仍在挂项目,但不再开始新项目
|
||||||
FilterSimulator.active = 24 / 24
|
FilterSimulator.active = 24 / 24
|
||||||
@@ -1140,7 +1147,7 @@ if __name__ == '__main__':
|
|||||||
"""
|
"""
|
||||||
这个文件包含模拟器和优化器两部分,取消注释对应的代码来运行
|
这个文件包含模拟器和优化器两部分,取消注释对应的代码来运行
|
||||||
Alas用户运行需要额外安装numba,无指定版本
|
Alas用户运行需要额外安装numba,无指定版本
|
||||||
非Alas用户运行需要python>=3.7,安装 numba numpy tqdm, 无指定版本
|
非Alas用户运行需要python>=3.7,安装 numba==0.45.1 llvmlite==0.29.0 numpy tqdm
|
||||||
|
|
||||||
过滤器与Alas内的过滤器基本相同,编写参考 https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/filter_string_cn
|
过滤器与Alas内的过滤器基本相同,编写参考 https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/filter_string_cn
|
||||||
但需要注意:
|
但需要注意:
|
||||||
@@ -1162,23 +1169,27 @@ if __name__ == '__main__':
|
|||||||
模拟大量用户使用同一个过滤器的平均毕业时间和毕业时获取物品的平均数量
|
模拟大量用户使用同一个过滤器的平均毕业时间和毕业时获取物品的平均数量
|
||||||
取消注释这些代码,将你的过滤器粘贴至这里,并运行,在8700k上需要约4.5分钟
|
取消注释这些代码,将你的过滤器粘贴至这里,并运行,在8700k上需要约4.5分钟
|
||||||
"""
|
"""
|
||||||
simulator = FilterSimulator("""
|
# simulator = FilterSimulator("""
|
||||||
S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-Q0.5 > S4-DR2.5 > !4-0.5 > S4-G1.5 > S4-Q1
|
# S4-DR0.5 > S4-PRY0.5 > S4-Q0.5 > S4-H0.5 > Q0.5 > S4-DR2.5
|
||||||
> S4-DR5 > S4-DR8 > S4-G4 > S4-PRY2.5 > !4-1 > S4-Q2 > reset > S4-G2.5
|
# > S4-G1.5 > S4-Q1 > S4-DR5 > 0.5 > S4-G4 > S4-Q2 > S4-PRY2.5 > reset
|
||||||
> S4-PRY5 > S4-PRY8 > !4-2 > !4-1.5 > S4-Q4 > !4-2.5 > !4-4 > S4-C6
|
# > S4-DR8 > Q1 > 1 > S4-E-315 > S4-G2.5 > G1.5 > 1.5 > S4-E-031
|
||||||
> S4-C8 > !4-6 > !4-8 > !4-12 > S4-C12
|
# > S4-Q4 > Q2 > E2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S4-PRY5
|
||||||
""")
|
# > S4-PRY8 > Q4 > G4 > 4 > S4-C6 > DR5 > PRY5 > 5 > C6 > 6 > S4-C8
|
||||||
simulator.run(sample_count=100000)
|
# > S4-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
# """)
|
||||||
|
# simulator.run(sample_count=300000)
|
||||||
"""
|
"""
|
||||||
优化一个过滤器,尝试调整过滤器选择的顺序,找到满足目标条件的消耗时间最短的排列方式
|
优化一个过滤器,尝试调整过滤器选择的顺序,找到满足目标条件的消耗时间最短的排列方式
|
||||||
类似于早期机器学习的实现,收敛过程中,向前尝试移动的距离变短,模拟样本量增大
|
类似于早期机器学习的实现,收敛过程中,向前尝试移动的距离变短,模拟样本量增大
|
||||||
取消注释这些代码并运行,在8700k上需要约1-2天
|
取消注释这些代码并运行,在8700k上需要约1-2天
|
||||||
已给出一个包含所有选项、顺序大体正确的过滤器作为开始,不需要修改
|
已给出一个包含所有选项、顺序大体正确的过滤器作为开始,不需要修改
|
||||||
"""
|
"""
|
||||||
# optimizer = BruteForceOptimizer()
|
optimizer = BruteForceOptimizer()
|
||||||
# optimizer.optimize("""
|
optimizer.optimize("""
|
||||||
# S4-H0.5 > S4-DR0.5 > S4-PRY0.5 > S4-Q0.5 > !4-0.5 > S4-G1.5 > S4-Q1 > S4-DR2.5
|
S4-H0.5 > S4-DR0.5 > S4-PRY0.5 > S4-Q0.5 > !4-0.5 > S4-G1.5 > S4-Q1 > S4-DR2.5
|
||||||
# > S4-G4 > S4-Q4 > S4-DR5 > S4-DR8 > S4-Q2 > S4-PRY2.5 > S4-G2.5 > !4-1
|
> S4-G4 > S4-Q4 > S4-DR5 > S4-DR8 > S4-Q2 > S4-PRY2.5 > S4-G2.5 > !4-1
|
||||||
# > reset > S4-PRY8 > !4-1.5 > S4-PRY5 > !4-2.5 > !4-2 > !4-4
|
> S4-H1 > S4-H2 > S4-H4
|
||||||
# > S4-C6 > !4-C8 > S4-C8 > !4-C6 > S4-C12 > !4-C12
|
> S4-EP2 > S4-EB2
|
||||||
# """, diff=1)
|
> reset > S4-PRY8 > !4-1.5 > S4-PRY5 > !4-2.5 > !4-2 > !4-4
|
||||||
|
> S4-C6 > !4-C8 > S4-C8 > !4-C6 > S4-C12 > !4-C12
|
||||||
|
""", diff=1)
|
||||||
|
|||||||
@@ -156,7 +156,8 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
|
|||||||
logger.hr('FINDING FLAGSHIP')
|
logger.hr('FINDING FLAGSHIP')
|
||||||
|
|
||||||
scanner = ShipScanner(
|
scanner = ShipScanner(
|
||||||
level=(1, 33), emotion=(10, 150), rarity='common', fleet=0, status='free')
|
level=(1, 32), emotion=(10, 150), fleet=self.config.Fleet_Fleet1, status='free')
|
||||||
|
scanner.disable('rarity')
|
||||||
|
|
||||||
if not self.server_support_status_fleet_scan():
|
if not self.server_support_status_fleet_scan():
|
||||||
logger.info(f'Server {self.config.SERVER} does not yet support status and fleet scanning')
|
logger.info(f'Server {self.config.SERVER} does not yet support status and fleet scanning')
|
||||||
@@ -169,7 +170,14 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
|
|||||||
|
|
||||||
self.dock_sort_method_dsc_set(False)
|
self.dock_sort_method_dsc_set(False)
|
||||||
|
|
||||||
return scanner.scan(self.device.image)
|
ships = scanner.scan(self.device.image)
|
||||||
|
if ships:
|
||||||
|
# Don't need to change current
|
||||||
|
return ships
|
||||||
|
|
||||||
|
scanner.set_limitation(fleet=0)
|
||||||
|
return scanner.scan(self.device.image, output=False)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
template = {
|
template = {
|
||||||
'BOGUE': TEMPLATE_BOGUE,
|
'BOGUE': TEMPLATE_BOGUE,
|
||||||
@@ -180,7 +188,13 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
|
|||||||
|
|
||||||
self.dock_sort_method_dsc_set()
|
self.dock_sort_method_dsc_set()
|
||||||
|
|
||||||
candidates = [ship for ship in scanner.scan(self.device.image)
|
ships = scanner.scan(self.device.image)
|
||||||
|
if ships:
|
||||||
|
# Don't need to change current
|
||||||
|
return ships
|
||||||
|
|
||||||
|
scanner.set_limitation(fleet=0)
|
||||||
|
candidates = [ship for ship in scanner.scan(self.device.image, output=False)
|
||||||
if template.match(self.image_crop(ship.button), similarity=SIM_VALUE)]
|
if template.match(self.image_crop(ship.button), similarity=SIM_VALUE)]
|
||||||
|
|
||||||
if candidates:
|
if candidates:
|
||||||
@@ -208,12 +222,19 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
|
|||||||
max_level = 70
|
max_level = 70
|
||||||
|
|
||||||
scanner = ShipScanner(level=(max_level, max_level), emotion=(10, 150),
|
scanner = ShipScanner(level=(max_level, max_level), emotion=(10, 150),
|
||||||
rarity='common', fleet=0, status='free')
|
fleet=self.config.Fleet_Fleet1, status='free')
|
||||||
|
scanner.disable('rarity')
|
||||||
|
|
||||||
if not self.server_support_status_fleet_scan():
|
if not self.server_support_status_fleet_scan():
|
||||||
scanner.disable('status', 'fleet')
|
scanner.disable('status', 'fleet')
|
||||||
|
|
||||||
return scanner.scan(self.device.image)
|
ships = scanner.scan(self.device.image)
|
||||||
|
if ships:
|
||||||
|
# Don't need to change current
|
||||||
|
return ships
|
||||||
|
|
||||||
|
scanner.set_limitation(fleet=0)
|
||||||
|
return scanner.scan(self.device.image, output=False)
|
||||||
|
|
||||||
def flagship_change_execute(self):
|
def flagship_change_execute(self):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -1516,6 +1516,7 @@
|
|||||||
"value": "campaign_main",
|
"value": "campaign_main",
|
||||||
"option": [
|
"option": [
|
||||||
"campaign_main",
|
"campaign_main",
|
||||||
|
"event_20201229_cn",
|
||||||
"event_20211111_cn",
|
"event_20211111_cn",
|
||||||
"event_20210121_cn",
|
"event_20210121_cn",
|
||||||
"event_20220915_cn",
|
"event_20220915_cn",
|
||||||
@@ -1569,10 +1570,10 @@
|
|||||||
"event_20200326_cn",
|
"event_20200326_cn",
|
||||||
"event_20200227_cn"
|
"event_20200227_cn"
|
||||||
],
|
],
|
||||||
"tw": "event_20211111_cn",
|
"cn": "event_20201229_cn",
|
||||||
"cn": "event_20220915_cn",
|
"en": "event_20201229_cn",
|
||||||
"en": "event_20220915_cn",
|
"jp": "event_20201229_cn",
|
||||||
"jp": "event_20220915_cn"
|
"tw": "event_20201229_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
@@ -1936,6 +1937,7 @@
|
|||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "campaign_main",
|
"value": "campaign_main",
|
||||||
"option": [
|
"option": [
|
||||||
|
"event_20201229_cn",
|
||||||
"event_20211111_cn",
|
"event_20211111_cn",
|
||||||
"event_20210121_cn",
|
"event_20210121_cn",
|
||||||
"event_20220915_cn",
|
"event_20220915_cn",
|
||||||
@@ -1960,7 +1962,6 @@
|
|||||||
"event_20220224_cn",
|
"event_20220224_cn",
|
||||||
"event_20210225_cn",
|
"event_20210225_cn",
|
||||||
"event_20220210_cn",
|
"event_20220210_cn",
|
||||||
"event_20201229_cn",
|
|
||||||
"event_20211229_cn",
|
"event_20211229_cn",
|
||||||
"event_20211125_cn",
|
"event_20211125_cn",
|
||||||
"event_20211028_tw",
|
"event_20211028_tw",
|
||||||
@@ -1990,10 +1991,10 @@
|
|||||||
"event_20200227_cn"
|
"event_20200227_cn"
|
||||||
],
|
],
|
||||||
"display": "disabled",
|
"display": "disabled",
|
||||||
"tw": "event_20211111_cn",
|
"cn": "event_20201229_cn",
|
||||||
"cn": "event_20220915_cn",
|
"en": "event_20201229_cn",
|
||||||
"en": "event_20220915_cn",
|
"jp": "event_20201229_cn",
|
||||||
"jp": "event_20220915_cn"
|
"tw": "event_20201229_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
@@ -2356,6 +2357,7 @@
|
|||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "campaign_main",
|
"value": "campaign_main",
|
||||||
"option": [
|
"option": [
|
||||||
|
"event_20201229_cn",
|
||||||
"event_20211111_cn",
|
"event_20211111_cn",
|
||||||
"event_20210121_cn",
|
"event_20210121_cn",
|
||||||
"event_20220915_cn",
|
"event_20220915_cn",
|
||||||
@@ -2380,7 +2382,6 @@
|
|||||||
"event_20220224_cn",
|
"event_20220224_cn",
|
||||||
"event_20210225_cn",
|
"event_20210225_cn",
|
||||||
"event_20220210_cn",
|
"event_20220210_cn",
|
||||||
"event_20201229_cn",
|
|
||||||
"event_20211229_cn",
|
"event_20211229_cn",
|
||||||
"event_20211125_cn",
|
"event_20211125_cn",
|
||||||
"event_20211028_tw",
|
"event_20211028_tw",
|
||||||
@@ -2410,10 +2411,10 @@
|
|||||||
"event_20200227_cn"
|
"event_20200227_cn"
|
||||||
],
|
],
|
||||||
"display": "disabled",
|
"display": "disabled",
|
||||||
"tw": "event_20211111_cn",
|
"cn": "event_20201229_cn",
|
||||||
"cn": "event_20220915_cn",
|
"en": "event_20201229_cn",
|
||||||
"en": "event_20220915_cn",
|
"jp": "event_20201229_cn",
|
||||||
"jp": "event_20220915_cn"
|
"tw": "event_20211111_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
@@ -2787,6 +2788,7 @@
|
|||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "campaign_main",
|
"value": "campaign_main",
|
||||||
"option": [
|
"option": [
|
||||||
|
"event_20201229_cn",
|
||||||
"event_20211111_cn",
|
"event_20211111_cn",
|
||||||
"event_20210121_cn",
|
"event_20210121_cn",
|
||||||
"event_20220915_cn",
|
"event_20220915_cn",
|
||||||
@@ -2841,10 +2843,10 @@
|
|||||||
"event_20200227_cn"
|
"event_20200227_cn"
|
||||||
],
|
],
|
||||||
"display": "disabled",
|
"display": "disabled",
|
||||||
"tw": "event_20211111_cn",
|
"cn": "event_20201229_cn",
|
||||||
"cn": "event_20220915_cn",
|
"en": "event_20201229_cn",
|
||||||
"en": "event_20220915_cn",
|
"jp": "event_20201229_cn",
|
||||||
"jp": "event_20220915_cn"
|
"tw": "event_20201229_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
@@ -3224,6 +3226,7 @@
|
|||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "campaign_main",
|
"value": "campaign_main",
|
||||||
"option": [
|
"option": [
|
||||||
|
"event_20201229_cn",
|
||||||
"event_20211111_cn",
|
"event_20211111_cn",
|
||||||
"event_20210121_cn",
|
"event_20210121_cn",
|
||||||
"event_20220915_cn",
|
"event_20220915_cn",
|
||||||
@@ -3278,10 +3281,10 @@
|
|||||||
"event_20200227_cn"
|
"event_20200227_cn"
|
||||||
],
|
],
|
||||||
"display": "disabled",
|
"display": "disabled",
|
||||||
"tw": "event_20211111_cn",
|
"cn": "event_20201229_cn",
|
||||||
"cn": "event_20220915_cn",
|
"en": "event_20201229_cn",
|
||||||
"en": "event_20220915_cn",
|
"jp": "event_20201229_cn",
|
||||||
"jp": "event_20220915_cn"
|
"tw": "event_20211111_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
@@ -3661,6 +3664,7 @@
|
|||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "campaign_main",
|
"value": "campaign_main",
|
||||||
"option": [
|
"option": [
|
||||||
|
"event_20201229_cn",
|
||||||
"event_20211111_cn",
|
"event_20211111_cn",
|
||||||
"event_20210121_cn",
|
"event_20210121_cn",
|
||||||
"event_20220915_cn",
|
"event_20220915_cn",
|
||||||
@@ -3715,10 +3719,10 @@
|
|||||||
"event_20200227_cn"
|
"event_20200227_cn"
|
||||||
],
|
],
|
||||||
"display": "disabled",
|
"display": "disabled",
|
||||||
"tw": "event_20211111_cn",
|
"cn": "event_20201229_cn",
|
||||||
"cn": "event_20220915_cn",
|
"en": "event_20201229_cn",
|
||||||
"en": "event_20220915_cn",
|
"jp": "event_20201229_cn",
|
||||||
"jp": "event_20220915_cn"
|
"tw": "event_20201229_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
@@ -4098,6 +4102,7 @@
|
|||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "campaign_main",
|
"value": "campaign_main",
|
||||||
"option": [
|
"option": [
|
||||||
|
"event_20201229_cn",
|
||||||
"event_20211111_cn",
|
"event_20211111_cn",
|
||||||
"event_20210121_cn",
|
"event_20210121_cn",
|
||||||
"event_20220915_cn",
|
"event_20220915_cn",
|
||||||
@@ -4152,10 +4157,10 @@
|
|||||||
"event_20200227_cn"
|
"event_20200227_cn"
|
||||||
],
|
],
|
||||||
"display": "disabled",
|
"display": "disabled",
|
||||||
"tw": "event_20211111_cn",
|
"cn": "event_20201229_cn",
|
||||||
"cn": "event_20220915_cn",
|
"en": "event_20201229_cn",
|
||||||
"en": "event_20220915_cn",
|
"jp": "event_20201229_cn",
|
||||||
"jp": "event_20220915_cn"
|
"tw": "event_20201229_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
@@ -4525,6 +4530,7 @@
|
|||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "campaign_main",
|
"value": "campaign_main",
|
||||||
"option": [
|
"option": [
|
||||||
|
"event_20201229_cn",
|
||||||
"event_20211111_cn",
|
"event_20211111_cn",
|
||||||
"event_20210121_cn",
|
"event_20210121_cn",
|
||||||
"event_20220915_cn",
|
"event_20220915_cn",
|
||||||
@@ -4579,10 +4585,10 @@
|
|||||||
"event_20200227_cn"
|
"event_20200227_cn"
|
||||||
],
|
],
|
||||||
"display": "disabled",
|
"display": "disabled",
|
||||||
"tw": "event_20211111_cn",
|
"cn": "event_20201229_cn",
|
||||||
"cn": "event_20220915_cn",
|
"en": "event_20201229_cn",
|
||||||
"en": "event_20220915_cn",
|
"jp": "event_20201229_cn",
|
||||||
"jp": "event_20220915_cn"
|
"tw": "event_20211111_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
|
|||||||
93
module/config/code_generator.py
Normal file
93
module/config/code_generator.py
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
import typing as t
|
||||||
|
|
||||||
|
|
||||||
|
class TabWrapper:
|
||||||
|
def __init__(self, generator, prefix='', suffix=''):
|
||||||
|
"""
|
||||||
|
Args:
|
||||||
|
generator (CodeGenerator):
|
||||||
|
"""
|
||||||
|
self.generator = generator
|
||||||
|
self.prefix = prefix
|
||||||
|
self.suffix = suffix
|
||||||
|
|
||||||
|
def __enter__(self):
|
||||||
|
if self.prefix:
|
||||||
|
self.generator.add(self.prefix)
|
||||||
|
self.generator.tab_count += 1
|
||||||
|
return self
|
||||||
|
|
||||||
|
def __exit__(self, exc_type, exc_val, exc_tb):
|
||||||
|
self.generator.tab_count -= 1
|
||||||
|
if self.suffix:
|
||||||
|
self.generator.add(self.suffix)
|
||||||
|
|
||||||
|
|
||||||
|
class CodeGenerator:
|
||||||
|
def __init__(self):
|
||||||
|
self.tab_count = 0
|
||||||
|
self.lines = []
|
||||||
|
|
||||||
|
def generate(self) -> t.Iterable[str]:
|
||||||
|
yield ''
|
||||||
|
|
||||||
|
def add(self, line, comment=False, newline=True):
|
||||||
|
self.lines.append(self._line_with_tabs(line, comment=comment, newline=newline))
|
||||||
|
|
||||||
|
def print(self):
|
||||||
|
lines = ''.join(self.lines)
|
||||||
|
print(lines)
|
||||||
|
|
||||||
|
def write(self, file: str = None):
|
||||||
|
lines = ''.join(self.lines)
|
||||||
|
with open(file, 'w', encoding='utf-8', newline='') as f:
|
||||||
|
f.write(lines)
|
||||||
|
|
||||||
|
def _line_with_tabs(self, line, comment=False, newline=True):
|
||||||
|
if comment:
|
||||||
|
line = '# ' + line
|
||||||
|
out = ' ' * self.tab_count + line
|
||||||
|
if newline:
|
||||||
|
out += '\n'
|
||||||
|
return out
|
||||||
|
|
||||||
|
def _repr(self, obj):
|
||||||
|
if isinstance(obj, str) and '\n' in obj:
|
||||||
|
out = '"""\n'
|
||||||
|
with self.tab():
|
||||||
|
for line in obj.strip().split('\n'):
|
||||||
|
line = line.strip()
|
||||||
|
out += self._line_with_tabs(line)
|
||||||
|
out += self._line_with_tabs('"""', newline=False)
|
||||||
|
return out
|
||||||
|
return repr(obj)
|
||||||
|
|
||||||
|
def tab(self):
|
||||||
|
return TabWrapper(self)
|
||||||
|
|
||||||
|
def Value(self, key=None, value=None, **kwargs):
|
||||||
|
if key is not None:
|
||||||
|
self.add(f'{key} = {self._repr(value)}')
|
||||||
|
for key, value in kwargs.items():
|
||||||
|
self.Value(key, value)
|
||||||
|
|
||||||
|
def Comment(self, text):
|
||||||
|
for line in text.strip().split('\n'):
|
||||||
|
line = line.strip()
|
||||||
|
self.add(line, comment=True)
|
||||||
|
|
||||||
|
def Dict(self, key):
|
||||||
|
return TabWrapper(self, prefix=str(key) + ' = {', suffix='}')
|
||||||
|
|
||||||
|
def DictItem(self, key=None, value=None, **kwargs):
|
||||||
|
if key is not None:
|
||||||
|
self.add(f'{self._repr(key)}: {self._repr(value)},')
|
||||||
|
for key, value in kwargs.items():
|
||||||
|
self.DictItem(key, value)
|
||||||
|
|
||||||
|
|
||||||
|
generator = CodeGenerator()
|
||||||
|
Value = generator.Value
|
||||||
|
Comment = generator.Comment
|
||||||
|
Dict = generator.Dict
|
||||||
|
DictItem = generator.DictItem
|
||||||
@@ -585,6 +585,7 @@
|
|||||||
"name": "Event Name",
|
"name": "Event Name",
|
||||||
"help": "Automatically selects to the latest event",
|
"help": "Automatically selects to the latest event",
|
||||||
"campaign_main": "campaign_main",
|
"campaign_main": "campaign_main",
|
||||||
|
"event_20201229_cn": "Inverted Orthant Rerun",
|
||||||
"event_20211111_cn": "The Flame-Touched Dagger",
|
"event_20211111_cn": "The Flame-Touched Dagger",
|
||||||
"raid_20221027": "Fight On Royal Maids!(Part 3)",
|
"raid_20221027": "Fight On Royal Maids!(Part 3)",
|
||||||
"event_20210121_cn": "Empyreal Tragicomedy Rerun",
|
"event_20210121_cn": "Empyreal Tragicomedy Rerun",
|
||||||
@@ -614,7 +615,6 @@
|
|||||||
"event_20210225_cn": "Khorovod of Dawns Rime",
|
"event_20210225_cn": "Khorovod of Dawns Rime",
|
||||||
"event_20220210_cn": "Northern Overture Rerun",
|
"event_20220210_cn": "Northern Overture Rerun",
|
||||||
"raid_20220127": "Mystery Investigation",
|
"raid_20220127": "Mystery Investigation",
|
||||||
"event_20201229_cn": "Inverted Orthant",
|
|
||||||
"event_20211229_cn": "Tower of Transcendence",
|
"event_20211229_cn": "Tower of Transcendence",
|
||||||
"event_20211125_cn": "World-spanning Arclight",
|
"event_20211125_cn": "World-spanning Arclight",
|
||||||
"event_20211028_tw": "復刻光與影的鳶尾之華",
|
"event_20211028_tw": "復刻光與影的鳶尾之華",
|
||||||
@@ -1026,7 +1026,7 @@
|
|||||||
},
|
},
|
||||||
"FlagshipChange": {
|
"FlagshipChange": {
|
||||||
"name": "Enable Flagship Change",
|
"name": "Enable Flagship Change",
|
||||||
"help": "Switch out to new common CV/CVL whose level is in range of 1 to 32, after current has reached level 32+.\nMeanwhile, abandoned flagships will be retired. Any common CV/CVL whose level is 24+ will be regarded as targets.\nDo confirm that your own ships which is not a target has been locked"
|
"help": "Switch out to new common CV/CVL whose level is in range of 1 to 32, after current has reached level 32+.\nMeanwhile, abandoned flagships will be retired. Any common CV/CVL whose level is 2+ will be regarded as targets.\nDo confirm that your own ships which is not a target has been locked"
|
||||||
},
|
},
|
||||||
"FlagshipEquipChange": {
|
"FlagshipEquipChange": {
|
||||||
"name": "Enable Flagship Equipment Change",
|
"name": "Enable Flagship Equipment Change",
|
||||||
@@ -1034,7 +1034,7 @@
|
|||||||
},
|
},
|
||||||
"VanguardChange": {
|
"VanguardChange": {
|
||||||
"name": "Enable Vanguard Change",
|
"name": "Enable Vanguard Change",
|
||||||
"help": "Applies to fleet 1, switch out to new level 100(70) common vanguard after current has reached level 35+\n(Only CN players'0 limit break ship can reach level 100)"
|
"help": "Switch out to new level 100(70) common vanguard after current flagship has reached level 32+\n(Only CN players'0 limit break ship can reach level 100)"
|
||||||
},
|
},
|
||||||
"VanguardEquipChange": {
|
"VanguardEquipChange": {
|
||||||
"name": "Enable Vanguard Equipment Change",
|
"name": "Enable Vanguard Equipment Change",
|
||||||
|
|||||||
@@ -585,6 +585,7 @@
|
|||||||
"name": "Campaign.Event.name",
|
"name": "Campaign.Event.name",
|
||||||
"help": "Campaign.Event.help",
|
"help": "Campaign.Event.help",
|
||||||
"campaign_main": "campaign_main",
|
"campaign_main": "campaign_main",
|
||||||
|
"event_20201229_cn": "虚畳なりし限象(復刻)",
|
||||||
"event_20211111_cn": "燈火のシニエ",
|
"event_20211111_cn": "燈火のシニエ",
|
||||||
"raid_20221027": "戦え!ロイヤルメイド隊3rd",
|
"raid_20221027": "戦え!ロイヤルメイド隊3rd",
|
||||||
"event_20210121_cn": "悲歎せし焔海の詩(復刻)",
|
"event_20210121_cn": "悲歎せし焔海の詩(復刻)",
|
||||||
@@ -614,7 +615,6 @@
|
|||||||
"event_20210225_cn": "暁射す氷華の嵐",
|
"event_20210225_cn": "暁射す氷華の嵐",
|
||||||
"event_20220210_cn": "凍絶の北海(復刻)",
|
"event_20220210_cn": "凍絶の北海(復刻)",
|
||||||
"raid_20220127": "秘密事件調査",
|
"raid_20220127": "秘密事件調査",
|
||||||
"event_20201229_cn": "虚畳なりし限象",
|
|
||||||
"event_20211229_cn": "遡望せし虹彩の塔",
|
"event_20211229_cn": "遡望せし虹彩の塔",
|
||||||
"event_20211125_cn": "弧光は交わる世界にて",
|
"event_20211125_cn": "弧光は交わる世界にて",
|
||||||
"event_20211028_tw": "復刻光與影的鳶尾之華",
|
"event_20211028_tw": "復刻光與影的鳶尾之華",
|
||||||
|
|||||||
@@ -585,6 +585,7 @@
|
|||||||
"name": "活动名称",
|
"name": "活动名称",
|
||||||
"help": "自动选择至最新的活动",
|
"help": "自动选择至最新的活动",
|
||||||
"campaign_main": "主线图",
|
"campaign_main": "主线图",
|
||||||
|
"event_20201229_cn": "复刻负象限作战",
|
||||||
"event_20211111_cn": "杰诺瓦的焰火",
|
"event_20211111_cn": "杰诺瓦的焰火",
|
||||||
"raid_20221027": "战斗!皇家女仆队3rd",
|
"raid_20221027": "战斗!皇家女仆队3rd",
|
||||||
"event_20210121_cn": "复刻神圣的悲喜剧",
|
"event_20210121_cn": "复刻神圣的悲喜剧",
|
||||||
@@ -614,7 +615,6 @@
|
|||||||
"event_20210225_cn": "破晓冰华",
|
"event_20210225_cn": "破晓冰华",
|
||||||
"event_20220210_cn": "复刻北境序曲",
|
"event_20220210_cn": "复刻北境序曲",
|
||||||
"raid_20220127": "演习神秘事件调查",
|
"raid_20220127": "演习神秘事件调查",
|
||||||
"event_20201229_cn": "负象限作战",
|
|
||||||
"event_20211229_cn": "逆转彩虹之塔",
|
"event_20211229_cn": "逆转彩虹之塔",
|
||||||
"event_20211125_cn": "交汇世界的弧光",
|
"event_20211125_cn": "交汇世界的弧光",
|
||||||
"event_20211028_tw": "復刻光與影的鳶尾之華",
|
"event_20211028_tw": "復刻光與影的鳶尾之華",
|
||||||
@@ -1026,7 +1026,7 @@
|
|||||||
},
|
},
|
||||||
"FlagshipChange": {
|
"FlagshipChange": {
|
||||||
"name": "更换旗舰",
|
"name": "更换旗舰",
|
||||||
"help": "寻找等级在1-32之间的白皮航母,同时会在退役时选择更换下来的旗舰。\n所有等级大于24级的白皮航母均会被视为退役目标,请务必锁定不是目标的船。"
|
"help": "寻找等级在1-32之间的白皮航母,同时会在退役时选择更换下来的旗舰。\n所有等级大于1级的白皮航母均会被视为退役目标,请务必锁定不是目标的船。"
|
||||||
},
|
},
|
||||||
"FlagshipEquipChange": {
|
"FlagshipEquipChange": {
|
||||||
"name": "更换旗舰的装备",
|
"name": "更换旗舰的装备",
|
||||||
@@ -1034,7 +1034,7 @@
|
|||||||
},
|
},
|
||||||
"VanguardChange": {
|
"VanguardChange": {
|
||||||
"name": "更换前排",
|
"name": "更换前排",
|
||||||
"help": "换前排通过找一艘150心情等级100的白鹰白皮驱逐完成,所以尽量保证有足够多的驱逐在后排休息。\n国服以外则为150心情等级70的白鹰白船驱逐。\n不启用将不更换前排"
|
"help": "换前排通过找一艘心情不低于10、等级100的白鹰白皮驱逐完成,所以尽量保证有足够多的驱逐。\n国服以外则为等级70的白鹰白船驱逐。\n不启用将不更换前排"
|
||||||
},
|
},
|
||||||
"VanguardEquipChange": {
|
"VanguardEquipChange": {
|
||||||
"name": "更换前排的装备",
|
"name": "更换前排的装备",
|
||||||
|
|||||||
@@ -585,6 +585,7 @@
|
|||||||
"name": "活動名稱",
|
"name": "活動名稱",
|
||||||
"help": "自動選擇至最新的活動圖",
|
"help": "自動選擇至最新的活動圖",
|
||||||
"campaign_main": "主線圖",
|
"campaign_main": "主線圖",
|
||||||
|
"event_20201229_cn": "Inverted Orthant Rerun",
|
||||||
"event_20211111_cn": "杰諾瓦的焰火",
|
"event_20211111_cn": "杰諾瓦的焰火",
|
||||||
"raid_20221027": "Fight On Royal Maids!(Part 3)",
|
"raid_20221027": "Fight On Royal Maids!(Part 3)",
|
||||||
"event_20210121_cn": "復刻神聖的悲喜劇",
|
"event_20210121_cn": "復刻神聖的悲喜劇",
|
||||||
@@ -614,7 +615,6 @@
|
|||||||
"event_20210225_cn": "破曉冰華",
|
"event_20210225_cn": "破曉冰華",
|
||||||
"event_20220210_cn": "Northern Overture Rerun",
|
"event_20220210_cn": "Northern Overture Rerun",
|
||||||
"raid_20220127": "Mystery Investigation",
|
"raid_20220127": "Mystery Investigation",
|
||||||
"event_20201229_cn": "負象限作戰",
|
|
||||||
"event_20211229_cn": "Tower of Transcendence",
|
"event_20211229_cn": "Tower of Transcendence",
|
||||||
"event_20211125_cn": "交匯世界的弧光",
|
"event_20211125_cn": "交匯世界的弧光",
|
||||||
"event_20211028_tw": "復刻光與影的鳶尾之華",
|
"event_20211028_tw": "復刻光與影的鳶尾之華",
|
||||||
@@ -1026,7 +1026,7 @@
|
|||||||
},
|
},
|
||||||
"FlagshipChange": {
|
"FlagshipChange": {
|
||||||
"name": "更換旗艦",
|
"name": "更換旗艦",
|
||||||
"help": "尋找等級在1-32之間的白船航母,同時會在退役時選擇更換下來的旗艦。\n所有等級大於24級的白船航母均會被視為退役目標,請務必鎖定不是目標的船。"
|
"help": "尋找等級在1-32之間的白船航母,同時會在退役時選擇更換下來的旗艦。\n所有等級大於1級的白船航母均會被視為退役目標,請務必鎖定不是目標的船。"
|
||||||
},
|
},
|
||||||
"FlagshipEquipChange": {
|
"FlagshipEquipChange": {
|
||||||
"name": "更換旗艦的裝備",
|
"name": "更換旗艦的裝備",
|
||||||
@@ -1034,7 +1034,7 @@
|
|||||||
},
|
},
|
||||||
"VanguardChange": {
|
"VanguardChange": {
|
||||||
"name": "更換前排",
|
"name": "更換前排",
|
||||||
"help": "換前排通過找一艘150心情等級100的白鷹白船驅逐完成,所以盡量保證有足夠多的驅逐在後排休息。\n國服以外則為150心情等級70的白鷹白船驅逐。 \n不啟用將不更換前排"
|
"help": "換前排通過找一艘心情不低於10、等級100的白鷹白船驅逐完成,所以盡量保證有足夠多的驅逐。\n國服以外則為等級70的白鷹白船驅逐。 \n不啟用將不更換前排"
|
||||||
},
|
},
|
||||||
"VanguardEquipChange": {
|
"VanguardEquipChange": {
|
||||||
"name": "更換前排的裝備",
|
"name": "更換前排的裝備",
|
||||||
|
|||||||
@@ -1,111 +1,276 @@
|
|||||||
FILTER_STRING_SHORTEST = '0.5 > 1 > 1.5 > 2 > 2.5 > 3 > 4 > 5 > 6 > 8 > 10 > 12'
|
FILTER_STRING_SHORTEST = '0.5 > 1 > 1.5 > 2 > 2.5 > 3 > 4 > 5 > 6 > 8 > 10 > 12'
|
||||||
FILTER_STRING_CHEAPEST = 'Q1 > Q2 > T3 > T4 > Q4 > C6 > T6 > C8 > C12 > G1.5 > D2.5 > G2.5 > D5 > Q0.5 > G4 > D8 > H1 > H2 > H0.5 > D0.5 > H4'
|
FILTER_STRING_CHEAPEST = 'Q1 > Q2 > T3 > T4 > Q4 > C6 > T6 > C8 > C12 > G1.5 > D2.5 > G2.5 > D5 > Q0.5 > G4 > D8 > H1 > H2 > H0.5 > D0.5 > H4'
|
||||||
DICT_FILTER_PRESET = {
|
DICT_FILTER_PRESET = {
|
||||||
'series_5_blueprint_152_cube': """
|
# Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
S5-Q0.5 > S5-DR0.5 > S5-PRY0.5 > S5-H0.5 > S5-DR2.5 > 0.5 > S5-Q1
|
# Average time cost: 153.41706666666678
|
||||||
> S5-H1 > S5-Q2 > reset > S5-Q4 > S5-G1.5 > Q1 > 1 > S5-H2 > S5-G4
|
# Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333]
|
||||||
> 1.5 > S5-G2.5 > S5-PRY2.5 > 2.5 > S5-DR5 > Q2 > 2 > 3
|
|
||||||
> S5-H4 > S5-DR8 > S5-PRY5 > Q4 > G4 > 4 > 5 > S5-PRY8
|
|
||||||
> S5-C6 > C6 > 6 > S5-C8 > 8 > S5-C12 > 12""",
|
|
||||||
'series_5_blueprint_152': """
|
|
||||||
S5-DR0.5 > S5-PRY0.5 > S5-H0.5 > S5-Q0.5 > S5-DR2.5 > 0.5 > S5-G1.5
|
|
||||||
> S5-Q1 > S5-DR5 > S5-DR8 > S5-G4 > S5-PRY2.5 > 1 > S5-Q2 > reset
|
|
||||||
> S5-G2.5 > S5-PRY5 > S5-PRY8 > 1.5 > 2 > S5-Q4 > 2.5 > 3
|
|
||||||
> Q4 > G4 > 4 > 5 > S5-C6 > C6 > 6 > S5-C8 > 8
|
|
||||||
> S5-C12 > 12""",
|
|
||||||
'series_5_blueprint_only_cube': """
|
|
||||||
S5-DR0.5 > S5-H0.5 > S5-PRY0.5 > S5-H1 > S5-H2 > S5-DR2.5 > S5-Q0.5
|
|
||||||
> 0.5 > S5-DR5 > reset > S5-DR8 > S5-H4 > S5-Q1 > Q1 > 1 > S5-G1.5
|
|
||||||
> 1.5 > S5-Q2 > Q2 > 2 > S5-G2.5 > S5-PRY2.5 > 2.5 > 3
|
|
||||||
> S5-Q4 > S5-G4 > Q4 > G4 > 4 > S5-PRY5 > 5 > S5-PRY8 > S5-C6
|
|
||||||
> C6 > 6 > S5-C8 > 8 > S5-C12 > 12""",
|
|
||||||
'series_5_blueprint_only': """
|
|
||||||
S5-DR0.5 > S5-PRY0.5 > S5-H0.5 > S5-DR8 > S5-DR2.5 > S5-DR5 > S5-G1.5
|
|
||||||
> S5-PRY2.5 > S5-Q0.5 > 0.5 > S5-G2.5 > S5-Q1 > 1 > reset > S5-G4
|
|
||||||
> S5-PRY5 > 1.5 > S5-Q2 > 2 > S5-PRY8 > 2.5 > 3 > S5-Q4
|
|
||||||
> Q4 > G4 > 4 > 5 > S5-C6 > C6 > 6 > S5-C8 > 8
|
|
||||||
> S5-C12 > 12""",
|
|
||||||
'series_5_152_only_cube': """
|
'series_5_152_only_cube': """
|
||||||
S5-Q0.5 > S5-DR0.5 > S5-PRY0.5 > S5-Q1 > S5-Q4 > S5-Q2 > S5-H0.5 > 0.5
|
S5-Q0.5 > S5-DR0.5 > S5-PRY0.5 > Q0.5 > S5-Q4 > S5-Q2 > S5-Q1 > 0.5
|
||||||
> S5-G4 > S5-G1.5 > Q1 > S5-H1 > 1 > reset > S5-DR2.5 > S5-PRY2.5
|
> S5-E-315 > S5-G1.5 > S5-G4 > Q1 > reset > S5-H1 > H1 > 1 > S5-E-031
|
||||||
> S5-G2.5 > 1.5 > Q2 > S5-H2 > 2 > 2.5 > 3 > S5-DR5 > S5-PRY5
|
> S5-DR2.5 > S5-PRY2.5 > S5-G2.5 > G1.5 > 1.5 > Q2 > E2 > S5-H2 > H2
|
||||||
> Q4 > G4 > S5-H4 > H4 > 4 > 5 > S5-DR8 > S5-PRY8 > S5-C6
|
> 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S5-DR5 > S5-PRY5 > Q4 > G4
|
||||||
> C6 > S5-C8 > 8 > S5-C12 > 12""",
|
> S5-H4 > H4 > 4 > S5-C6 > DR5 > PRY5 > 5 > S5-DR8 > S5-PRY8 > S5-C8
|
||||||
|
> C6 > 6 > S5-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
|
# Average time cost: 161.37177965277806
|
||||||
|
# Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978]
|
||||||
'series_5_152_only': """
|
'series_5_152_only': """
|
||||||
S5-Q0.5 > S5-DR0.5 > S5-PRY0.5 > S5-Q4 > S5-Q1 > S5-Q2 > S5-H0.5 > 0.5
|
S5-Q0.5 > S5-PRY0.5 > S5-DR0.5 > Q0.5 > S5-Q4 > S5-Q2 > S5-Q1 > 0.5
|
||||||
> S5-G4 > S5-G1.5 > Q1 > 1 > S5-DR2.5 > S5-PRY2.5 > reset > S5-G2.5 > 1.5
|
> S5-E-315 > S5-G4 > S5-G1.5 > Q1 > 1 > S5-E-031 > S5-DR2.5 > reset
|
||||||
> Q2 > 2 > 2.5 > 3 > S5-DR5 > S5-PRY5 > Q4 > G4
|
> S5-G2.5 > S5-PRY2.5 > G1.5 > 1.5 > Q2 > E2 > 2 > DR2.5 > PRY2.5
|
||||||
> 4 > 5 > S5-C6 > S5-DR8 > S5-PRY8 > S5-C8 > C6 > 6 > 8
|
> G2.5 > 2.5 > S5-DR5 > S5-PRY5 > Q4 > G4 > 4 > S5-C6 > DR5 > PRY5
|
||||||
> S5-C12 > 12""",
|
> 5 > S5-DR8 > S5-PRY8 > S5-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8
|
||||||
'series_4_blueprint_tenrai_cube': """
|
> S5-C12 > C12 > 12
|
||||||
S4-Q0.5 > S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-DR2.5 > 0.5 > S4-Q1
|
""",
|
||||||
> S4-H1 > S4-Q2 > reset > S4-Q4 > S4-G1.5 > Q1 > 1 > S4-H2 > S4-G4
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
> 1.5 > S4-G2.5 > S4-PRY2.5 > 2.5 > S4-DR5 > Q2 > 2 > 3
|
# Average time cost: 124.67622465277958
|
||||||
> S4-H4 > S4-DR8 > S4-PRY5 > Q4 > G4 > 4 > 5 > S4-PRY8
|
# Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164]
|
||||||
> S4-C6 > C6 > 6 > S4-C8 > 8 > S4-C12 > 12""",
|
'series_5_blueprint_152_cube': """
|
||||||
'series_4_blueprint_tenrai': """
|
S5-DR0.5 > S5-Q0.5 > S5-PRY0.5 > 0.5 > S5-DR2.5 > S5-Q1 > S5-Q2
|
||||||
S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-Q0.5 > S4-DR2.5 > 0.5 > S4-G1.5
|
> S5-H1 > S5-E-315 > S5-G1.5 > reset > S5-Q4 > S5-G4 > S5-H2 > Q1
|
||||||
> S4-Q1 > S4-DR5 > S4-DR8 > S4-G4 > S4-PRY2.5 > 1 > S4-Q2 > reset
|
> H1 > 1 > S5-G2.5 > S5-DR5 > S5-PRY2.5 > G1.5 > 1.5 > S5-E-031
|
||||||
> S4-G2.5 > S4-PRY5 > S4-PRY8 > 1.5 > 2 > S4-Q4 > 2.5 > 3
|
> S5-DR8 > Q2 > E2 > H2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S5-H4
|
||||||
> Q4 > G4 > 4 > 5 > S4-C6 > C6 > 6 > S4-C8 > 8
|
> S5-PRY5 > Q4 > G4 > H4 > 4 > S5-C6 > S5-PRY8 > DR5 > PRY5 > 5 > C6
|
||||||
> S4-C12 > 12""",
|
> 6 > S5-C8 > DR8 > PRY8 > C8 > 8 > S5-C12 > C12 > 12
|
||||||
'series_4_blueprint_only_cube': """
|
""",
|
||||||
S4-DR0.5 > S4-H0.5 > S4-PRY0.5 > S4-H1 > S4-H2 > S4-DR2.5 > S4-Q0.5
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
> 0.5 > S4-DR5 > reset > S4-DR8 > S4-H4 > S4-Q1 > Q1 > 1 > S4-G1.5
|
# Average time cost: 143.56399131945145
|
||||||
> 1.5 > S4-Q2 > Q2 > 2 > S4-G2.5 > S4-PRY2.5 > 2.5 > 3
|
# Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499]
|
||||||
> S4-Q4 > S4-G4 > Q4 > G4 > 4 > S4-PRY5 > 5 > S4-PRY8 > S4-C6
|
'series_5_blueprint_152': """
|
||||||
> C6 > 6 > S4-C8 > 8 > S4-C12 > 12""",
|
S5-DR0.5 > S5-PRY0.5 > S5-Q0.5 > S5-H0.5 > Q0.5 > S5-DR2.5
|
||||||
'series_4_blueprint_only': """
|
> S5-G1.5 > S5-Q1 > S5-DR5 > 0.5 > S5-G4 > S5-Q2 > S5-PRY2.5 > reset
|
||||||
S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-DR8 > S4-DR2.5 > S4-DR5 > S4-G1.5
|
> S5-DR8 > Q1 > 1 > S5-E-315 > S5-G2.5 > G1.5 > 1.5 > S5-E-031
|
||||||
> S4-PRY2.5 > S4-Q0.5 > 0.5 > S4-G2.5 > S4-Q1 > 1 > reset > S4-G4
|
> S5-Q4 > Q2 > E2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S5-PRY5
|
||||||
> S4-PRY5 > 1.5 > S4-Q2 > 2 > S4-PRY8 > 2.5 > 3 > S4-Q4
|
> S5-PRY8 > Q4 > G4 > 4 > S5-C6 > DR5 > PRY5 > 5 > C6 > 6 > S5-C8
|
||||||
> Q4 > G4 > 4 > 5 > S4-C6 > C6 > 6 > S4-C8 > 8
|
> S5-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
> S4-C12 > 12""",
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
# Average time cost: 82.0121088194467
|
||||||
|
# Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791]
|
||||||
|
'series_5_blueprint_only_cube': """
|
||||||
|
S5-DR0.5 > S5-PRY0.5 > S5-H0.5 > S5-H1 > S5-H2 > S5-DR2.5 > S5-DR5
|
||||||
|
> 0.5 > S5-DR8 > reset > S5-H4 > S5-Q1 > Q1 > H1 > 1 > S5-G1.5 > G1.5
|
||||||
|
> 1.5 > S5-G2.5 > S5-Q2 > S5-E-315 > S5-E-031 > Q2 > E2 > H2 > 2
|
||||||
|
> S5-PRY2.5 > S5-G4 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S5-Q4 > Q4 > G4
|
||||||
|
> H4 > 4 > S5-PRY5 > S5-PRY8 > S5-C6 > DR5 > PRY5 > 5 > C6 > 6
|
||||||
|
> S5-C8 > S5-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
# Average time cost: 124.71616166666873
|
||||||
|
# Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238]
|
||||||
|
'series_5_blueprint_only': """
|
||||||
|
S5-DR0.5 > S5-H0.5 > S5-PRY0.5 > S5-DR8 > S5-DR5 > S5-DR2.5
|
||||||
|
> S5-G1.5 > S5-PRY2.5 > 0.5 > S5-G2.5 > S5-G4 > reset > S5-Q1 > Q1
|
||||||
|
> 1 > S5-PRY5 > G1.5 > 1.5 > S5-Q2 > S5-E-031 > S5-E-315 > Q2 > E2
|
||||||
|
> 2 > S5-PRY8 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S5-Q4 > Q4 > G4 > 4
|
||||||
|
> S5-C6 > DR5 > PRY5 > 5 > C6 > 6 > S5-C8 > DR8 > PRY8 > C8 > 8
|
||||||
|
> S5-C12 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
|
# Average time cost: 153.41706666666678
|
||||||
|
# Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333]
|
||||||
'series_4_tenrai_only_cube': """
|
'series_4_tenrai_only_cube': """
|
||||||
S4-Q0.5 > S4-DR0.5 > S4-PRY0.5 > S4-Q1 > S4-Q4 > S4-Q2 > S4-H0.5 > 0.5
|
S4-Q0.5 > S4-DR0.5 > S4-PRY0.5 > Q0.5 > S4-Q4 > S4-Q2 > S4-Q1 > 0.5
|
||||||
> S4-G4 > S4-G1.5 > Q1 > S4-H1 > 1 > reset > S4-DR2.5 > S4-PRY2.5
|
> S4-E-315 > S4-G1.5 > S4-G4 > Q1 > reset > S4-H1 > H1 > 1 > S4-E-031
|
||||||
> S4-G2.5 > 1.5 > Q2 > S4-H2 > 2 > 2.5 > 3 > S4-DR5 > S4-PRY5
|
> S4-DR2.5 > S4-PRY2.5 > S4-G2.5 > G1.5 > 1.5 > Q2 > E2 > S4-H2 > H2
|
||||||
> Q4 > G4 > S4-H4 > H4 > 4 > 5 > S4-DR8 > S4-PRY8 > S4-C6
|
> 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S4-DR5 > S4-PRY5 > Q4 > G4
|
||||||
> C6 > S4-C8 > 8 > S4-C12 > 12""",
|
> S4-H4 > H4 > 4 > S4-C6 > DR5 > PRY5 > 5 > S4-DR8 > S4-PRY8 > S4-C8
|
||||||
|
> C6 > 6 > S4-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
|
# Average time cost: 161.37177965277806
|
||||||
|
# Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978]
|
||||||
'series_4_tenrai_only': """
|
'series_4_tenrai_only': """
|
||||||
S4-Q0.5 > S4-DR0.5 > S4-PRY0.5 > S4-Q4 > S4-Q1 > S4-Q2 > S4-H0.5 > 0.5
|
S4-Q0.5 > S4-PRY0.5 > S4-DR0.5 > Q0.5 > S4-Q4 > S4-Q2 > S4-Q1 > 0.5
|
||||||
> S4-G4 > S4-G1.5 > Q1 > 1 > S4-DR2.5 > S4-PRY2.5 > reset > S4-G2.5 > 1.5
|
> S4-E-315 > S4-G4 > S4-G1.5 > Q1 > 1 > S4-E-031 > S4-DR2.5 > reset
|
||||||
> Q2 > 2 > 2.5 > 3 > S4-DR5 > S4-PRY5 > Q4 > G4
|
> S4-G2.5 > S4-PRY2.5 > G1.5 > 1.5 > Q2 > E2 > 2 > DR2.5 > PRY2.5
|
||||||
> 4 > 5 > S4-C6 > S4-DR8 > S4-PRY8 > S4-C8 > C6 > 6 > 8
|
> G2.5 > 2.5 > S4-DR5 > S4-PRY5 > Q4 > G4 > 4 > S4-C6 > DR5 > PRY5
|
||||||
> S4-C12 > 12""",
|
> 5 > S4-DR8 > S4-PRY8 > S4-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8
|
||||||
'series_2_than_3_457_234': """
|
> S4-C12 > C12 > 12
|
||||||
S2-Q0.5 > S2-PRY0.5 > S2-DR0.5 > S2-Q4 > S2-Q1 > S2-Q2 > S2-H0.5 > 0.5
|
""",
|
||||||
> S3-Q1 > S3-Q2 > S2-G4 > S3-Q4 > S2-G1.5 > S2-DR2.5 > reset > Q1 > S2-PRY2.5 > S2-G2.5 > H1 > 1.5
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
> Q2 > 2.5 > S2-DR5 > S2-PRY5 > Q4 > G4 > 5 > H2 > S2-C6 > S2-DR8 > S2-PRY8 > S2-C8
|
# Average time cost: 124.67622465277958
|
||||||
> 6 > 8 > 4 > S2-C12 > 12""",
|
# Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164]
|
||||||
|
'series_4_blueprint_tenrai_cube': """
|
||||||
|
S4-DR0.5 > S4-Q0.5 > S4-PRY0.5 > 0.5 > S4-DR2.5 > S4-Q1 > S4-Q2
|
||||||
|
> S4-H1 > S4-E-315 > S4-G1.5 > reset > S4-Q4 > S4-G4 > S4-H2 > Q1
|
||||||
|
> H1 > 1 > S4-G2.5 > S4-DR5 > S4-PRY2.5 > G1.5 > 1.5 > S4-E-031
|
||||||
|
> S4-DR8 > Q2 > E2 > H2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S4-H4
|
||||||
|
> S4-PRY5 > Q4 > G4 > H4 > 4 > S4-C6 > S4-PRY8 > DR5 > PRY5 > 5 > C6
|
||||||
|
> 6 > S4-C8 > DR8 > PRY8 > C8 > 8 > S4-C12 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
|
# Average time cost: 143.56399131945145
|
||||||
|
# Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499]
|
||||||
|
'series_4_blueprint_tenrai': """
|
||||||
|
S4-DR0.5 > S4-PRY0.5 > S4-Q0.5 > S4-H0.5 > Q0.5 > S4-DR2.5
|
||||||
|
> S4-G1.5 > S4-Q1 > S4-DR5 > 0.5 > S4-G4 > S4-Q2 > S4-PRY2.5 > reset
|
||||||
|
> S4-DR8 > Q1 > 1 > S4-E-315 > S4-G2.5 > G1.5 > 1.5 > S4-E-031
|
||||||
|
> S4-Q4 > Q2 > E2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S4-PRY5
|
||||||
|
> S4-PRY8 > Q4 > G4 > 4 > S4-C6 > DR5 > PRY5 > 5 > C6 > 6 > S4-C8
|
||||||
|
> S4-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
# Average time cost: 82.0121088194467
|
||||||
|
# Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791]
|
||||||
|
'series_4_blueprint_only_cube': """
|
||||||
|
S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-H1 > S4-H2 > S4-DR2.5 > S4-DR5
|
||||||
|
> 0.5 > S4-DR8 > reset > S4-H4 > S4-Q1 > Q1 > H1 > 1 > S4-G1.5 > G1.5
|
||||||
|
> 1.5 > S4-G2.5 > S4-Q2 > S4-E-315 > S4-E-031 > Q2 > E2 > H2 > 2
|
||||||
|
> S4-PRY2.5 > S4-G4 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S4-Q4 > Q4 > G4
|
||||||
|
> H4 > 4 > S4-PRY5 > S4-PRY8 > S4-C6 > DR5 > PRY5 > 5 > C6 > 6
|
||||||
|
> S4-C8 > S4-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
# Average time cost: 124.71616166666873
|
||||||
|
# Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238]
|
||||||
|
'series_4_blueprint_only': """
|
||||||
|
S4-DR0.5 > S4-H0.5 > S4-PRY0.5 > S4-DR8 > S4-DR5 > S4-DR2.5
|
||||||
|
> S4-G1.5 > S4-PRY2.5 > 0.5 > S4-G2.5 > S4-G4 > reset > S4-Q1 > Q1
|
||||||
|
> 1 > S4-PRY5 > G1.5 > 1.5 > S4-Q2 > S4-E-031 > S4-E-315 > Q2 > E2
|
||||||
|
> 2 > S4-PRY8 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S4-Q4 > Q4 > G4 > 4
|
||||||
|
> S4-C6 > DR5 > PRY5 > 5 > C6 > 6 > S4-C8 > DR8 > PRY8 > C8 > 8
|
||||||
|
> S4-C12 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
|
# Average time cost: 153.41706666666678
|
||||||
|
# Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333]
|
||||||
|
'series_3_234_only_cube': """
|
||||||
|
S3-Q0.5 > S3-DR0.5 > S3-PRY0.5 > Q0.5 > S3-Q4 > S3-Q2 > S3-Q1 > 0.5
|
||||||
|
> S3-E-315 > S3-G1.5 > S3-G4 > Q1 > reset > S3-H1 > H1 > 1 > S3-E-031
|
||||||
|
> S3-DR2.5 > S3-PRY2.5 > S3-G2.5 > G1.5 > 1.5 > Q2 > E2 > S3-H2 > H2
|
||||||
|
> 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S3-DR5 > S3-PRY5 > Q4 > G4
|
||||||
|
> S3-H4 > H4 > 4 > S3-C6 > DR5 > PRY5 > 5 > S3-DR8 > S3-PRY8 > S3-C8
|
||||||
|
> C6 > 6 > S3-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
|
# Average time cost: 161.37177965277806
|
||||||
|
# Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978]
|
||||||
'series_3_234_only': """
|
'series_3_234_only': """
|
||||||
S2-Q0.5 > S2-PRY0.5 > S2-DR0.5 > S3-Q4 > S3-Q1 > S3-Q2 > S2-H0.5 > 0.5
|
S3-Q0.5 > S3-PRY0.5 > S3-DR0.5 > Q0.5 > S3-Q4 > S3-Q2 > S3-Q1 > 0.5
|
||||||
> S3-G4 > S3-G1.5 > S3-DR2.5 > reset > Q1 > S3-PRY2.5 > S3-G2.5 > H1 > 1.5
|
> S3-E-315 > S3-G4 > S3-G1.5 > Q1 > 1 > S3-E-031 > S3-DR2.5 > reset
|
||||||
> Q2 > 2.5 > S3-DR5 > S3-PRY5 > Q4 > G4 > 5 > H2 > S2-C6 > S3-DR8 > S3-PRY8 > S3-C8
|
> S3-G2.5 > S3-PRY2.5 > G1.5 > 1.5 > Q2 > E2 > 2 > DR2.5 > PRY2.5
|
||||||
> 6 > 8 > 4 > S3-C12 > 12""",
|
> G2.5 > 2.5 > S3-DR5 > S3-PRY5 > Q4 > G4 > 4 > S3-C6 > DR5 > PRY5
|
||||||
|
> 5 > S3-DR8 > S3-PRY8 > S3-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8
|
||||||
|
> S3-C12 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
|
# Average time cost: 124.67622465277958
|
||||||
|
# Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164]
|
||||||
|
'series_3_blueprint_234_cube': """
|
||||||
|
S3-DR0.5 > S3-Q0.5 > S3-PRY0.5 > 0.5 > S3-DR2.5 > S3-Q1 > S3-Q2
|
||||||
|
> S3-H1 > S3-E-315 > S3-G1.5 > reset > S3-Q4 > S3-G4 > S3-H2 > Q1
|
||||||
|
> H1 > 1 > S3-G2.5 > S3-DR5 > S3-PRY2.5 > G1.5 > 1.5 > S3-E-031
|
||||||
|
> S3-DR8 > Q2 > E2 > H2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S3-H4
|
||||||
|
> S3-PRY5 > Q4 > G4 > H4 > 4 > S3-C6 > S3-PRY8 > DR5 > PRY5 > 5 > C6
|
||||||
|
> 6 > S3-C8 > DR8 > PRY8 > C8 > 8 > S3-C12 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
|
# Average time cost: 143.56399131945145
|
||||||
|
# Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499]
|
||||||
'series_3_blueprint_234': """
|
'series_3_blueprint_234': """
|
||||||
S3-Q0.5 > S3-DR0.5 > S3-PRY0.5 > S3-H0.5 > S3-DR2.5 > 0.5 > S3-G1.5
|
S3-DR0.5 > S3-PRY0.5 > S3-Q0.5 > S3-H0.5 > Q0.5 > S3-DR2.5
|
||||||
> S3-Q1 > S3-G4 > S3-DR5 > S3-DR8 > S3-PRY2.5 > 1 > S3-Q2 > reset
|
> S3-G1.5 > S3-Q1 > S3-DR5 > 0.5 > S3-G4 > S3-Q2 > S3-PRY2.5 > reset
|
||||||
> S3-G2.5 > S3-PRY5 > S3-PRY8 > 1.5 > 2 > S3-Q4 > 2.5 > 4 > 5 > S3-C6
|
> S3-DR8 > Q1 > 1 > S3-E-315 > S3-G2.5 > G1.5 > 1.5 > S3-E-031
|
||||||
> S3-C8 > 6 > 8 > S3-C12 > 12""",
|
> S3-Q4 > Q2 > E2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S3-PRY5
|
||||||
'series_2_blueprint_457': """
|
> S3-PRY8 > Q4 > G4 > 4 > S3-C6 > DR5 > PRY5 > 5 > C6 > 6 > S3-C8
|
||||||
S2-Q0.5 > S2-DR0.5 > S2-PRY0.5 > S2-H0.5 > S2-DR2.5 > 0.5 > S2-G1.5
|
> S3-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
> S2-Q1 > S2-G4 > S2-DR5 > S2-DR8 > S2-PRY2.5 > 1 > S2-Q2 > reset
|
""",
|
||||||
> S2-G2.5 > S2-PRY5 > S2-PRY8 > 1.5 > 2 > S2-Q4 > 2.5 > 4 > 5 > S2-C6
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
> S2-C8 > 6 > 8 > S2-C12 > 12""",
|
# Average time cost: 82.0121088194467
|
||||||
|
# Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791]
|
||||||
|
'series_3_blueprint_only_cube': """
|
||||||
|
S3-DR0.5 > S3-PRY0.5 > S3-H0.5 > S3-H1 > S3-H2 > S3-DR2.5 > S3-DR5
|
||||||
|
> 0.5 > S3-DR8 > reset > S3-H4 > S3-Q1 > Q1 > H1 > 1 > S3-G1.5 > G1.5
|
||||||
|
> 1.5 > S3-G2.5 > S3-Q2 > S3-E-315 > S3-E-031 > Q2 > E2 > H2 > 2
|
||||||
|
> S3-PRY2.5 > S3-G4 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S3-Q4 > Q4 > G4
|
||||||
|
> H4 > 4 > S3-PRY5 > S3-PRY8 > S3-C6 > DR5 > PRY5 > 5 > C6 > 6
|
||||||
|
> S3-C8 > S3-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
# Average time cost: 124.71616166666873
|
||||||
|
# Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238]
|
||||||
'series_3_blueprint_only': """
|
'series_3_blueprint_only': """
|
||||||
S3-DR0.5 > S3-PRY0.5 > S3-H0.5 > S3-Q0.5 > S3-DR2.5 > S3-G4 > S3-G1.5
|
S3-DR0.5 > S3-H0.5 > S3-PRY0.5 > S3-DR8 > S3-DR5 > S3-DR2.5
|
||||||
> S3-PRY2.5 > 0.5 > S3-G2.5 > S3-Q1 > 1 > reset > S3-DR5 > S3-DR8
|
> S3-G1.5 > S3-PRY2.5 > 0.5 > S3-G2.5 > S3-G4 > reset > S3-Q1 > Q1
|
||||||
> S3-PRY5 > 1.5 > S3-Q2 > 2 > S3-PRY8 > 2.5 > S3-Q4 > 4 > 5 > S3-C6
|
> 1 > S3-PRY5 > G1.5 > 1.5 > S3-Q2 > S3-E-031 > S3-E-315 > Q2 > E2
|
||||||
> 6 > S3-C8 > 8 > S3-C12 > 12""",
|
> 2 > S3-PRY8 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S3-Q4 > Q4 > G4 > 4
|
||||||
'series_2_blueprint_only': """
|
> S3-C6 > DR5 > PRY5 > 5 > C6 > 6 > S3-C8 > DR8 > PRY8 > C8 > 8
|
||||||
S2-DR0.5 > S2-PRY0.5 > S2-H0.5 > S2-Q0.5 > S2-DR2.5 > S2-G4 > S2-G1.5
|
> S3-C12 > C12 > 12
|
||||||
> S2-PRY2.5 > 0.5 > S2-G2.5 > S2-Q1 > 1 > reset > S2-DR5 > S2-DR8
|
""",
|
||||||
> S2-PRY5 > 1.5 > S2-Q2 > 2 > S2-PRY8 > 2.5 > S2-Q4 > 4 > 5 > S2-C6
|
# Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
> 6 > S2-C8 > 8 > S2-C12 > 12""",
|
# Average time cost: 153.41706666666678
|
||||||
|
# Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333]
|
||||||
|
'series_2_457_only_cube': """
|
||||||
|
S2-Q0.5 > S2-DR0.5 > S2-PRY0.5 > Q0.5 > S2-Q4 > S2-Q2 > S2-Q1 > 0.5
|
||||||
|
> S2-E-315 > S2-G1.5 > S2-G4 > Q1 > reset > S2-H1 > H1 > 1 > S2-E-031
|
||||||
|
> S2-DR2.5 > S2-PRY2.5 > S2-G2.5 > G1.5 > 1.5 > Q2 > E2 > S2-H2 > H2
|
||||||
|
> 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S2-DR5 > S2-PRY5 > Q4 > G4
|
||||||
|
> S2-H4 > H4 > 4 > S2-C6 > DR5 > PRY5 > 5 > S2-DR8 > S2-PRY8 > S2-C8
|
||||||
|
> C6 > 6 > S2-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
|
# Average time cost: 161.37177965277806
|
||||||
|
# Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978]
|
||||||
'series_2_457_only': """
|
'series_2_457_only': """
|
||||||
S2-Q0.5 > S2-PRY0.5 > S2-DR0.5 > S2-Q4 > S2-Q1 > S2-Q2 > S2-H0.5 > 0.5
|
S2-Q0.5 > S2-PRY0.5 > S2-DR0.5 > Q0.5 > S2-Q4 > S2-Q2 > S2-Q1 > 0.5
|
||||||
> Q1 > S2-G4 > S2-G1.5 > S2-DR2.5 > reset > S2-PRY2.5 > S2-G2.5 > H1 > 1.5
|
> S2-E-315 > S2-G4 > S2-G1.5 > Q1 > 1 > S2-E-031 > S2-DR2.5 > reset
|
||||||
> Q2 > 2.5 > S2-DR5 > S2-PRY5 > Q4 > G4 > 5 > H2 > S2-C6 > S2-DR8 > S2-PRY8 > S2-C8
|
> S2-G2.5 > S2-PRY2.5 > G1.5 > 1.5 > Q2 > E2 > 2 > DR2.5 > PRY2.5
|
||||||
> 6 > 8 > 4 > S2-C12 > 12"""
|
> G2.5 > 2.5 > S2-DR5 > S2-PRY5 > Q4 > G4 > 4 > S2-C6 > DR5 > PRY5
|
||||||
|
> 5 > S2-DR8 > S2-PRY8 > S2-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8
|
||||||
|
> S2-C12 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
|
# Average time cost: 124.67622465277958
|
||||||
|
# Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164]
|
||||||
|
'series_2_blueprint_457_cube': """
|
||||||
|
S2-DR0.5 > S2-Q0.5 > S2-PRY0.5 > 0.5 > S2-DR2.5 > S2-Q1 > S2-Q2
|
||||||
|
> S2-H1 > S2-E-315 > S2-G1.5 > reset > S2-Q4 > S2-G4 > S2-H2 > Q1
|
||||||
|
> H1 > 1 > S2-G2.5 > S2-DR5 > S2-PRY2.5 > G1.5 > 1.5 > S2-E-031
|
||||||
|
> S2-DR8 > Q2 > E2 > H2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S2-H4
|
||||||
|
> S2-PRY5 > Q4 > G4 > H4 > 4 > S2-C6 > S2-PRY8 > DR5 > PRY5 > 5 > C6
|
||||||
|
> 6 > S2-C8 > DR8 > PRY8 > C8 > 8 > S2-C12 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
|
# Average time cost: 143.56399131945145
|
||||||
|
# Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499]
|
||||||
|
'series_2_blueprint_457': """
|
||||||
|
S2-DR0.5 > S2-PRY0.5 > S2-Q0.5 > S2-H0.5 > Q0.5 > S2-DR2.5
|
||||||
|
> S2-G1.5 > S2-Q1 > S2-DR5 > 0.5 > S2-G4 > S2-Q2 > S2-PRY2.5 > reset
|
||||||
|
> S2-DR8 > Q1 > 1 > S2-E-315 > S2-G2.5 > G1.5 > 1.5 > S2-E-031
|
||||||
|
> S2-Q4 > Q2 > E2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S2-PRY5
|
||||||
|
> S2-PRY8 > Q4 > G4 > 4 > S2-C6 > DR5 > PRY5 > 5 > C6 > 6 > S2-C8
|
||||||
|
> S2-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
# Average time cost: 82.0121088194467
|
||||||
|
# Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791]
|
||||||
|
'series_2_blueprint_only_cube': """
|
||||||
|
S2-DR0.5 > S2-PRY0.5 > S2-H0.5 > S2-H1 > S2-H2 > S2-DR2.5 > S2-DR5
|
||||||
|
> 0.5 > S2-DR8 > reset > S2-H4 > S2-Q1 > Q1 > H1 > 1 > S2-G1.5 > G1.5
|
||||||
|
> 1.5 > S2-G2.5 > S2-Q2 > S2-E-315 > S2-E-031 > Q2 > E2 > H2 > 2
|
||||||
|
> S2-PRY2.5 > S2-G4 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S2-Q4 > Q4 > G4
|
||||||
|
> H4 > 4 > S2-PRY5 > S2-PRY8 > S2-C6 > DR5 > PRY5 > 5 > C6 > 6
|
||||||
|
> S2-C8 > S2-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
# Average time cost: 124.71616166666873
|
||||||
|
# Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238]
|
||||||
|
'series_2_blueprint_only': """
|
||||||
|
S2-DR0.5 > S2-H0.5 > S2-PRY0.5 > S2-DR8 > S2-DR5 > S2-DR2.5
|
||||||
|
> S2-G1.5 > S2-PRY2.5 > 0.5 > S2-G2.5 > S2-G4 > reset > S2-Q1 > Q1
|
||||||
|
> 1 > S2-PRY5 > G1.5 > 1.5 > S2-Q2 > S2-E-031 > S2-E-315 > Q2 > E2
|
||||||
|
> 2 > S2-PRY8 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S2-Q4 > Q4 > G4 > 4
|
||||||
|
> S2-C6 > DR5 > PRY5 > 5 > C6 > 6 > S2-C8 > DR8 > PRY8 > C8 > 8
|
||||||
|
> S2-C12 > C12 > 12
|
||||||
|
""",
|
||||||
|
# Old community filters
|
||||||
|
'series_2_than_3_457_234': """
|
||||||
|
S2-Q0.5 > S2-PRY0.5 > S2-DR0.5 > S2-Q4 > S2-Q1 > S2-Q2 > S2-H0.5
|
||||||
|
> 0.5 > S3-Q1 > S3-Q2 > S2-G4 > S3-Q4 > S2-G1.5 > S2-DR2.5 > reset
|
||||||
|
> Q1 > S2-PRY2.5 > S2-G2.5 > H1 > 1.5 > Q2 > 2.5 > S2-DR5 > S2-PRY5
|
||||||
|
> Q4 > G4 > 5 > H2 > S2-C6 > S2-DR8 > S2-PRY8 > S2-C8 > 6 > 8 > 4
|
||||||
|
> S2-C12 > 12
|
||||||
|
""",
|
||||||
}
|
}
|
||||||
|
|||||||
195
module/research/preset_generator.py
Normal file
195
module/research/preset_generator.py
Normal file
@@ -0,0 +1,195 @@
|
|||||||
|
import re
|
||||||
|
|
||||||
|
|
||||||
|
def split_filter(string):
|
||||||
|
if isinstance(string, list):
|
||||||
|
return string
|
||||||
|
return [f.strip(' \t\r\n') for f in string.split('>')]
|
||||||
|
|
||||||
|
|
||||||
|
def join_filter(selection):
|
||||||
|
if isinstance(selection, str):
|
||||||
|
return selection
|
||||||
|
return ' > '.join(selection)
|
||||||
|
|
||||||
|
|
||||||
|
def beautify_filter(list_filter):
|
||||||
|
if isinstance(list_filter, str):
|
||||||
|
list_filter = split_filter(list_filter)
|
||||||
|
|
||||||
|
out = []
|
||||||
|
length = 0
|
||||||
|
for selection in list_filter:
|
||||||
|
if length + len(selection) + 3 > 70:
|
||||||
|
out.append('\n')
|
||||||
|
length = 0
|
||||||
|
out.append(selection)
|
||||||
|
length += len(selection) + 3
|
||||||
|
string = ' > '.join(out).strip('\n >').replace(' > \n', '\n').replace('\n ', '\n')
|
||||||
|
return string
|
||||||
|
|
||||||
|
|
||||||
|
def translate(string: str, target='series_4_tenrai_only_cube', for_simulate=False):
|
||||||
|
res = re.search(r'series_?(\d)', target)
|
||||||
|
if res:
|
||||||
|
series = res.group(1)
|
||||||
|
else:
|
||||||
|
print(f'Translate target from unknown series: {target}')
|
||||||
|
return
|
||||||
|
cube = 'cube' in target
|
||||||
|
string = string.replace('S4-H0.5 > !4-0.5', '0.5')
|
||||||
|
string = string.replace('!4-0.5', '0.5')
|
||||||
|
# Add Q0.5 after the last 0.5 selection
|
||||||
|
selections = split_filter(string)
|
||||||
|
last_05 = 0
|
||||||
|
for index, sele in enumerate(selections):
|
||||||
|
if sele == '0.5':
|
||||||
|
break
|
||||||
|
if '0.5' in sele:
|
||||||
|
last_05 = index
|
||||||
|
if last_05:
|
||||||
|
selections.insert(last_05 + 1, 'Q0.5')
|
||||||
|
string = join_filter(selections)
|
||||||
|
string = string.replace('S4-Q0.5 > Q0.5 > 0.5', '0.5')
|
||||||
|
string = string.replace('Q0.5 > 0.5', '0.5')
|
||||||
|
|
||||||
|
string = string.replace('!4-1.5', 'G1.5 > 1.5')
|
||||||
|
string = string.replace('!4-1', 'Q1 > H1 > 1')
|
||||||
|
string = string.replace('!4-2.5', 'DR2.5 > PRY2.5 > G2.5 > 2.5')
|
||||||
|
string = string.replace('!4-2', 'Q2 > E2 > H2 > 2')
|
||||||
|
string = string.replace('!4-4', 'Q4 > G4 > H4 > 4')
|
||||||
|
string = string.replace('!4-5', 'DR5 > PRY5 > 5')
|
||||||
|
string = string.replace('!4-C6', 'C6 > 6')
|
||||||
|
string = string.replace('!4-C8', 'DR8 > PRY8 > C8 > 8')
|
||||||
|
string = string.replace('!4-C12', 'C12 > 12')
|
||||||
|
|
||||||
|
if not for_simulate:
|
||||||
|
string = string.replace('A2', 'E-315')
|
||||||
|
string = string.replace('Z2', 'E-031')
|
||||||
|
|
||||||
|
if not cube:
|
||||||
|
string = re.sub(r'(S4-)?H[124] > ', '', string)
|
||||||
|
string = string.replace('H1 > 1 > reset > S4-H1', 'reset > S4-H1 > H1 > 1')
|
||||||
|
string = string.replace('H1 > 1 > S4-H1', 'S4-H1 > H1 > 1')
|
||||||
|
string = string.replace('H2 > 2 > S4-H2', 'S4-H2 > H2 > 2')
|
||||||
|
string = string.replace('H4 > 4 > S4-H4', 'S4-H4 > H4 > 4')
|
||||||
|
string = re.sub(r'S4', f'S{series}', string)
|
||||||
|
|
||||||
|
return beautify_filter(string)
|
||||||
|
|
||||||
|
|
||||||
|
def convert_name(name, series):
|
||||||
|
name = re.sub(r'series_\d', f'series_{series}', name)
|
||||||
|
if 'series_5' in name:
|
||||||
|
name = name.replace('tenrai', '152')
|
||||||
|
if 'series_4' in name:
|
||||||
|
pass
|
||||||
|
if 'series_3' in name:
|
||||||
|
name = name.replace('tenrai', '234')
|
||||||
|
if 'series_2' in name:
|
||||||
|
name = name.replace('tenrai', '457')
|
||||||
|
return name
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
from module.config.code_generator import *
|
||||||
|
|
||||||
|
Value(FILTER_STRING_SHORTEST='0.5 > 1 > 1.5 > 2 > 2.5 > 3 > 4 > 5 > 6 > 8 > 10 > 12')
|
||||||
|
Value(
|
||||||
|
FILTER_STRING_CHEAPEST='Q1 > Q2 > T3 > T4 > Q4 > C6 > T6 > C8 > C12 > G1.5 > D2.5 > G2.5 > D5 > Q0.5 > G4 > D8 > H1 > H2 > H0.5 > D0.5 > H4')
|
||||||
|
with Dict('DICT_FILTER_PRESET'):
|
||||||
|
for series in [5, 4, 3, 2]:
|
||||||
|
def new_filter(**kwargs):
|
||||||
|
for k, v in kwargs.items():
|
||||||
|
k = convert_name(k, series)
|
||||||
|
v = translate(v, target=k)
|
||||||
|
DictItem(k, v)
|
||||||
|
|
||||||
|
# 1
|
||||||
|
Comment("""
|
||||||
|
Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
|
Average time cost: 153.41706666666678
|
||||||
|
Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333]
|
||||||
|
""")
|
||||||
|
new_filter(series_4_tenrai_only_cube="""
|
||||||
|
S4-Q0.5 > S4-DR0.5 > S4-PRY0.5 > S4-Q4 > S4-Q2 > S4-Q1 > !4-0.5
|
||||||
|
> S4-A2 > S4-G1.5 > S4-G4 > !4-1 > reset > S4-H1 > S4-Z2
|
||||||
|
> S4-DR2.5 > S4-PRY2.5 > S4-G2.5 > !4-1.5 > !4-2 > S4-H2 > !4-2.5 > S4-DR5 > S4-PRY5
|
||||||
|
> !4-4 > S4-H4 > S4-C6 > !4-5 > S4-DR8 > S4-PRY8 > S4-C8 > !4-C6 > S4-C12
|
||||||
|
> !4-C8 > !4-C12
|
||||||
|
""")
|
||||||
|
# 2
|
||||||
|
Comment("""
|
||||||
|
Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150
|
||||||
|
Average time cost: 161.37177965277806
|
||||||
|
Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978]
|
||||||
|
""")
|
||||||
|
new_filter(series_4_tenrai_only="""
|
||||||
|
S4-Q0.5 > S4-PRY0.5 > S4-DR0.5 > S4-Q4 > S4-Q2 > S4-Q1 > S4-H0.5 > !4-0.5 > S4-A2
|
||||||
|
> S4-G4 > S4-H1 > S4-G1.5 > !4-1 > S4-Z2 > S4-DR2.5 > reset
|
||||||
|
> S4-G2.5 > S4-PRY2.5 > !4-1.5 > !4-2 > !4-2.5 > S4-H2 > S4-H4 > S4-DR5
|
||||||
|
> S4-PRY5 > !4-4 > S4-C6 > !4-5 > S4-DR8 > S4-PRY8 > S4-C8 > !4-C6
|
||||||
|
> !4-C8 > S4-C12 > !4-C12
|
||||||
|
""")
|
||||||
|
# 5
|
||||||
|
Comment("""
|
||||||
|
Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
|
Average time cost: 124.67622465277958
|
||||||
|
Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164]
|
||||||
|
""")
|
||||||
|
new_filter(series_4_blueprint_tenrai_cube="""
|
||||||
|
S4-DR0.5 > S4-Q0.5 > S4-PRY0.5 > S4-H0.5 > !4-0.5 > S4-DR2.5 > S4-Q1
|
||||||
|
> S4-Q2 > S4-H1 > S4-A2 > S4-G1.5 > reset > S4-Q4 > S4-G4 > S4-H2
|
||||||
|
> !4-1 > S4-G2.5 > S4-DR5 > S4-PRY2.5 > !4-1.5 > S4-Z2 > S4-DR8
|
||||||
|
> !4-2 > !4-2.5 > S4-H4 > S4-PRY5 > !4-4 > S4-C6 > S4-PRY8 > !4-5 > !4-C6 > S4-C8
|
||||||
|
> !4-C8 > S4-C12 > !4-C12
|
||||||
|
""")
|
||||||
|
# 6
|
||||||
|
Comment("""
|
||||||
|
Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100
|
||||||
|
Average time cost: 143.56399131945145
|
||||||
|
Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499]
|
||||||
|
""")
|
||||||
|
new_filter(series_4_blueprint_tenrai="""
|
||||||
|
S4-DR0.5 > S4-PRY0.5 > S4-Q0.5 > S4-H1 > S4-H0.5 > S4-DR2.5 > S4-G1.5
|
||||||
|
> S4-Q1 > S4-DR5 > !4-0.5 > S4-G4 > S4-Q2 > S4-PRY2.5 > reset > S4-DR8
|
||||||
|
> !4-1 > S4-A2 > S4-G2.5 > S4-H2 > !4-1.5 > S4-Z2 > S4-H4
|
||||||
|
> S4-Q4 > !4-2 > !4-2.5 > S4-PRY5 > S4-PRY8 > !4-4 > S4-C6 > !4-5 > !4-C6 > S4-C8
|
||||||
|
> S4-C12 > !4-C8 > !4-C12
|
||||||
|
""")
|
||||||
|
# 3
|
||||||
|
Comment("""
|
||||||
|
Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
Average time cost: 82.0121088194467
|
||||||
|
Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791]
|
||||||
|
""")
|
||||||
|
new_filter(series_4_blueprint_only_cube="""
|
||||||
|
S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-H1 > S4-H2 > S4-DR2.5 > S4-DR5 > S4-Q0.5
|
||||||
|
> !4-0.5 > S4-DR8 > reset > S4-H4 > S4-Q1 > !4-1 > S4-G1.5 > !4-1.5
|
||||||
|
> S4-G2.5 > S4-Q2 > S4-A2 > S4-Z2 > !4-2 > S4-PRY2.5 > S4-G4 > !4-2.5
|
||||||
|
> S4-Q4 > !4-4 > S4-PRY5 > S4-PRY8 > S4-C6 > !4-5 > !4-C6 > S4-C8
|
||||||
|
> S4-C12 > !4-C8 > !4-C12
|
||||||
|
""")
|
||||||
|
# 4
|
||||||
|
Comment("""
|
||||||
|
Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0
|
||||||
|
Average time cost: 124.71616166666873
|
||||||
|
Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238]
|
||||||
|
""")
|
||||||
|
new_filter(series_4_blueprint_only="""
|
||||||
|
S4-DR0.5 > S4-H0.5 > S4-PRY0.5 > S4-DR8 > S4-DR5
|
||||||
|
> S4-DR2.5 > S4-G1.5 > S4-PRY2.5 > S4-Q0.5 > !4-0.5 > S4-G2.5 > S4-G4
|
||||||
|
> reset > S4-Q1 > !4-1 > S4-PRY5 > !4-1.5 > S4-Q2 > S4-Z2 > S4-A2 > !4-2 > S4-PRY8
|
||||||
|
> !4-2.5 > S4-Q4 > !4-4 > S4-C6 > !4-5 > !4-C6 > S4-C8
|
||||||
|
> !4-C8 > S4-C12 > !4-C12
|
||||||
|
""")
|
||||||
|
|
||||||
|
Comment('Old community filters')
|
||||||
|
DictItem(series_2_than_3_457_234=beautify_filter("""
|
||||||
|
S2-Q0.5 > S2-PRY0.5 > S2-DR0.5 > S2-Q4 > S2-Q1 > S2-Q2 > S2-H0.5 > 0.5
|
||||||
|
> S3-Q1 > S3-Q2 > S2-G4 > S3-Q4 > S2-G1.5 > S2-DR2.5 > reset > Q1 > S2-PRY2.5 > S2-G2.5 > H1 > 1.5
|
||||||
|
> Q2 > 2.5 > S2-DR5 > S2-PRY5 > Q4 > G4 > 5 > H2 > S2-C6 > S2-DR8 > S2-PRY8 > S2-C8
|
||||||
|
> 6 > 8 > 4 > S2-C12 > 12
|
||||||
|
"""))
|
||||||
|
from module.logger import logger
|
||||||
|
generator.write('./module/research/preset.py')
|
||||||
@@ -361,19 +361,29 @@ class ResearchProject:
|
|||||||
series (int): Such as 1, 2, 3
|
series (int): Such as 1, 2, 3
|
||||||
"""
|
"""
|
||||||
self.valid = True
|
self.valid = True
|
||||||
# self.config = config
|
# 'D-057-UL'
|
||||||
self.name = self.check_name(name)
|
self.name = self.check_name(name)
|
||||||
if self.name != name:
|
if self.name != name:
|
||||||
logger.info(f'Research name {name} is revised to {self.name}')
|
logger.info(f'Research name {name} is revised to {self.name}')
|
||||||
|
# '4'
|
||||||
self.raw_series = series
|
self.raw_series = series
|
||||||
|
# 'S4'
|
||||||
self.series = f'S{series}'
|
self.series = f'S{series}'
|
||||||
|
# 'D'
|
||||||
self.genre = ''
|
self.genre = ''
|
||||||
|
# '057'
|
||||||
|
self.number = ''
|
||||||
|
# '0.5'
|
||||||
self.duration = '24'
|
self.duration = '24'
|
||||||
|
# Ship face, like 'Azuma'
|
||||||
self.ship = ''
|
self.ship = ''
|
||||||
|
# 'dr' or 'pry'
|
||||||
self.ship_rarity = ''
|
self.ship_rarity = ''
|
||||||
self.need_coin = False
|
self.need_coin = False
|
||||||
self.need_cube = False
|
self.need_cube = False
|
||||||
self.need_part = False
|
self.need_part = False
|
||||||
|
# Project requirements, like:
|
||||||
|
# 'Scrap 8 pieces of gear.'
|
||||||
self.task = ''
|
self.task = ''
|
||||||
|
|
||||||
matched = False
|
matched = False
|
||||||
@@ -381,6 +391,7 @@ class ResearchProject:
|
|||||||
matched = True
|
matched = True
|
||||||
self.data = data
|
self.data = data
|
||||||
self.genre = data['name'][0]
|
self.genre = data['name'][0]
|
||||||
|
self.number = data['name'][2:5]
|
||||||
self.duration = str(data['time'] / 3600).rstrip('.0')
|
self.duration = str(data['time'] / 3600).rstrip('.0')
|
||||||
self.task = data['task']
|
self.task = data['task']
|
||||||
for item in data['input']:
|
for item in data['input']:
|
||||||
|
|||||||
@@ -22,8 +22,9 @@ FILTER_REGEX = re.compile('(s[12345])?'
|
|||||||
'(dr|pry)?'
|
'(dr|pry)?'
|
||||||
'([bcdeghqt])?'
|
'([bcdeghqt])?'
|
||||||
'-?'
|
'-?'
|
||||||
|
'(\d{3})?'
|
||||||
'(\d.\d|\d\d?)?')
|
'(\d.\d|\d\d?)?')
|
||||||
FILTER_ATTR = ('series', 'ship', 'ship_rarity', 'genre', 'duration')
|
FILTER_ATTR = ('series', 'ship', 'ship_rarity', 'genre', 'number', 'duration')
|
||||||
FILTER_PRESET = ('shortest', 'cheapest', 'reset')
|
FILTER_PRESET = ('shortest', 'cheapest', 'reset')
|
||||||
FILTER = Filter(FILTER_REGEX, FILTER_ATTR, FILTER_PRESET)
|
FILTER = Filter(FILTER_REGEX, FILTER_ATTR, FILTER_PRESET)
|
||||||
|
|
||||||
|
|||||||
@@ -266,10 +266,10 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
|
|||||||
logger.info(f'Total retired: {total}')
|
logger.info(f'Total retired: {total}')
|
||||||
return total
|
return total
|
||||||
|
|
||||||
def retire_gems_farming_flagships(self, decrease_level=False):
|
def retire_gems_farming_flagships(self):
|
||||||
"""
|
"""
|
||||||
Retire abandoned flagships of GemsFarming.
|
Retire abandoned flagships of GemsFarming.
|
||||||
Common CV whose level > 24, fleet is none and status is free
|
Common CV whose level > 1, fleet is none and status is free
|
||||||
will be regarded as targets.
|
will be regarded as targets.
|
||||||
"""
|
"""
|
||||||
logger.info('Retire abandoned flagships of GemsFarming')
|
logger.info('Retire abandoned flagships of GemsFarming')
|
||||||
@@ -291,7 +291,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
|
|||||||
self.dock_favourite_set(False)
|
self.dock_favourite_set(False)
|
||||||
|
|
||||||
scanner = ShipScanner(
|
scanner = ShipScanner(
|
||||||
rarity='common', fleet=0, status='free', level=(24, 100))
|
rarity='common', fleet=0, status='free', level=(2, 100))
|
||||||
scanner.disable('emotion')
|
scanner.disable('emotion')
|
||||||
|
|
||||||
total = 0
|
total = 0
|
||||||
@@ -306,15 +306,12 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
|
|||||||
self.device.screenshot()
|
self.device.screenshot()
|
||||||
|
|
||||||
ships = scanner.scan(self.device.image)
|
ships = scanner.scan(self.device.image)
|
||||||
if not ships:
|
if len(ships) < 2:
|
||||||
if decrease_level:
|
break
|
||||||
logger.info('No ship found, trying to decrease level limitation')
|
else:
|
||||||
scanner.set_limitation(level=(2, 100))
|
# Try to keep the one with the highest emotion
|
||||||
skip_first_screenshot = True
|
ships.sort(key=lambda ship: ship.emotion)
|
||||||
decrease_level = False
|
ships = ships[:-1]
|
||||||
continue
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
|
|
||||||
for ship in ships[:10]:
|
for ship in ships[:10]:
|
||||||
self.device.click(ship.button)
|
self.device.click(ship.button)
|
||||||
@@ -412,7 +409,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
|
|||||||
# logger.warning('No ship retired, trying to reset quick retire settings to "all"')
|
# logger.warning('No ship retired, trying to reset quick retire settings to "all"')
|
||||||
# self.quick_retire_setting_set('all')
|
# self.quick_retire_setting_set('all')
|
||||||
# total = self.retire_ships_one_click()
|
# total = self.retire_ships_one_click()
|
||||||
total += self.retire_gems_farming_flagships(decrease_level=not total)
|
total += self.retire_gems_farming_flagships()
|
||||||
if not total:
|
if not total:
|
||||||
logger.critical('No ship retired')
|
logger.critical('No ship retired')
|
||||||
logger.critical('Please configure your "Quick Retire Options" in game, '
|
logger.critical('Please configure your "Quick Retire Options" in game, '
|
||||||
@@ -421,7 +418,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
|
|||||||
elif mode == 'old_retire':
|
elif mode == 'old_retire':
|
||||||
self.handle_dock_cards_loading()
|
self.handle_dock_cards_loading()
|
||||||
total = self.retire_ships_old()
|
total = self.retire_ships_old()
|
||||||
total += self.retire_gems_farming_flagships(decrease_level=not total)
|
total += self.retire_gems_farming_flagships()
|
||||||
if not total:
|
if not total:
|
||||||
logger.critical('No ship retired')
|
logger.critical('No ship retired')
|
||||||
logger.critical('Please configure your retirement settings in Alas, '
|
logger.critical('Please configure your retirement settings in Alas, '
|
||||||
|
|||||||
Reference in New Issue
Block a user