diff --git a/Maquette/Assets/Animations/Clyde.controller b/Maquette/Assets/Animations/Clyde.controller index 6b0ae4b7786df49609a778043245d3e321fb333f..36259fb5c989c3ff5945bf5a9fc55cbb6611d0c6 100644 --- a/Maquette/Assets/Animations/Clyde.controller +++ b/Maquette/Assets/Animations/Clyde.controller @@ -141,10 +141,7 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Shooting - m_EventTreshold: 0 + m_Conditions: [] m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 7853119932566970837} m_Solo: 0 @@ -424,7 +421,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0.00000017948213 m_ExitTime: 2.1791391e-10 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Maquette/Assets/WeaponLoot.prefab b/Maquette/Assets/WeaponLoot.prefab index d88f76afe9dfd8c925e39add2465569a7799631c..4a2b44e8e568fa9584b4a65a3be5918091437836 100644 --- a/Maquette/Assets/WeaponLoot.prefab +++ b/Maquette/Assets/WeaponLoot.prefab @@ -115,7 +115,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -36.5, y: -84} + m_AnchoredPosition: {x: 14.5, y: -80.1} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3075358178863567199 @@ -168,7 +168,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -3.2915955, y: 9.166534} + m_Offset: {x: 1.1428833, y: 5.717186} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -179,7 +179,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 128.72943, y: 120.41107} + m_Size: {x: 163.22192, y: 149.97707} m_EdgeRadius: 0 --- !u!114 &3075358178863567136 MonoBehaviour: @@ -195,5 +195,4 @@ MonoBehaviour: m_EditorClassIdentifier: gunName: 3 value: 5 - canvas: {fileID: 0} weapons: {fileID: 11400000, guid: 1919b5b27e7b84012a3f4bba54b04b0f, type: 2} diff --git a/Maquette/Assets/prefabs/DeadPlayer.prefab b/Maquette/Assets/prefabs/DeadPlayer.prefab index c75c6fbea8bd94b2e3def21d850dae64604bb4d0..cd55017b08f68e955b6c0ec39a32d66f1db24f1b 100644 --- a/Maquette/Assets/prefabs/DeadPlayer.prefab +++ b/Maquette/Assets/prefabs/DeadPlayer.prefab @@ -70,8 +70,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 507560563 - m_SortingLayer: 4 + m_SortingLayerID: 702145399 + m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: d4ba48e7442724f579282e2f1f88a6ad, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1}