1

2023-10-24 23:37:59 +08:00
parent 325f63d6bc
commit 3e39e627bc
388 changed files with 29043 additions and 889 deletions
--- a/Assets/Artists/Configs/Animator/Core/EntityBasedNPC.controller
+++ b/Assets/Artists/Configs/Animator/Core/EntityBasedNPC.controller
@@ -1,27 +1,31 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8944048238387094739
-AnimatorStateTransition:
+--- !u!1107 &-9120357483318927721
+AnimatorStateMachine:
+  serializedVersion: 6
  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: -2872314262290925133}
-  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
+  m_Name: Attack
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -5060886563922672075}
+    m_Position: {x: 250, y: 80, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -8088620814189296577}
+    m_Position: {x: 250, y: 140, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours:
+  - {fileID: 276872393024185899}
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -5060886563922672075}
 --- !u!1102 &-8318622992684206721
 AnimatorState:
  serializedVersion: 6
@@ -34,7 +38,8 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: -2257074110139407426}
-  m_StateMachineBehaviours: []
+  m_StateMachineBehaviours:
+  - {fileID: -4682183484338247278}
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
@@ -49,6 +54,55 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &-8088620814189296577
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Attack_R
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -6022094536806633483}
+  m_StateMachineBehaviours: []
+  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: 65a4736dd630e3e4e9f7c6a572a54956, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-7490854506384927082
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 6058815529303356158}
+  m_DstState: {fileID: 0}
+  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!1101 &-6682989306357693698
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -71,6 +125,55 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &-6022094536806633483
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 6058815529303356158}
+  m_DstState: {fileID: 0}
+  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!1102 &-5060886563922672075
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Attack_L
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -7490854506384927082}
+  m_StateMachineBehaviours: []
+  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: 2e02f8e429bd50041a0a22e527708abf, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &-4873137299548358500
 AnimatorStateMachine:
  serializedVersion: 6
@@ -96,6 +199,30 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 700, y: 100, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -3174240966205496616}
+--- !u!114 &-4682183484338247278
+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: 806583545631342607
+  index: 0
+  duration: 0
+  variables: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583545631342607
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Movement
 --- !u!1102 &-3624621611510814089
 AnimatorState:
  serializedVersion: 6
@@ -108,7 +235,8 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 455483977735225797}
-  m_StateMachineBehaviours: []
+  m_StateMachineBehaviours:
+  - {fileID: -150162369578498782}
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
@@ -123,32 +251,6 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1107 &-3577891082255179188
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Upper Layer
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: -2872314262290925133}
-    m_Position: {x: 30, y: 180, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 3164795607557365492}
-    m_Position: {x: 290, y: 180, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions:
-  - {fileID: -196818614216295774}
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: -2872314262290925133}
 --- !u!1102 &-3174240966205496616
 AnimatorState:
  serializedVersion: 6
@@ -175,32 +277,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-2872314262290925133
-AnimatorState:
-  serializedVersion: 6
+--- !u!1101 &-2445016005032985477
+AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Idle
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  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: 0}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-2257074110139407426
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -226,31 +324,54 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &-196818614216295774
-AnimatorStateTransition:
+--- !u!114 &-1149441261307116378
+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_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: Melee
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 3164795607557365492}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.75
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
+  m_EditorClassIdentifier: 
+  stateName:
+    rid: 806583545631342605
+  index: 0
+  duration: 0
+  variables: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583545631342605
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: HitStun
+--- !u!114 &-150162369578498782
+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: 806583545631342606
+  index: 0
+  duration: 0
+  variables: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583545631342606
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Idle
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@@ -265,19 +386,13 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
-  - m_Name: Melee
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
  - m_Name: SqrMagnitude
    m_Type: 1
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@@ -291,18 +406,6 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
-  - serializedVersion: 5
-    m_Name: Upper Layer
-    m_StateMachine: {fileID: -3577891082255179188}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 1
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
    m_Name: Additive Layer
    m_StateMachine: {fileID: -4873137299548358500}
@@ -315,6 +418,40 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
+--- !u!114 &276872393024185899
+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: 806583545631342611
+  index: 0
+  duration: 0
+  variables:
+  - rid: 806583545631342609
+  - rid: 806583545631342610
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583545631342609
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Attack_L
+    - rid: 806583545631342610
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Attack_R
+    - rid: 806583545631342611
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Attack
 --- !u!1101 &455483977735225797
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -367,33 +504,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &3164795607557365492
-AnimatorState:
-  serializedVersion: 6
+--- !u!1101 &4579198035393053474
+AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Attack
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -8944048238387094739}
-  m_StateMachineBehaviours: []
-  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: 00d8a0f68533b9b4192a7c6d473d591f, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  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 &6058815529303356158
 AnimatorStateMachine:
  serializedVersion: 6
@@ -409,13 +541,49 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: -8318622992684206721}
    m_Position: {x: 260, y: 180, z: 0}
-  m_ChildStateMachines: []
+  - serializedVersion: 1
+    m_State: {fileID: 8265139578357769089}
+    m_Position: {x: 530, y: 180, z: 0}
+  m_ChildStateMachines:
+  - serializedVersion: 1
+    m_StateMachine: {fileID: -9120357483318927721}
+    m_Position: {x: 260, y: 100, z: 0}
  m_AnyStateTransitions: []
  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
+  m_StateMachineTransitions:
+  - first: {fileID: -9120357483318927721}
+    second: []
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
  m_EntryPosition: {x: 50, y: 120, z: 0}
  m_ExitPosition: {x: 550, y: 110, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -3624621611510814089}
+--- !u!1102 &8265139578357769089
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HitStun
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -2445016005032985477}
+  m_StateMachineBehaviours:
+  - {fileID: -1149441261307116378}
+  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: c9d4ca0a62700ee488e80586d79da367, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
--- a/Assets/Artists/Configs/Animator/GunController.controller
+++ b/Assets/Artists/Configs/Animator/GunController.controller
@@ -451,9 +451,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0
  m_TransitionOffset: 0
-  m_ExitTime: 0.75
+  m_ExitTime: 1
  m_HasExitTime: 1
  m_HasFixedDuration: 1
  m_InterruptionSource: 2
--- a/Assets/Artists/Configs/Animator/MeleeController.controller
+++ b/Assets/Artists/Configs/Animator/MeleeController.controller
--- a/Assets/Artists/Configs/Animator/Pose.controller
+++ b/Assets/Artists/Configs/Animator/Pose.controller
@@ -0,0 +1,165 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-7279506085134558611
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New State
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 1
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2}
+  m_Tag: 
+  m_SpeedParameter: Speed
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-6115830228273227718
+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: IsAlive
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1107 &-5383015995915285676
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -7279506085134558611}
+    m_Position: {x: 30, y: 180, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 8070093193186123607}
+    m_Position: {x: 370, y: 70, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions:
+  - {fileID: -1887378640362712805}
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 630, y: 60, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -7279506085134558611}
+--- !u!1101 &-1887378640362712805
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsAlive
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 8070093193186123607}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 0
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Pose
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Speed
+    m_Type: 1
+    m_DefaultFloat: 0.2
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: IsAlive
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 1
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -5383015995915285676}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &8070093193186123607
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Death
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -6115830228273227718}
+  m_StateMachineBehaviours: []
+  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: db6569b2f424b464592fb079f6c8e435, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
--- a/Assets/Artists/Configs/Animator/ThrowingController.controller
+++ b/Assets/Artists/Configs/Animator/ThrowingController.controller
@@ -0,0 +1,251 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-8000311602464041889
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Throw
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -4967112762278070718}
+  m_StateMachineBehaviours:
+  - {fileID: -6247976549397085200}
+  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: 46f6bba0b7dfc524c814da620942f888, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!114 &-6517901631659466536
+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: 806583526086934671
+  index: 0
+  duration: 0
+  variables: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583526086934671
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Draw
+--- !u!1107 &-6249399899547047150
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 4618170466298800719}
+    m_Position: {x: 30, y: 170, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -5544499878387165102}
+    m_Position: {x: 30, y: 240, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -8000311602464041889}
+    m_Position: {x: 260, y: 210, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 490, y: 210, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 4618170466298800719}
+--- !u!114 &-6247976549397085200
+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: 806583526086934674
+  index: 0
+  duration: 0
+  variables: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583526086934674
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Throw
+--- !u!114 &-5679675043502648851
+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: 806583526086934673
+  index: 0
+  duration: 0
+  variables: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583526086934673
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Idle
+--- !u!1102 &-5544499878387165102
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours:
+  - {fileID: -5679675043502648851}
+  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: 68182865c01bbae4fb3027ea32634e3f, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-4967112762278070718
+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: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 1
+  m_OrderedInterruption: 0
+  m_CanTransitionToSelf: 1
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ThrowingController
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -6249399899547047150}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &4618170466298800719
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Draw
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 5333647381821307321}
+  m_StateMachineBehaviours:
+  - {fileID: -6517901631659466536}
+  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: 73f4040677932bd4eb75341b67350857, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &5333647381821307321
+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: -5544499878387165102}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
--- a/Assets/Artists/Configs/Animator/Zombie.overrideController
+++ b/Assets/Artists/Configs/Animator/Zombie.overrideController
@@ -15,6 +15,12 @@ AnimatorOverrideController:
  - m_OriginalClip: {fileID: 7400000, guid: d0620b5ee177bad468ceeac53272b40b, type: 2}
    m_OverrideClip: {fileID: -5091876547363602435, guid: a91e64e3665997c4aab9ac6657ec7fd2,
      type: 3}
-  - m_OriginalClip: {fileID: 7400000, guid: 00d8a0f68533b9b4192a7c6d473d591f, type: 2}
-    m_OverrideClip: {fileID: -722364122401081825, guid: 10b7a755d3c5c284d978736e6f8af395,
+  - m_OriginalClip: {fileID: 7400000, guid: c9d4ca0a62700ee488e80586d79da367, type: 2}
+    m_OverrideClip: {fileID: 6718848898307459054, guid: 2d1247122cb945c48b03642fe8f48bf9,
+      type: 3}
+  - m_OriginalClip: {fileID: 7400000, guid: 2e02f8e429bd50041a0a22e527708abf, type: 2}
+    m_OverrideClip: {fileID: 4941507361278309450, guid: 69621cc42f6a3324c9a7f7b7ae747a38,
+      type: 3}
+  - m_OriginalClip: {fileID: 7400000, guid: 65a4736dd630e3e4e9f7c6a572a54956, type: 2}
+    m_OverrideClip: {fileID: 3623907491181672982, guid: 3460fe979eaba16409a3f7668ae33fe5,
      type: 3}
--- a/Assets/Artists/Configs/AssetCache.asset
+++ b/Assets/Artists/Configs/AssetCache.asset
@@ -0,0 +1,24 @@
+%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: 80b507ad25f1af24687db7fa18d953fd, type: 3}
+  m_Name: AssetCache
+  m_EditorClassIdentifier: 
+  isEditable: 1
+  _assets:
+  - {fileID: 4066453597750257159, guid: f18510934c4581d47819abfbf1bd3647, type: 3}
+  - {fileID: 4826102346843731729, guid: e5d265393747af741b4f5d719598831a, type: 3}
+  - {fileID: 594564951014165300, guid: 374b2f92905c4f147abf889c9aeb5aab, type: 3}
+  - {fileID: 102900000, guid: 2dee481995db18f4f833cba844c60c01, type: 3}
+  - {fileID: 102900000, guid: 64ec0870d67188d4a92d78fb4f1b656e, type: 3}
+  - {fileID: 102900000, guid: b89cff0714cbe0f47916a494c499616e, type: 3}
+  - {fileID: 102900000, guid: c983dbe6ebc2b57489601f50c99fa1cb, type: 3}
+  - {fileID: 102900000, guid: c07a96c3e3e14944ca8e41b6d805923e, type: 3}
--- a/Assets/Artists/Configs/Items/Apple.asset
+++ b/Assets/Artists/Configs/Items/Apple.asset
@@ -23,6 +23,7 @@ MonoBehaviour:
  - rid: 6077775448293769231
  - rid: 806583097028509696
  - rid: 806583097028509697
+  - rid: 806583545631342594
  references:
    version: 2
    RefIds:
@@ -34,6 +35,9 @@ MonoBehaviour:
      type: {class: PlayerEatAddThirst, ns: BITFALL.Player.Survival, asm: BITFALL.Player.Survival}
      data:
        value: 15
+    - rid: 806583545631342594
+      type: {class: EquipmentUseItem, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data: 
    - rid: 6077775448293769231
      type: {class: ItemWeight, ns: BITFALL, asm: BITFALL.Item}
      data:
--- a/Assets/Artists/Configs/Items/BodyPlate.asset
+++ b/Assets/Artists/Configs/Items/BodyPlate.asset
@@ -20,7 +20,7 @@ MonoBehaviour:
  rectangleIcon: {fileID: 2800000, guid: 0e89085d0836ce54f955db61e1762017, type: 3}
  quality: 3
  factoryProperties:
-  - rid: 806583484692037655
+  - rid: 806583526086934678
  - rid: 806583484692037794
  meleeDamage: 0
  meleeRange: 0
@@ -31,10 +31,15 @@ MonoBehaviour:
  references:
    version: 2
    RefIds:
-    - rid: 806583484692037655
-      type: {class: EquipmentUseItem, ns: BITFALL, asm: BITFALL.Entities.Equipment}
-      data: 
    - rid: 806583484692037794
      type: {class: AddArmor, ns: BITFALL.Items.Armor, asm: BITFALL.Item}
      data:
        Armor: 25
+    - rid: 806583526086934678
+      type: {class: EquipmentAsSlot, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data:
+        slot:
+          rid: 806583526086934680
+    - rid: 806583526086934680
+      type: {class: EquipmentAsArmorPlate, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data: 
--- a/Assets/Artists/Configs/Items/Grenade.asset
+++ b/Assets/Artists/Configs/Items/Grenade.asset
@@ -0,0 +1,36 @@
+%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: e85133da5368bfe4b845d18f4e7def30, type: 3}
+  m_Name: Grenade
+  m_EditorClassIdentifier: 
+  displayName: "\u9AD8\u7206\u624B\u96F7"
+  description: "\u4E22\u51FA\u53BB"
+  addressablePath: Assets/Grenade
+  prefab: {fileID: 2065734771687522921, guid: a553c303344ee814ab274017e0f0e389, type: 3}
+  squareIcon: {fileID: 2800000, guid: eb6f6f191136996449c69251d147e308, type: 3}
+  rectangleIcon: {fileID: 2800000, guid: eb6f6f191136996449c69251d147e308, type: 3}
+  quality: 0
+  factoryProperties:
+  - rid: 806583526086934675
+  instance: {fileID: 5322756313667207077, guid: 6c561c5784df77f4aa248f741584c96f,
+    type: 3}
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583526086934675
+      type: {class: EquipmentAsSlot, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data:
+        slot:
+          rid: 806583526086934677
+    - rid: 806583526086934677
+      type: {class: EquipmentAsThrow, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data: 
--- a/Assets/Artists/Configs/Items/Soda.asset
+++ b/Assets/Artists/Configs/Items/Soda.asset
@@ -0,0 +1,29 @@
+%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: Soda
+  m_EditorClassIdentifier: 
+  displayName: "\u82CF\u6253\u6C34"
+  description: "\u996E\u6599"
+  addressablePath: Assets/Soda
+  prefab: {fileID: 1906669864236619332, guid: 90a7e66310865604a84cc4f70bccc45b, type: 3}
+  squareIcon: {fileID: 0}
+  rectangleIcon: {fileID: 0}
+  quality: 0
+  factoryProperties:
+  - rid: 806583545631342598
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583545631342598
+      type: {class: EquipmentUseItem, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data: 
--- a/Assets/Artists/Configs/Items/Weapon_Glock.asset
+++ b/Assets/Artists/Configs/Items/Weapon_Glock.asset
@@ -31,6 +31,8 @@ MonoBehaviour:
  heavyMeleeForce: 0
  fireMode:
    rid: 806583484692037646
+  initialDamage: 12
+  initialBulletForce: 256
  references:
    version: 2
    RefIds:
@@ -47,7 +49,7 @@ MonoBehaviour:
    - rid: 806583484692037646
      type: {class: SemiFireMode, ns: BITFALL.Guns, asm: BITFALL.Item}
      data:
-        fireRate: 3
+        fireRate: 8
    - rid: 6077775441645010964
      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}
      data: 
--- a/Assets/Artists/Configs/Items/Weapon_M4A1.asset
+++ b/Assets/Artists/Configs/Items/Weapon_M4A1.asset
@@ -23,6 +23,7 @@ MonoBehaviour:
  - rid: 749940214065790993
  - rid: 749940214065790995
  - rid: 6077775441645010963
+  - rid: 806583545631342592
  meleeDamage: 32
  meleeRange: 2
  meleeForce: 64
@@ -31,6 +32,8 @@ MonoBehaviour:
  heavyMeleeForce: 0
  fireMode:
    rid: 806583484692037645
+  initialDamage: 32
+  initialBulletForce: 512
  references:
    version: 2
    RefIds:
@@ -48,6 +51,10 @@ MonoBehaviour:
      type: {class: AutoFireMode, ns: BITFALL.Guns, asm: BITFALL.Item}
      data:
        fireRate: 10
+    - rid: 806583545631342592
+      type: {class: VectorRecoil, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        recoil: {x: -1, y: 1, z: 1}
    - rid: 6077775441645010963
      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}
      data: 
--- a/Assets/Artists/Configs/Items/Weapon_TacticalKnife.asset
+++ b/Assets/Artists/Configs/Items/Weapon_TacticalKnife.asset
@@ -28,6 +28,8 @@ MonoBehaviour:
  heavyMeleeDamage: 64
  heavyMeleeRange: 2.4
  heavyMeleeForce: 512
+  blockStaminaCost: 32
+  heavyAttackStaminaCost: 64
  references:
    version: 2
    RefIds:
--- a/Assets/Artists/Configs/PhysicsMaterial/Prop.physicMaterial
+++ b/Assets/Artists/Configs/PhysicsMaterial/Prop.physicMaterial
@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Prop
+  dynamicFriction: 0.6
+  staticFriction: 0.6
+  bounciness: 1
+  frictionCombine: 0
+  bounceCombine: 0
--- a/Assets/Artists/Configs/URP/Universal
+++ b/Assets/Artists/Configs/URP/Universal
@@ -158,10 +158,10 @@ MonoBehaviour:
  m_AssetVersion: 2
  m_OpaqueLayerMask:
    serializedVersion: 2
-    m_Bits: 2147513463
+    m_Bits: 2147578999
  m_TransparentLayerMask:
    serializedVersion: 2
-    m_Bits: 2147513463
+    m_Bits: 2147578999
  m_DefaultStencilState:
    overrideStencilState: 0
    stencilReference: 0
--- a/Assets/Artists/Configs/VFX/VFX_Explosion_Large.asset
+++ b/Assets/Artists/Configs/VFX/VFX_Explosion_Large.asset
@@ -0,0 +1,20 @@
+%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: fdd387d83e4ca1e42ac03c3aa9700ffb, type: 3}
+  m_Name: VFX_Explosion_Large
+  m_EditorClassIdentifier: 
+  tags:
+  - Explosion
+  - Large
+  prefabs:
+  - {fileID: 4070324366562018, guid: 585a1ef8c48a0cf4f97332139e4344de, type: 3}
+  clips: []
--- a/Assets/Artists/Configs/VFX/VFX_Explosion_Small.asset
+++ b/Assets/Artists/Configs/VFX/VFX_Explosion_Small.asset
@@ -0,0 +1,20 @@
+%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: fdd387d83e4ca1e42ac03c3aa9700ffb, type: 3}
+  m_Name: VFX_Explosion_Small
+  m_EditorClassIdentifier: 
+  tags:
+  - Explosion
+  - Small
+  prefabs:
+  - {fileID: 4934833856949886, guid: 5ed0a013702bd9f42847584f2fba7b21, type: 3}
+  clips: []