diff --git a/Assets/Audio/Sfx/ZapSplat/LaserWithRecovery.mp3 b/Assets/Audio/Sfx/ZapSplat/LaserWithRecovery.mp3 index 8145b86..699345d 100644 Binary files a/Assets/Audio/Sfx/ZapSplat/LaserWithRecovery.mp3 and b/Assets/Audio/Sfx/ZapSplat/LaserWithRecovery.mp3 differ diff --git a/Assets/GameObjects/Prefabs/Player.prefab b/Assets/GameObjects/Prefabs/Player.prefab index a417857..3088007 100644 --- a/Assets/GameObjects/Prefabs/Player.prefab +++ b/Assets/GameObjects/Prefabs/Player.prefab @@ -192,7 +192,7 @@ GameObject: - component: {fileID: 6532210512705233048} - component: {fileID: 5936763286718212152} m_Layer: 0 - m_Name: Bobber + m_Name: GunAnimator m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1350,7 +1350,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: -1410552352759146441, guid: ff7bf5284859d9f45a64971a67bb173a, type: 2} m_audioClip: {fileID: 0} m_PlayOnAwake: 0 - m_Volume: 0.5 + m_Volume: 1 m_Pitch: 1 Loop: 0 Mute: 0 @@ -1704,7 +1704,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 550df8ac62d76a64a8c621ea6b32398f, type: 2} - {fileID: 11400000, guid: 2d9739d3745581a41ae0ed6a569766d5, type: 2} Gun: {fileID: 1865991757674780053} - GunBobber: {fileID: 5936763286718212152} + GunAnimator: {fileID: 5936763286718212152} SoldierProceduralAnimator: {fileID: 8393781323051440261} DisabledOnDeath: - {fileID: 7391558912582364398} @@ -1724,7 +1724,7 @@ MonoBehaviour: LaserPrefab: {fileID: 8009551885746485900, guid: 5c99da0361d098646b319a35fcc80095, type: 3} Splatter: {fileID: 5204970423912589616} GunShotAudioSource: {fileID: 3686721060470342146} - RaygunClip: {fileID: 8300000, guid: 39b92d54fd06ad1419e7fb833ec9d43a, type: 3} + RaygunClip: {fileID: 8300000, guid: 643f2f841d3577649b254780ae82bfcf, type: 3} HitAudioSource: {fileID: 8513157977701802929} LocalHitAudioSource: {fileID: 8513157977701802929} Pitch: 0 @@ -2350,6 +2350,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1734861684113691137} m_Modifications: + - target: {fileID: -9048068652112721972, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000019371507 + objectReference: {fileID: 0} + - target: {fileID: -9048068652112721972, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0000001788139 + objectReference: {fileID: 0} + - target: {fileID: -9048068652112721972, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.043377466 + objectReference: {fileID: 0} + - target: {fileID: -9048068652112721972, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 1.7742399e-17 + objectReference: {fileID: 0} + - target: {fileID: -9048068652112721972, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -1.4883403e-10 + objectReference: {fileID: 0} - target: {fileID: -8938611747474359449, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2414,6 +2434,46 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -8175073431029806771, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.18189411 + objectReference: {fileID: 0} + - target: {fileID: -8175073431029806771, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.22799295 + objectReference: {fileID: 0} + - target: {fileID: -8175073431029806771, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.1367777 + objectReference: {fileID: 0} + - target: {fileID: -8175073431029806771, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.946692 + objectReference: {fileID: 0} + - target: {fileID: -8175073431029806771, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0000000013411028 + objectReference: {fileID: 0} + - target: {fileID: -8175073431029806771, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0070000035 + objectReference: {fileID: 0} + - target: {fileID: -8175073431029806771, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -6.705518e-10 + objectReference: {fileID: 0} + - target: {fileID: -6668198964032970785, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -6668198964032970785, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6668198964032970785, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00064120046 + objectReference: {fileID: 0} - target: {fileID: -5619626674655446429, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2434,6 +2494,30 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -4568838483885302556, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000027885656 + objectReference: {fileID: 0} + - target: {fileID: -4568838483885302556, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000000034485534 + objectReference: {fileID: 0} + - target: {fileID: -4568838483885302556, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.935965 + objectReference: {fileID: 0} + - target: {fileID: -4568838483885302556, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 1.4901166e-10 + objectReference: {fileID: 0} + - target: {fileID: -4568838483885302556, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0070000016 + objectReference: {fileID: 0} + - target: {fileID: -4568838483885302556, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -2.3373545e-10 + objectReference: {fileID: 0} - target: {fileID: -3989830250587162462, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2442,6 +2526,34 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -2727985816247612917, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.8574994 + objectReference: {fileID: 0} + - target: {fileID: -2727985816247612917, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.023382446 + objectReference: {fileID: 0} + - target: {fileID: -2727985816247612917, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.48273692 + objectReference: {fileID: 0} + - target: {fileID: -2727985816247612917, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.17638862 + objectReference: {fileID: 0} + - target: {fileID: -2727985816247612917, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0050000004 + objectReference: {fileID: 0} + - target: {fileID: -2727985816247612917, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0050000013 + objectReference: {fileID: 0} + - target: {fileID: -2727985816247612917, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: 1.8626464e-10 + objectReference: {fileID: 0} - target: {fileID: -2475922412546223987, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2466,6 +2578,54 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -1023746502932839868, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000023841855 + objectReference: {fileID: 0} + - target: {fileID: -1023746502932839868, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000023841855 + objectReference: {fileID: 0} + - target: {fileID: -1023746502932839868, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -1023746502932839868, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: -5.587935e-11 + objectReference: {fileID: 0} + - target: {fileID: -1023746502932839868, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0079999985 + objectReference: {fileID: 0} + - target: {fileID: -1023746502932839868, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: 0.001 + objectReference: {fileID: 0} + - target: {fileID: -1008694686840817437, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.21973674 + objectReference: {fileID: 0} + - target: {fileID: -1008694686840817437, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000010192097 + objectReference: {fileID: 0} + - target: {fileID: -1008694686840817437, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000013444377 + objectReference: {fileID: 0} + - target: {fileID: -1008694686840817437, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 1.6652871e-17 + objectReference: {fileID: 0} + - target: {fileID: -1008694686840817437, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.006999999 + objectReference: {fileID: 0} + - target: {fileID: -1008694686840817437, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: 7.0088324e-11 + objectReference: {fileID: 0} - target: {fileID: -1007519007793455862, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2478,6 +2638,34 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -307756406267600624, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.06589119 + objectReference: {fileID: 0} + - target: {fileID: -307756406267600624, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.70403016 + objectReference: {fileID: 0} + - target: {fileID: -307756406267600624, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.70403004 + objectReference: {fileID: 0} + - target: {fileID: -307756406267600624, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.06589117 + objectReference: {fileID: 0} + - target: {fileID: -307756406267600624, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0.00012213463 + objectReference: {fileID: 0} + - target: {fileID: -307756406267600624, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0012506978 + objectReference: {fileID: 0} + - target: {fileID: -307756406267600624, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0069270083 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Name value: SoldierM @@ -2494,6 +2682,58 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 1062060413906573047, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7398268 + objectReference: {fileID: 0} + - target: {fileID: 1062060413906573047, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 1062060413906573047, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000005960463 + objectReference: {fileID: 0} + - target: {fileID: 1062060413906573047, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.67279744 + objectReference: {fileID: 0} + - target: {fileID: 1062060413906573047, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 3.2782554e-10 + objectReference: {fileID: 0} + - target: {fileID: 1062060413906573047, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.01004988 + objectReference: {fileID: 0} + - target: {fileID: 1062060413906573047, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -1.4901154e-10 + objectReference: {fileID: 0} + - target: {fileID: 1528903356143588859, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.9516012 + objectReference: {fileID: 0} + - target: {fileID: 1528903356143588859, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000061047025 + objectReference: {fileID: 0} + - target: {fileID: 1528903356143588859, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009159318 + objectReference: {fileID: 0} + - target: {fileID: 1528903356143588859, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.30733564 + objectReference: {fileID: 0} + - target: {fileID: 1528903356143588859, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 1.7742394e-17 + objectReference: {fileID: 0} + - target: {fileID: 1528903356143588859, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -1.4883399e-10 + objectReference: {fileID: 0} - target: {fileID: 1635930599506061040, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2538,6 +2778,30 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 3471705024737857814, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3471705024737857814, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3471705024737857814, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3471705024737857814, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 3471705024737857814, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3471705024737857814, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000014901161 + objectReference: {fileID: 0} - target: {fileID: 3898088480367394180, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2554,10 +2818,86 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 4618155824103463327, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 4618155824103463327, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.0000000020579518 + objectReference: {fileID: 0} + - target: {fileID: 4618155824103463327, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4618155824103463327, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 4618155824103463327, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: -8.881784e-18 + objectReference: {fileID: 0} + - target: {fileID: 4618155824103463327, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0035000015 + objectReference: {fileID: 0} + - target: {fileID: 4741190521196183227, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.026346888 + objectReference: {fileID: 0} + - target: {fileID: 4741190521196183227, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.01741207 + objectReference: {fileID: 0} + - target: {fileID: 4741190521196183227, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.18639788 + objectReference: {fileID: 0} + - target: {fileID: 4741190521196183227, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98196673 + objectReference: {fileID: 0} + - target: {fileID: 4741190521196183227, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0000000017881381 + objectReference: {fileID: 0} + - target: {fileID: 4741190521196183227, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0070000044 + objectReference: {fileID: 0} + - target: {fileID: 4741190521196183227, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0000000026077007 + objectReference: {fileID: 0} - target: {fileID: 4781013230934216779, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 4829908095900899598, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.1722259 + objectReference: {fileID: 0} + - target: {fileID: 4829908095900899598, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.1313042 + objectReference: {fileID: 0} + - target: {fileID: 4829908095900899598, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.022178574 + objectReference: {fileID: 0} + - target: {fileID: 4829908095900899598, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9760152 + objectReference: {fileID: 0} + - target: {fileID: 4829908095900899598, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4829908095900899598, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -9.313234e-12 + objectReference: {fileID: 0} - target: {fileID: 4996979199693665407, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2570,6 +2910,34 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 5808585151339674361, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.043164343 + objectReference: {fileID: 0} + - target: {fileID: 5808585151339674361, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.22059314 + objectReference: {fileID: 0} + - target: {fileID: 5808585151339674361, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.15149395 + objectReference: {fileID: 0} + - target: {fileID: 5808585151339674361, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.9625618 + objectReference: {fileID: 0} + - target: {fileID: 5808585151339674361, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 7.450576e-10 + objectReference: {fileID: 0} + - target: {fileID: 5808585151339674361, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0050000027 + objectReference: {fileID: 0} + - target: {fileID: 5808585151339674361, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: 2.9802366e-10 + objectReference: {fileID: 0} - target: {fileID: 5866666021909216657, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Controller value: @@ -2586,10 +2954,66 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 6653399682821747160, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.029600028 + objectReference: {fileID: 0} + - target: {fileID: 6653399682821747160, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.027976638 + objectReference: {fileID: 0} + - target: {fileID: 6653399682821747160, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.91828465 + objectReference: {fileID: 0} + - target: {fileID: 6653399682821747160, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.39382043 + objectReference: {fileID: 0} + - target: {fileID: 6653399682821747160, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: -5.5879627e-11 + objectReference: {fileID: 0} + - target: {fileID: 6653399682821747160, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.005000002 + objectReference: {fileID: 0} + - target: {fileID: 6653399682821747160, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: 2.980231e-10 + objectReference: {fileID: 0} - target: {fileID: 6665228367387902487, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 6861537778114151268, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.6418371 + objectReference: {fileID: 0} + - target: {fileID: 6861537778114151268, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.23354365 + objectReference: {fileID: 0} + - target: {fileID: 6861537778114151268, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.111073256 + objectReference: {fileID: 0} + - target: {fileID: 6861537778114151268, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7219178 + objectReference: {fileID: 0} + - target: {fileID: 6861537778114151268, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0050000004 + objectReference: {fileID: 0} + - target: {fileID: 6861537778114151268, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.004999999 + objectReference: {fileID: 0} + - target: {fileID: 6861537778114151268, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -5.587937e-10 + objectReference: {fileID: 0} - target: {fileID: 8527667082344392330, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} propertyPath: m_Layer value: 15 @@ -2598,6 +3022,34 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 9221008120034015891, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.86758906 + objectReference: {fileID: 0} + - target: {fileID: 9221008120034015891, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000024889738 + objectReference: {fileID: 0} + - target: {fileID: 9221008120034015891, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000010021271 + objectReference: {fileID: 0} + - target: {fileID: 9221008120034015891, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.49728188 + objectReference: {fileID: 0} + - target: {fileID: 9221008120034015891, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.x + value: 2.9802445e-11 + objectReference: {fileID: 0} + - target: {fileID: 9221008120034015891, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.010049878 + objectReference: {fileID: 0} + - target: {fileID: 9221008120034015891, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + propertyPath: m_LocalPosition.z + value: -9.685747e-10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} --- !u!1 &2976767849567766614 stripped @@ -2732,6 +3184,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.5 objectReference: {fileID: 0} + - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000014901161 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000013411045 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000000044703484 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 7.450611e-11 + objectReference: {fileID: 0} - target: {fileID: -7703549873400780641, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2744,6 +3236,34 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.07660069 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.5246513 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.13764413 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.83661664 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 2.9802363e-10 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.005000001 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 1.0658127e-16 + objectReference: {fileID: 0} - target: {fileID: -6793525576862520222, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2764,6 +3284,34 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.613478 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.35163134 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.61347836 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.35163128 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -4.1526386e-11 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.010049878 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 7.450577e-11 + objectReference: {fileID: 0} - target: {fileID: -5748330711211812795, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2776,6 +3324,34 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.45494157 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.4542402 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.54119664 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5420334 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0069274693 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0012508247 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00011394534 + objectReference: {fileID: 0} - target: {fileID: -4131907830278110932, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2796,6 +3372,34 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.026346855 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.017412037 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.18639795 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9819667 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 1.4901153e-10 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0069999998 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 8.1956314e-10 + objectReference: {fileID: 0} - target: {fileID: -2651755571945067983, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2804,14 +3408,170 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.52313673 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.47573957 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.5231365 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.47573954 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -1.3915952e-11 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.010049876 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 5.9604643e-10 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.029599873 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.027976846 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.9182847 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.39382026 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 3.352766e-10 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000000026822078 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.70710695 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000011048039 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071066 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 3.6172504e-10 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0035000027 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.13677768 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.22799295 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.18189417 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9466919 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -2.1389511e-10 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0070000025 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: -1.2922075e-10 + objectReference: {fileID: 0} - target: {fileID: -1258012695961233954, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 156644665701319248, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.17222582 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.13130417 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0221785 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9760152 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 3.552715e-17 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: -3.5527146e-17 + objectReference: {fileID: 0} - target: {fileID: 483363334423502078, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2856,6 +3616,30 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.64183706 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.23354372 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.111073665 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7219177 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0049999994 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 2.2351737e-10 + objectReference: {fileID: 0} - target: {fileID: 3052791828982171308, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2872,6 +3656,30 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.8574994 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.02338251 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.48273712 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.17638841 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0050000004 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 5.3290694e-17 + objectReference: {fileID: 0} - target: {fileID: 4750802995923270682, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2888,6 +3696,34 @@ PrefabInstance: propertyPath: m_ApplyRootMotion value: 0 objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.21973684 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000030500817 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000011920929 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97555923 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -1.1920907e-10 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0069999993 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: -3.516517e-10 + objectReference: {fileID: 0} - target: {fileID: 6351483409919393762, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 @@ -2896,14 +3732,86 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.35209328 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000002234901 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000000026885486 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.93596494 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -1.1920905e-10 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0069999984 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2048304e-11 + objectReference: {fileID: 0} - target: {fileID: 7465317193259347286, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.99905884 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000022351736 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0000002086162 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.043377314 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: -1.1920927e-10 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: -1.4901158e-10 + objectReference: {fileID: 0} - target: {fileID: 8267919885921639191, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.95160115 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000029802315 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000029802315 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.30733573 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 1.192093e-10 + objectReference: {fileID: 0} - target: {fileID: 8654052703341272426, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Layer value: 15 diff --git a/Assets/Graphics/Animation/Gun/GunAnimatorController.controller b/Assets/Graphics/Animation/Gun/GunAnimatorController.controller index 639fb72..9bc67ad 100644 --- a/Assets/Graphics/Animation/Gun/GunAnimatorController.controller +++ b/Assets/Graphics/Animation/Gun/GunAnimatorController.controller @@ -1,5 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5744268222577063663 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GunShot + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1261693981416901029} + m_StateMachineBehaviours: [] + 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: 2b04d1204eb12d746b93c58f188c3b75, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-4154719974799769365 AnimatorState: serializedVersion: 5 @@ -10,7 +37,8 @@ AnimatorState: m_Name: Idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 3435677535705054684} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -38,6 +66,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -4154719974799769365} m_Position: {x: 270, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5744268222577063663} + m_Position: {x: 270, y: 180, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -48,6 +79,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -4154719974799769365} +--- !u!1101 &-1261693981416901029 +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: -4154719974799769365} + 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: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-844397901598186827 AnimatorStateMachine: serializedVersion: 5 @@ -104,7 +157,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: GunAnimatorController serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Shot + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: BaseLayer @@ -130,3 +189,28 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &3435677535705054684 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Shot + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5744268222577063663} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.8125 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Graphics/Animation/Gun/GunShot.anim b/Assets/Graphics/Animation/Gun/GunShot.anim new file mode 100644 index 0000000..2724e42 --- /dev/null +++ b/Assets/Graphics/Animation/Gun/GunShot.anim @@ -0,0 +1,531 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GunShot + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 5, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0, y: 0.01, z: -0.1} + inSlope: {x: 0, y: 0, z: -0.36923066} + outSlope: {x: 0, y: 0, z: -0.36923066} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: 0, y: 0, z: -0.12} + inSlope: {x: 0, y: -0.030769229, z: 0} + outSlope: {x: 0, y: -0.030769229, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: -0.01, z: 0.03} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.01 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: -0.030769229 + outSlope: -0.030769229 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -0.01 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -0.1 + inSlope: -0.36923066 + outSlope: -0.36923066 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.12 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Graphics/Animation/Gun/GunShot.anim.meta b/Assets/Graphics/Animation/Gun/GunShot.anim.meta new file mode 100644 index 0000000..88a5393 --- /dev/null +++ b/Assets/Graphics/Animation/Gun/GunShot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b04d1204eb12d746b93c58f188c3b75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Players/Player.cs b/Assets/Scripts/Players/Player.cs index 2acb83c..a53a77c 100644 --- a/Assets/Scripts/Players/Player.cs +++ b/Assets/Scripts/Players/Player.cs @@ -20,7 +20,7 @@ namespace NeonTea.Quakeball.Players { public MoveStyle[] MoveStyles; public Transform Gun; - public Animator GunBobber; + public Animator GunAnimator; public SoldierProceduralAnimator SoldierProceduralAnimator; @@ -191,6 +191,7 @@ namespace NeonTea.Quakeball.Players { break; } + GunAnimator.SetBool("Shot", true); GameObject LaserEffect = Instantiate(LaserPrefab); Laser Laser = LaserEffect.GetComponent(); Laser.From = GunPoint; @@ -289,6 +290,7 @@ namespace NeonTea.Quakeball.Players { } private void LateUpdate() { + GunAnimator.SetBool("Shot", false); UpdateMovement(); } @@ -341,7 +343,7 @@ namespace NeonTea.Quakeball.Players { } float TargetBobbiness = Grounded ? GroundVelocity.magnitude / MoveStyle.TargetVelocity : 0; - GunBobber.SetLayerWeight(1, Mathf.Lerp(GunBobber.GetLayerWeight(1), TargetBobbiness, 10f * Time.deltaTime)); + GunAnimator.SetLayerWeight(1, Mathf.Lerp(GunAnimator.GetLayerWeight(1), TargetBobbiness, 10f * Time.deltaTime)); } } }