1

2024-03-29 00:58:24 +08:00
parent 967ad8eacf
commit 05315ef4a8
232 changed files with 53368 additions and 8539 deletions
--- a/Assets/Artists/Configs/Items/Weapons/AG14W.asset
+++ b/Assets/Artists/Configs/Items/Weapons/AG14W.asset
@@ -26,6 +26,8 @@ MonoBehaviour:
  - rid: 749940214065790993
  - rid: 749940214065790995
  - rid: 6077775441645010963
+  - rid: 3736623781039046675
+  - rid: 3736623781039046676
  runtimeProperties:
  - rid: 1055089825765916815
  - rid: 7707057575186923982
@@ -39,7 +41,7 @@ MonoBehaviour:
  initialAimMoveSpeed: 1.5
  fireMode:
    rid: 806583484692037645
-  initialDamage: 24
+  initialDamage: 32
  initialBulletForce: 512
  initialBulletSpeed: 200
  initialAimZoom: 1
@@ -75,6 +77,15 @@ MonoBehaviour:
        ammoType:
          rid: -2
        ammoItem: {fileID: 11400000, guid: be94e0afa329e8540acffa49aea3087b, type: 2}
+    - rid: 3736623781039046675
+      type: {class: VectorRecoil, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        recoil: {x: -1, y: 1, z: 1}
+        viewRecoilWeight: {x: 1, y: 1, z: 1}
+    - rid: 3736623781039046676
+      type: {class: VectorSpread, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        spread: {x: -0.1, y: 0.1}
    - rid: 6077775441645010963
      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}
      data: 
--- a/Assets/Artists/Configs/Items/Weapons/Flashbang.asset
+++ b/Assets/Artists/Configs/Items/Weapons/Flashbang.asset
@@ -25,7 +25,7 @@ MonoBehaviour:
  factoryProperties:
  - rid: 806583526086934675
  runtimeProperties: []
-  instance: {fileID: 5322756313667207077, guid: 2c021b0fb224edb47a64a22e6736d50c,
+  instance: {fileID: 2149132301750699066, guid: a32ed3b4a1b59094fa265c105338498a,
    type: 3}
  references:
    version: 2
--- a/Assets/Artists/Configs/Items/Weapons/M4A1.asset
+++ b/Assets/Artists/Configs/Items/Weapons/M4A1.asset
@@ -37,7 +37,7 @@ MonoBehaviour:
  heavyMeleeDamage: 50
  heavyMeleeRange: 0
  heavyMeleeForce: 0
-  initialMoveSpeed: 2
+  initialMoveSpeed: 2.5
  initialAimMoveSpeed: 1.5
  fireMode:
    rid: 806583484692037645
--- a/Assets/Artists/Configs/Items/Weapons/X12.asset
+++ b/Assets/Artists/Configs/Items/Weapons/X12.asset
@@ -10,12 +10,12 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 092c80c0770597e448a316790a23c45b, type: 3}
-  m_Name: X13
+  m_Name: X12
  m_EditorClassIdentifier: 
  addressableId: 1189337485825549616
  displayName: X12
  description: "\u534A\u81EA\u52A8\u624B\u67AA"
-  addressablePath: Assets_X13
+  addressablePath: Assets_X12
  prefab: {fileID: 6055451464609734780, guid: 6e8a58aad6b71fb4c8af3d8e72fa5fc0, type: 3}
  squareIcon: {fileID: 2800000, guid: ae3a3be8020e4e8448944df901ed45b3, type: 3}
  rectangleIcon: {fileID: 2800000, guid: 7910edbea6bc88e49ac8a733f8f40238, type: 3}
@@ -26,17 +26,17 @@ MonoBehaviour:
  - rid: 3736623712532955148
  runtimeProperties:
  - rid: 3736623725218627695
-  meleeDamage: 0
-  meleeRange: 0
-  meleeForce: 0
+  meleeDamage: 32
+  meleeRange: 2
+  meleeForce: 64
  heavyMeleeDamage: 0
  heavyMeleeRange: 0
  heavyMeleeForce: 0
-  initialMoveSpeed: 2.5
+  initialMoveSpeed: 2.3
  initialAimMoveSpeed: 2
  fireMode:
    rid: 3736623712532955139
-  initialDamage: 0
+  initialDamage: 24
  initialBulletForce: 0
  initialBulletSpeed: 128
  initialAimZoom: 1
@@ -53,7 +53,7 @@ MonoBehaviour:
    - rid: 3736623712532955139
      type: {class: SemiFireMode, ns: BITFALL.Guns, asm: BITFALL.Item}
      data:
-        fireRate: 8
+        fireRate: 10
        requireBoltAction: 0
    - rid: 3736623712532955148
      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}