diff --git a/1.6/Defs/HediffDefs/Hediffs_WULA.xml b/1.6/Defs/HediffDefs/Hediffs_WULA.xml index 329baa41..5fb32d2c 100644 --- a/1.6/Defs/HediffDefs/Hediffs_WULA.xml +++ b/1.6/Defs/HediffDefs/Hediffs_WULA.xml @@ -12,6 +12,8 @@ false
  • + + 0 0 @@ -21,11 +23,11 @@ - 0.3 - 0.2 - 2.00 + 0.2 + 0.1 + 0.5 - 1.25 + -100 120 1 diff --git a/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml index 9fa7f922..65931f6a 100644 --- a/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml +++ b/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml @@ -918,7 +918,7 @@
  • WULA_Heavy_Infantry_PowerArmor_PowerFist - + Torso
  • diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index a30fc87b..4fdf31c4 100644 --- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -158,6 +158,7 @@ 0.7 Interact_Rifle + 0 700 diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/CopilotIndices/17.14.878.3237/CodeChunks.db b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/CopilotIndices/17.14.878.3237/CodeChunks.db new file mode 100644 index 00000000..647aab53 Binary files /dev/null and b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/CopilotIndices/17.14.878.3237/CodeChunks.db differ diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/CopilotIndices/17.14.878.3237/SemanticSymbols.db b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/CopilotIndices/17.14.878.3237/SemanticSymbols.db new file mode 100644 index 00000000..eba6d07f Binary files /dev/null and b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/CopilotIndices/17.14.878.3237/SemanticSymbols.db differ diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/299c3c50-9221-4905-9f8b-f9d7bba18ee3.vsidx b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/299c3c50-9221-4905-9f8b-f9d7bba18ee3.vsidx deleted file mode 100644 index 7f5f33cd..00000000 Binary files a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/299c3c50-9221-4905-9f8b-f9d7bba18ee3.vsidx and /dev/null differ diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/b197b77d-fb89-453c-ba1e-6709439799e6.vsidx b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/b197b77d-fb89-453c-ba1e-6709439799e6.vsidx new file mode 100644 index 00000000..70aef67a Binary files /dev/null and b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/b197b77d-fb89-453c-ba1e-6709439799e6.vsidx differ diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/ba80cafd-9454-45fa-95d3-71eef1711ec3.vsidx b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/ba80cafd-9454-45fa-95d3-71eef1711ec3.vsidx new file mode 100644 index 00000000..70aef67a Binary files /dev/null and b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/ba80cafd-9454-45fa-95d3-71eef1711ec3.vsidx differ diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/c22e1bad-5f90-4483-8bcb-f1e6d3c6413f.vsidx b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/c22e1bad-5f90-4483-8bcb-f1e6d3c6413f.vsidx deleted file mode 100644 index ac53fde2..00000000 Binary files a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/c22e1bad-5f90-4483-8bcb-f1e6d3c6413f.vsidx and /dev/null differ diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/f398628d-38cd-4792-a323-e6eb6ee14d27.vsidx b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/f398628d-38cd-4792-a323-e6eb6ee14d27.vsidx new file mode 100644 index 00000000..fb8fa02f Binary files /dev/null and b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/FileContentIndex/f398628d-38cd-4792-a323-e6eb6ee14d27.vsidx differ diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo index dcdc0a3e..a267226d 100644 Binary files a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo and b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo differ diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json index ff3a24ab..afc1a80b 100644 --- a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json +++ b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json @@ -1,9 +1,9 @@ { "Version": 1, - "WorkspaceRootPath": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpire\\Source\\WulaFallenEmpire\\", + "WorkspaceRootPath": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpire\\Source\\WulaFallenEmpire\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\wulafallenempire\\source\\wulafallenempire\\building_wula_darkenergy_engine.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|d:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\wulafallenempire\\source\\wulafallenempire\\building_wula_darkenergy_engine.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F5AE8C3B-0221-4C16-A128-9A62D521A8FF}|WulaFallenEmpire.csproj|solutionrelative:building_wula_darkenergy_engine.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], @@ -20,11 +20,11 @@ "$type": "Document", "DocumentIndex": 0, "Title": "Building_Wula_DarkEnergy_Engine.cs", - "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpire\\Source\\WulaFallenEmpire\\Building_Wula_DarkEnergy_Engine.cs", + "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpire\\Source\\WulaFallenEmpire\\Building_Wula_DarkEnergy_Engine.cs", "RelativeDocumentMoniker": "Building_Wula_DarkEnergy_Engine.cs", - "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpire\\Source\\WulaFallenEmpire\\Building_Wula_DarkEnergy_Engine.cs", + "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\WulaFallenEmpire\\Source\\WulaFallenEmpire\\Building_Wula_DarkEnergy_Engine.cs", "RelativeToolTip": "Building_Wula_DarkEnergy_Engine.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAAACEAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-07-14T12:24:18.86Z", "EditorCaption": "" diff --git a/Source/WulaFallenEmpire/Building_Wula_DarkEnergy_Engine.cs b/Source/WulaFallenEmpire/Building_Wula_DarkEnergy_Engine.cs index 33f49471..afe368e4 100644 --- a/Source/WulaFallenEmpire/Building_Wula_DarkEnergy_Engine.cs +++ b/Source/WulaFallenEmpire/Building_Wula_DarkEnergy_Engine.cs @@ -9,35 +9,5 @@ using Verse; namespace WulaFallenEmpire { - [StaticConstructorOnStartup] - public class Building_Wula_DarkEnergy_Engine : Building_GravEngine - { - // 子类自己的静态只读字段 - private static readonly string _childStaticValue = "Child Value"; - private static readonly CachedMaterial Wula_DarkEnergy_OrbMat = new CachedMaterial("Wula/Building/Wula_DarkEnergy_Engine_Orb", ShaderDatabase.Cutout); - // 通过实例属性暴露静态值 - protected override string InstanceValue => _childStaticValue; - private static readonly CachedMaterial OrbMat = new CachedMaterial("Wula/Building/Wula_DarkEnergy_Engine_Orb", ShaderDatabase.Cutout); - } - public abstract class Building_Wula_DarkEnergy_Engine_Parent : Building_GravEngine - { - // 受保护的抽象属性(实例级别) - protected abstract string InstanceValue { get; } - - // 公共访问点 - public void PrintValue() - { - Console.WriteLine(InstanceValue); - } - } - - public class Child : Parent - { - // 子类自己的静态只读字段 - private static readonly string _childStaticValue = "Child Value"; - - // 通过实例属性暴露静态值 - protected override string InstanceValue => _childStaticValue; - } } \ No newline at end of file diff --git a/Source/WulaFallenEmpire/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Source/WulaFallenEmpire/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index adcb635b..db079a57 100644 Binary files a/Source/WulaFallenEmpire/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Source/WulaFallenEmpire/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Source/WulaFallenEmpire/obj/Debug/WulaFallenEmpire.csproj.AssemblyReference.cache b/Source/WulaFallenEmpire/obj/Debug/WulaFallenEmpire.csproj.AssemblyReference.cache index 27eeab1e..351a3401 100644 Binary files a/Source/WulaFallenEmpire/obj/Debug/WulaFallenEmpire.csproj.AssemblyReference.cache and b/Source/WulaFallenEmpire/obj/Debug/WulaFallenEmpire.csproj.AssemblyReference.cache differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor.dds b/Textures/Wula/Building/Door/SRAAutodoor.dds deleted file mode 100644 index 42035c62..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor.dds and /dev/null differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.dds b/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.dds deleted file mode 100644 index 377d9daf..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.dds and /dev/null differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor_Mover.dds b/Textures/Wula/Building/Door/SRAAutodoor_Mover.dds deleted file mode 100644 index a1ce180c..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor_Mover.dds and /dev/null differ diff --git a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_northeast.png b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_northeast.png index 6f9db027..99e951e9 100644 Binary files a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_northeast.png and b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_northeast.png differ diff --git a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_northwest.png b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_northwest.png index b91b3364..63fb6037 100644 Binary files a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_northwest.png and b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_northwest.png differ diff --git a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_southeast.png b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_southeast.png index 6b145af9..7522ce04 100644 Binary files a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_southeast.png and b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_southeast.png differ diff --git a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_southwest.png b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_southwest.png index 5d384cb4..0e6b59f9 100644 Binary files a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_southwest.png and b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_Partial_southwest.png differ diff --git a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_northeast.png b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_northeast.png index 602d3f6e..0ce015db 100644 Binary files a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_northeast.png and b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_northeast.png differ diff --git a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_northwest.png b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_northwest.png index 7b81bd76..cd9f3c4a 100644 Binary files a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_northwest.png and b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_northwest.png differ diff --git a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_southeast.png b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_southeast.png index 8b35251a..ec0512cf 100644 Binary files a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_southeast.png and b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_southeast.png differ diff --git a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_southwest.png b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_southwest.png index 11ce8d42..a802bd76 100644 Binary files a/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_southwest.png and b/Textures/Wula/Building/Linked/WulaWall/AngledWulaWall_southwest.png differ