1

2023-12-03 17:35:43 +08:00
parent ba342d6627
commit ba9f4eda80
702 changed files with 162078 additions and 21050 deletions
--- a/Assets/Artists/Configs/Animator/GunController.controller
+++ b/Assets/Artists/Configs/Animator/GunController.controller
@@ -120,6 +120,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-8337597632852078871
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4995920671595690745}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &-8302189511459068455
 AnimatorStateMachine:
  serializedVersion: 6
@@ -347,6 +369,31 @@ MonoBehaviour:
      type: {class: Reference, ns: BITKit, asm: BITKit}
      data:
        value: Draw
+--- !u!1101 &-6893675488972428975
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Cancel
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4995920671595690745}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!206 &-6759077618508240475
 BlendTree:
  m_ObjectHideFlags: 1
@@ -429,6 +476,9 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: -679274784810428359}
    m_Position: {x: 30, y: 240, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -1082240786246698890}
+    m_Position: {x: -270, y: 270, z: 0}
  m_ChildStateMachines:
  - serializedVersion: 1
    m_StateMachine: {fileID: -8302189511459068455}
@@ -1058,6 +1108,35 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &-1082240786246698890
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Inspect
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -6893675488972428975}
+  - {fileID: -8337597632852078871}
+  m_StateMachineBehaviours:
+  - {fileID: 2636309788305898282}
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: ba17ff9bc2da4ea418fcfb4eaa75bb7f, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-679274784810428359
 AnimatorState:
  serializedVersion: 6
@@ -1184,6 +1263,12 @@ AnimatorController:
    m_DefaultInt: 0
    m_DefaultBool: 0
    m_Controller: {fileID: 9100000}
+  - m_Name: Cancel
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@@ -1241,6 +1326,9 @@ AnimatorController:
    - serializedVersion: 2
      m_State: {fileID: -1965665561355275315}
      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: -1082240786246698890}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
    m_Behaviours: []
    m_BlendingMode: 0
    m_SyncedLayerIndex: 0
@@ -1249,9 +1337,9 @@ AnimatorController:
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
-    m_Name: Additive 1
-    m_StateMachine: {fileID: 1319471132019400685}
-    m_Mask: {fileID: 0}
+    m_Name: Additive 0
+    m_StateMachine: {fileID: -5623997194552822566}
+    m_Mask: {fileID: 31900000, guid: 0bc0f34d7e29eca428dd743f0d97288b, type: 2}
    m_Motions: []
    m_Behaviours: []
    m_BlendingMode: 1
@@ -1261,9 +1349,9 @@ AnimatorController:
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
-    m_Name: Additive 0
-    m_StateMachine: {fileID: -5623997194552822566}
-    m_Mask: {fileID: 31900000, guid: 0bc0f34d7e29eca428dd743f0d97288b, type: 2}
+    m_Name: Additive 2
+    m_StateMachine: {fileID: 4669574472028033924}
+    m_Mask: {fileID: 0}
    m_Motions: []
    m_Behaviours: []
    m_BlendingMode: 1
@@ -1285,8 +1373,8 @@ AnimatorController:
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
-    m_Name: Additive 2
-    m_StateMachine: {fileID: 4669574472028033924}
+    m_Name: Additive 1
+    m_StateMachine: {fileID: 1319471132019400685}
    m_Mask: {fileID: 0}
    m_Motions: []
    m_Behaviours: []
@@ -1522,6 +1610,30 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!114 &2636309788305898282
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stateName:
+    rid: 7707057575186923713
+  variableNames: []
+  duration: 0
+  variables: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923713
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Movement.Inspect
 --- !u!114 &3072856450903755207
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -2019,14 +2131,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  stateName:
-    rid: 750605349520146439
+    rid: 7707057575186923712
  variableNames: []
  duration: 0
  variables: []
  references:
    version: 2
    RefIds:
-    - rid: 750605349520146439
-      type: {class: Reference, ns: BITKit, asm: BITKit}
+    - rid: 7707057575186923712
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
      data:
-        value: Movement
+        so: {fileID: 11400000, guid: f1505ef92d31da144b5c1cda54475f33, type: 2}
--- a/Assets/Artists/Configs/AssetCache.asset
+++ b/Assets/Artists/Configs/AssetCache.asset
@@ -28,3 +28,9 @@ MonoBehaviour:
  - {fileID: 102900000, guid: a40db164d1f75904b91d1888ac32536c, type: 3}
  - {fileID: 102900000, guid: 722a6b05e4651ad459acdc759f8e9690, type: 3}
  - {fileID: 102900000, guid: 7ac99371a73ce0a49882060604ce2e87, type: 3}
+  - {fileID: 2462377427821260557, guid: f7b831c9117af914d81247e3a751b182, type: 3}
+  - {fileID: 11400000, guid: e93b0ee1edc41584cb8385a24d9cf72f, type: 2}
+  - {fileID: 11400000, guid: b7391ad4ecc8f5a43a7742936d9d746c, type: 2}
+  - {fileID: 102900000, guid: 3bdd3dd125e2c8444ac4b397a3704a34, type: 3}
+  - {fileID: 102900000, guid: 72d2660dce099184bbeb0e9039a2df00, type: 3}
+  - {fileID: 102900000, guid: aee8d09a63ef2c3429a58e3664825ac3, type: 3}
--- a/Assets/Artists/Configs/Items/ClipNATO.asset
+++ b/Assets/Artists/Configs/Items/ClipNATO.asset
@@ -20,12 +20,17 @@ MonoBehaviour:
  rectangleIcon: {fileID: 0}
  quality: 1
  isImprovised: 0
+  allowUseWhileKnocked: 0
  factoryProperties:
  - rid: 749940214065790976
  - rid: 749940214065790977
+  runtimeProperties:
+  - rid: 1055089825765916816
  references:
    version: 2
    RefIds:
+    - rid: -2
+      type: {class: , ns: , asm: }
    - rid: 749940214065790976
      type: {class: Cellable, ns: BITFALL, asm: BITFALL.Item}
      data:
@@ -36,3 +41,11 @@ MonoBehaviour:
      type: {class: ItemWeight, ns: BITFALL, asm: BITFALL.Item}
      data:
        Weight: 0.64
+    - rid: 1055089825765916816
+      type: {class: DefaultClip, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        remaining: 30
+        capacity: 30
+        ammoType:
+          rid: -2
+        ammoItem: {fileID: 11400000}
--- a/Assets/Artists/Configs/Items/Magazine/G-Magzine.asset
+++ b/Assets/Artists/Configs/Items/Magazine/G-Magzine.asset
@@ -0,0 +1,39 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1124c18d28c78f74cae355c518715ba3, type: 3}
+  m_Name: G-Magzine
+  m_EditorClassIdentifier: 
+  displayName: "Glock\u5F39\u5323"
+  description: "\u9002\u7528\u4E8EG17-G18\u7684\u5F39\u5323"
+  addressablePath: Assets_G-Magzine
+  prefab: {fileID: 1404104980599356199, guid: e5ff4635697757a43bc8b359bbf33049, type: 3}
+  squareIcon: {fileID: 2800000, guid: c597578d294e7f34f815518a69dde2eb, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 2
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties:
+  - rid: 7707057575186923994
+  references:
+    version: 2
+    RefIds:
+    - rid: -2
+      type: {class: , ns: , asm: }
+    - rid: 7707057575186923994
+      type: {class: DefaultClip, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        remaining: 17
+        capacity: 17
+        ammoType:
+          rid: -2
+        ammoItem: {fileID: 11400000}
--- a/Assets/Artists/Configs/Items/Modifies/GunModify+EnhancedBarrel.asset
+++ b/Assets/Artists/Configs/Items/Modifies/GunModify+EnhancedBarrel.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04376dba7a67c8e4692ebd613aa87c55, type: 3}
+  m_Name: GunModify+EnhancedBarrel
+  m_EditorClassIdentifier: 
+  displayName: "\u5F3A\u5316\u67AA\u7BA1"
+  description: "\u9002\u7528\u4E8E\u4E2D\u8DDD\u79BB\u6218\u6597"
+  addressablePath: Assets_GunModify+EnhancedBarrel
+  prefab: {fileID: 5485067213398265813, guid: 306b64e27eea09741b9240535ee436dc, type: 3}
+  squareIcon: {fileID: 2800000, guid: f6daa07455351e146ad3f4c9e67a9669, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 4
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties: []
+  type:
+    rid: 7707057575186923905
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923905
+      type: {class: Barrel, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Modifies/GunModify+Holographic.asset
+++ b/Assets/Artists/Configs/Items/Modifies/GunModify+Holographic.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04376dba7a67c8e4692ebd613aa87c55, type: 3}
+  m_Name: GunModify+Holographic
+  m_EditorClassIdentifier: 
+  displayName: "\u5168\u606F\u7784\u5177"
+  description: "1\u500D\u5168\u606F\u5FEB\u901F\u7784\u51C6"
+  addressablePath: Assets_GunModify+Holographic
+  prefab: {fileID: 4814061285056169830, guid: 792960a9d1c98ed4096dc0fe9466396d, type: 3}
+  squareIcon: {fileID: 2800000, guid: 868c9fd3d7d4a724db217e78da944112, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 4
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties: []
+  type:
+    rid: 7707057575186923907
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923907
+      type: {class: Sights, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Modifies/GunModify+Laser.asset
+++ b/Assets/Artists/Configs/Items/Modifies/GunModify+Laser.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04376dba7a67c8e4692ebd613aa87c55, type: 3}
+  m_Name: GunModify+Laser
+  m_EditorClassIdentifier: 
+  displayName: "\u6218\u672F\u956D\u5C04\u706F"
+  description: "\u7528\u4E8E\u5728\u9ED1\u591C\u548C\u5BA4\u5185\u5FEB\u901F\u7784\u51C6"
+  addressablePath: Assets_GunModify+Laser
+  prefab: {fileID: 8797350811906070904, guid: f540cab8cf7947944896bf6896cfc1ac, type: 3}
+  squareIcon: {fileID: 2800000, guid: 7ce6284baccf07a4984560422bb8a2ef, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 0
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties: []
+  type:
+    rid: 7707057575186923908
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923908
+      type: {class: Tactical, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Modifies/GunModify+Light.asset
+++ b/Assets/Artists/Configs/Items/Modifies/GunModify+Light.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04376dba7a67c8e4692ebd613aa87c55, type: 3}
+  m_Name: GunModify+Light
+  m_EditorClassIdentifier: 
+  displayName: "\u6218\u672F\u706F"
+  description: "\u7528\u4E8E\u5728\u9ED1\u6697\u4E2D\u4F7F\u7528\u6B66\u5668"
+  addressablePath: Assets_GunModify+Light
+  prefab: {fileID: 3072695553386023202, guid: b4d97f62efaf01a4ea564225ea57ecdd, type: 3}
+  squareIcon: {fileID: 2800000, guid: 8fef4af7406166f41974b7f6b7d2688d, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 0
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties: []
+  type:
+    rid: 7707057575186923909
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923909
+      type: {class: Tactical, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Modifies/GunModify+OPV4.asset
+++ b/Assets/Artists/Configs/Items/Modifies/GunModify+OPV4.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04376dba7a67c8e4692ebd613aa87c55, type: 3}
+  m_Name: GunModify+OPV4
+  m_EditorClassIdentifier: 
+  displayName: OP-V4
+  description: "2\u500D\u7CBE\u51C6\u7784\u5177"
+  addressablePath: Assets_GunModify+OPV4
+  prefab: {fileID: 2210631594659826691, guid: 6c833c6132da3bb42842becb3b6f66af, type: 3}
+  squareIcon: {fileID: 2800000, guid: 868c9fd3d7d4a724db217e78da944112, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 4
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties: []
+  type:
+    rid: 7707057575186923910
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923910
+      type: {class: Sights, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Modifies/GunModify+OPV6.asset
+++ b/Assets/Artists/Configs/Items/Modifies/GunModify+OPV6.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04376dba7a67c8e4692ebd613aa87c55, type: 3}
+  m_Name: GunModify+OPV6
+  m_EditorClassIdentifier: 
+  displayName: OPV6
+  description: "\u9002\u7528\u4E8E\u4E2D\u8DDD\u79BB\u6218\u6597"
+  addressablePath: Assets_GunModify+OPV6
+  prefab: {fileID: 5700578360053697053, guid: 9fed5476c0797e3418a067665d413cd7, type: 3}
+  squareIcon: {fileID: 2800000, guid: 67ec43161be865b4b956810d9c24fa24, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 4
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties: []
+  type:
+    rid: 7707057575186923911
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923911
+      type: {class: Sights, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Modifies/GunModify+Silencer.asset
+++ b/Assets/Artists/Configs/Items/Modifies/GunModify+Silencer.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04376dba7a67c8e4692ebd613aa87c55, type: 3}
+  m_Name: GunModify+Silencer
+  m_EditorClassIdentifier: 
+  displayName: "\u5F3A\u97F3\u67AA\u53E3"
+  description: "\u6709\u58F0\u65E0\u606F"
+  addressablePath: Assets_GunModify+Silencer
+  prefab: {fileID: 6461277487400119995, guid: 9c78badd3e3268c48980cd59a0485dc5, type: 3}
+  squareIcon: {fileID: 2800000, guid: 043224f34ee09794c80f89d5d1a2f1dd, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 4
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties: []
+  type:
+    rid: 7707057575186923906
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923906
+      type: {class: Muzzle, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Modifies/GunModify+VerticalGrip.asset
+++ b/Assets/Artists/Configs/Items/Modifies/GunModify+VerticalGrip.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04376dba7a67c8e4692ebd613aa87c55, type: 3}
+  m_Name: GunModify+VerticalGrip
+  m_EditorClassIdentifier: 
+  displayName: "\u5782\u76F4\u63E1\u628A"
+  description: "\u51CF\u5C11\u540E\u5750\u529B,\u4F46\u540C\u65F6\u589E\u52A0\u5F00\u955C\u65F6\u95F4"
+  addressablePath: Assets_GunModify+VerticalGrip
+  prefab: {fileID: 6720479106134062230, guid: 49b382019c702974cb5c1ae3306d01a2, type: 3}
+  squareIcon: {fileID: 2800000, guid: 777f90c690cab5a42b80d157b90067a9, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 4
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties: []
+  runtimeProperties: []
+  type:
+    rid: 7707057575186923912
+  references:
+    version: 2
+    RefIds:
+    - rid: 7707057575186923912
+      type: {class: Underbarrel, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Weapons/C4.asset
+++ b/Assets/Artists/Configs/Items/Weapons/C4.asset
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f15b27d3e9f1d34b9ecff4500bd98eb, type: 3}
+  m_Name: C4
+  m_EditorClassIdentifier: 
+  displayName: "C4\u5851\u80F6\u70B8\u836F"
+  description: "\u901A\u5E38\u7528\u4E8E\u6467\u6BC1\u91CD\u8981\u76EE\u6807"
+  addressablePath: Assets_C4
+  prefab: {fileID: 1758847374906704517, guid: 95924c72a6f225c46b53abae2226b5bd, type: 3}
+  squareIcon: {fileID: 2800000, guid: 713e714b4efc8984c866a0c903a0faf6, type: 3}
+  rectangleIcon: {fileID: 0}
+  quality: 3
+  isImprovised: 0
+  allowUseWhileKnocked: 0
+  factoryProperties:
+  - rid: 1055089825765916696
+  placementObject: {fileID: 5190228676294042633, guid: 27be32783edbfbc4381fb86fd14b98bb,
+    type: 3}
+  references:
+    version: 2
+    RefIds:
+    - rid: 1055089825765916696
+      type: {class: EquipmentUseItem, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data: 
--- a/Assets/Artists/Configs/Items/Weapons/Glock.asset
+++ b/Assets/Artists/Configs/Items/Weapons/Glock.asset
@@ -27,6 +27,9 @@ MonoBehaviour:
  - rid: 6077775441645010964
  - rid: 1055089614898331654
  - rid: 1055089614898331655
+  runtimeProperties:
+  - rid: 7707057575186923989
+  - rid: 7707057575186923993
  meleeDamage: 24
  meleeRange: 1.6
  meleeForce: 64
@@ -49,6 +52,8 @@ MonoBehaviour:
  references:
    version: 2
    RefIds:
+    - rid: -2
+      type: {class: , ns: , asm: }
    - rid: 749940167810482195
      type: {class: Cellable, ns: BITFALL, asm: BITFALL.Item}
      data:
@@ -76,3 +81,33 @@ MonoBehaviour:
    - rid: 6077775441645010964
      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}
      data: 
+    - rid: 7707057575186923989
+      type: {class: GunModify, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data:
+        elements:
+        - index:
+            rid: 7707057575186923990
+          value: {fileID: 0}
+        - index:
+            rid: 7707057575186923991
+          value: {fileID: 0}
+        - index:
+            rid: 7707057575186923992
+          value: {fileID: 0}
+    - rid: 7707057575186923990
+      type: {class: Magazine, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
+    - rid: 7707057575186923991
+      type: {class: Tactical, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
+    - rid: 7707057575186923992
+      type: {class: Muzzle, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
+    - rid: 7707057575186923993
+      type: {class: DefaultClip, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        remaining: 17
+        capacity: 17
+        ammoType:
+          rid: -2
+        ammoItem: {fileID: 11400000, guid: 660340888d40658489b0908466be9ebc, type: 2}
--- a/Assets/Artists/Configs/Items/Weapons/M4A1.asset
+++ b/Assets/Artists/Configs/Items/Weapons/M4A1.asset
@@ -27,6 +27,9 @@ MonoBehaviour:
  - rid: 6077775441645010963
  - rid: 806583545631342592
  - rid: 1055089240850825572
+  runtimeProperties:
+  - rid: 1055089825765916815
+  - rid: 7707057575186923982
  meleeDamage: 32
  meleeRange: 2
  meleeForce: 64
@@ -49,6 +52,8 @@ MonoBehaviour:
  references:
    version: 2
    RefIds:
+    - rid: -2
+      type: {class: , ns: , asm: }
    - rid: 749940214065790993
      type: {class: Cellable, ns: BITFALL, asm: BITFALL.Item}
      data:
@@ -72,6 +77,54 @@ MonoBehaviour:
      type: {class: VectorSpread, ns: BITFALL.Guns, asm: BITFALL.Item}
      data:
        spread: {x: 0.08, y: 0.08}
+    - rid: 1055089825765916815
+      type: {class: DefaultClip, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        remaining: 30
+        capacity: 30
+        ammoType:
+          rid: -2
+        ammoItem: {fileID: 11400000, guid: be94e0afa329e8540acffa49aea3087b, type: 2}
    - rid: 6077775441645010963
      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}
      data: 
+    - rid: 7707057575186923982
+      type: {class: GunModify, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data:
+        elements:
+        - index:
+            rid: 7707057575186923983
+          value: {fileID: 0}
+        - index:
+            rid: 7707057575186923984
+          value: {fileID: 0}
+        - index:
+            rid: 7707057575186923985
+          value: {fileID: 0}
+        - index:
+            rid: 7707057575186923986
+          value: {fileID: 0}
+        - index:
+            rid: 7707057575186923987
+          value: {fileID: 0}
+        - index:
+            rid: 7707057575186923988
+          value: {fileID: 0}
+    - rid: 7707057575186923983
+      type: {class: Barrel, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
+    - rid: 7707057575186923984
+      type: {class: Magazine, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
+    - rid: 7707057575186923985
+      type: {class: Muzzle, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
+    - rid: 7707057575186923986
+      type: {class: Sights, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
+    - rid: 7707057575186923987
+      type: {class: Tactical, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
+    - rid: 7707057575186923988
+      type: {class: Underbarrel, ns: BITFALL.Guns.Modify, asm: BITFALL.Item}
+      data: 
--- a/Assets/Artists/Configs/Items/Weapons/MP5.asset
+++ b/Assets/Artists/Configs/Items/Weapons/MP5.asset
@@ -67,7 +67,7 @@ MonoBehaviour:
      type: {class: VectorRecoil, ns: BITFALL.Guns, asm: BITFALL.Item}
      data:
        recoil: {x: -0.64, y: 0.64, z: 0.64}
-        viewRecoilWeight: {x: 1, y: 1, z: 1}
+        viewRecoilWeight: {x: 0.5, y: 0.5, z: 0.5}
    - rid: 1055089240850825572
      type: {class: VectorSpread, ns: BITFALL.Guns, asm: BITFALL.Item}
      data:
--- a/Assets/Artists/Configs/Items/Weapons/Revolver.asset
+++ b/Assets/Artists/Configs/Items/Weapons/Revolver.asset
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 092c80c0770597e448a316790a23c45b, type: 3}
+  m_Name: Revolver
+  m_EditorClassIdentifier: 
+  displayName: Revolver
+  description: "\u53EF\u9760\u7684.357\u5DE6\u8F6E\u624B\u67AA"
+  addressablePath: Assets_Revolver
+  prefab: {fileID: 6691697948450827514, guid: c3b7bc862efff4a4783063ab2fe49671, type: 3}
+  squareIcon: {fileID: 2800000, guid: eb41602f5c15ed44585cec14586f3293, type: 3}
+  rectangleIcon: {fileID: 2800000, guid: 136862ba49e3ab041bb622b1ee6af584, type: 3}
+  quality: 1
+  isImprovised: 0
+  allowUseWhileKnocked: 1
+  factoryProperties:
+  - rid: 749940167810482195
+  - rid: 749940167810482196
+  - rid: 6077775441645010964
+  - rid: 1055089614898331654
+  - rid: 1055089614898331655
+  runtimeProperties: []
+  meleeDamage: 24
+  meleeRange: 1.6
+  meleeForce: 64
+  heavyMeleeDamage: 0
+  heavyMeleeRange: 0
+  heavyMeleeForce: 0
+  initialMoveSpeed: 2.5
+  initialAimMoveSpeed: 2.5
+  fireMode:
+    rid: 806583484692037646
+  initialDamage: 60
+  initialBulletForce: 256
+  initialBulletSpeed: 128
+  initialAimZoom: 1
+  isScopeAim: 0
+  buckshot:
+    allow: 0
+    value: 0
+  initialHipFireSpread: 2
+  references:
+    version: 2
+    RefIds:
+    - rid: 749940167810482195
+      type: {class: Cellable, ns: BITFALL, asm: BITFALL.Item}
+      data:
+        size:
+          x: 2
+          y: 2
+    - rid: 749940167810482196
+      type: {class: ItemWeight, ns: BITFALL, asm: BITFALL.Item}
+      data:
+        Weight: 0.32
+    - rid: 806583484692037646
+      type: {class: SemiFireMode, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        fireRate: 3
+        requireBoltAction: 0
+    - rid: 1055089614898331654
+      type: {class: VectorSpread, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        spread: {x: 0.1, y: 0.1}
+    - rid: 1055089614898331655
+      type: {class: VectorRecoil, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        recoil: {x: -0.8, y: 0.8, z: 0}
+        viewRecoilWeight: {x: 2, y: 2, z: 2}
+    - rid: 6077775441645010964
+      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data: 
--- a/Assets/Artists/Configs/Refences/UXHud_Popup.asset
+++ b/Assets/Artists/Configs/Refences/UXHud_Popup.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 69820685192a7b140b6034ec1d0e585e, type: 3}
+  m_Name: UXHud_Popup
+  m_EditorClassIdentifier: 
+  value: UXHud_Popup
--- a/Assets/Artists/Configs/URP/Universal
+++ b/Assets/Artists/Configs/URP/Universal
@@ -131,7 +131,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3}
  m_Name: Overlay Transparent Show
  m_EditorClassIdentifier: 
-  m_Active: 0
+  m_Active: 1
  settings:
    passTag: Overlay Transparent Show
    Event: 500
@@ -382,7 +382,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9b7f813b992430245ad61f09b0473d9f, type: 3}
  m_Name: MKGlow
  m_EditorClassIdentifier: 
-  m_Active: 1
+  m_Active: 0
  showEditorMainBehavior: 1
  showEditorBloomBehavior: 0
  showEditorLensSurfaceBehavior: 0