#140 完善第八宇宙地图

DoctorReid · Jan 21, 2024 · 271952d · 271952d
1 parent 722b5fd
commit 271952d
Show file tree

Hide file tree

Showing 100 changed files with 1,268 additions and 594 deletions.
diff --git a/config/sim_uni/08/combat/010/route.yml b/config/sim_uni/08/combat/010/route.yml
@@ -7,5 +7,5 @@ op_list:
     data: [411, 863]
   - op: 'patrol'
   - op: 'move'
-    data: [308, 864]
+    data: [318, 862]
   - op: 'patrol'
diff --git a/config/sim_uni/08/combat/019/route.yml b/config/sim_uni/08/combat/019/route.yml
@@ -4,5 +4,5 @@ floor: 1
 start_pos: [530, 701]
 op_list:
   - op: 'move'
-    data: [483, 699]
+    data: [486, 699]
   - op: 'patrol'
diff --git a/config/sim_uni/08/combat/028/route.yml b/config/sim_uni/08/combat/028/route.yml
@@ -4,5 +4,5 @@ floor: 0
 start_pos: [792, 885]
 op_list:
   - op: 'move'
-    data: [830, 911]
+    data: [827, 908]
   - op: 'patrol'
diff --git a/config/sim_uni/08/combat/030/route.yml b/config/sim_uni/08/combat/030/route.yml
@@ -10,5 +10,5 @@ op_list:
     data: [728, 840]
   - op: 'patrol'
   - op: 'move'
-    data: [736, 804]
+    data: [738, 798]
   - op: 'patrol'
diff --git a/config/sim_uni/08/combat/032/mm.png b/config/sim_uni/08/combat/032/mm.png
diff --git a/config/sim_uni/08/combat/032/route.yml b/config/sim_uni/08/combat/032/route.yml
@@ -0,0 +1,13 @@
+planet: '仙舟罗浮'
+region: '廻星港'
+floor: 1
+start_pos: [363, 285]
+op_list:
+  - op: 'move'
+    data: [322, 354]
+  - op: 'patrol'
+  - op: 'move'
+    data: [316, 426]
+  - op: 'move'
+    data: [348, 435]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/033/mm.png b/config/sim_uni/08/combat/033/mm.png
diff --git a/config/sim_uni/08/combat/033/route.yml b/config/sim_uni/08/combat/033/route.yml
@@ -0,0 +1,16 @@
+planet: '雅利洛'
+region: '铁卫禁区'
+floor: 0
+start_pos: [791, 942]
+op_list:
+  - op: 'move'
+    data: [787, 1008]
+  - op: 'patrol'
+  - op: 'move'
+    data: [786, 1058]
+  - op: 'move'
+    data: [743, 1099]
+  - op: 'patrol'
+  - op: 'move'
+    data: [709, 1100]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/034/mm.png b/config/sim_uni/08/combat/034/mm.png
diff --git a/config/sim_uni/08/combat/034/route.yml b/config/sim_uni/08/combat/034/route.yml
@@ -0,0 +1,8 @@
+planet: '雅利洛'
+region: '铁卫禁区'
+floor: 0
+start_pos: [375, 858]
+op_list:
+  - op: 'move'
+    data: [333, 858]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/035/mm.png b/config/sim_uni/08/combat/035/mm.png
diff --git a/config/sim_uni/08/combat/035/route.yml b/config/sim_uni/08/combat/035/route.yml
@@ -0,0 +1,8 @@
+planet: '雅利洛'
+region: '铁卫禁区'
+floor: 0
+start_pos: [613, 566]
+op_list:
+  - op: 'move'
+    data: [620, 610]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/036/mm.png b/config/sim_uni/08/combat/036/mm.png
diff --git a/config/sim_uni/08/combat/036/route.yml b/config/sim_uni/08/combat/036/route.yml
@@ -0,0 +1,8 @@
+planet: '仙舟罗浮'
+region: '丹鼎司'
+floor: 2
+start_pos: [716, 771]
+op_list:
+  - op: 'move'
+    data: [745, 736]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/037/mm.png b/config/sim_uni/08/combat/037/mm.png
diff --git a/config/sim_uni/08/combat/037/route.yml b/config/sim_uni/08/combat/037/route.yml
@@ -0,0 +1,16 @@
+planet: '雅利洛'
+region: '铆钉镇'
+floor: 1
+start_pos: [569, 599]
+op_list:
+  - op: 'move'
+    data: [514, 602]
+  - op: 'patrol'
+  - op: 'move'
+    data: [503, 554]
+  - op: 'patrol'
+  - op: 'move'
+    data: [470, 519]
+  - op: 'move'
+    data: [450, 499]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/038/mm.png b/config/sim_uni/08/combat/038/mm.png
diff --git a/config/sim_uni/08/combat/038/route.yml b/config/sim_uni/08/combat/038/route.yml
@@ -0,0 +1,10 @@
+planet: '雅利洛'
+region: '铆钉镇'
+floor: 1
+start_pos: [687, 435]
+op_list:
+  - op: 'move'
+    data: [705, 409]
+  - op: 'move'
+    data: [705, 387]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/039/mm.png b/config/sim_uni/08/combat/039/mm.png
diff --git a/config/sim_uni/08/combat/039/route.yml b/config/sim_uni/08/combat/039/route.yml
@@ -0,0 +1,8 @@
+planet: '仙舟罗浮'
+region: '流云渡'
+floor: 1
+start_pos: [475, 1378]
+op_list:
+  - op: 'move'
+    data: [430, 1379]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/040/mm.png b/config/sim_uni/08/combat/040/mm.png
diff --git a/config/sim_uni/08/combat/040/route.yml b/config/sim_uni/08/combat/040/route.yml
@@ -0,0 +1,8 @@
+planet: '仙舟罗浮'
+region: '工造司'
+floor: 0
+start_pos: [376, 612]
+op_list:
+  - op: 'move'
+    data: [399, 645]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/041/mm.png b/config/sim_uni/08/combat/041/mm.png
diff --git a/config/sim_uni/08/combat/041/route.yml b/config/sim_uni/08/combat/041/route.yml
@@ -0,0 +1,8 @@
+planet: '仙舟罗浮'
+region: '工造司'
+floor: 0
+start_pos: [412, 1146]
+op_list:
+  - op: 'move'
+    data: [413, 1189]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/042/mm.png b/config/sim_uni/08/combat/042/mm.png
diff --git a/config/sim_uni/08/combat/042/route.yml b/config/sim_uni/08/combat/042/route.yml
@@ -0,0 +1,8 @@
+planet: '仙舟罗浮'
+region: '工造司'
+floor: 0
+start_pos: [938, 821]
+op_list:
+  - op: 'move'
+    data: [930, 780]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/043/mm.png b/config/sim_uni/08/combat/043/mm.png
diff --git a/config/sim_uni/08/combat/043/route.yml b/config/sim_uni/08/combat/043/route.yml
@@ -0,0 +1,18 @@
+planet: '雅利洛'
+region: '大矿区'
+floor: 0
+start_pos: [845, 630]
+op_list:
+  - op: 'move'
+    data: [810, 668]
+  - op: 'move'
+    data: [769, 709]
+  - op: 'patrol'
+  - op: 'move'
+    data: [737, 692]
+  - op: 'move'
+    data: [758, 655]
+  - op: 'patrol'
+  - op: 'move'
+    data: [774, 577]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/044/mm.png b/config/sim_uni/08/combat/044/mm.png
diff --git a/config/sim_uni/08/combat/044/route.yml b/config/sim_uni/08/combat/044/route.yml
@@ -0,0 +1,8 @@
+planet: '雅利洛'
+region: '边缘通路'
+floor: 0
+start_pos: [657, 196]
+op_list:
+  - op: 'move'
+    data: [631, 198]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/045/mm.png b/config/sim_uni/08/combat/045/mm.png
diff --git a/config/sim_uni/08/combat/045/route.yml b/config/sim_uni/08/combat/045/route.yml
@@ -0,0 +1,8 @@
+planet: '仙舟罗浮'
+region: '流云渡'
+floor: 1
+start_pos: [524, 1289]
+op_list:
+  - op: 'move'
+    data: [525, 1245]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/046/mm.png b/config/sim_uni/08/combat/046/mm.png
diff --git a/config/sim_uni/08/combat/046/route.yml b/config/sim_uni/08/combat/046/route.yml
@@ -0,0 +1,16 @@
+planet: '雅利洛'
+region: '铆钉镇'
+floor: 1
+start_pos: [703, 365]
+op_list:
+  - op: 'move'
+    data: [708, 411]
+  - op: 'patrol'
+  - op: 'move'
+    data: [736, 423]
+  - op: 'move'
+    data: [734, 460]
+  - op: 'patrol'
+  - op: 'move'
+    data: [735, 531]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/047/mm.png b/config/sim_uni/08/combat/047/mm.png
diff --git a/config/sim_uni/08/combat/047/route.yml b/config/sim_uni/08/combat/047/route.yml
@@ -0,0 +1,8 @@
+planet: '雅利洛'
+region: '磐岩镇'
+floor: 0
+start_pos: [456, 532]
+op_list:
+  - op: 'move'
+    data: [455, 566]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/048/mm.png b/config/sim_uni/08/combat/048/mm.png
diff --git a/config/sim_uni/08/combat/048/route.yml b/config/sim_uni/08/combat/048/route.yml
@@ -0,0 +1,14 @@
+planet: '仙舟罗浮'
+region: '廻星港'
+floor: 2
+start_pos: [679, 280]
+op_list:
+  - op: 'move'
+    data: [734, 278]
+  - op: 'patrol'
+  - op: 'move'
+    data: [785, 277]
+  - op: 'patrol'
+  - op: 'move'
+    data: [830, 272]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/049/mm.png b/config/sim_uni/08/combat/049/mm.png
diff --git a/config/sim_uni/08/combat/049/route.yml b/config/sim_uni/08/combat/049/route.yml
@@ -0,0 +1,8 @@
+planet: '仙舟罗浮'
+region: '廻星港'
+floor: 1
+start_pos: [704, 751]
+op_list:
+  - op: 'move'
+    data: [718, 780]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/050/mm.png b/config/sim_uni/08/combat/050/mm.png
diff --git a/config/sim_uni/08/combat/050/route.yml b/config/sim_uni/08/combat/050/route.yml
@@ -0,0 +1,8 @@
+planet: '仙舟罗浮'
+region: '廻星港'
+floor: 1
+start_pos: [324, 434]
+op_list:
+  - op: 'move'
+    data: [376, 440]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/combat/051/mm.png b/config/sim_uni/08/combat/051/mm.png
diff --git a/config/sim_uni/08/combat/051/route.yml b/config/sim_uni/08/combat/051/route.yml
@@ -0,0 +1,11 @@
+planet: '雅利洛'
+region: '铆钉镇'
+floor: 1
+start_pos: [629, 326]
+op_list:
+  - op: 'move'
+    data: [668, 296]
+  - op: 'patrol'
+  - op: 'move'
+    data: [735, 264]
+  - op: 'patrol'
diff --git a/config/sim_uni/08/transaction/001/mm.png → config/sim_uni/08/event/007/mm.png b/config/sim_uni/08/transaction/001/mm.png → config/sim_uni/08/event/007/mm.png
diff --git a/config/sim_uni/08/transaction/001/route.yml → config/sim_uni/08/event/007/route.yml b/config/sim_uni/08/transaction/001/route.yml → config/sim_uni/08/event/007/route.yml
diff --git a/config/sim_uni/08/event/008/mm.png b/config/sim_uni/08/event/008/mm.png
diff --git a/config/sim_uni/08/event/008/route.yml b/config/sim_uni/08/event/008/route.yml
@@ -0,0 +1,7 @@
+planet: '仙舟罗浮'
+region: '流云渡'
+floor: 1
+start_pos: [525, 1280]
+op_list:
+  - op: 'move'
+    data: [536, 1228]
diff --git a/config/sim_uni/08/event/009/mm.png b/config/sim_uni/08/event/009/mm.png
diff --git a/config/sim_uni/08/event/009/route.yml b/config/sim_uni/08/event/009/route.yml
@@ -0,0 +1,7 @@
+planet: '雅利洛'
+region: '铁卫禁区'
+floor: 0
+start_pos: [636, 631]
+op_list:
+  - op: 'move'
+    data: [630, 577]
diff --git a/config/sim_uni/08/event/010/mm.png b/config/sim_uni/08/event/010/mm.png
diff --git a/config/sim_uni/08/event/010/route.yml b/config/sim_uni/08/event/010/route.yml
@@ -0,0 +1,7 @@
+planet: '雅利洛'
+region: '大矿区'
+floor: 0
+start_pos: [376, 341]
+op_list:
+  - op: 'move'
+    data: [431, 324]
diff --git a/config/sim_uni/08/event/011/mm.png b/config/sim_uni/08/event/011/mm.png
diff --git a/config/sim_uni/08/event/011/route.yml b/config/sim_uni/08/event/011/route.yml
@@ -0,0 +1,7 @@
+planet: '仙舟罗浮'
+region: '丹鼎司'
+floor: 2
+start_pos: [753, 880]
+op_list:
+  - op: 'move'
+    data: [687, 881]
diff --git a/config/sim_uni/08/respite/004/mm.png b/config/sim_uni/08/respite/004/mm.png
diff --git a/config/sim_uni/08/respite/004/route.yml b/config/sim_uni/08/respite/004/route.yml
@@ -0,0 +1,7 @@
+planet: '仙舟罗浮'
+region: '丹鼎司'
+floor: 2
+start_pos: [990, 926]
+op_list:
+  - op: 'move'
+    data: [1019, 973]
diff --git a/config/sim_uni/08/respite/005/mm.png b/config/sim_uni/08/respite/005/mm.png
diff --git a/config/sim_uni/08/respite/005/route.yml b/config/sim_uni/08/respite/005/route.yml
@@ -0,0 +1,5 @@
+planet: '雅利洛'
+region: '铁卫禁区'
+floor: 0
+start_pos: [1041, 588]
+op_list: []
diff --git a/config/sim_uni/08/respite/006/mm.png b/config/sim_uni/08/respite/006/mm.png
diff --git a/config/sim_uni/08/respite/006/route.yml b/config/sim_uni/08/respite/006/route.yml
@@ -0,0 +1,7 @@
+planet: '仙舟罗浮'
+region: '流云渡'
+floor: 1
+start_pos: [686, 1360]
+op_list:
+  - op: 'move'
+    data: [742, 1373]
diff --git a/config/sim_uni/08/respite/007/mm.png b/config/sim_uni/08/respite/007/mm.png
diff --git a/config/sim_uni/08/respite/007/route.yml b/config/sim_uni/08/respite/007/route.yml
@@ -0,0 +1,7 @@
+planet: '雅利洛'
+region: '铆钉镇'
+floor: 1
+start_pos: [540, 401]
+op_list:
+  - op: 'move'
+    data: [594, 382]
diff --git a/config/sim_uni/08/respite/008/mm.png b/config/sim_uni/08/respite/008/mm.png
diff --git a/config/sim_uni/08/respite/008/route.yml b/config/sim_uni/08/respite/008/route.yml
@@ -0,0 +1,7 @@
+planet: '雅利洛'
+region: '大矿区'
+floor: 0
+start_pos: [782, 298]
+op_list:
+  - op: 'move'
+    data: [722, 309]
diff --git a/src/basic/os_utils.py b/src/basic/os_utils.py
@@ -1,6 +1,7 @@
 import datetime
 import os
 import sys
+from typing import Optional
 
 
 def join_dir_path_with_mk(path: str, *subs) -> str:
@@ -116,6 +117,17 @@ def get_sunday_dt(dt: str) -> str:
     return sunday_date.strftime("%Y%m%d")
 
 
+def is_monday(dt: str) -> bool:
+    """
+    是否星期一
+    :param dt:
+    :return:
+    """
+    date = datetime.datetime.strptime(dt, "%Y%m%d")
+    weekday = date.weekday()  # 0表示星期一，6表示星期天
+    return weekday == 0
+
+
 def dt_day_diff(dt_1: str, dt_2: str) -> int:
     """
     计算两个dt之间相差多少天

diff --git a/src/gui/sim_uni/sim_uni_challenge_config_view.py b/src/gui/sim_uni/sim_uni_challenge_config_view.py
@@ -599,7 +599,7 @@ def _on_curio_text_update(self, e):
         :param e:
         :return:
         """
-        curio_name_list = self.get_str_list(self.level_type_text)
+        curio_name_list = self.get_str_list(self.curio_text)
         curio_list: List[SimUniCurioEnum] = []
         for curio_name in curio_name_list:
             curio = curio_enum_from_name(curio_name)