Merge pull request #324 from Fuynkio/dev_shawn

MAA读仓库小改
ArkMowers · Oct 3, 2023 · 91a2d0c · 91a2d0c
2 parents b64a3cb + a9a82c4
commit 91a2d0c
Show file tree

Hide file tree

Showing 8 changed files with 984 additions and 1,014 deletions.
diff --git a/.gitignore b/.gitignore
@@ -178,7 +178,7 @@ dmypy.json
 /tmp/
 
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
-*.json
+/*.json
 dist
 MAA
-*.yml
+/*.yml
diff --git a/arknights_mower/data/__init__.py b/arknights_mower/data/__init__.py
@@ -54,6 +54,9 @@
 recruit_agent = json.loads(
     Path(f'{__rootdir__}/data/recruit.json').read_text('utf-8'))
 
+key_mapping = json.loads(
+    Path(f"{__rootdir__}/data/key_mapping.json").read_text("utf-8"))
+
 recruit_tag = ['资深干员', '高级资深干员']
 for x in recruit_agent.values():
     recruit_tag += x['tags']
-Original file line number
+Diff line change
@@ Expand Up / @@ -178,7 +178,7 @@ dmypy.json @@
     /tmp/
     # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
-    *.json
+    /*.json
     dist
     MAA
-    *.yml
+    /*.yml