1

Assets/Artists/Configs/Animator/UseController.controller

@@ -1,5 +1,27 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8583447253539064739
+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: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-6225440301908278770
 AnimatorState:
   serializedVersion: 6
@@ -10,7 +32,8 @@ AnimatorState:
   m_Name: Exit
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -8583447253539064739}
   m_StateMachineBehaviours:
   - {fileID: 3941207575723502659}
   m_Position: {x: 50, y: 50, z: 0}
@@ -65,12 +88,12 @@ 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: 0
+  m_InterruptionSource: 2
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
 --- !u!91 &9100000
@@ -95,6 +118,28 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &761492899490755068
+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: -6225440301908278770}
+  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
 --- !u!114 &1601994892391978028
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -130,7 +175,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 3912522527455923443}
-    m_Position: {x: 30, y: 180, z: 0}
+    m_Position: {x: 30, y: 170, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 8555862083137980829}
     m_Position: {x: 30, y: 250, z: 0}
@@ -144,7 +189,7 @@ AnimatorStateMachine:
   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_ExitPosition: {x: 480, y: 240, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 3912522527455923443}
 --- !u!1102 &3912522527455923443
@@ -198,7 +243,7 @@ MonoBehaviour:
     - rid: 806583484692037649
       type: {class: Reference, ns: BITKit, asm: BITKit}
       data:
-        value: Close
+        value: Exit
 --- !u!1102 &8555862083137980829
 AnimatorState:
   serializedVersion: 6
@@ -209,7 +254,8 @@ AnimatorState:
   m_Name: Use
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 761492899490755068}
   m_StateMachineBehaviours:
   - {fileID: -3138131730491430725}
   m_Position: {x: 50, y: 50, z: 0}

Assets/Artists/Configs/Items/BodyPlate.asset

@@ -9,21 +9,32 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1124c18d28c78f74cae355c518715ba3, type: 3}
+  m_Script: {fileID: 11500000, guid: 009e9a685f706414d964df0e5fcaa064, type: 3}
   m_Name: BodyPlate
   m_EditorClassIdentifier: 
   displayName: BodyPlate
   description: "\u62A4\u7532\u63D2\u677F,\u63D0\u4F9B\u9AD8\u7EA7\u9632\u62A4"
   addressablePath: Assets/BodyPlate
-  prefab: {fileID: 0}
+  prefab: {fileID: 5771951068758094859, guid: 3ffa8857b55c0e04dbeb91cf5b61e23b, type: 3}
   squareIcon: {fileID: 2800000, guid: 0e89085d0836ce54f955db61e1762017, type: 3}
   rectangleIcon: {fileID: 2800000, guid: 0e89085d0836ce54f955db61e1762017, type: 3}
   quality: 3
   factoryProperties:
   - rid: 806583484692037655
+  - rid: 806583484692037794
+  meleeDamage: 0
+  meleeRange: 0
+  meleeForce: 0
+  heavyMeleeDamage: 0
+  heavyMeleeRange: 0
+  heavyMeleeForce: 0
   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

Assets/Artists/Configs/Items/Dev_BulletVest.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1124c18d28c78f74cae355c518715ba3, type: 3}
+  m_Script: {fileID: 11500000, guid: 6f5161c9da9ad2a4889e94ad0f66ae2f, type: 3}
   m_Name: Dev_BulletVest
   m_EditorClassIdentifier: 
   displayName: "\u9632\u5F39\u80CC\u5FC3"
@@ -23,6 +23,7 @@ MonoBehaviour:
   - rid: 6077775357238050820
   - rid: 6077775357238050821
   - rid: 6077775357238050823
+  maxArmor: 100
   references:
     version: 2
     RefIds:

Assets/Artists/Configs/Items/Umbrella.asset

@@ -20,10 +20,10 @@ MonoBehaviour:
   rectangleIcon: {fileID: 2800000, guid: 79525a62c6fb81b4aba7f4a445973fb3, type: 3}
   quality: 0
   factoryProperties:
-  - rid: 806583144903606803
+  - rid: 806583484692037661
   references:
     version: 2
     RefIds:
-    - rid: 806583144903606803
-      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+    - rid: 806583484692037661
+      type: {class: EquipmentUseItem, ns: BITFALL, asm: BITFALL.Entities.Equipment}
       data: