1

2023-10-30 01:25:53 +08:00
parent add6d0cab3
commit 18f664a545
125 changed files with 3529 additions and 700 deletions
--- a/Assets/Artists/Prefabs/Player.prefab
+++ b/Assets/Artists/Prefabs/Player.prefab
@@ -240,7 +240,7 @@ MonoBehaviour:
      draggable: 1
      expandable: 1
      multipleSelection: 1
-      isExpanded: 1
+      isExpanded: 0
      label:
        m_Text: Keys
        m_Image: {fileID: 0}
@@ -255,7 +255,7 @@ MonoBehaviour:
      elementNameOverride: 
      elementIcon: {fileID: 0}
    reqReferences: {fileID: 0}
-    isExpanded: 1
+    isExpanded: 0
    _keyValues:
    - Assets/Improvised_AmmoBox
    _keys:
@@ -577,6 +577,7 @@ Transform:
  - {fileID: 974388490910736766}
  - {fileID: 6504162899667296546}
  - {fileID: 6778784877586059904}
+  - {fileID: 3139903432182894523}
  m_Father: {fileID: 5592345712141467330}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1773428102 &2224691859326090984
@@ -1244,6 +1245,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  dictionary:
    _serializedList:
+    - Key: Assets/RiotShield
+      Value: {fileID: 1336640300666574394}
    - Key: Assets/Weapon_M4A1
      Value: {fileID: 974388490910736766}
    - Key: Assets/Improvised_AmmoBox
@@ -1279,6 +1282,8 @@ MonoBehaviour:
  animationKeyWords:
  - rid: 806583666069995745
  - rid: 806583666069995746
+  - rid: 806583703969988612
+  - rid: 806583703969988622
  _rootVelocity:
    rid: -2
  boolParameters: []
@@ -1296,6 +1301,14 @@ MonoBehaviour:
      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
      data:
        so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
+    - rid: 806583703969988612
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
+    - rid: 806583703969988622
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: 4a847097a446a4c42b582c2a2f878b11, type: 2}
 --- !u!114 &6438031452483613087
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -1350,6 +1363,10 @@ MonoBehaviour:
  unityAnimator: {fileID: 6002452162850529175}
  animatorControllers:
    _serializedList:
+    - Key: Assets/RiotShield
+      Value: {fileID: 22100000, guid: 465fc0e3c3db4e94182db050d2809aea, type: 2}
+    - Key: Assets/TacticalKnife
+      Value: {fileID: 22100000, guid: 3518d002db077a44ab2866a3cec5f060, type: 2}
    - Key: Assets/Weapon_M4A1
      Value: {fileID: 22100000, guid: ac08606b82ce5894b912a062bc236fa3, type: 2}
    - Key: Assets/Weapon_Glock
@@ -1584,6 +1601,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  equipped:
    _serializedList:
+    - Key: Assets/RiotShield
+      Value: {fileID: 3136326129886663733}
    - Key: Assets/TacticalKnife
      Value: {fileID: 6778784877585698464}
    - Key: Assets/Weapon_Glock
@@ -2558,6 +2577,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 7999429370730056110}
  - {fileID: 3277717096784339497}
  - {fileID: 7681178683086533546}
  - {fileID: 1428674107237432471}
@@ -2633,6 +2653,68 @@ Transform:
  m_Children: []
  m_Father: {fileID: 4826102346843731735}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5534769563475854462
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7999429370730056110}
+  - component: {fileID: 55057610730573739}
+  m_Layer: 7
+  m_Name: EmptyController
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7999429370730056110
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5534769563475854462}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2019605867538852436}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &55057610730573739
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5534769563475854462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ed423df83f75aa141b9c427c163769e8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stateMachine:
+    _currentStateName: 
+    debug: 0
+    transitionOnNextFrame: 0
+  item: {fileID: 11400000, guid: 1f69b8202d0d9fc4aa50a06f24e46266, type: 2}
+  animator: {fileID: 0}
+  vfxPlayer: {fileID: 0}
+  entityAnimator: {fileID: 0}
+  renderers: []
+  cameraTransform: {fileID: 7999429370730056110}
+  meleeService:
+    rid: 806583703969988652
+  references:
+    version: 2
+    RefIds:
+    - rid: 806583703969988652
+      type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
+      data: 
 --- !u!1 &5633551467716821190
 GameObject:
  m_ObjectHideFlags: 0
@@ -3084,6 +3166,37 @@ ParentConstraint:
  m_Sources:
  - sourceTransform: {fileID: 3905569252357375247}
    weight: 1
+--- !u!1 &7183123841516261596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1336640300666574394}
+  m_Layer: 9
+  m_Name: Drop
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1336640300666574394
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7183123841516261596}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.615, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3139903432182894523}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7598281767233133373
 GameObject:
  m_ObjectHideFlags: 0
@@ -3976,6 +4089,10 @@ PrefabInstance:
        type: 3}
      insertIndex: -1
      addedObject: {fileID: 2426015728857496741}
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8ce64bfbf2bb80840af381346bccb782,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2513368842649961580}
  m_SourcePrefab: {fileID: 100100000, guid: 8ce64bfbf2bb80840af381346bccb782, type: 3}
 --- !u!137 &735532174701725946 stripped
 SkinnedMeshRenderer:
@@ -4042,7 +4159,7 @@ MonoBehaviour:
  item: {fileID: 11400000, guid: 9bba7152a5d65c049b17a8461ad4e844, type: 2}
  animator: {fileID: 4834117868670403678}
  vfxPlayer: {fileID: 0}
-  entityAnimator: {fileID: 0}
+  entityAnimator: {fileID: 2513368842649961580}
  renderers:
  - {fileID: 1221488407187310397}
  - {fileID: 735532174701725946}
@@ -4085,6 +4202,55 @@ MonoBehaviour:
      type: {class: Blocking, ns: BITFALL.Entities.Equipment.Melee, asm: BITFALL.Equip}
      data:
        meleeController: {fileID: 2426015728857496741}
+--- !u!114 &2513368842649961580
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1772301879848412717}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ac2d465b526bc94fa8ecba1c434c884, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  animators:
+  - {fileID: 4834117868670403678}
+  animationKeyWords:
+  - rid: 806583703969988615
+  - rid: 806583703969988616
+  - rid: 806583703969988617
+  - rid: 806583703969988618
+  - rid: 806583703969988619
+  _rootVelocity:
+    rid: -2
+  boolParameters: []
+  floatParameters: []
+  references:
+    version: 2
+    RefIds:
+    - rid: -2
+      type: {class: , ns: , asm: }
+    - rid: 806583703969988615
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
+    - rid: 806583703969988616
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: d8b9663a2f4fd4b408b9db8ce2aa859c, type: 2}
+    - rid: 806583703969988617
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: 8a53085143a39744ebe0f755e7d1c1fe, type: 2}
+    - rid: 806583703969988618
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: 0f127b679db2ca5478ac73cfbf407cc8, type: 2}
+    - rid: 806583703969988619
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: 4a847097a446a4c42b582c2a2f878b11, type: 2}
 --- !u!4 &2437386659687487010 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 3857971597623217502, guid: 8ce64bfbf2bb80840af381346bccb782,
@@ -5220,6 +5386,7 @@ MonoBehaviour:
  - rid: 749939664269606914
  - rid: 806583666069995741
  - rid: 806583666069995742
+  - rid: 806583703969988623
  _rootVelocity:
    rid: 750605193046130692
  boolParameters:
@@ -5261,6 +5428,10 @@ MonoBehaviour:
      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
      data:
        so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
+    - rid: 806583703969988623
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
 --- !u!114 &4676489320873285128
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -5440,6 +5611,147 @@ Animator:
    type: 3}
  m_PrefabInstance: {fileID: 3095788410081854914}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3135374973463242519
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2367504132869257504}
+    m_Modifications:
+    - target: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_Name
+      value: SM_Wep_RiotShield_01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_Layer
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
+        type: 3}
+      propertyPath: m_Size.x
+      value: 0.7936606
+      objectReference: {fileID: 0}
+    - target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
+        type: 3}
+      propertyPath: m_Size.y
+      value: 1.2573875
+      objectReference: {fileID: 0}
+    - target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
+        type: 3}
+      propertyPath: m_Center.x
+      value: -0.01157405
+      objectReference: {fileID: 0}
+    - target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
+        type: 3}
+      propertyPath: m_Center.y
+      value: -0.0967747
+      objectReference: {fileID: 0}
+    - target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
+        type: 3}
+      propertyPath: m_Center.z
+      value: 0.040806536
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1336640300666574394}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2259428400979183358}
+  m_SourcePrefab: {fileID: 100100000, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
+--- !u!1 &3136326129886663733 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39,
+    type: 3}
+  m_PrefabInstance: {fileID: 3135374973463242519}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &2259428400979183358
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3136326129886663733}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b5dd32aae6c2084db4b79343a0bdc65, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  spring:
+    damp: 20
+    frequence: 15
+    value: {x: 0, y: 0, z: 0}
+  maxSpring:
+    allow: 1
+    value: 8
+--- !u!4 &3139903432182894523 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39,
+    type: 3}
+  m_PrefabInstance: {fileID: 3135374973463242519}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3451855730188380086
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -7989,6 +8301,7 @@ MonoBehaviour:
  - rid: 749939664269606914
  - rid: 806583666069995743
  - rid: 806583666069995744
+  - rid: 806583703969988624
  _rootVelocity:
    rid: 750605193046130692
  boolParameters:
@@ -8030,6 +8343,10 @@ MonoBehaviour:
      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
      data:
        so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
+    - rid: 806583703969988624
+      type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
+      data:
+        so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
 --- !u!114 &4384885775763546391
 MonoBehaviour:
  m_ObjectHideFlags: 0