diff --git a/.gitignore b/.gitignore index 8204fda..56fbc35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ # VScode file -.vscode/ .vs/ DR.code-workspace trytry/ diff --git a/.vscode/settings.json b/.vscode/settings.json index fd1b140..b61e0cd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,5 @@ { - "rust-analyzer.linkedProjects": [ - "mods/dr_game/Difficult_Rocket_rs/src/Cargo.toml", - "libs/pyglet_rs/src/Cargo.toml", - ] -} + "rust-analyzer.linkedProjects": [ + "mods/dr_game/Difficult_Rocket_rs/src/Cargo.toml" + ] +} \ No newline at end of file diff --git a/libs/lib_not_dr b/libs/lib_not_dr index 364624a..716f735 160000 --- a/libs/lib_not_dr +++ b/libs/lib_not_dr @@ -1 +1 @@ -Subproject commit 364624a996501d39d508d0f416dfc78e428e1dc1 +Subproject commit 716f735fe797ed7d34b07f1f52e269e2ab7e7ce5 diff --git a/libs/pyglet b/libs/pyglet index 8bef88a..6b586c7 160000 --- a/libs/pyglet +++ b/libs/pyglet @@ -1 +1 @@ -Subproject commit 8bef88a5922c13cd5ff466f300a2610ce43eacbb +Subproject commit 6b586c72a7c17aa7b140db3a0549897cc73f9959 diff --git a/pyproject.toml b/pyproject.toml index 9272b86..d627554 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,8 +33,19 @@ build = [ "imageio>=2.25.0", ] -[tool.ruff] +[tool.pyright] +include = ["Difficult_Rocket", "libs/utils", "mods"] +exclude = [ + 'libs/pyglet', + 'libs/pyperclip', + 'libs/lib_not_dr', + 'libs/MCDR', + 'libs/xmltodict', +] +pythonVersion = "3.8" + +[tool.ruff] target-version = "py38" line-length = 90 src = ["Difficult_Rocket", "libs/utils", "mods"] @@ -44,7 +55,6 @@ exclude = [ 'libs/lib_not_dr', 'libs/MCDR', 'libs/xmltodict', - 'libs/utils/logger-old.py', # 旧版日志, 忽略他就好 ] [tool.ruff.lint] @@ -110,4 +120,4 @@ include-data-dir = [ include-package = ['Difficult_Rocket.api'] # DR.api 没有直接 import, 所以需要手动添加 -disable-plugin = ['pyqt5', 'tk-inter'] \ No newline at end of file +disable-plugin = ['pyqt5', 'tk-inter']