Merge branch 'main' into no-async

removed async load class
feat: 会转的电锯，版本调整至1.0.3
2025-11-20 19:47:01 +08:00 · 2025-11-20 19:45:07 +08:00 · 2025-11-20 19:43:18 +08:00 · 2025-11-20 18:55:03 +08:00
14 changed files with 29 additions and 16 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ Build
 Documents
 Package
 Cache
 Packages
 .vscode
 .vs
 *.VC.db
--- a/Content/Blueprints/Battle/BP_EnemySpawner.uasset
+++ b/Content/Blueprints/Battle/BP_EnemySpawner.uasset
--- a/Content/Blueprints/Battle/BP_Enemy_Blue.uasset
+++ b/Content/Blueprints/Battle/BP_Enemy_Blue.uasset
--- a/Content/Blueprints/Battle/ST_EnemyRecord.uasset
+++ b/Content/Blueprints/Battle/ST_EnemyRecord.uasset
--- a/Content/Blueprints/Data/DT_ResourceNode.uasset
+++ b/Content/Blueprints/Data/DT_ResourceNode.uasset
--- a/Content/Levels/TechTree.umap
+++ b/Content/Levels/TechTree.umap
--- a/Content/Models/Enemy/saw/saw_body_001.uasset
+++ b/Content/Models/Enemy/saw/saw_body_001.uasset
--- a/Content/Models/Enemy/saw/saw_cap_001.uasset
+++ b/Content/Models/Enemy/saw/saw_cap_001.uasset
--- a/Content/Models/Enemy/saw/圆环_001.uasset
+++ b/Content/Models/Enemy/saw/圆环_001.uasset
--- a/Content/Models/Enemy/saw/圆环_002.uasset
+++ b/Content/Models/Enemy/saw/圆环_002.uasset
--- a/Content/UI/TechTree/WBP_Dialog_TechTreeApplyTech.uasset
+++ b/Content/UI/TechTree/WBP_Dialog_TechTreeApplyTech.uasset
--- a/Content/UI/WBP_MainMenu.uasset
+++ b/Content/UI/WBP_MainMenu.uasset
--- a/Content/UI/WBP_TechTree.uasset
+++ b/Content/UI/WBP_TechTree.uasset
--- a/2
+++ b/2
@@ -1 +1 @@
-v1.0.2
+v1.0.3
Author	SHA1	Message	Date
Stanley	4bb89d4591	Merge branch 'main' into no-async	2025-11-20 19:47:01 +08:00
AzurIce	5b624d5cf8	removed async load class	2025-11-20 19:45:07 +08:00
Stanley_233	c62b69ac61	feat: 会转的电锯，版本调整至1.0.3	2025-11-20 19:43:18 +08:00
Stanley_233	8c564351b1	fix: 珍稀有机材料命名、发电运镜	2025-11-20 18:55:03 +08:00