add sniper

2023-10-31 18:07:15 +08:00
parent 18f664a545
commit f0f348c246
47 changed files with 4568 additions and 389 deletions
--- a/Assets/Artists/Configs/Animator/GunController.controller
+++ b/Assets/Artists/Configs/Animator/GunController.controller
@@ -259,17 +259,17 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  stateName:
-    rid: 6077775334095717166
+    rid: 806583747386015898
  index: 0
  duration: 0
  variables: []
  references:
    version: 2
    RefIds:
-    - rid: 6077775334095717166
-      type: {class: Reference, ns: BITKit, asm: BITKit}
+    - rid: 806583747386015898
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
      data:
-        value: Melee
+        so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
 --- !u!114 &-7573863279144559529
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -418,6 +418,9 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: 7328599787890610630}
    m_Position: {x: 600, y: 70, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2957080522954235941}
+    m_Position: {x: 510, y: -30, z: 0}
  m_ChildStateMachines:
  - serializedVersion: 1
    m_StateMachine: {fileID: -8302189511459068455}
@@ -532,6 +535,25 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 1521578019813095063}
+--- !u!1107 &-5585087820927220773
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Property Labey
+  m_ChildStates: []
+  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: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 0}
 --- !u!1102 &-5486025096061310462
 AnimatorState:
  serializedVersion: 6
@@ -735,6 +757,34 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1102 &-2957080522954235941
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ReloadBolt
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 5961391799434743852}
+  m_StateMachineBehaviours:
+  - {fileID: 8882185399953573684}
+  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: 4f865b7f02e5f224b8533fdd1498a38e, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!114 &-2375047907031775370
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -863,6 +913,37 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!206 &-275151238792902146
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Childs:
+  - serializedVersion: 2
+    m_Motion: {fileID: 7400000, guid: ce6e88da5907adc429d030f147024c48, type: 2}
+    m_Threshold: 0
+    m_Position: {x: 0, y: 0}
+    m_TimeScale: 1
+    m_CycleOffset: 0
+    m_DirectBlendParameter: SqrMagnitude
+    m_Mirror: 0
+  - serializedVersion: 2
+    m_Motion: {fileID: 7400000, guid: 8d9f33d150164f341a38ee4645421a42, type: 2}
+    m_Threshold: 1
+    m_Position: {x: 0, y: 0}
+    m_TimeScale: 1
+    m_CycleOffset: 0
+    m_DirectBlendParameter: SqrMagnitude
+    m_Mirror: 0
+  m_BlendParameter: SqrMagnitude
+  m_BlendParameterY: SqrMagnitude
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@@ -909,6 +990,57 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: Property Labey
+    m_StateMachine: {fileID: -5585087820927220773}
+    m_Mask: {fileID: 0}
+    m_Motions:
+    - serializedVersion: 2
+      m_State: {fileID: 4995920671595690745}
+      m_Motion: {fileID: -275151238792902146}
+    - serializedVersion: 2
+      m_State: {fileID: -5486025096061310462}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: 1980680052221774797}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: -534393602400926625}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: 7010801729564127113}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: 1384115644875593788}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: -6212384126105992686}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: 7328599787890610630}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: -4346237340383602777}
+      m_Motion: {fileID: 7400000, guid: ed88f135a8a788346a203496110202b7, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: -2143452696148819182}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: -7284265982017391337}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: -8362454903672907206}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    - serializedVersion: 2
+      m_State: {fileID: -1965665561355275315}
+      m_Motion: {fileID: 7400000, guid: a6a1743e1865fa143838b339679d4dd3, type: 2}
+    m_Behaviours: []
+    m_BlendingMode: 1
+    m_SyncedLayerIndex: 0
+    m_DefaultWeight: 1
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
    m_Name: Additive 0
    m_StateMachine: {fileID: -5623997194552822566}
@@ -1004,17 +1136,17 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  stateName:
-    rid: 6077775334095717164
+    rid: 806583747386015897
  index: 0
  duration: 0
  variables: []
  references:
    version: 2
    RefIds:
-    - rid: 6077775334095717164
-      type: {class: Reference, ns: BITKit, asm: BITKit}
+    - rid: 806583747386015897
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
      data:
-        value: Reload
+        so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
 --- !u!1101 &975168284167818646
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -1316,6 +1448,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &5961391799434743852
+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.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &6102623710537632219
 AnimatorState:
  serializedVersion: 6
@@ -1487,6 +1641,30 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!114 &8882185399953573684
+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: 806583747386015896
+  index: 0
+  duration: 0
+  variables: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583747386015896
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
 --- !u!114 &8909065250513692485
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/Assets/Artists/Configs/Items/Weapon_AWP.asset
+++ b/Assets/Artists/Configs/Items/Weapon_AWP.asset
@@ -0,0 +1,52 @@
+%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: Weapon_AWP
+  m_EditorClassIdentifier: 
+  displayName: AWP
+  description: "\u9AD8\u7CBE\u5EA6\u72D9\u51FB\u6B65\u67AA,\u9488\u5BF9\u91CD\u8981\u76EE\u6807"
+  addressablePath: Assets/Weapon_AWP
+  prefab: {fileID: 6968124341799536336, guid: b3ebf5aa66a5f1f4c8ef6adfc5a34f0c, type: 3}
+  squareIcon: {fileID: 2800000, guid: 5dce4c8f533344f489799e3194b1a9c6, type: 3}
+  rectangleIcon: {fileID: 2800000, guid: d27c479c8877f18468965c9b1d155540, type: 3}
+  quality: 4
+  isImprovised: 0
+  factoryProperties:
+  - rid: 806583747386015752
+  - rid: 806583747386015753
+  meleeDamage: 32
+  meleeRange: 1.6
+  meleeForce: 64
+  heavyMeleeDamage: 64
+  heavyMeleeRange: 1.6
+  heavyMeleeForce: 64
+  fireMode:
+    rid: 806583747386015749
+  initialDamage: 100
+  initialBulletForce: 512
+  initialBulletSpeed: 256
+  initialAimZoom: 8
+  isScopeAim: 1
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583747386015749
+      type: {class: SemiFireMode, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        fireRate: 1
+    - rid: 806583747386015752
+      type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment}
+      data: 
+    - rid: 806583747386015753
+      type: {class: VectorRecoil, ns: BITFALL.Guns, asm: BITFALL.Item}
+      data:
+        recoil: {x: -8, y: 8, z: 8}
--- a/Assets/Artists/Configs/Items/Weapon_M4A1.asset
+++ b/Assets/Artists/Configs/Items/Weapon_M4A1.asset
@@ -19,6 +19,7 @@ MonoBehaviour:
  squareIcon: {fileID: 2800000, guid: 454ee622559369049b64a96fa6456fd2, type: 3}
  rectangleIcon: {fileID: 2800000, guid: 8c4b3d8772ae2a54eaba9d401a095089, type: 3}
  quality: 2
+  isImprovised: 0
  factoryProperties:
  - rid: 749940214065790993
  - rid: 749940214065790995
@@ -34,6 +35,8 @@ MonoBehaviour:
    rid: 806583484692037645
  initialDamage: 32
  initialBulletForce: 512
+  initialBulletSpeed: 128
+  initialAimZoom: 1
  references:
    version: 2
    RefIds: