Merge branch 'master' of https://git.ra3battle.cn/Kalospacer/ArachnaeSwarm

2025-09-19 20:02:00 +08:00
parent 4fdfad7021 377cc3d7ce
commit 0b6ae6c398
27 changed files with 459 additions and 254 deletions
--- a/1.6/1.6/Defs/TraitDefs/ARA_Traits.xml
+++ b/1.6/1.6/Defs/TraitDefs/ARA_Traits.xml
@@ -5,8 +5,11 @@
    <commonality>0</commonality>
    <degreeDatas>
      <li>
+<<<<<<< HEAD
        <degree>1</degree>
-        <label>节肢类类动物</label>
+=======
+        <label>节肢类昆虫</label>
+>>>>>>> 377cc3d7ce40e7320d0936dbd14071a1e9cfe27c
        <description>{PAWN_nameDef} 是一只巨大的节肢类昆虫，多对附肢、镜面反光的外骨骼和扭动的分节身体足以引发人类心底埋藏的强烈恐惧感。\n\n额，你该不会真以为它们是一群美少女吧？</description>
        <marketValueFactorOffset>-1</marketValueFactorOffset>
      </li>