1

2024-03-25 16:08:26 +08:00
parent 65d90d1bfa
commit 967ad8eacf
67 changed files with 3097 additions and 39530 deletions
--- a/Assets/Artists/Configs/Asset
+++ b/Assets/Artists/Configs/Asset
@@ -41,3 +41,4 @@ MonoBehaviour:
  - {fileID: 102900000, guid: 72d2660dce099184bbeb0e9039a2df00, type: 3}
  - {fileID: 102900000, guid: aee8d09a63ef2c3429a58e3664825ac3, type: 3}
  - {fileID: 833098253977982021, guid: c01b7ba098c32bd4a83fa4f641e88883, type: 3}
+  - {fileID: 102900000, guid: 3c3b6903fbe8530448f026360a8f1c83, type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Aim.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Aim.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: e10d487ea3416624f9d8b6866cfc8623,
+        clip: {fileID: -5005298213620940126, guid: 49040ec99e08f4a479d274681c2f0224,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_AimFire.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_AimFire.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: b2c0b6226e5c5ef4b9c513c64c06d31c,
+        clip: {fileID: -5005298213620940126, guid: a260ff58e4c34aa4887de4cbf73b267f,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Crouch.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Crouch.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: 87be0f2fac035024ebc507d9607f0e7d,
+        clip: {fileID: -5005298213620940126, guid: 5b91a2e9158b82f4a98aac9427f2cb50,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Equip.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Equip.asset
@@ -17,7 +17,7 @@ MonoBehaviour:
  - rid: 3736623726865940497
  - rid: 3736623726865940498
  value:
-    rid: 3736623726865940499
+    rid: 3736623747328901129
  references:
    version: 2
    RefIds:
@@ -34,8 +34,10 @@ MonoBehaviour:
      type: {class: Reference, ns: BITKit, asm: BITKit}
      data:
        value: Equip
-    - rid: 3736623726865940499
-      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
+    - rid: 3736623747328901129
+      type: {class: MotionMatchingDualClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: 1a8337e3a0059ad4b9cb2003bbf051ee,
+        clip1: {fileID: -5005298213620940126, guid: 6c6d1461845bb8943be2ef627c086617,
+          type: 3}
+        clip2: {fileID: 5828064820269887830, guid: a23e054f57158a9488a281fbfde20dc1,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Fire.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Fire.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: 15f7ffc8f9f60134aa2b1121f8cd946d,
+        clip: {fileID: -5005298213620940126, guid: 3d23d06fbabd61c4c80ae37a17ef6bc2,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Holster.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Holster.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: f1a8af97ffb75664d99d9c2814d9968e,
+        clip: {fileID: -6224038092205281515, guid: 70347011fba32754091f54f76f5e9586,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Jump.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Jump.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: e2527a50e93850647a77016e2b36d512,
+        clip: {fileID: -5005298213620940126, guid: 1c130561ae62a3f48ac800b0c05635ef,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Land.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Land.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: abb77c2e43dfeed438472d2e013d4424,
+        clip: {fileID: -5005298213620940126, guid: 45a5988f8360cf445a825aae5e154e58,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Movement.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Movement.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: 5ec9c418c9b7f75459a8eb8a1329d64b,
+        clip: {fileID: 6183853948075537494, guid: 962e3a8a690068641be39724f488fe0d,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Reload.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Reload.asset
@@ -17,7 +17,7 @@ MonoBehaviour:
  - rid: 3736623726865940497
  - rid: 3736623726865940498
  value:
-    rid: 3736623726865940499
+    rid: 3736623747328901126
  references:
    version: 2
    RefIds:
@@ -34,8 +34,10 @@ MonoBehaviour:
      type: {class: Reference, ns: BITKit, asm: BITKit}
      data:
        value: Reload
-    - rid: 3736623726865940499
-      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
+    - rid: 3736623747328901126
+      type: {class: MotionMatchingDualClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: d6c3eebf076204440a566f53f0ee13e6,
+        clip1: {fileID: 3146893969071494344, guid: f8d18cf04542afa4ab4e4da1930645b3,
+          type: 3}
+        clip2: {fileID: 2599069708638463515, guid: a23e054f57158a9488a281fbfde20dc1,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Run.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Run.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: bd60372f42a61b84c956da752509ba27,
+        clip: {fileID: -4896380239855528765, guid: f4a35ae8a68d1c541a76d42051aa7cf1,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Slide.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Slide.asset
@@ -0,0 +1,41 @@
+%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: b43979511dcafe047b047852cf9f3c47, type: 3}
+  m_Name: AG14W_Slide
+  m_EditorClassIdentifier: 
+  tags:
+  - rid: 3736623726865940496
+  - rid: 3736623726865940497
+  - rid: 3736623726865940498
+  value:
+    rid: 3736623726865940499
+  references:
+    version: 2
+    RefIds:
+    - rid: 3736623726865940496
+      type: {class: DictionaryReference, ns: BITKit, asm: BITKit}
+      data:
+        index: -463043648
+        keyword: 
+    - rid: 3736623726865940497
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: AG14W
+    - rid: 3736623726865940498
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Slide
+    - rid: 3736623726865940499
+      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
+      data:
+        clip: {fileID: 3860152649546669951, guid: 2ed0820f2388a824da6322c066fcd5c6,
+          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Sprint.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Sprint.asset
@@ -17,7 +17,7 @@ MonoBehaviour:
  - rid: 3736623726865940497
  - rid: 3736623726865940498
  value:
-    rid: 3736623726865940499
+    rid: 3736623754094837762
  references:
    version: 2
    RefIds:
@@ -34,8 +34,10 @@ MonoBehaviour:
      type: {class: Reference, ns: BITKit, asm: BITKit}
      data:
        value: Sprint
-    - rid: 3736623726865940499
-      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
+    - rid: 3736623754094837762
+      type: {class: MotionMatchingDualClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: de852abee32973e4583ce1764ef6fa80,
+        clip1: {fileID: -3618829970799408532, guid: aff28d809b7b8fa4d84103019e007b29,
+          type: 3}
+        clip2: {fileID: 8945782531527108956, guid: a23e054f57158a9488a281fbfde20dc1,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Walk.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W/AG14W_Walk.asset
@@ -37,5 +37,5 @@ MonoBehaviour:
    - rid: 3736623726865940499
      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
      data:
-        clip: {fileID: -623603649343465320, guid: 70764c67b12777b4d92c3db7457c5171,
+        clip: {fileID: -5005298213620940126, guid: e0a7bb2381bd5cd4785e1fd19556e2aa,
          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W_Cimb.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W_Cimb.asset
@@ -0,0 +1,41 @@
+%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: b43979511dcafe047b047852cf9f3c47, type: 3}
+  m_Name: AG14W_Cimb
+  m_EditorClassIdentifier: 
+  tags:
+  - rid: 3736623754094837780
+  - rid: 3736623754094837781
+  - rid: 3736623754094837782
+  value:
+    rid: 3736623754094837783
+  references:
+    version: 2
+    RefIds:
+    - rid: 3736623754094837780
+      type: {class: DictionaryReference, ns: BITKit, asm: BITKit}
+      data:
+        index: -463043648
+        keyword: 
+    - rid: 3736623754094837781
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: AG14W
+    - rid: 3736623754094837782
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Climb
+    - rid: 3736623754094837783
+      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
+      data:
+        clip: {fileID: 4299282957090598557, guid: e64856a178eee57418f9f6029844ccbc,
+          type: 3}
--- a/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W_Draw.asset
+++ b/Assets/Artists/Configs/MotionMatching/C_Weapon/AG14W_Draw.asset
@@ -0,0 +1,41 @@
+%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: b43979511dcafe047b047852cf9f3c47, type: 3}
+  m_Name: AG14W_Draw
+  m_EditorClassIdentifier: 
+  tags:
+  - rid: 3736623747328901132
+  - rid: 3736623747328901133
+  - rid: 3736623747328901134
+  value:
+    rid: 3736623747328901135
+  references:
+    version: 2
+    RefIds:
+    - rid: 3736623747328901132
+      type: {class: DictionaryReference, ns: BITKit, asm: BITKit}
+      data:
+        index: -463043648
+        keyword: c
+    - rid: 3736623747328901133
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: AG14W
+    - rid: 3736623747328901134
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: Draw
+    - rid: 3736623747328901135
+      type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
+      data:
+        clip: {fileID: -623603649343465320, guid: 423c2531523ea7d47be774282830d369,
+          type: 3}