1

Assets/ModuleCore/ModuleInventory/EquipmentTool.cs

@@ -11,7 +11,6 @@ public static class EquipmentTool {
 	/// <summary> 添加属性 </summary>
 	public static void Add(this DataAddition a, DataAddition b) {
 		a.armorClass += b.armorClass;
-		a.damageDices.AddRange(b.damageDices);
 	}
 	/// <summary> 合并属性 </summary>
 	public static DataAddition Merge(List<DataAddition> additions) {

Assets/ModuleCore/ModuleInventory/WeaponDictionary.cs

@@ -15,44 +15,44 @@ public static class WeaponDictionary {
 		weapon.weaponType = weaponType;
 		return weapon;
 	}
-	/// <summary> 伤害骰子 </summary>
-	public static DataAddition DamageDice(int value, DamageType type) {
-		DataDamageDice dice = new DataDamageDice(value, type);
-		DataAddition addition = new DataAddition();
-		addition.damageDices.Add(dice);
-		return addition;
+
+	/// <summary> 空手 1d2 </summary>
+	public static DataWeapon Weapon000() {
+		DataWeapon weapon = Weapon("空手", WeaponType.无);
+		weapon.damageDice = new DataDamageDice(2, DamageType.无);
+		return weapon;
 	}
 
 	/// <summary> 匕首 1d4 </summary>
 	public static DataWeapon Weapon101() {
 		DataWeapon weapon = Weapon("匕首", WeaponType.轻型武器);
-		weapon.additions.Add(DamageDice(4, DamageType.穿刺));
+		weapon.damageDice = new DataDamageDice(4, DamageType.穿刺);
 		return weapon;
 	}
 	/// <summary> 短弓 1d6 </summary>
 	public static DataWeapon Weapon102() {
 		DataWeapon weapon = Weapon("短弓", WeaponType.轻型武器);
-		weapon.additions.Add(DamageDice(6, DamageType.穿刺));
+		weapon.damageDice = new DataDamageDice(6, DamageType.穿刺);
 		return weapon;
 	}
 
 	/// <summary> 木棒 1d6 </summary>
 	public static DataWeapon Weapon201() {
 		DataWeapon weapon = Weapon("木棒", WeaponType.中型武器);
-		weapon.additions.Add(DamageDice(6, DamageType.挥砍));
+		weapon.damageDice = new DataDamageDice(6, DamageType.钝击);
 		return weapon;
 	}
 
 	/// <summary> 巨棒 1d8 </summary>
 	public static DataWeapon Weapon301() {
 		DataWeapon weapon = Weapon("巨棒", WeaponType.重型武器);
-		weapon.additions.Add(DamageDice(8, DamageType.钝击));
+		weapon.damageDice = new DataDamageDice(8, DamageType.钝击);
 		return weapon;
 	}
 	/// <summary> 法杖 1d6 </summary>
 	public static DataWeapon Weapon302() {
 		DataWeapon weapon = Weapon("法杖", WeaponType.重型武器);
-		weapon.additions.Add(DamageDice(6, DamageType.钝击));
+		weapon.damageDice = new DataDamageDice(6, DamageType.钝击);
 		return weapon;
 	}