diff --git a/Assets/Prefabs/Weapons/Shotgun.prefab b/Assets/Prefabs/Weapons/Shotgun.prefab index df16d34798a7ae9259628c440ca0cbba9a7a214c..a2ece265c2e591beb72ccbdcb320d3267d56b397 100644 --- a/Assets/Prefabs/Weapons/Shotgun.prefab +++ b/Assets/Prefabs/Weapons/Shotgun.prefab @@ -5387,23 +5387,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.039 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.006 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.7072302 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.7069834 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalRotation.y @@ -5411,11 +5411,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -89.98 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -5438,10 +5438,41 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} insertIndex: -1 addedObject: {fileID: 2465119738321024574} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} + insertIndex: -1 + addedObject: {fileID: 7999585237107731416} m_SourcePrefab: {fileID: 100100000, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} --- !u!4 &5828645645051632533 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} m_PrefabInstance: {fileID: 6298630598253837438} m_PrefabAsset: {fileID: 0} +--- !u!1 &6604620085898133807 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e7d5afe420c2da64dbe236f4faa5b3a7, type: 3} + m_PrefabInstance: {fileID: 6298630598253837438} + m_PrefabAsset: {fileID: 0} +--- !u!136 &7999585237107731416 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6604620085898133807} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.015 + m_Height: 0.12 + m_Direction: 0 + m_Center: {x: 0.0029257722, y: 0, z: 0.01} diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity index a54d6fbf50e8b7714bfa9735ea0534cd8e6f2d7c..f0eb76bd7f75a4c0059a43a5fd2725ea5de4351e 100644 --- a/Assets/Scenes/Level01.unity +++ b/Assets/Scenes/Level01.unity @@ -12358,7 +12358,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -642.6587, y: -300} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 75, y: 60} m_Pivot: {x: 0, y: 0} --- !u!1 &1297588071 @@ -14019,6 +14019,7 @@ MonoBehaviour: shopTimeRemaining: 0 shopKeeper: {fileID: 0} timerCanvas: {fileID: 0} + stats: {fileID: 0} --- !u!1 &1695883712 GameObject: m_ObjectHideFlags: 0