#56 根据 1224910892 反馈调整部分路线；增加路线作者署名

DoctorReid · Oct 26, 2023 · 8091d1c · 8091d1c
1 parent 2ef6e5e
commit 8091d1c
Show file tree

Hide file tree

Showing 45 changed files with 100 additions and 11 deletions.
diff --git a/config/world_patrol/P01_KJZHT/R02_JZCD_R01_JKS.yml b/config/world_patrol/P01_KJZHT/R02_JZCD_R01_JKS.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '空间站黑塔'
 region: '基座舱段'
 level: 0

diff --git a/config/world_patrol/P01_KJZHT/R03_SRCD_R01_HMZL.yml b/config/world_patrol/P01_KJZHT/R03_SRCD_R01_HMZL.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '空间站黑塔'
 region: '收容舱段'
 level: 1

diff --git a/config/world_patrol/P01_KJZHT/R03_SRCD_R02_KZZXW.yml b/config/world_patrol/P01_KJZHT/R03_SRCD_R02_KZZXW.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '空间站黑塔'
 region: '收容舱段'
 level: 1

diff --git a/config/world_patrol/P01_KJZHT/R03_SRCD_R03_ZT.yml b/config/world_patrol/P01_KJZHT/R03_SRCD_R03_ZT.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '空间站黑塔'
 region: '收容舱段'
 level: 1

diff --git a/config/world_patrol/P01_KJZHT/R04_ZYCD_R01_DLS.yml b/config/world_patrol/P01_KJZHT/R04_ZYCD_R01_DLS.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '空间站黑塔'
 region: '支援舱段'
 level: 2

diff --git a/config/world_patrol/P01_KJZHT/R04_ZYCD_R02_CHZL.yml b/config/world_patrol/P01_KJZHT/R04_ZYCD_R02_CHZL.yml
@@ -1,16 +1,19 @@
+author: ['DoctorReid', '1224910892']
 planet: '空间站黑塔'
 region: '支援舱段'
 level: 2
 tp: '存护之蕾'
 route:
   - op: 'move'
-    data: [500, 388]
+    data: [473, 388]
+  - op: 'move'
+    data: [503, 388]
   - op: 'interact'
     data: '配控装置'
   - op: 'wait'
     data: 'in_world'
   - op: 'update_pos'
-    data: [500, 388, 1]
+    data: [503, 388, 1]
   - op: 'move'
     data: [482, 274]
   - op: 'patrol'
diff --git a/config/world_patrol/P02_YLL6/R02_CJXY_R01_HYZL.yml b/config/world_patrol/P02_YLL6/R02_CJXY_R01_HYZL.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '城郊雪原'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R03_BYTL_R01_GDJZ.yml b/config/world_patrol/P02_YLL6/R03_BYTL_R01_GDJZ.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '边缘通路'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R05_CXHL_R01_ZCLY.yml b/config/world_patrol/P02_YLL6/R05_CXHL_R01_ZCLY.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '残响回廊'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R05_CXHL_R02_MLZX.yml b/config/world_patrol/P02_YLL6/R05_CXHL_R02_MLZX.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '残响回廊'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R05_CXHL_R03_MLZX_2.yml b/config/world_patrol/P02_YLL6/R05_CXHL_R03_MLZX_2.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid', '1224910892']
 planet: '雅利洛'
 region: '残响回廊'
 level: 0
@@ -18,4 +19,6 @@ route:
     data: [740, 627]
   - op: 'move'
     data: [718, 647]
+  - op: 'move'
+    data: [697, 663]
   - op: 'patrol'
diff --git a/config/world_patrol/P02_YLL6/R05_CXHL_R04_ZZZHS.yml b/config/world_patrol/P02_YLL6/R05_CXHL_R04_ZZZHS.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '残响回廊'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R05_CXHL_R05_GZCQX.yml b/config/world_patrol/P02_YLL6/R05_CXHL_R05_GZCQX.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid', '1224910892']
 planet: '雅利洛'
 region: '残响回廊'
 level: 0
@@ -7,6 +8,7 @@ route:
     data: [490, 1232]
   - op: 'move'
     data: [488, 1176]
+  - op: 'patrol'
   - op: 'move'
     data: [373, 1176]
   - op: 'patrol'
@@ -15,5 +17,5 @@ route:
   - op: 'move'
     data: [265, 1190]
   - op: 'move'
-    data: [270, 1280]
+    data: [265, 1320]
   - op: 'patrol'
diff --git a/config/world_patrol/P02_YLL6/R06_YDL_R01_GZC.yml b/config/world_patrol/P02_YLL6/R06_YDL_R01_GZC.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '永冬岭'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R06_YDL_R02_RZZJ.yml b/config/world_patrol/P02_YLL6/R06_YDL_R02_RZZJ.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '永冬岭'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R10_DKQ_R01_FMZX.yml b/config/world_patrol/P02_YLL6/R10_DKQ_R01_FMZX.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '大矿区'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R10_DKQ_R02_FKD.yml b/config/world_patrol/P02_YLL6/R10_DKQ_R02_FKD.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '大矿区'
 level: 0

diff --git a/config/world_patrol/P02_YLL6/R11_MDZ_R01_GEY.yml b/config/world_patrol/P02_YLL6/R11_MDZ_R01_GEY.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '铆钉镇'
 level: 1

diff --git a/config/world_patrol/P02_YLL6/R11_MDZ_R02_XFZX.yml b/config/world_patrol/P02_YLL6/R11_MDZ_R02_XFZX.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid', '1224910892']
 planet: '雅利洛'
 region: '铆钉镇'
 level: 1
@@ -15,3 +16,6 @@ route:
   - op: 'move'
     data: [732, 479]
   - op: 'patrol'
+  - op: 'move'
+    data: [733, 515]
+  - op: 'patrol'
diff --git a/config/world_patrol/P02_YLL6/R11_MDZ_R03_FQSJ.yml b/config/world_patrol/P02_YLL6/R11_MDZ_R03_FQSJ.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '铆钉镇'
 level: 1

diff --git a/config/world_patrol/P02_YLL6/R12_JXJL_R01_TXZL.yml b/config/world_patrol/P02_YLL6/R12_JXJL_R01_TXZL.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '雅利洛'
 region: '机械聚落'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R02_LYD_R01_JYF.yml b/config/world_patrol/P03_XZLF/R02_LYD_R01_JYF.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid', '1224910892']
 planet: '仙舟罗浮'
 region: '流云渡'
 level: 1
@@ -11,4 +12,6 @@ route:
     data: [597, 661, 2]
   - op: 'move'
     data: [555, 660]
+  - op: 'move'
+    data: [539, 676]
   - op: 'patrol'
diff --git a/config/world_patrol/P03_XZLF/R02_LYD_R02_JYF_2.yml b/config/world_patrol/P03_XZLF/R02_LYD_R02_JYF_2.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '流云渡'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R02_LYD_R03_JYF_3.yml b/config/world_patrol/P03_XZLF/R02_LYD_R03_JYF_3.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '流云渡'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R03_HXG_R01_FXXZ.yml b/config/world_patrol/P03_XZLF/R03_HXG_R01_FXXZ.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '廻星港'
 level: 2

diff --git a/config/world_patrol/P03_XZLF/R03_HXG_R02_ZCQMJ.yml b/config/world_patrol/P03_XZLF/R03_HXG_R02_ZCQMJ.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '廻星港'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R03_HXG_R03_ZCQMJ_2.yml b/config/world_patrol/P03_XZLF/R03_HXG_R03_ZCQMJ_2.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '廻星港'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R03_HXG_R04_ZCQMJ_3.yml b/config/world_patrol/P03_XZLF/R03_HXG_R04_ZCQMJ_3.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '廻星港'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R06_TBS_R01_JHZ.yml b/config/world_patrol/P03_XZLF/R06_TBS_R01_JHZ.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '太卜司'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R06_TBS_R02_JHZ_2.yml b/config/world_patrol/P03_XZLF/R06_TBS_R02_JHZ_2.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '太卜司'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R06_TBS_R03_XT.yml b/config/world_patrol/P03_XZLF/R06_TBS_R03_XT.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid', '1224910892']
 planet: '仙舟罗浮'
 region: '太卜司'
 level: 2
@@ -31,7 +32,13 @@ route:
     data: [565, 918]
   - op: 'patrol'
   - op: 'move'
-    data: [495, 918]
+    data: [573, 885]
+  - op: 'move'
+    data: [572, 842]
+  - op: 'move'
+    data: [535, 841]
+  - op: 'move'
+    data: [493, 841]
   - op: 'move'
     data: [490, 882]
   - op: 'move'

diff --git a/config/world_patrol/P03_XZLF/R07_GZS_R01_RJFTD.yml b/config/world_patrol/P03_XZLF/R07_GZS_R01_RJFTD.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid', '1224910892']
 planet: '仙舟罗浮'
 region: '工造司'
 level: 0
@@ -74,3 +75,6 @@ route:
   - op: 'move'
     data: [343, 392]
   - op: 'patrol'
+  - op: 'move'
+    data: [346, 427]
+  - op: 'patrol'
diff --git a/config/world_patrol/P03_XZLF/R07_GZS_R02_GWYTD.yml b/config/world_patrol/P03_XZLF/R07_GZS_R02_GWYTD.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid', '1224910892']
 planet: '仙舟罗浮'
 region: '工造司'
 level: 0
@@ -40,3 +41,6 @@ route:
   - op: 'move'
     data: [426, 1210]
   - op: 'patrol'
+  - op: 'move'
+    data: [449, 1217]
+  - op: 'patrol'
diff --git a/config/world_patrol/P03_XZLF/R07_GZS_R03_ZHHL.yml b/config/world_patrol/P03_XZLF/R07_GZS_R03_ZHHL.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '工造司'
 level: 0

diff --git a/config/world_patrol/P03_XZLF/R08_DDS_R01_TZDS.yml b/config/world_patrol/P03_XZLF/R08_DDS_R01_TZDS.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid', '1224910892']
 planet: '仙舟罗浮'
 region: '丹鼎司'
 level: 1
@@ -27,7 +28,13 @@ route:
   - op: 'move'
     data: [292, 444]
   - op: 'move'
-    data: [313, 427]
+    data: [267, 444]
+  - op: 'move'
+    data: [269, 413]
+  - op: 'move'
+    data: [305, 411]
+  - op: 'move'
+    data: [311, 430]
   - op: 'patrol'
   - op: 'move'
     data: [380, 430]

diff --git a/config/world_patrol/P03_XZLF/R08_DDS_R02_GYT.yml b/config/world_patrol/P03_XZLF/R08_DDS_R02_GYT.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '丹鼎司'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R08_DDS_R03_GYT_2.yml b/config/world_patrol/P03_XZLF/R08_DDS_R03_GYT_2.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '丹鼎司'
 level: 1

diff --git a/config/world_patrol/P03_XZLF/R08_DDS_R04_YSZJ.yml b/config/world_patrol/P03_XZLF/R08_DDS_R04_YSZJ.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '丹鼎司'
 level: 2

diff --git a/config/world_patrol/P03_XZLF/R08_DDS_R05_XYSJ.yml b/config/world_patrol/P03_XZLF/R08_DDS_R05_XYSJ.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '丹鼎司'
 level: 2

diff --git a/config/world_patrol/P03_XZLF/R09_LYJ_R01_NSZX.yml b/config/world_patrol/P03_XZLF/R09_LYJ_R01_NSZX.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '鳞渊境'
 level: 0

diff --git a/config/world_patrol/P03_XZLF/R09_LYJ_R02_GXSC.yml b/config/world_patrol/P03_XZLF/R09_LYJ_R02_GXSC.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '鳞渊境'
 level: 0

diff --git a/config/world_patrol/P03_XZLF/R09_LYJ_R03_GHGX.yml b/config/world_patrol/P03_XZLF/R09_LYJ_R03_GHGX.yml
@@ -1,3 +1,4 @@
+author: ['DoctorReid']
 planet: '仙舟罗浮'
 region: '鳞渊境'
 level: 0

diff --git a/src/gui/world_patrol_draft_route_view.py b/src/gui/world_patrol_draft_route_view.py
@@ -10,7 +10,6 @@
 
 from basic import config_utils, os_utils
 from basic.img import cv2_utils
-from basic.img.os import get_debug_world_patrol_dir
 from basic.log_utils import log
 from sr.app.world_patrol import load_all_route_id, WorldPatrolRoute, WorldPatrol, WorldPatrolRouteId
 from sr.constants.map import Planet, get_planet_by_cn, PLANET_LIST, PLANET_2_REGION, get_region_by_cn, Region, \
@@ -24,6 +23,12 @@ def __init__(self, page: ft.Page, ctx: Context):
         self.page = page
         self.ctx = ctx
 
+        self.author_text = ft.TextField(label='作者署名', width=200, value='DoctorReid')
+        author_row = ft.Row(spacing=10, controls=[
+            self.author_text,
+            ft.Text(value='留下您的大名可以让大家知道您的贡献，匿名提供也替大家谢谢您')
+            ])
+
         self.route_id_list: List[WorldPatrolRouteId] = None
         self.existed_route_dropdown = ft.Dropdown(
             label='编辑已有路线',
@@ -84,6 +89,7 @@ def __init__(self, page: ft.Page, ctx: Context):
 
         display_part = ft.Column(
             controls=[
+                ft.Container(content=author_row, padding=20),
                 ft.Container(content=load_existed_row, padding=20),
                 ft.Container(content=choose_row, padding=20),
                 ft.Container(content=ctrl_row, padding=20),
@@ -103,6 +109,7 @@ def __init__(self, page: ft.Page, ctx: Context):
             ]
         )
 
+        self.author_list: List[str] = [self.author_text.value]
         self.route_list: List = []
         self.chosen_planet: Planet = None
         self.chosen_region: Region = None
@@ -244,6 +251,9 @@ def on_map_click(self, e):
         x = int(e.local_x / scale)
         y = int(e.local_y / scale)
 
+        if x > original_width or y > original_height:
+            return
+
         self.route_list.append({'op': 'move', 'data': (x, y, int(self.switch_level.value))})
         self.draw_route_and_display()
 
@@ -267,6 +277,10 @@ def get_route_config_str(self) -> str:
         if self.chosen_sp is None:
             return
         last_level = int(self.level_dropdown.value)
+        display_auth_list = self.author_list.copy()
+        if self.author_text.value not in display_auth_list:
+            display_auth_list.append(self.author_text.value)
+        cfg += "author: %s\n" % display_auth_list
         cfg += "planet: '%s'\n" % self.chosen_planet.cn
         cfg += "region: '%s'\n" % self.chosen_region.cn
         cfg += "level: %d\n" % last_level
@@ -382,6 +396,7 @@ def on_existed_route_changed(self, e):
         self.tp_dropdown.value = route.tp.cn
         self.chosen_sp = route.tp
 
+        self.author_list = route.author_list
         self.route_list = route.route_list
         self.init_route_list_from_outer_data()
         self.draw_route_and_display()

diff --git a/src/sr/app/world_patrol.py b/src/sr/app/world_patrol.py
@@ -77,6 +77,7 @@ def file_path(self):
 class WorldPatrolRoute(ConfigHolder):
 
     def __init__(self, route_id: WorldPatrolRouteId):
+        self.author_list: List[str] = None
         self.tp: TransportPoint = None
         self.route_list: List = None
         self.route_id: WorldPatrolRouteId = route_id
@@ -85,7 +86,8 @@ def __init__(self, route_id: WorldPatrolRouteId):
     def init(self):
         self.init_from_data(**self.data)
 
-    def init_from_data(self, planet: str, region: str, tp: str, level: int, route: List):
+    def init_from_data(self, author: List[str], planet: str, region: str, tp: str, level: int, route: List):
+        self.author_list = author
         self.tp: TransportPoint = constants.map.get_sp_by_cn(planet, region, level, tp)
         self.route_list = route
 
@@ -174,6 +176,7 @@ def run_one_route(self, route_id: WorldPatrolRouteId) -> bool:
         """
         route: WorldPatrolRoute = WorldPatrolRoute(route_id)
         log.info('准备执行线路 %s %s %s %s', route_id, route.tp.planet.cn, route.tp.region.cn, route.tp.cn)
+        log.info('感谢以下人员提供本路线 %s', route.author_list)
         if self.record is not None and route_id.display_name in self.record.finished:
             log.info('线路 %s 之前已执行 跳过', route_id.display_name)
             return False