Skip to content

Commit

Permalink
#103 重构中 开拓力副本统一到生存索引中
Browse files Browse the repository at this point in the history
  • Loading branch information
DoctorReid committed Feb 8, 2024
1 parent 6f37f74 commit dda13d3
Show file tree
Hide file tree
Showing 28 changed files with 381 additions and 271 deletions.
2 changes: 1 addition & 1 deletion config/world_patrol/P01_KJZHT/R03_SRCD_R01_HMZL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid']
planet: '空间站黑塔'
region: '收容舱段'
floor: 1
tp: '毁灭之蕾拟造花萼赤'
tp: '毁灭之蕾·拟造花萼(赤)'
route:
- op: 'move'
data: [318, 445, -1]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P01_KJZHT/R04_ZYCD_R02_CHZL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid', '龙女姬']
planet: '空间站黑塔'
region: '支援舱段'
floor: 2
tp: '存护之蕾拟造花萼赤'
tp: '存护之蕾·拟造花萼(赤)'
route:
- op: 'move'
data: [473, 388]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P02_YLL6/R02_CJXY_R01_HYZL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid']
planet: '雅利洛'
region: '城郊雪原'
floor: 0
tp: '回忆之蕾拟造花萼金'
tp: '回忆之蕾·拟造花萼(金)'
route:
- op: 'move'
data: [1067, 477]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P02_YLL6/R05_CXHL_R02_MLZX.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid']
planet: '雅利洛'
region: '残响回廊'
floor: 0
tp: '鸣雷之形凝滞虚影'
tp: '鸣雷之形·凝滞虚影'
route:
- op: 'move'
data: [488, 630]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P02_YLL6/R05_CXHL_R03_MLZX_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid', '龙女姬']
planet: '雅利洛'
region: '残响回廊'
floor: 0
tp: '鸣雷之形凝滞虚影'
tp: '鸣雷之形·凝滞虚影'
route:
- op: 'move'
data: [520, 610]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P02_YLL6/R06_YDL_R02_RZZJ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid']
planet: '雅利洛'
region: '永冬岭'
floor: 0
tp: '睿治之径侵蚀隧洞'
tp: '睿治之径·侵蚀隧洞'
route:
- op: 'move'
data: [560, 553]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P02_YLL6/R10_DKQ_R01_FMZX.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid']
planet: '雅利洛'
region: '大矿区'
floor: 0
tp: '锋芒之形凝滞虚影'
tp: '锋芒之形·凝滞虚影'
route:
- op: 'move'
data: [434, 526]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P02_YLL6/R11_MDZ_R02_XFZX.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid', '龙女姬']
planet: '雅利洛'
region: '铆钉镇'
floor: 1
tp: '巽风之形凝滞虚影'
tp: '巽风之形·凝滞虚影'
route:
- op: 'move'
data: [603, 459]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P02_YLL6/R12_JXJL_R01_TXZL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid']
planet: '雅利洛'
region: '机械聚落'
floor: 1
tp: '同谐之蕾拟造花萼赤'
tp: '同谐之蕾·拟造花萼(赤)'
route:
- op: 'move'
data: [312, 531]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P03_XZLF/R08_DDS_R04_YSZJ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid', '龙女姬']
planet: '仙舟罗浮'
region: '丹鼎司'
floor: 2
tp: '药使之径侵蚀隧洞'
tp: '药使之径·侵蚀隧洞'
route:
- op: 'move'
data: [669, 1458]
Expand Down
2 changes: 1 addition & 1 deletion config/world_patrol/P03_XZLF/R09_LYJ_R01_NSZX.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ author: ['DoctorReid', '龙女姬']
planet: '仙舟罗浮'
region: '鳞渊境'
floor: 0
tp: '孽兽之形凝滞虚影'
tp: '孽兽之形·凝滞虚影'
route:
- op: 'move'
data: [876, 171]
Expand Down
72 changes: 36 additions & 36 deletions data/locales/ocr/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ msgstr "Monitoring Room"
msgid "接待中心"
msgstr "Reception Center"

msgid "空海之形凝滞虚影"
msgid "空海之形·凝滞虚影"
msgstr "Stagnant Shadow"

# Special Point - Herta Space Station - Storage Zone
Expand All @@ -230,10 +230,10 @@ msgstr "Special Purpose Lab"
msgid "无明之间"
msgstr "Gallery of Shadow"

msgid "毁灭之蕾拟造花萼赤"
msgid "毁灭之蕾·拟造花萼(赤)"
msgstr "Bud of Destruction"

msgid "霜风之径侵蚀隧洞"
msgid "霜风之径·侵蚀隧洞"
msgstr "Path of Gelid Wind"

msgid "裂界征兆"
Expand All @@ -249,10 +249,10 @@ msgstr "Railway Platform"
msgid "电力室"
msgstr "Electrical Room"

msgid "存护之蕾拟造花萼赤"
msgid "存护之蕾·拟造花萼(赤)"
msgstr "Bud of Preservation"

msgid "毁灭的开端历战回响"
msgid "毁灭的开端·历战余响"
msgstr "Destruction's Beginning"

# Interact
Expand All @@ -275,7 +275,7 @@ msgstr "Pharmaceutical Room"
msgid "生物烘焙箱"
msgstr "Lifeform Oven"

msgid "蛀星的旧靥历战回响"
msgid "蛀星的旧靥·历战余响"
msgstr "Borehole Planet's Old Crater"

# Special Point - Jarilo-VI - Administrative District
Expand Down Expand Up @@ -331,10 +331,10 @@ msgstr "Long Slope"
msgid "着陆点"
msgstr "Landing Point"

msgid "巡猎之蕾拟造花萼赤"
msgid "巡猎之蕾·拟造花萼(赤)"
msgstr "Bud of The Hunt"

msgid "回忆之蕾拟造花萼金"
msgid "回忆之蕾·拟造花萼(金)"
msgstr "Bud of Memories"

msgid "玲可"
Expand All @@ -350,13 +350,13 @@ msgstr "Leisure Plaza"
msgid "歌德旧宅"
msgstr "Goethe Mansion"

msgid "幻光之形凝滞虚影"
msgid "幻光之形·凝滞虚影"
msgstr "Shape of Mirage"

msgid "丰饶之蕾拟造花萼赤"
msgid "丰饶之蕾·拟造花萼(赤)"
msgstr "Bud of Abundance"

msgid "以太之蕾拟造花萼金"
msgid "以太之蕾·拟造花萼(金)"
msgstr "Bud of Aether"

# Special Point - Jarilo-VI - Silvermane Guard Restricted Zone
Expand All @@ -369,10 +369,10 @@ msgstr "Frontline"
msgid "能源枢纽"
msgstr "Energy Hub"

msgid "炎华之形凝滞虚影"
msgid "炎华之形·凝滞虚影"
msgstr "Shape of Blaze"

msgid "迅拳之径侵蚀隧洞"
msgid "迅拳之径·侵蚀隧洞"
msgstr "Path of Jabbing Punch"

msgid "以眼还眼"
Expand All @@ -394,13 +394,13 @@ msgstr "Command Center"
msgid "古战场前线"
msgstr "Ancient Battlefield: Frontline"

msgid "鸣雷之形凝滞虚影"
msgid "鸣雷之形·凝滞虚影"
msgstr "Shape of Fulmination"

msgid "霜晶之形凝滞虚影"
msgid "霜晶之形·凝滞虚影"
msgstr "Shape of Rime"

msgid "漂泊之径侵蚀隧洞"
msgid "漂泊之径·侵蚀隧洞"
msgstr "Path of Drifting"

# Special Point - Jarilo-VI - Everwinter Hill
Expand All @@ -410,10 +410,10 @@ msgstr "Ancient Battlefield"
msgid "造物平台"
msgstr "Deck of Creation"

msgid "睿治之径侵蚀隧洞"
msgid "睿治之径·侵蚀隧洞"
msgstr "Path of Providence"

msgid "寒潮的落幕历战回响"
msgid "寒潮的落幕·历战余响"
msgstr "End of the Eternal Freeze"

# Special Point - Jarilo-VI - Pillars of Creation
Expand Down Expand Up @@ -465,16 +465,16 @@ msgstr "Overlook"
msgid "主矿道"
msgstr "Main Mine Shaft"

msgid "锋芒之形凝滞虚影"
msgid "锋芒之形·凝滞虚影"
msgstr "Shape of Spike"

msgid "燔灼之形凝滞虚影"
msgid "燔灼之形·凝滞虚影"
msgstr "Shape of Scorch"

msgid "虚无之蕾拟造花萼赤"
msgid "虚无之蕾·拟造花萼(赤)"
msgstr "Bud of Nihility"

msgid "藏珍之蕾拟造花萼金"
msgid "藏珍之蕾·拟造花萼(金)"
msgstr "Bud of Treasures"

# Special Point - Jarilo-VI - Rivet Town
Expand All @@ -484,10 +484,10 @@ msgstr "Orphanage"
msgid "废弃市集"
msgstr "Abandoned Market"

msgid "巽风之形凝滞虚影"
msgid "巽风之形·凝滞虚影"
msgstr "Shape of Gust"

msgid "智识之蕾拟造花萼赤"
msgid "智识之蕾·拟造花萼(赤)"
msgstr "Bud of Erudition"

# Special Point - Jarilo-VI - Robot Settlement
Expand All @@ -500,7 +500,7 @@ msgstr "Svarog's Base"
msgid "能源转换设施"
msgstr "Energy Conversion Station"

msgid "同谐之蕾拟造花萼赤"
msgid "同谐之蕾·拟造花萼(赤)"
msgstr "Bud of Harmony"

# Special Point - The Xianzhou Luofu - Central Starskiff Haven
Expand Down Expand Up @@ -544,10 +544,10 @@ msgstr "Trove of Verdure: South Wing"
msgid "流云渡乘槎处"
msgstr "Cloudford: Skiff Boarding Area"

msgid "冰棱之形凝滞虚影"
msgid "冰棱之形·凝滞虚影"
msgstr "Shape of Icicle"

msgid "圣颂之径侵蚀隧洞"
msgid "圣颂之径·侵蚀隧洞"
msgstr "Path of Holy Hymn"

msgid "过期邮包收购处"
Expand All @@ -566,10 +566,10 @@ msgstr "Ship Nursery - The Burgeoning"
msgid "泊航区"
msgstr "The Mooring"

msgid "震厄之形凝滞虚影"
msgid "震厄之形·凝滞虚影"
msgstr "Shape of Doom"

msgid "野焰之径侵蚀隧洞"
msgid "野焰之径·侵蚀隧洞"
msgstr "Path of Conflagration"

# Special Point - The Xianzhou Luofu - Exalting Sanctum
Expand Down Expand Up @@ -663,7 +663,7 @@ msgstr "Arcane Moorage"
msgid "造化洪炉"
msgstr "Creation Furnace"

msgid "偃偶之形凝滞虚影"
msgid "偃偶之形·凝滞虚影"
msgstr "Shape of Puppetry"

# Interact
Expand All @@ -683,10 +683,10 @@ msgstr "Healer's Market"
msgid "岐黄署"
msgstr "Medicine Bureau"

msgid "天人之形凝滞虚影"
msgid "天人之形·凝滞虚影"
msgstr "Shape of Celestial"

msgid "药使之径侵蚀隧洞"
msgid "药使之径·侵蚀隧洞"
msgstr "Path of Elixir Seekers"

msgid "祈龙坛"
Expand All @@ -711,10 +711,10 @@ msgstr "Ancient Sea Palace Ruins"
msgid "显龙大雩殿"
msgstr "Draggonvista Rain Hall"

msgid "孽兽之形凝滞虚影"
msgid "孽兽之形·凝滞虚影"
msgstr "Shape of Abomination"

msgid "不死的神实历战回响"
msgid "不死的神实·历战余响"
msgstr "Divine Seed"

# Special Point - The Xianzhou Luofu - Fyxestroll Garden
Expand All @@ -730,10 +730,10 @@ msgstr "Verdant Terrace Entrance"
msgid "燕乐亭入口"
msgstr "Swallowsong Pavilion Entrance"

msgid "幽府之形凝滞虚影"
msgid "幽府之形·凝滞虚影"
msgstr "Shape of Perdition"

msgid "幽冥之径侵蚀隧洞"
msgid "幽冥之径·侵蚀隧洞"
msgstr "Path of Darkness"

msgid "集合点"
Expand Down
8 changes: 4 additions & 4 deletions data/locales/ui/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ msgstr "Electrical Room"
msgid "存护之蕾"
msgstr "Bud of Preservation"

msgid "毁灭的开端历战回响"
msgid "毁灭的开端·历战余响"
msgstr "Destruction's Beginning"

# Interact
Expand Down Expand Up @@ -384,7 +384,7 @@ msgstr "Deck of Creation"
msgid "睿治之径"
msgstr "Path of Providence"

msgid "寒潮的落幕历战回响"
msgid "寒潮的落幕·历战余响"
msgstr "End of the Eternal Freeze"

# Special Point - Jarilo-VI - Pillars of Creation
Expand Down Expand Up @@ -685,7 +685,7 @@ msgstr "Draggonvista Rain Hall"
msgid "孽兽之形"
msgstr "Shape of Abomination"

msgid "不死的神实历战回响"
msgid "不死的神实·历战余响"
msgstr "Divine Seed"

# Special Point - The Xianzhou Luofu - Fyxestroll Garden
Expand Down Expand Up @@ -733,7 +733,7 @@ msgstr "Trailblaze Power"
msgid "实训"
msgstr "Daily Training"

msgid "历战回响"
msgid "历战余响"
msgstr "Echo of War"

msgid "忘却之庭"
Expand Down
2 changes: 1 addition & 1 deletion src/gui/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def __init__(self, page: ft.Page, ctx: Context):
ft.NavigationRailDestination(
icon=ft.icons.SURROUND_SOUND_OUTLINED,
selected_icon=ft.icons.SURROUND_SOUND,
label=gt('历战回响', model='ui')
label=gt('历战余响', model='ui')
),
ft.NavigationRailDestination(
icon=ft.icons.BOOKMARKS_OUTLINED,
Expand Down
2 changes: 1 addition & 1 deletion src/gui/one_stop_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def __init__(self, page: ft.Page, ctx: Context):
assignment_row_2 = ft.Row(controls=[self.assignment_3_label, self.assignment_4_label])

self.training = Label2NormalValueRow('实训', '500', '/500')
self.echo = Label2NormalValueRow('历战回响剩余(本地)', '3', '/3')
self.echo = Label2NormalValueRow('历战余响剩余(本地)', '3', '/3')
training_row = ft.Row(controls=[self.training, self.echo])

self.sim_rank = Label2NormalValueRow('模拟宇宙', '0', '/14000')
Expand Down
Loading

0 comments on commit dda13d3

Please sign in to comment.