1

2023-09-01 14:33:54 +08:00
parent 4fadd3a530
commit 8ef5c7ec0a
451 changed files with 1048940 additions and 2028 deletions
--- a/Assets/Artists/Models/Guns/Core/EquipAdditiveMask.mask
+++ b/Assets/Artists/Models/Guns/Core/EquipAdditiveMask.mask
@@ -0,0 +1,69 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!319 &31900000
+AvatarMask:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: EquipAdditiveMask
+  m_Mask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+  m_Elements:
+  - m_Path: 
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure
+    m_Weight: 0
+  - m_Path: FPS_ArmaTure/FPS_Camera
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Left_Shoulder
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Left_Shoulder/FPS_Left_UpperArm
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Left_Shoulder/FPS_Left_UpperArm/FPS_Left_LowerArm
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Left_Shoulder/FPS_Left_UpperArm/FPS_Left_LowerArm/FPS_Left_Hand
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Left_Shoulder/FPS_Left_UpperArm/FPS_Left_LowerArm/FPS_Left_Hand/FPS_Left_Root
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Right_Shoulder
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Right_Shoulder/FPS_Right_UpperArm
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Right_Shoulder/FPS_Right_UpperArm/FPS_Right_LowerArm
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Right_Shoulder/FPS_Right_UpperArm/FPS_Right_LowerArm/FPS_Right_Hand
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Right_Shoulder/FPS_Right_UpperArm/FPS_Right_LowerArm/FPS_Right_Hand/FPS_Right_Root
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Weapon_Magazine
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Weapon_Magazine_Sec
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Weapon_Root
+    m_Weight: 1
+  - m_Path: FPS_ArmaTure/FPS_Weapon_Root/FPS_AimPoint
+    m_Weight: 0
+  - m_Path: FPS_ArmaTure/FPS_Weapon_Root/FPS_Weapon_Bolt
+    m_Weight: 0
+  - m_Path: M4_8
+    m_Weight: 0
+  - m_Path: M4_8/M4_Optic_01
+    m_Weight: 0
+  - m_Path: M4_8/M4_Optic_02
+    m_Weight: 0
+  - m_Path: M4_8/M4_Optic_03
+    m_Weight: 0
+  - m_Path: M4_8/M4_Optic_04
+    m_Weight: 0
+  - m_Path: M4_8/M4_Optic_05
+    m_Weight: 0
+  - m_Path: M4_8/M4_Optic_06
+    m_Weight: 0
+  - m_Path: M4_8/M4_Optic_07
+    m_Weight: 0
+  - m_Path: M4_8/M4_Optic_08
+    m_Weight: 0
+  - m_Path: Mesh_Arm
+    m_Weight: 0
+  - m_Path: Mesh_Arm_Slim
+    m_Weight: 0
--- a/Assets/Artists/Models/Guns/Glock/Weapon_Glock.overrideController
+++ b/Assets/Artists/Models/Guns/Glock/Weapon_Glock.overrideController
@@ -45,3 +45,9 @@ AnimatorOverrideController:
  - m_OriginalClip: {fileID: 7400000, guid: 00d8a0f68533b9b4192a7c6d473d591f, type: 2}
    m_OverrideClip: {fileID: -3784128091923313851, guid: 1ce161a4d1dd40c4fa95801c98f74a9a,
      type: 3}
+  - m_OriginalClip: {fileID: 7400000, guid: 2a2012ea7f7e0e042ac7ede06063b02b, type: 2}
+    m_OverrideClip: {fileID: 4080960951410847890, guid: 1ce161a4d1dd40c4fa95801c98f74a9a,
+      type: 3}
+  - m_OriginalClip: {fileID: 7400000, guid: 77284660b64f8b747a959381bd306474, type: 2}
+    m_OverrideClip: {fileID: 4080960951410847890, guid: 1ce161a4d1dd40c4fa95801c98f74a9a,
+      type: 3}