diff --git a/1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml b/1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
index 32484d65..6ec7643b 100644
--- a/1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
+++ b/1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
@@ -11,6 +11,15 @@
         <li>Torso</li>
       </groups>
       <parts>
+        <!-- 能源炉，代替了胃、心脏、肺、肾、肝 -->
+        <li>
+          <def>WULA_Skeleton_Bodypart</def>
+          <coverage>0</coverage>
+          <depth>Inside</depth>
+          <groups>
+            <li>Torso</li>
+          </groups>
+        </li>
         <!-- 能源炉，代替了胃、心脏、肺、肾、肝 -->
         <li>
           <def>WULA_Energy_Furnace_Bodypart</def>
@@ -557,6 +566,19 @@
     <bleedRate>0</bleedRate>
     <destroyableByDamage>false</destroyableByDamage>
   </BodyPartDef>
+  <BodyPartDef>
+    <defName>WULA_Skeleton_Bodypart</defName>
+    <label>合金骨架</label>
+    <hitPoints>30</hitPoints>
+    <permanentInjuryChanceFactor>0</permanentInjuryChanceFactor>
+    <skinCovered>false</skinCovered>
+    <solid>true</solid>
+    <bleedRate>0</bleedRate>
+    <destroyableByDamage>false</destroyableByDamage>
+    <tags>
+      <li>ManipulationLimbSegment</li>
+    </tags>
+  </BodyPartDef>
 
 
   <BodyDef>
diff --git a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
index d2f2e1e1..16aed7ca 100644
--- a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
+++ b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
-  <DamageDef Name="Wula_Darm_Matter_Beam_DMG">
-    <defName>Wula_Darm_Matter_Beam</defName>
+  <DamageDef Name="Wula_Dark_Matter_Beam_DMG">
+    <defName>Wula_Dark_Matter_Beam</defName>
     <ignoreShields>true</ignoreShields>
     <igniteChanceByTargetFlammability>
       <points>
@@ -37,12 +37,12 @@
   </DamageDef>
 
   <DamageDef ParentName="Flame">
-    <defName>Wula_Darm_Matter_Flame</defName>
+    <defName>Wula_Dark_Matter_Flame</defName>
     <label>暗物质湮灭</label>
     <deathMessage>{0} 由于暗物质湮灭爆炸而死。</deathMessage>
   </DamageDef>
 
-  <DamageDef ParentName="Wula_Darm_Matter_Beam_DMG">
+  <DamageDef ParentName="Wula_Dark_Matter_Beam_DMG">
     <defName>Wula_Psi_Damage</defName>
     <ignoreShields>true</ignoreShields>
     <igniteChanceByTargetFlammability>
diff --git a/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
index 9b42e920..b1b1dfaa 100644
--- a/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
+++ b/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
@@ -578,7 +578,7 @@
       </thingDefs>
     </fixedIngredientFilter>
     <appliedOnFixedBodyParts>
-      <li>Torso</li>
+      <li>WULA_Skeleton_Bodypart</li>
     </appliedOnFixedBodyParts>
     <recipeUsers Inherit="False">
       <li>WulaSpecies</li>
diff --git a/1.6/1.6/Defs/HediffDefs/Hediffs_WULA_Damage_Effect.xml b/1.6/1.6/Defs/HediffDefs/Hediffs_WULA_Damage_Effect.xml
index c249bf0a..99a67bcb 100644
--- a/1.6/1.6/Defs/HediffDefs/Hediffs_WULA_Damage_Effect.xml
+++ b/1.6/1.6/Defs/HediffDefs/Hediffs_WULA_Damage_Effect.xml
@@ -97,7 +97,7 @@
         <severityPerDay>-4</severityPerDay>
       </li>
       <li Class="WulaFallenEmpire.HediffCompProperties_TimedExplosion">
-        <damageDef>Wula_Darm_Matter_Flame</damageDef>
+        <damageDef>Wula_Dark_Matter_Flame</damageDef>
         <soundDef>Explosion_Bomb</soundDef>
         <explosionRadius>1.5</explosionRadius>
         <showRemainingTime>true</showRemainingTime>
diff --git a/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
index aeb6c33a..8ca0f398 100644
--- a/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
+++ b/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
@@ -23,7 +23,7 @@
     <description>获取构建乌拉帝国堡垒结构的知识，包括坚固耐用的墙和通过速度较高的自动门。</description>
     <baseCost>600</baseCost>
     <researchViewX>1.00</researchViewX>
-    <researchViewY>0.20</researchViewY>
+    <researchViewY>4.70</researchViewY>
     <prerequisites>
       <li>WULA_Base_Technology</li>
     </prerequisites>
@@ -66,7 +66,7 @@
   <!-- 衣服 -->
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Clothes_Technology</defName>
-    <researchViewX>2.00</researchViewX>
+    <researchViewX>1.00</researchViewX>
     <researchViewY>1.80</researchViewY>
     <label>基础衣物套件</label>
     <description>开发能够被乌拉帝国合成人穿着的基础衣物。</description>
@@ -126,7 +126,7 @@
   <!-- 武器 -->
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Weapon_Technology</defName>
-    <researchViewX>2.00</researchViewX>
+    <researchViewX>1.00</researchViewX>
     <researchViewY>0.20</researchViewY>
     <label>基础武装套件</label>
     <description>开发能够武装乌拉帝国合成人的老式气动武器，以抵御针对殖民地的外部袭击。</description>
@@ -136,6 +136,29 @@
       <li>WULA_Base_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_Synth_Weapon_2_Plasm_Technology</defName>
+    <researchViewX>3.00</researchViewX>
+    <researchViewY>0.20</researchViewY>
+    <label>等离子武装套件</label>
+    <description>开发能够供乌拉帝国合成人的使用的等离子武器，以便进一步对抗强大的外部威胁。</description>
+    <baseCost>600</baseCost>
+    <prerequisites>
+      <li>WULA_Synth_Weapon_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_Synth_Weapon_Shield_Technology</defName>
+    <researchViewX>2.00</researchViewX>
+    <researchViewY>1.20</researchViewY>
+    <label>护盾武装套件</label>
+    <description>开发能够保护乌拉帝国合成人的手持护盾，以抵抗来自敌方的猛烈攻击。</description>
+    <baseCost>800</baseCost>
+    <prerequisites>
+      <li>WULA_Synth_Weapon_Technology</li>
+      <li>WULA_Synth_Clothes_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Weapon_2_Melee_Technology</defName>
     <label>短兵武装套件</label>
@@ -146,7 +169,7 @@
     <prerequisites>
       <li>Fabrication</li>
       <li>WULA_Adv_WorkTable_Technology</li>
-      <li>WULA_Synth_Weapon_Technology</li>
+      <li>WULA_Synth_Weapon_2_Plasm_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
@@ -172,7 +195,7 @@
     <prerequisites>
       <li>ChargedShot</li>
       <li>WULA_Adv_WorkTable_Technology</li>
-      <li>WULA_Synth_Weapon_Technology</li>
+      <li>WULA_Synth_Weapon_2_Plasm_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
@@ -353,4 +376,4 @@
       <li>WULA_Dark_Matter_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-</Defs>
+</Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml
index 3ab3f3da..dc2e9f5c 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml
@@ -1350,7 +1350,7 @@
     <label>乌拉帝国盾牌</label>
     <description>一面供乌拉帝国突击队使用的盾牌，在武装序列中属于重型盾牌，可以为远程武器提供架枪支柱以稳定瞄准。</description>
     <recipeMaker>
-      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
+      <researchPrerequisite>WULA_Synth_Weapon_Shield_Technology</researchPrerequisite>
       <skillRequirements>
         <Crafting>7</Crafting>
       </skillRequirements>
@@ -1396,7 +1396,7 @@
       <li>ApparelNoble</li>
     </thingCategories>
     <recipeMaker>
-      <researchPrerequisite>WULA_Synth_Clothes_2_Technology</researchPrerequisite>
+      <researchPrerequisite>WULA_Synth_Weapon_Shield_Technology</researchPrerequisite>
       <skillRequirements>
         <Crafting>7</Crafting>
       </skillRequirements>
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_MW_Lance.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_MW_Lance.xml
index 1bebadba..fc8b598e 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_MW_Lance.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_MW_Lance.xml
@@ -1,233 +1,276 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
+  <!-- 铳枪 -->
+  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
+    <defName>WULA_MW_Lance</defName>
+    <label>CMl-28"铳枪"</label>
+    <description>乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射暗物质射流打击敌军。</description>
+    <weaponTags>
+      <li>Spear</li>
+    </weaponTags>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_MW_Lance</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+      <drawSize>2</drawSize>
+    </graphicData>
+    <techLevel>Spacer</techLevel>
+    <costStuffCount>120</costStuffCount>
+    <generateCommonality>0</generateCommonality>
+    <stuffCategories>
+      <li>Metallic</li>
+    </stuffCategories>
+    <costList Inherit="False">
+      <Plasteel>150</Plasteel>
+      <WULA_Dark_Matter_Item>2</WULA_Dark_Matter_Item>
+    </costList>
+    <statBases>
+      <WorkToMake>20000</WorkToMake>
+      <Mass>10</Mass>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.5</AccuracyShort>
+      <AccuracyMedium>0.4</AccuracyMedium>
+      <AccuracyLong>0.3</AccuracyLong>
+      <RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
+    </statBases>
+    <tools>
+      <li>
+        <label>横扫</label>
+        <capacities>
+          <li>Blunt</li>
+          <li>Poke</li>
+        </capacities>
+        <power>42</power>
+        <cooldownTime>1.6</cooldownTime>
+        <surpriseAttack>
+          <extraMeleeDamages>
+            <li>
+              <def>Stun</def>
+              <amount>14</amount>
+            </li>
+          </extraMeleeDamages>
+        </surpriseAttack>
+      </li>
+      <li>
+        <label>穿刺</label>
+        <capacities>
+          <li>Stab</li>
+        </capacities>
+        <power>65</power>
+        <armorPenetration>0.80</armorPenetration>
+        <cooldownTime>2.6</cooldownTime>
+      </li>
+    </tools>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_4_DM_Base_Technology</researchPrerequisite>
+      <skillRequirements>
+        <Crafting>7</Crafting>
+      </skillRequirements>
+      <displayPriority>450</displayPriority>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <verbs>
+      <!--<li>
+          <verbClass>Verb_Shoot</verbClass>
+          <hasStandardCommand>true</hasStandardCommand>
+          <defaultProjectile>Bullet_WULA_MW_Lance</defaultProjectile>
+          <warmupTime>2</warmupTime>
+          <minRange>6</minRange>
+          <forcedMissRadius>0.1</forcedMissRadius>
+          <range>38</range>
+          <burstShotCount>1</burstShotCount>
+          <soundCast>Shot_TurretSniper</soundCast>
+          <soundCastTail>GunTail_Heavy</soundCastTail>
+          <muzzleFlashScale>6</muzzleFlashScale>
+        </li>-->
+    </verbs>
+    <thingSetMakerTags>
+      <li>RewardStandardQualitySuper</li>
+    </thingSetMakerTags>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_Switch">
+        <changeTo>WULA_MW_Lance_Ranged</changeTo>
+        <abilityDef>WULA_WULA_MW_Lance_WeaponSwitchAbility</abilityDef>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
+    <defName>WULA_MW_Lance_Ranged</defName>
+    <label>CMl-28"铳枪"(远程)</label>
+    <description>乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射暗物质射流打击敌军。</description>
+    <weaponTags>
+      <!-- <li>Spear</li> -->
+    </weaponTags>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_MW_Lance_Ranged</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+      <drawSize>2</drawSize>
+    </graphicData>
+    <techLevel>Spacer</techLevel>
+    <costStuffCount>120</costStuffCount>
+    <stuffCategories>
+      <li>Metallic</li>
+    </stuffCategories>
+    <costList Inherit="False">
+      <Plasteel>150</Plasteel>
+      <WULA_Dark_Matter_Item>2</WULA_Dark_Matter_Item>
+    </costList>
+    <statBases>
+      <WorkToMake>20000</WorkToMake>
+      <Mass>10</Mass>
+      <AccuracyTouch>1</AccuracyTouch>
+      <AccuracyShort>1</AccuracyShort>
+      <AccuracyMedium>1</AccuracyMedium>
+      <AccuracyLong>1</AccuracyLong>
+      <RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
+    </statBases>
+    <tools>
+      <li>
+        <label>横扫</label>
+        <capacities>
+          <li>Blunt</li>
+          <li>Poke</li>
+        </capacities>
+        <power>42</power>
+        <cooldownTime>1.6</cooldownTime>
+        <surpriseAttack>
+          <extraMeleeDamages>
+            <li>
+              <def>Stun</def>
+              <amount>14</amount>
+            </li>
+          </extraMeleeDamages>
+        </surpriseAttack>
+      </li>
+      <li>
+        <label>穿刺</label>
+        <capacities>
+          <li>Stab</li>
+        </capacities>
+        <power>65</power>
+        <armorPenetration>0.80</armorPenetration>
+        <cooldownTime>2.6</cooldownTime>
+      </li>
+    </tools>
+    <!--加上这个就行-->
+    <!-- <tickerType>Normal</tickerType> -->
+    <!--避免被生成-->
+    <generateCommonality>0</generateCommonality>
+    <!--不可制作-->
+    <recipeMaker Inherit="False" />
+    <verbs>
+      <li Class="WulaFallenEmpire.VerbPropertiesExplosiveBeam">
+        <verbClass>WulaFallenEmpire.Verb_ShootBeamExplosive</verbClass>
 
-    <!-- 铳枪 -->
-    <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-        <defName>WULA_MW_Lance</defName>
-        <label>CMl-28"铳枪"</label>
-        <description>乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射高精度射弹打击敌军。</description>
-        <weaponTags>
-            <!-- <li>Spear</li> -->
-        </weaponTags>
-        <graphicData>
-            <texPath>Wula/Weapon/WULA_MW_Lance</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shaderType>CutoutComplex</shaderType>
-            <drawSize>2</drawSize>
-        </graphicData>
-        <techLevel>Spacer</techLevel>
-        <costStuffCount>120</costStuffCount>
-        <stuffCategories>
-            <li>Metallic</li>
-        </stuffCategories>
-        <costList Inherit="False">
-            <Plasteel>150</Plasteel>
-            <WULA_Dark_Matter_Item>2</WULA_Dark_Matter_Item>
-        </costList>
-        <statBases>
-            <WorkToMake>20000</WorkToMake>
-            <Mass>10</Mass>
-            <AccuracyTouch>0.5</AccuracyTouch>
-            <AccuracyShort>0.5</AccuracyShort>
-            <AccuracyMedium>0.4</AccuracyMedium>
-            <AccuracyLong>0.3</AccuracyLong>
-            <RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
-        </statBases>
-        <tools>
-            <li>
-                <label>横扫</label>
-                <capacities>
-                    <li>Blunt</li>
-                    <li>Poke</li>
-                </capacities>
-                <power>42</power>
-                <cooldownTime>1.6</cooldownTime>
-                <surpriseAttack>
-                    <extraMeleeDamages>
-                        <li>
-                            <def>Stun</def>
-                            <amount>14</amount>
-                        </li>
-                    </extraMeleeDamages>
-                </surpriseAttack>
-            </li>
-            <li>
-                <label>穿刺</label>
-                <capacities>
-                    <li>Stab</li>
-                </capacities>
-                <power>65</power>
-                <armorPenetration>0.80</armorPenetration>
-                <cooldownTime>2.6</cooldownTime>
-            </li>
-        </tools>
-        <recipeMaker>
-            <recipeUsers Inherit="False">
-                <li>WULA_Cube_Productor_Energy</li>
-            </recipeUsers>
-            <researchPrerequisite>WULA_Synth_Weapon_4_DM_Base_Technology</researchPrerequisite>
-            <skillRequirements>
-                <Crafting>7</Crafting>
-            </skillRequirements>
-            <displayPriority>450</displayPriority>
-            <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-        </recipeMaker>
-        <verbs>
-            <!--<li>
-                <verbClass>Verb_Shoot</verbClass>
-                <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_WULA_MW_Lance</defaultProjectile>
-                <warmupTime>2</warmupTime>
-                <minRange>6</minRange>
-                <forcedMissRadius>0.1</forcedMissRadius>
-                <range>38</range>
-                <burstShotCount>1</burstShotCount>
-                <soundCast>Shot_TurretSniper</soundCast>
-                <soundCastTail>GunTail_Heavy</soundCastTail>
-                <muzzleFlashScale>6</muzzleFlashScale>
-            </li>-->
-        </verbs>
-        <thingSetMakerTags>
-            <li>RewardStandardQualitySuper</li>
-        </thingSetMakerTags>
-        <comps>
-            <li Class="WulaFallenEmpire.CompProperties_Switch">
-                <changeTo>WULA_MW_Lance_Ranged</changeTo>
-                <abilityDef>WULA_WeaponSwitchAbility</abilityDef>
-            </li>
-        </comps>
-    </ThingDef>
+        <!-- 基础射线参数 -->
+        <hasStandardCommand>true</hasStandardCommand>
+        <warmupTime>1</warmupTime>
+        <range>24</range>
+        <burstShotCount>6</burstShotCount>
+        <ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+        <beamDamageDef>Wula_Dark_Matter_Beam</beamDamageDef>
 
-    <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-        <defName>WULA_MW_Lance_Ranged</defName>
-        <label>CMl-28"铳枪"(远程)</label>
-        <description>乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射高精度射弹打击敌军。</description>
-        <weaponTags>
-            <!-- <li>Spear</li> -->
-        </weaponTags>
-        <graphicData>
-            <texPath>Wula/Weapon/WULA_MW_Lance</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shaderType>CutoutComplex</shaderType>
-            <drawSize>2</drawSize>
-        </graphicData>
-        <techLevel>Spacer</techLevel>
-        <costStuffCount>120</costStuffCount>
-        <stuffCategories>
-            <li>Metallic</li>
-        </stuffCategories>
-        <costList Inherit="False">
-            <Plasteel>150</Plasteel>
-            <WULA_Dark_Matter_Item>2</WULA_Dark_Matter_Item>
-        </costList>
-        <statBases>
-            <WorkToMake>20000</WorkToMake>
-            <Mass>10</Mass>
-            <AccuracyTouch>0.5</AccuracyTouch>
-            <AccuracyShort>0.5</AccuracyShort>
-            <AccuracyMedium>0.4</AccuracyMedium>
-            <AccuracyLong>0.3</AccuracyLong>
-            <RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
-        </statBases>
-        <tools>
-            <li>
-                <label>横扫</label>
-                <capacities>
-                    <li>Blunt</li>
-                    <li>Poke</li>
-                </capacities>
-                <power>42</power>
-                <cooldownTime>1.6</cooldownTime>
-                <surpriseAttack>
-                    <extraMeleeDamages>
-                        <li>
-                            <def>Stun</def>
-                            <amount>14</amount>
-                        </li>
-                    </extraMeleeDamages>
-                </surpriseAttack>
-            </li>
-            <li>
-                <label>穿刺</label>
-                <capacities>
-                    <li>Stab</li>
-                </capacities>
-                <power>65</power>
-                <armorPenetration>0.80</armorPenetration>
-                <cooldownTime>2.6</cooldownTime>
-            </li>
-        </tools>
-        <!--加上这个就行-->
-		<tickerType>Normal</tickerType>
-		<!--避免被生成-->
-		<generateCommonality>0</generateCommonality>
-		<!--不可制作-->
-		<recipeMaker Inherit="False"/>
-        <verbs>
-            <li>
-                <verbClass>Verb_Shoot</verbClass>
-                <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_WULA_MW_Lance</defaultProjectile>
-                <warmupTime>2</warmupTime>
-                <minRange>6</minRange>
-                <forcedMissRadius>0.1</forcedMissRadius>
-                <range>38</range>
-                <burstShotCount>1</burstShotCount>
-                <soundCast>Shot_TurretSniper</soundCast>
-                <soundCastTail>GunTail_Heavy</soundCastTail>
-                <muzzleFlashScale>6</muzzleFlashScale>
-            </li>
-        </verbs>
-        <thingSetMakerTags>
-            <li>RewardStandardQualitySuper</li>
-        </thingSetMakerTags>
-        <comps>
-            <li Class="WulaFallenEmpire.CompProperties_Switch">
-                <changeTo>WULA_MW_Lance</changeTo>
-                <abilityDef>WULA_WeaponSwitchAbility</abilityDef>
-            </li>
-        </comps>
-    </ThingDef>
+        <!-- 消除射线偏移的参数 -->
+        <beamFullWidthRange>1000</beamFullWidthRange>
+        <beamWidth>-1</beamWidth>
+        <beamMaxDeviation>0</beamMaxDeviation>
+        <beamCurvature>0</beamCurvature>
+        <beamStartOffset>0</beamStartOffset>
 
-	<AbilityDef>
-		<defName>WULA_WeaponSwitchAbility</defName>
-		<label>变换形态</label>
-		<description>变换武器形态</description>
-		<cooldownTicksRange>601</cooldownTicksRange>
-		<iconPath><!-- 图标路径--></iconPath>
-		<hostile>false</hostile>
-		<showOnCharacterCard>false</showOnCharacterCard>
-		<aiCanUse>true</aiCanUse>
-		<targetRequired>false</targetRequired>
-		<casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-		<statBases>
-			<!-- 如果不需要限时，可以把这玩意删了-->
-			<!--<Ability_Duration>10</Ability_Duration>-->
-		</statBases>
-		<verbProperties>
-			<verbClass>Verb_CastAbility</verbClass>
-			<warmupTime>0.1</warmupTime>
-			<drawAimPie>false</drawAimPie>
-			<requireLineOfSight>false</requireLineOfSight>
-			<targetable>false</targetable>
-			<targetParams>
-				<canTargetSelf>true</canTargetSelf>
-			</targetParams>
-		</verbProperties>
-		<comps>
-			<li Class="CompProperties_AbilityEffect">
-				<compClass>WulaFallenEmpire.CompAbilityEffect_Switch</compClass>
-			</li>
-			<!-- 如果不需要限时，可以把这玩意删了-->
-			<!--<li Class="CompProperties_AbilityGiveHediff">
+        <!-- 视觉和音效 -->
+        <muzzleFlashScale>0</muzzleFlashScale>
+        <soundCastBeam>BeamGraser_Shooting</soundCastBeam>
+        <beamGroundFleckDef>Fleck_BeamBurn</beamGroundFleckDef>
+        <beamFleckChancePerTick>0.32</beamFleckChancePerTick>
+        <beamMoteDef>Mote_Wula_Dark_Matter_Beam</beamMoteDef>
+        <beamEndEffecterDef>GraserBeam_End</beamEndEffecterDef>
+
+        <screenShakeFactor>0.35</screenShakeFactor>
+
+        <!-- 火焰效果 -->
+        <beamChanceToStartFire>0.6</beamChanceToStartFire>
+        <beamChanceToAttachFire>0.6</beamChanceToAttachFire>
+        <beamFireSizeRange>0.25</beamFireSizeRange>
+
+        <!-- 其他射线属性 -->
+        <beamHitsNeighborCells>true</beamHitsNeighborCells>
+        <beamLineFleckChanceCurve>
+          <points>
+            <li>(0, 0)</li>
+            <li>(0.65, 0.4)</li>
+            <li>(1, 0.75)</li>
+          </points>
+        </beamLineFleckChanceCurve>
+
+        <!-- 攻击目标设置 -->
+        <targetParams>
+          <canTargetLocations>true</canTargetLocations>
+        </targetParams>
+
+        <enableExplosion>true</enableExplosion>
+        <explosionShotInterval>3</explosionShotInterval>
+        <explosionRadius>0.25</explosionRadius>
+        <explosionDamageDef>Wula_Dark_Matter_Flame</explosionDamageDef>
+        <explosionDamage>15</explosionDamage>
+        <explosionSound>Explosion_Bomb</explosionSound>
+        <chanceToStartFire>0.6</chanceToStartFire>
+      </li>
+    </verbs>
+    <thingSetMakerTags>
+      <li>RewardStandardQualitySuper</li>
+    </thingSetMakerTags>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_Switch">
+        <changeTo>WULA_MW_Lance</changeTo>
+        <abilityDef>WULA_WULA_MW_Lance_WeaponSwitchAbility</abilityDef>
+      </li>
+    </comps>
+  </ThingDef>
+
+  <AbilityDef>
+    <defName>WULA_WULA_MW_Lance_WeaponSwitchAbility</defName>
+    <label>武装解放 / 武装闭锁</label>
+    <description>控制暗物质能源炉的能量输出，以决定CMl-28"铳枪"是否可以发射暗物质射流</description>
+    <cooldownTicksRange>601</cooldownTicksRange>
+    <iconPath>Wula/UI/Abilities/WULA_WeaponSwitchAbility</iconPath>
+    <hostile>false</hostile>
+    <showOnCharacterCard>false</showOnCharacterCard>
+    <aiCanUse>false</aiCanUse>
+    <targetRequired>false</targetRequired>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <statBases>
+      <!-- 如果不需要限时，可以把这玩意删了-->
+      <!--<Ability_Duration>10</Ability_Duration>-->
+    </statBases>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <warmupTime>0</warmupTime>
+      <drawAimPie>false</drawAimPie>
+      <requireLineOfSight>false</requireLineOfSight>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityEffect">
+        <compClass>WulaFallenEmpire.CompAbilityEffect_Switch</compClass>
+      </li>
+      <!-- 如果不需要限时，可以把这玩意删了-->
+      <!--<li
+      Class="CompProperties_AbilityGiveHediff">
 				<compClass>CompAbilityEffect_GiveHediff</compClass>
 				<hediffDef>WULA_HediffSwitchDuration</hediffDef>
 				<onlyApplyToSelf>True</onlyApplyToSelf>
 			</li>-->
-		</comps>
-	</AbilityDef>
+    </comps>
+  </AbilityDef>
 
-    <!--<HediffDef>
+  <!--<HediffDef>
 		<defName>WULA_HediffSwitchDuration</defName>
 		<label>变换形态</label>
 		<description>变换形态的持续时间显示。</description>
@@ -242,59 +285,4 @@
 			</li>
 		</comps>
 	</HediffDef>-->
-
-    <AbilityDef>
-		<defName>WULA_WeaponSwitchCancel</defName>
-		<label>解除变换</label>
-		<description>解除武器变换</description>
-		<!-- 让它显示在武器变换后面。-->
-        <displayOrder>1</displayOrder>
-		<cooldownTicksRange>0</cooldownTicksRange>
-		<iconPath><!-- 图标路径--></iconPath>
-		<hostile>false</hostile>
-		<showOnCharacterCard>false</showOnCharacterCard>
-		<aiCanUse>false</aiCanUse>
-		<targetRequired>false</targetRequired>
-		<casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-		<verbProperties>
-			<verbClass>Verb_CastAbility</verbClass>
-			<warmupTime>0.1</warmupTime>
-			<drawAimPie>false</drawAimPie>
-			<requireLineOfSight>false</requireLineOfSight>
-			<targetable>false</targetable>
-			<targetParams>
-				<canTargetSelf>true</canTargetSelf>
-			</targetParams>
-		</verbProperties>
-		<comps>
-			<!--<li Class="CompProperties_AbilityEffect">
-				<compClass>WulaFallenEmpire.CompAbilityEffect_RemoveHediff</compClass>
-			</li>-->
-		</comps>
-	</AbilityDef>
-
-
-    <ThingDef ParentName="BaseBullet">
-        <defName>Bullet_WULA_MW_Lance</defName>
-        <label>铳枪穿甲弹</label>
-        <thingClass>Projectile_Explosive</thingClass>
-        <tickerType>Normal</tickerType>
-        <neverMultiSelect>True</neverMultiSelect>
-        <graphicData>
-            <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shaderType>TransparentPostLight</shaderType>
-            <drawSize>3.4</drawSize>
-        </graphicData>
-        <projectile>
-            <damageDef>Bullet</damageDef>
-            <damageAmountBase>120</damageAmountBase>
-            <speed>180</speed>
-            <explosionRadius>1.6</explosionRadius>
-            <arcHeightFactor>0.4</arcHeightFactor>
-            <soundExplode>Explosion_Rocket</soundExplode>
-            <armorPenetrationBase>0.7</armorPenetrationBase>
-        </projectile>
-    </ThingDef>
-
 </Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index 02cd1feb..73f74dac 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -292,6 +292,89 @@
       <recipeUsers Inherit="False" />
     </recipeMaker>
   </ThingDef>
+
+  <!-- 双用枪 -->
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_Plasm_AR</defName>
+    <label>PMa-72"磷叶"</label>
+    <description>乌拉帝国的旧式多用途突击步枪，搭载了一套用于发射等离子体的谐振器，可以射出高精度的等离子体，也可以在近距离搏斗上当成等离子喷枪来使用。</description>
+    <tickerType>Normal</tickerType>
+    <techLevel>Spacer</techLevel>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_Plasm_AR</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>1.4</drawSize>
+    </graphicData>
+    <soundInteract>Interact_Rifle</soundInteract>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_BIO</li>
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_2_Plasm_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <statBases>
+      <WorkToMake>7500</WorkToMake>
+      <!-- <MarketValue>370</MarketValue> -->
+      <Mass>3.5</Mass>
+      <AccuracyTouch>0.85</AccuracyTouch>
+      <AccuracyShort>0.85</AccuracyShort>
+      <AccuracyMedium>0.75</AccuracyMedium>
+      <AccuracyLong>0.5</AccuracyLong>
+      <RangedWeapon_Cooldown>1.46</RangedWeapon_Cooldown>
+    </statBases>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_RW_Plasm_AR</defaultProjectile>
+        <warmupTime>1.25</warmupTime>
+        <range>28</range>
+        <burstShotCount>6</burstShotCount>
+        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+        <soundCast>ChargeLance_Fire</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
+        <muzzleFlashScale>7</muzzleFlashScale>
+      </li>
+    </verbs>
+    <tools>
+      <li>
+        <label>等离子切割</label>
+        <capacities>
+          <li>Blunt</li>
+        </capacities>
+        <power>20</power>
+        <cooldownTime>2</cooldownTime>
+        <armorPenetration>0.5</armorPenetration>
+        <soundMeleeHit>ChargeLance_Fire</soundMeleeHit>
+      </li>
+    </tools>
+    <costList Inherit="False">
+      <Steel>180</Steel>
+      <ComponentIndustrial>10</ComponentIndustrial>
+    </costList>
+    <weaponTags>
+      <li>Wula_Weapon_Init</li>
+    </weaponTags>
+    <thingSetMakerTags>
+      <li>RewardStandardQualitySuper</li>
+    </thingSetMakerTags>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_Plasm_AR</defName>
+    <label>磷叶等离子体射弹</label>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Bullet_Plasm</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <projectile>
+      <damageDef>Bullet</damageDef>
+      <damageAmountBase>12</damageAmountBase>
+      <armorPenetrationBase>0.5</armorPenetrationBase>
+      <speed>55</speed>
+    </projectile>
+  </ThingDef>
   
   <!-- 动力破墙锤 -->
   <ThingDef ParentName="BaseMeleeWeapon_Blunt_Quality">
@@ -472,15 +555,15 @@
       <WorkToMake>20000</WorkToMake>
       <Mass>2.5</Mass>
     </statBases>
-    <tools>
+    <tools Inherit="False">
       <li>
         <label>链锯</label>
         <capacities>
           <li>Cut</li>
         </capacities>
         <armorPenetration>0.5</armorPenetration>
-        <power>18</power> <!-- 2.5x natural fist -->
-        <cooldownTime>1.4</cooldownTime>
+        <power>25</power> <!-- 2.5x natural fist -->
+        <cooldownTime>1.2</cooldownTime>
         <soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
         <soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
       </li>
@@ -490,8 +573,8 @@
           <li>Blunt</li>
           <li>Poke</li>
         </capacities>
-        <power>14</power>
-        <cooldownTime>1.75</cooldownTime>
+        <power>18</power>
+        <cooldownTime>1.5</cooldownTime>
         <surpriseAttack>
           <extraMeleeDamages>
             <li>
@@ -551,13 +634,13 @@
       <WorkToMake>30000</WorkToMake>
       <Mass>100</Mass>
     </statBases>
-    <tools>
+    <tools Inherit="False">
       <li>
         <label>横扫</label>
         <capacities>
           <li>Cut</li>
         </capacities>
-        <power>18</power>
+        <power>35</power>
         <cooldownTime>1.9</cooldownTime>
         <armorPenetration>0.50</armorPenetration>
       </li>
@@ -566,9 +649,9 @@
         <capacities>
           <li>Stab</li>
         </capacities>
-        <power>20</power>
+        <power>40</power>
         <armorPenetration>0.90</armorPenetration>
-        <cooldownTime>2.5</cooldownTime>
+        <cooldownTime>2.2</cooldownTime>
       </li>
     </tools>
     <recipeMaker>
@@ -631,7 +714,7 @@
         <range>18</range>
         <burstShotCount>3</burstShotCount>
         <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-        <soundCast>ChargeLance_Fire</soundCast>
+        <soundCast>Shot_BoltActionRifle</soundCast>
         <soundCastTail>GunTail_Heavy</soundCastTail>
         <muzzleFlashScale>7</muzzleFlashScale>
       </li>
@@ -649,7 +732,7 @@
     </graphicData>
     <projectile>
       <damageDef>Bullet</damageDef>
-      <damageAmountBase>15</damageAmountBase>
+      <damageAmountBase>25</damageAmountBase>
       <stoppingPower>2.5</stoppingPower>
       <armorPenetrationBase>0.65</armorPenetrationBase>
       <speed>55</speed>
@@ -1044,7 +1127,7 @@
         <range>30</range>
         <burstShotCount>3</burstShotCount>
         <ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-        <beamDamageDef>Wula_Darm_Matter_Beam</beamDamageDef>
+        <beamDamageDef>Wula_Dark_Matter_Beam</beamDamageDef>
 
         <!-- 消除射线偏移的参数 -->
         <beamFullWidthRange>1000</beamFullWidthRange>
@@ -1087,7 +1170,7 @@
         <enableExplosion>true</enableExplosion>
         <explosionShotInterval>1</explosionShotInterval>
         <explosionRadius>1.8</explosionRadius>
-        <explosionDamageDef>Wula_Darm_Matter_Flame</explosionDamageDef>
+        <explosionDamageDef>Wula_Dark_Matter_Flame</explosionDamageDef>
         <explosionDamage>15</explosionDamage>
         <explosionSound>Explosion_Bomb</explosionSound>
         <chanceToStartFire>0.6</chanceToStartFire>
@@ -1146,7 +1229,7 @@
         <range>22</range>
         <burstShotCount>12</burstShotCount>
         <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-        <beamDamageDef>Wula_Darm_Matter_Beam</beamDamageDef>
+        <beamDamageDef>Wula_Dark_Matter_Beam</beamDamageDef>
 
         <!-- 消除射线偏移的参数 -->
         <!-- <beamFullWidthRange>1000</beamFullWidthRange>
@@ -1194,7 +1277,7 @@
         <enableExplosion>true</enableExplosion>
         <explosionShotInterval>2</explosionShotInterval>
         <explosionRadius>3</explosionRadius>
-        <explosionDamageDef>Wula_Darm_Matter_Flame</explosionDamageDef>
+        <explosionDamageDef>Wula_Dark_Matter_Flame</explosionDamageDef>
         <explosionDamage>25</explosionDamage>
         <explosionSound>Explosion_Bomb</explosionSound>
         <chanceToStartFire>0.6</chanceToStartFire>
diff --git a/Content/Textures/Wula/Projectile/WULA_Bullet_Plasm.png b/Content/Textures/Wula/Projectile/WULA_Bullet_Plasm.png
new file mode 100644
index 00000000..237184fe
Binary files /dev/null and b/Content/Textures/Wula/Projectile/WULA_Bullet_Plasm.png differ
diff --git a/Content/Textures/Wula/UI/Abilities/WULA_WeaponSwitchAbility.png b/Content/Textures/Wula/UI/Abilities/WULA_WeaponSwitchAbility.png
new file mode 100644
index 00000000..a0778f0b
Binary files /dev/null and b/Content/Textures/Wula/UI/Abilities/WULA_WeaponSwitchAbility.png differ
diff --git a/Content/Textures/Wula/Weapon/WULA_MW_Lance.png b/Content/Textures/Wula/Weapon/WULA_MW_Lance.png
index e96f1371..706354c6 100644
Binary files a/Content/Textures/Wula/Weapon/WULA_MW_Lance.png and b/Content/Textures/Wula/Weapon/WULA_MW_Lance.png differ
diff --git a/Content/Textures/Wula/Weapon/WULA_MW_Lance_Ranged.png b/Content/Textures/Wula/Weapon/WULA_MW_Lance_Ranged.png
new file mode 100644
index 00000000..4c884872
Binary files /dev/null and b/Content/Textures/Wula/Weapon/WULA_MW_Lance_Ranged.png differ
diff --git a/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR.png b/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR.png
new file mode 100644
index 00000000..23355a0c
Binary files /dev/null and b/Content/Textures/Wula/Weapon/WULA_RW_Plasm_AR.png differ
diff --git a/Source/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasm.png b/Source/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasm.png
new file mode 100644
index 00000000..237184fe
Binary files /dev/null and b/Source/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasm.png differ
diff --git a/Source/美术与文本源文件/Wula/UI/Abilities/WULA_WeaponSwitchAbility.sai2 b/Source/美术与文本源文件/Wula/UI/Abilities/WULA_WeaponSwitchAbility.sai2
new file mode 100644
index 00000000..60ba73e2
Binary files /dev/null and b/Source/美术与文本源文件/Wula/UI/Abilities/WULA_WeaponSwitchAbility.sai2 differ
diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Lance.sai2 b/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Lance.sai2
index 48c0775e..e3a4ba5a 100644
Binary files a/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Lance.sai2 and b/Source/美术与文本源文件/Wula/Weapon/WULA_MW_Lance.sai2 differ
diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasm_AR.sai2 b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasm_AR.sai2
new file mode 100644
index 00000000..8e34190c
Binary files /dev/null and b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasm_AR.sai2 differ