Brute-force porting of LME updates to the event_20250417 branch
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 7.2 KiB |
@@ -237,3 +237,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
|
|||||||
| 20250227 | event 20240725 cn | Interlude of Illusions | - | - | - | 幻夢間奏曲 |
|
| 20250227 | event 20240725 cn | Interlude of Illusions | - | - | - | 幻夢間奏曲 |
|
||||||
| 20250320 | event 20230223 cn | Revelations of Dust | 复刻湮烬尘墟 | Revelations of Dust Rerun | 黙示の遺構(復刻) | - |
|
| 20250320 | event 20230223 cn | Revelations of Dust | 复刻湮烬尘墟 | Revelations of Dust Rerun | 黙示の遺構(復刻) | - |
|
||||||
| 20250320 | event 20240521 cn | Light of the Martyrium | - | - | - | 綻放於輝光之城 |
|
| 20250320 | event 20240521 cn | Light of the Martyrium | - | - | - | 綻放於輝光之城 |
|
||||||
|
| 20250417 | coalition 20230323 | Frostfall | 极地风暴 | Frostfall | 星霜海嵐 | - |
|
||||||
|
|||||||
@@ -1263,7 +1263,6 @@
|
|||||||
"MapAchievement": "non_stop",
|
"MapAchievement": "non_stop",
|
||||||
"StageIncrease": false,
|
"StageIncrease": false,
|
||||||
"GetNewShip": false,
|
"GetNewShip": false,
|
||||||
"EventSwitch": false,
|
|
||||||
"ReachLevel": 0
|
"ReachLevel": 0
|
||||||
},
|
},
|
||||||
"Emotion": {
|
"Emotion": {
|
||||||
@@ -1303,7 +1302,7 @@
|
|||||||
"AmbushEvade": true
|
"AmbushEvade": true
|
||||||
},
|
},
|
||||||
"Coalition": {
|
"Coalition": {
|
||||||
"Mode": "hard",
|
"Mode": "tc1",
|
||||||
"Fleet": "single"
|
"Fleet": "single"
|
||||||
},
|
},
|
||||||
"StopCondition": {
|
"StopCondition": {
|
||||||
@@ -1874,7 +1873,7 @@
|
|||||||
"AmbushEvade": true
|
"AmbushEvade": true
|
||||||
},
|
},
|
||||||
"Coalition": {
|
"Coalition": {
|
||||||
"Mode": "hard",
|
"Mode": "sp",
|
||||||
"Fleet": "single"
|
"Fleet": "single"
|
||||||
},
|
},
|
||||||
"StopCondition": {
|
"StopCondition": {
|
||||||
@@ -2697,90 +2696,5 @@
|
|||||||
"Storage": {
|
"Storage": {
|
||||||
"Storage": {}
|
"Storage": {}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"Dashboard": {
|
|
||||||
"Oil": {
|
|
||||||
"Value": 0,
|
|
||||||
"Limit": 0,
|
|
||||||
"Color": "^000000",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"Coin": {
|
|
||||||
"Value": 0,
|
|
||||||
"Limit": 0,
|
|
||||||
"Color": "^FFAA33",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"Gem": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^FF3333",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"Pt": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^00BFFF",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"Cube": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^33FFFF",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"ActionPoint": {
|
|
||||||
"Value": 0,
|
|
||||||
"Total": 0,
|
|
||||||
"Color": "^0000FF",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"YellowCoin": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^FF8800",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"PurpleCoin": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^7700BB",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"Core": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^AAAAAA",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"Medal": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^FFDD00",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"Merit": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^FFFF00",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"GuildCoin": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^AAAAAA",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"ResearchPercent": {
|
|
||||||
"Value": 0,
|
|
||||||
"Limit": 100,
|
|
||||||
"Color": "^00AA00",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"PlayerLevel": {
|
|
||||||
"Value": 0,
|
|
||||||
"Color": "^FFAA33",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"PlayerExp": {
|
|
||||||
"Value": 0,
|
|
||||||
"Limit": 0,
|
|
||||||
"Color": "^FFAA33",
|
|
||||||
"Record": "2020-01-01 00:00:00"
|
|
||||||
},
|
|
||||||
"Storage": {
|
|
||||||
"Storage": {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,9 +27,9 @@ FROSTFALL_FLEET_PREPARATION = Button(area={'cn': (1057, 527, 1155, 548), 'en': (
|
|||||||
FROSTFALL_MODE_BATTLE = Button(area={'cn': (71, 608, 137, 653), 'en': (71, 608, 137, 653), 'jp': (71, 608, 137, 653), 'tw': (71, 608, 137, 653)}, color={'cn': (63, 106, 122), 'en': (63, 106, 122), 'jp': (63, 106, 122), 'tw': (63, 106, 122)}, button={'cn': (71, 608, 137, 653), 'en': (71, 608, 137, 653), 'jp': (71, 608, 137, 653), 'tw': (71, 608, 137, 653)}, file={'cn': './assets/cn/coalition/FROSTFALL_MODE_BATTLE.png', 'en': './assets/cn/coalition/FROSTFALL_MODE_BATTLE.png', 'jp': './assets/cn/coalition/FROSTFALL_MODE_BATTLE.png', 'tw': './assets/tw/coalition/FROSTFALL_MODE_BATTLE.png'})
|
FROSTFALL_MODE_BATTLE = Button(area={'cn': (71, 608, 137, 653), 'en': (71, 608, 137, 653), 'jp': (71, 608, 137, 653), 'tw': (71, 608, 137, 653)}, color={'cn': (63, 106, 122), 'en': (63, 106, 122), 'jp': (63, 106, 122), 'tw': (63, 106, 122)}, button={'cn': (71, 608, 137, 653), 'en': (71, 608, 137, 653), 'jp': (71, 608, 137, 653), 'tw': (71, 608, 137, 653)}, file={'cn': './assets/cn/coalition/FROSTFALL_MODE_BATTLE.png', 'en': './assets/cn/coalition/FROSTFALL_MODE_BATTLE.png', 'jp': './assets/cn/coalition/FROSTFALL_MODE_BATTLE.png', 'tw': './assets/tw/coalition/FROSTFALL_MODE_BATTLE.png'})
|
||||||
FROSTFALL_MODE_STORY = Button(area={'cn': (73, 610, 134, 652), 'en': (73, 610, 134, 652), 'jp': (73, 610, 134, 652), 'tw': (73, 610, 134, 652)}, color={'cn': (119, 44, 32), 'en': (119, 44, 32), 'jp': (119, 44, 32), 'tw': (119, 44, 32)}, button={'cn': (73, 610, 134, 652), 'en': (73, 610, 134, 652), 'jp': (73, 610, 134, 652), 'tw': (73, 610, 134, 652)}, file={'cn': './assets/cn/coalition/FROSTFALL_MODE_STORY.png', 'en': './assets/cn/coalition/FROSTFALL_MODE_STORY.png', 'jp': './assets/cn/coalition/FROSTFALL_MODE_STORY.png', 'tw': './assets/tw/coalition/FROSTFALL_MODE_STORY.png'})
|
FROSTFALL_MODE_STORY = Button(area={'cn': (73, 610, 134, 652), 'en': (73, 610, 134, 652), 'jp': (73, 610, 134, 652), 'tw': (73, 610, 134, 652)}, color={'cn': (119, 44, 32), 'en': (119, 44, 32), 'jp': (119, 44, 32), 'tw': (119, 44, 32)}, button={'cn': (73, 610, 134, 652), 'en': (73, 610, 134, 652), 'jp': (73, 610, 134, 652), 'tw': (73, 610, 134, 652)}, file={'cn': './assets/cn/coalition/FROSTFALL_MODE_STORY.png', 'en': './assets/cn/coalition/FROSTFALL_MODE_STORY.png', 'jp': './assets/cn/coalition/FROSTFALL_MODE_STORY.png', 'tw': './assets/tw/coalition/FROSTFALL_MODE_STORY.png'})
|
||||||
FROSTFALL_OCR_PT = Button(area={'cn': (1181, 641, 1254, 663), 'en': (1181, 641, 1254, 663), 'jp': (1181, 641, 1254, 663), 'tw': (1181, 641, 1254, 663)}, color={'cn': (93, 100, 106), 'en': (93, 100, 106), 'jp': (93, 100, 106), 'tw': (93, 100, 106)}, button={'cn': (1181, 641, 1254, 663), 'en': (1181, 641, 1254, 663), 'jp': (1181, 641, 1254, 663), 'tw': (1181, 641, 1254, 663)}, file={'cn': './assets/cn/coalition/FROSTFALL_OCR_PT.png', 'en': './assets/en/coalition/FROSTFALL_OCR_PT.png', 'jp': './assets/jp/coalition/FROSTFALL_OCR_PT.png', 'tw': './assets/tw/coalition/FROSTFALL_OCR_PT.png'})
|
FROSTFALL_OCR_PT = Button(area={'cn': (1181, 641, 1254, 663), 'en': (1181, 641, 1254, 663), 'jp': (1181, 641, 1254, 663), 'tw': (1181, 641, 1254, 663)}, color={'cn': (93, 100, 106), 'en': (93, 100, 106), 'jp': (93, 100, 106), 'tw': (93, 100, 106)}, button={'cn': (1181, 641, 1254, 663), 'en': (1181, 641, 1254, 663), 'jp': (1181, 641, 1254, 663), 'tw': (1181, 641, 1254, 663)}, file={'cn': './assets/cn/coalition/FROSTFALL_OCR_PT.png', 'en': './assets/en/coalition/FROSTFALL_OCR_PT.png', 'jp': './assets/jp/coalition/FROSTFALL_OCR_PT.png', 'tw': './assets/tw/coalition/FROSTFALL_OCR_PT.png'})
|
||||||
FROSTFALL_SP = Button(area={'cn': (631, 160, 658, 173), 'en': (631, 160, 658, 173), 'jp': (631, 160, 658, 173), 'tw': (505, 290, 532, 302)}, color={'cn': (194, 145, 252), 'en': (194, 145, 252), 'jp': (194, 145, 252), 'tw': (183, 128, 253)}, button={'cn': (631, 160, 658, 173), 'en': (631, 160, 658, 173), 'jp': (631, 160, 658, 173), 'tw': (505, 290, 532, 302)}, file={'cn': './assets/cn/coalition/FROSTFALL_SP.png', 'en': './assets/en/coalition/FROSTFALL_SP.png', 'jp': './assets/jp/coalition/FROSTFALL_SP.png', 'tw': './assets/tw/coalition/FROSTFALL_SP.png'})
|
FROSTFALL_SP = Button(area={'cn': (505, 290, 532, 302), 'en': (505, 290, 532, 302), 'jp': (505, 290, 532, 302), 'tw': (505, 290, 532, 302)}, color={'cn': (183, 128, 253), 'en': (183, 128, 253), 'jp': (183, 128, 253), 'tw': (183, 128, 253)}, button={'cn': (505, 290, 532, 302), 'en': (505, 290, 532, 302), 'jp': (505, 290, 532, 302), 'tw': (505, 290, 532, 302)}, file={'cn': './assets/cn/coalition/FROSTFALL_SP.png', 'en': './assets/en/coalition/FROSTFALL_SP.png', 'jp': './assets/jp/coalition/FROSTFALL_SP.png', 'tw': './assets/tw/coalition/FROSTFALL_SP.png'})
|
||||||
FROSTFALL_SWITCH_MULTI = Button(area={'cn': (1106, 449, 1237, 478), 'en': (1106, 449, 1237, 478), 'jp': (1106, 449, 1237, 478), 'tw': (1106, 449, 1237, 478)}, color={'cn': (232, 175, 58), 'en': (232, 175, 58), 'jp': (232, 175, 58), 'tw': (225, 170, 59)}, button={'cn': (1106, 449, 1237, 478), 'en': (1106, 449, 1237, 478), 'jp': (1106, 449, 1237, 478), 'tw': (1106, 449, 1237, 478)}, file={'cn': './assets/cn/coalition/FROSTFALL_SWITCH_MULTI.png', 'en': './assets/cn/coalition/FROSTFALL_SWITCH_MULTI.png', 'jp': './assets/cn/coalition/FROSTFALL_SWITCH_MULTI.png', 'tw': './assets/tw/coalition/FROSTFALL_SWITCH_MULTI.png'})
|
FROSTFALL_SWITCH_MULTI = Button(area={'cn': (1106, 449, 1237, 478), 'en': (1106, 449, 1237, 478), 'jp': (1106, 449, 1237, 478), 'tw': (1106, 449, 1237, 478)}, color={'cn': (232, 175, 58), 'en': (232, 175, 58), 'jp': (232, 175, 58), 'tw': (225, 170, 59)}, button={'cn': (1106, 449, 1237, 478), 'en': (1106, 449, 1237, 478), 'jp': (1106, 449, 1237, 478), 'tw': (1106, 449, 1237, 478)}, file={'cn': './assets/cn/coalition/FROSTFALL_SWITCH_MULTI.png', 'en': './assets/cn/coalition/FROSTFALL_SWITCH_MULTI.png', 'jp': './assets/cn/coalition/FROSTFALL_SWITCH_MULTI.png', 'tw': './assets/tw/coalition/FROSTFALL_SWITCH_MULTI.png'})
|
||||||
FROSTFALL_SWITCH_SINGLE = Button(area={'cn': (968, 449, 1098, 478), 'en': (968, 449, 1098, 478), 'jp': (968, 449, 1098, 478), 'tw': (968, 449, 1098, 478)}, color={'cn': (230, 173, 57), 'en': (230, 173, 57), 'jp': (230, 173, 57), 'tw': (220, 166, 58)}, button={'cn': (968, 449, 1098, 478), 'en': (968, 449, 1098, 478), 'jp': (968, 449, 1098, 478), 'tw': (968, 449, 1098, 478)}, file={'cn': './assets/cn/coalition/FROSTFALL_SWITCH_SINGLE.png', 'en': './assets/cn/coalition/FROSTFALL_SWITCH_SINGLE.png', 'jp': './assets/cn/coalition/FROSTFALL_SWITCH_SINGLE.png', 'tw': './assets/tw/coalition/FROSTFALL_SWITCH_SINGLE.png'})
|
FROSTFALL_SWITCH_SINGLE = Button(area={'cn': (968, 449, 1098, 478), 'en': (968, 449, 1098, 478), 'jp': (968, 449, 1098, 478), 'tw': (968, 449, 1098, 478)}, color={'cn': (230, 173, 57), 'en': (230, 173, 57), 'jp': (230, 173, 57), 'tw': (220, 166, 58)}, button={'cn': (968, 449, 1098, 478), 'en': (968, 449, 1098, 478), 'jp': (968, 449, 1098, 478), 'tw': (968, 449, 1098, 478)}, file={'cn': './assets/cn/coalition/FROSTFALL_SWITCH_SINGLE.png', 'en': './assets/cn/coalition/FROSTFALL_SWITCH_SINGLE.png', 'jp': './assets/cn/coalition/FROSTFALL_SWITCH_SINGLE.png', 'tw': './assets/tw/coalition/FROSTFALL_SWITCH_SINGLE.png'})
|
||||||
FROSTFALL_TC1 = Button(area={'cn': (304, 320, 330, 332), 'en': (304, 320, 330, 332), 'jp': (304, 320, 330, 332), 'tw': (304, 320, 330, 332)}, color={'cn': (204, 162, 254), 'en': (204, 162, 254), 'jp': (204, 162, 254), 'tw': (188, 137, 254)}, button={'cn': (304, 320, 330, 332), 'en': (304, 320, 330, 332), 'jp': (304, 320, 330, 332), 'tw': (304, 320, 330, 332)}, file={'cn': './assets/cn/coalition/FROSTFALL_TC1.png', 'en': './assets/en/coalition/FROSTFALL_TC1.png', 'jp': './assets/jp/coalition/FROSTFALL_TC1.png', 'tw': './assets/tw/coalition/FROSTFALL_TC1.png'})
|
FROSTFALL_TC1 = Button(area={'cn': (304, 320, 330, 332), 'en': (304, 320, 330, 332), 'jp': (304, 320, 330, 332), 'tw': (304, 320, 330, 332)}, color={'cn': (204, 162, 254), 'en': (204, 162, 254), 'jp': (204, 162, 254), 'tw': (188, 137, 254)}, button={'cn': (304, 320, 330, 332), 'en': (304, 320, 330, 332), 'jp': (304, 320, 330, 332), 'tw': (304, 320, 330, 332)}, file={'cn': './assets/cn/coalition/FROSTFALL_TC1.png', 'en': './assets/en/coalition/FROSTFALL_TC1.png', 'jp': './assets/jp/coalition/FROSTFALL_TC1.png', 'tw': './assets/tw/coalition/FROSTFALL_TC1.png'})
|
||||||
FROSTFALL_TC2 = Button(area={'cn': (810, 362, 835, 373), 'en': (810, 362, 835, 373), 'jp': (810, 362, 835, 373), 'tw': (631, 160, 658, 173)}, color={'cn': (214, 178, 254), 'en': (214, 178, 254), 'jp': (214, 178, 254), 'tw': (186, 136, 252)}, button={'cn': (810, 362, 835, 373), 'en': (810, 362, 835, 373), 'jp': (810, 362, 835, 373), 'tw': (631, 160, 658, 173)}, file={'cn': './assets/cn/coalition/FROSTFALL_TC2.png', 'en': './assets/en/coalition/FROSTFALL_TC2.png', 'jp': './assets/jp/coalition/FROSTFALL_TC2.png', 'tw': './assets/tw/coalition/FROSTFALL_TC2.png'})
|
FROSTFALL_TC2 = Button(area={'cn': (810, 362, 835, 373), 'en': (810, 362, 835, 373), 'jp': (810, 362, 835, 373), 'tw': (631, 160, 658, 173)}, color={'cn': (214, 178, 254), 'en': (214, 178, 254), 'jp': (214, 178, 254), 'tw': (186, 136, 252)}, button={'cn': (810, 362, 835, 373), 'en': (810, 362, 835, 373), 'jp': (810, 362, 835, 373), 'tw': (631, 160, 658, 173)}, file={'cn': './assets/cn/coalition/FROSTFALL_TC2.png', 'en': './assets/en/coalition/FROSTFALL_TC2.png', 'jp': './assets/jp/coalition/FROSTFALL_TC2.png', 'tw': './assets/tw/coalition/FROSTFALL_TC2.png'})
|
||||||
FROSTFALL_TC3 = Button(area={'cn': (505, 290, 532, 302), 'en': (505, 290, 532, 302), 'jp': (505, 290, 532, 302), 'tw': (810, 362, 835, 373)}, color={'cn': (210, 172, 252), 'en': (210, 172, 252), 'jp': (210, 172, 252), 'tw': (197, 153, 255)}, button={'cn': (505, 290, 532, 302), 'en': (505, 290, 532, 302), 'jp': (505, 290, 532, 302), 'tw': (810, 362, 835, 373)}, file={'cn': './assets/cn/coalition/FROSTFALL_TC3.png', 'en': './assets/en/coalition/FROSTFALL_TC3.png', 'jp': './assets/jp/coalition/FROSTFALL_TC3.png', 'tw': './assets/tw/coalition/FROSTFALL_TC3.png'})
|
FROSTFALL_TC3 = Button(area={'cn': (810, 362, 835, 373), 'en': (810, 362, 835, 373), 'jp': (810, 362, 835, 373), 'tw': (810, 362, 835, 373)}, color={'cn': (197, 153, 255), 'en': (197, 153, 255), 'jp': (197, 153, 255), 'tw': (197, 153, 255)}, button={'cn': (810, 362, 835, 373), 'en': (810, 362, 835, 373), 'jp': (810, 362, 835, 373), 'tw': (810, 362, 835, 373)}, file={'cn': './assets/cn/coalition/FROSTFALL_TC3.png', 'en': './assets/en/coalition/FROSTFALL_TC3.png', 'jp': './assets/jp/coalition/FROSTFALL_TC3.png', 'tw': './assets/tw/coalition/FROSTFALL_TC3.png'})
|
||||||
|
|||||||
@@ -5708,13 +5708,13 @@
|
|||||||
"event_20250227_cn"
|
"event_20250227_cn"
|
||||||
],
|
],
|
||||||
"option_bold": [
|
"option_bold": [
|
||||||
"event_20240725_cn",
|
"event_20230223_cn",
|
||||||
"event_20250227_cn"
|
"event_20240521_cn"
|
||||||
],
|
],
|
||||||
"cn": "event_20250227_cn",
|
"cn": "event_20230223_cn",
|
||||||
"en": "event_20250227_cn",
|
"en": "event_20230223_cn",
|
||||||
"jp": "event_20250227_cn",
|
"jp": "event_20230223_cn",
|
||||||
"tw": "event_20240725_cn"
|
"tw": "event_20240521_cn"
|
||||||
},
|
},
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
@@ -6825,10 +6825,6 @@
|
|||||||
"value": false,
|
"value": false,
|
||||||
"display": "hide"
|
"display": "hide"
|
||||||
},
|
},
|
||||||
"EventSwitch": {
|
|
||||||
"type": "checkbox",
|
|
||||||
"value": false
|
|
||||||
},
|
|
||||||
"ReachLevel": {
|
"ReachLevel": {
|
||||||
"type": "input",
|
"type": "input",
|
||||||
"value": 0,
|
"value": 0,
|
||||||
@@ -7023,11 +7019,11 @@
|
|||||||
"Coalition": {
|
"Coalition": {
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "hard",
|
"value": "tc1",
|
||||||
"option": [
|
"option": [
|
||||||
"easy",
|
"tc1",
|
||||||
"normal",
|
"tc2",
|
||||||
"hard",
|
"tc3",
|
||||||
"ex"
|
"ex"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -10334,11 +10330,12 @@
|
|||||||
"Coalition": {
|
"Coalition": {
|
||||||
"Mode": {
|
"Mode": {
|
||||||
"type": "select",
|
"type": "select",
|
||||||
"value": "hard",
|
"value": "sp",
|
||||||
"option": [
|
"option": [
|
||||||
"easy",
|
"tc1",
|
||||||
"normal",
|
"tc2",
|
||||||
"hard",
|
"tc3",
|
||||||
|
"sp",
|
||||||
"ex"
|
"ex"
|
||||||
],
|
],
|
||||||
"display": "hide"
|
"display": "hide"
|
||||||
@@ -13560,275 +13557,5 @@
|
|||||||
"display": "disabled"
|
"display": "disabled"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"Dashboard": {
|
|
||||||
"Oil": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Limit": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^000000",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Coin": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Limit": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^FFAA33",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Gem": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^FF3333",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Pt": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^00BFFF",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Cube": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^33FFFF",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ActionPoint": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Total": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^0000FF",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"YellowCoin": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^FF8800",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"PurpleCoin": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^7700BB",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Core": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^AAAAAA",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Medal": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^FFDD00",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Merit": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^FFFF00",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"GuildCoin": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^AAAAAA",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ResearchPercent": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Limit": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 100
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^00AA00",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"PlayerLevel": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^FFAA33",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"PlayerExp": {
|
|
||||||
"Value": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Limit": {
|
|
||||||
"type": "input",
|
|
||||||
"value": 0
|
|
||||||
},
|
|
||||||
"Color": {
|
|
||||||
"type": "input",
|
|
||||||
"value": "^FFAA33",
|
|
||||||
"display": "hide"
|
|
||||||
},
|
|
||||||
"Record": {
|
|
||||||
"type": "datetime",
|
|
||||||
"value": "2020-01-01 00:00:00",
|
|
||||||
"validate": "datetime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Storage": {
|
|
||||||
"Storage": {
|
|
||||||
"type": "storage",
|
|
||||||
"value": {},
|
|
||||||
"valuetype": "ignore",
|
|
||||||
"display": "disabled"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -537,8 +537,8 @@ MaritimeEscort:
|
|||||||
Enable: true
|
Enable: true
|
||||||
Coalition:
|
Coalition:
|
||||||
Mode:
|
Mode:
|
||||||
value: hard
|
value: tc1
|
||||||
option: [ easy, normal, hard, ex ]
|
option: [ tc1, tc2, tc3, sp, ex ]
|
||||||
Fleet:
|
Fleet:
|
||||||
value: single
|
value: single
|
||||||
option: [ single, multi ]
|
option: [ single, multi ]
|
||||||
|
|||||||
@@ -265,6 +265,9 @@ Coalition:
|
|||||||
UseAutoSearch: false
|
UseAutoSearch: false
|
||||||
Use2xBook: false
|
Use2xBook: false
|
||||||
AmbushEvade: true
|
AmbushEvade: true
|
||||||
|
Coalition:
|
||||||
|
Mode:
|
||||||
|
option: [ tc1, tc2, tc3, ex ]
|
||||||
StopCondition:
|
StopCondition:
|
||||||
MapAchievement: non_stop
|
MapAchievement: non_stop
|
||||||
StageIncrease: false
|
StageIncrease: false
|
||||||
@@ -293,7 +296,7 @@ CoalitionSp:
|
|||||||
AmbushEvade: true
|
AmbushEvade: true
|
||||||
Coalition:
|
Coalition:
|
||||||
# CoalitionSp hard-codes Mode='sp'
|
# CoalitionSp hard-codes Mode='sp'
|
||||||
Mode: hard
|
Mode: sp
|
||||||
StopCondition:
|
StopCondition:
|
||||||
MapAchievement: non_stop
|
MapAchievement: non_stop
|
||||||
StageIncrease: false
|
StageIncrease: false
|
||||||
|
|||||||
@@ -321,7 +321,7 @@ class GeneratedConfig:
|
|||||||
MaritimeEscort_Enable = True
|
MaritimeEscort_Enable = True
|
||||||
|
|
||||||
# Group `Coalition`
|
# Group `Coalition`
|
||||||
Coalition_Mode = 'hard' # easy, normal, hard, ex
|
Coalition_Mode = 'tc1' # tc1, tc2, tc3, sp, ex
|
||||||
Coalition_Fleet = 'single' # single, multi
|
Coalition_Fleet = 'single' # single, multi
|
||||||
|
|
||||||
# Group `Commission`
|
# Group `Commission`
|
||||||
|
|||||||
@@ -617,6 +617,8 @@ class ConfigUpdater:
|
|||||||
# 'GemsFarming.GemsFarming.ChangeVanguard',
|
# 'GemsFarming.GemsFarming.ChangeVanguard',
|
||||||
# change_ship_redirect),
|
# change_ship_redirect),
|
||||||
# ('Alas.DropRecord.API', 'Alas.DropRecord.API', api_redirect2)
|
# ('Alas.DropRecord.API', 'Alas.DropRecord.API', api_redirect2)
|
||||||
|
# 2025.04.17
|
||||||
|
('Coalition.Coalition.Mode', 'Coalition.Coalition.Mode', coalition_to_frostfall)
|
||||||
]
|
]
|
||||||
# redirection += [
|
# redirection += [
|
||||||
# (
|
# (
|
||||||
|
|||||||
@@ -2150,9 +2150,10 @@
|
|||||||
"Mode": {
|
"Mode": {
|
||||||
"name": "Mode",
|
"name": "Mode",
|
||||||
"help": "SP needs to use event daily SP to run",
|
"help": "SP needs to use event daily SP to run",
|
||||||
"easy": "Easy",
|
"tc1": "tc1",
|
||||||
"normal": "Normal",
|
"tc2": "tc2",
|
||||||
"hard": "Hard",
|
"tc3": "tc3",
|
||||||
|
"sp": "sp",
|
||||||
"ex": "EX"
|
"ex": "EX"
|
||||||
},
|
},
|
||||||
"Fleet": {
|
"Fleet": {
|
||||||
|
|||||||
@@ -2150,9 +2150,10 @@
|
|||||||
"Mode": {
|
"Mode": {
|
||||||
"name": "Coalition.Mode.name",
|
"name": "Coalition.Mode.name",
|
||||||
"help": "Coalition.Mode.help",
|
"help": "Coalition.Mode.help",
|
||||||
"easy": "easy",
|
"tc1": "tc1",
|
||||||
"normal": "normal",
|
"tc2": "tc2",
|
||||||
"hard": "hard",
|
"tc3": "tc3",
|
||||||
|
"sp": "sp",
|
||||||
"ex": "ex"
|
"ex": "ex"
|
||||||
},
|
},
|
||||||
"Fleet": {
|
"Fleet": {
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
"help": ""
|
"help": ""
|
||||||
},
|
},
|
||||||
"Coalition": {
|
"Coalition": {
|
||||||
"name": "童心学院",
|
"name": "极地风暴",
|
||||||
"help": ""
|
"help": ""
|
||||||
},
|
},
|
||||||
"MaritimeEscort": {
|
"MaritimeEscort": {
|
||||||
@@ -2150,9 +2150,10 @@
|
|||||||
"Mode": {
|
"Mode": {
|
||||||
"name": "难度",
|
"name": "难度",
|
||||||
"help": "SP图需要使用活动每日SP运行",
|
"help": "SP图需要使用活动每日SP运行",
|
||||||
"easy": "简单",
|
"tc1": "tc1",
|
||||||
"normal": "普通",
|
"tc2": "tc2",
|
||||||
"hard": "困难",
|
"tc3": "tc3",
|
||||||
|
"sp": "sp",
|
||||||
"ex": "EX"
|
"ex": "EX"
|
||||||
},
|
},
|
||||||
"Fleet": {
|
"Fleet": {
|
||||||
|
|||||||
@@ -2150,9 +2150,10 @@
|
|||||||
"Mode": {
|
"Mode": {
|
||||||
"name": "難度",
|
"name": "難度",
|
||||||
"help": "SP圖需要使用活動每日SP運行",
|
"help": "SP圖需要使用活動每日SP運行",
|
||||||
"easy": "簡單",
|
"tc1": "tc1",
|
||||||
"normal": "普通",
|
"tc2": "tc2",
|
||||||
"hard": "困難",
|
"tc3": "tc3",
|
||||||
|
"sp": "sp",
|
||||||
"ex": "EX"
|
"ex": "EX"
|
||||||
},
|
},
|
||||||
"Fleet": {
|
"Fleet": {
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ def emotion_mode_redirect(value):
|
|||||||
|
|
||||||
def change_ship_redirect(value):
|
def change_ship_redirect(value):
|
||||||
"""
|
"""
|
||||||
FlagshipChange + FlagshipEquipChange -> ChangeFlagship
|
FlagshipChange + FlagshipEquipChange -> ChangeFlagship
|
||||||
"""
|
"""
|
||||||
ship, equip = value
|
ship, equip = value
|
||||||
if not ship:
|
if not ship:
|
||||||
@@ -93,6 +93,7 @@ def change_ship_redirect(value):
|
|||||||
else:
|
else:
|
||||||
return 'ship'
|
return 'ship'
|
||||||
|
|
||||||
|
|
||||||
def api_redirect2(value):
|
def api_redirect2(value):
|
||||||
"""
|
"""
|
||||||
remove shanghai proxy, use guangzhou
|
remove shanghai proxy, use guangzhou
|
||||||
@@ -100,4 +101,32 @@ def api_redirect2(value):
|
|||||||
if value == 'cn_sh_reverse_proxy':
|
if value == 'cn_sh_reverse_proxy':
|
||||||
return 'cn_gz_reverse_proxy'
|
return 'cn_gz_reverse_proxy'
|
||||||
else:
|
else:
|
||||||
return value
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
def coalition_to_frostfall(value):
|
||||||
|
"""
|
||||||
|
Redirect Little Academy stage names to Frostfall
|
||||||
|
"""
|
||||||
|
if value == 'easy':
|
||||||
|
return 'tc1'
|
||||||
|
elif value == 'normal':
|
||||||
|
return 'tc2'
|
||||||
|
elif value == 'hard':
|
||||||
|
return 'tc3'
|
||||||
|
else:
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
def coalition_to_little_academy(value):
|
||||||
|
"""
|
||||||
|
Redirect Little Academy stage names to Frostfall
|
||||||
|
"""
|
||||||
|
if value == 'tc1':
|
||||||
|
return 'easy'
|
||||||
|
elif value == 'tc2':
|
||||||
|
return 'normal'
|
||||||
|
elif value == 'tc3':
|
||||||
|
return 'hard'
|
||||||
|
else:
|
||||||
|
return value
|
||||||
|
|||||||
@@ -131,18 +131,18 @@ page_campaign.link(button=CAMPAIGN_GOTO_EVENT, destination=page_sp)
|
|||||||
|
|
||||||
# Coalition
|
# Coalition
|
||||||
# FROSTFALL
|
# FROSTFALL
|
||||||
# page_coalition = Page(COALITION_CHECK)
|
page_coalition = Page(COALITION_CHECK)
|
||||||
# page_coalition.link(button=GOTO_MAIN, destination=page_main)
|
page_coalition.link(button=GOTO_MAIN, destination=page_main)
|
||||||
# page_coalition.link(button=BACK_ARROW, destination=page_campaign)
|
page_coalition.link(button=BACK_ARROW, destination=page_campaign)
|
||||||
# page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition)
|
|
||||||
# ACADEMY
|
|
||||||
page_coalition_menu = Page(COALITION_ACADEMY_MAIN_CHECK)
|
|
||||||
page_coalition_menu.link(button=COALITION_ACADEMY_HOME, destination=page_main)
|
|
||||||
page_coalition = Page(COALITION_ACADEMY_CAMPAIGN_CHECK)
|
|
||||||
page_coalition.link(button=COALITION_ACADEMY_HOME, destination=page_main)
|
|
||||||
page_coalition.link(button=COALITION_ACADEMY_BACK, destination=page_coalition_menu)
|
|
||||||
page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition)
|
page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition)
|
||||||
page_coalition_menu.link(button=COALITION_ACADEMY_GOTO_CAMPAIGN, destination=page_coalition)
|
# ACADEMY
|
||||||
|
# page_coalition_menu = Page(COALITION_ACADEMY_MAIN_CHECK)
|
||||||
|
# page_coalition_menu.link(button=COALITION_ACADEMY_HOME, destination=page_main)
|
||||||
|
# page_coalition = Page(COALITION_ACADEMY_CAMPAIGN_CHECK)
|
||||||
|
# page_coalition.link(button=COALITION_ACADEMY_HOME, destination=page_main)
|
||||||
|
# page_coalition.link(button=COALITION_ACADEMY_BACK, destination=page_coalition_menu)
|
||||||
|
# page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition)
|
||||||
|
# page_coalition_menu.link(button=COALITION_ACADEMY_GOTO_CAMPAIGN, destination=page_coalition)
|
||||||
|
|
||||||
# Operation Siren
|
# Operation Siren
|
||||||
page_os = Page(OS_CHECK)
|
page_os = Page(OS_CHECK)
|
||||||
|
|||||||