diff --git a/Assets/Resources/Player1.prefab b/Assets/Resources/Player1.prefab index 2f0ea3a..fb4f604 100644 --- a/Assets/Resources/Player1.prefab +++ b/Assets/Resources/Player1.prefab @@ -122,7 +122,7 @@ CircleCollider2D: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 64 + m_Bits: 192 m_LayerOverridePriority: 0 m_ForceSendLayers: serializedVersion: 2 diff --git a/Assets/Resources/Player2.prefab b/Assets/Resources/Player2.prefab index 9025978..1840cd8 100644 --- a/Assets/Resources/Player2.prefab +++ b/Assets/Resources/Player2.prefab @@ -122,7 +122,7 @@ CircleCollider2D: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 64 + m_Bits: 192 m_LayerOverridePriority: 0 m_ForceSendLayers: serializedVersion: 2 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index e3104d2..ffdff5d 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -5391,7 +5391,7 @@ MonoBehaviour: bloodCompute: {fileID: 7200000, guid: 99867deda8cf464cd87542adcc3c08f2, type: 3} mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} instancedMaterial: {fileID: 2100000, guid: 0d09c46ae354e8c49b2688cc4325b256, type: 2} - size: 0.05 + size: 0.1 scoreMult: 1 activeParticles: 0 score: 0 @@ -17214,6 +17214,42 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1609280383408315754, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: orthographic size + value: 7.7460885 + objectReference: {fileID: 0} + - target: {fileID: 2849751201525768572, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalPosition.x + value: -12.662641 + objectReference: {fileID: 0} + - target: {fileID: 2849751201525768572, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalPosition.y + value: -19.486038 + objectReference: {fileID: 0} + - target: {fileID: 3197454023887695364, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalPosition.x + value: -12.662641 + objectReference: {fileID: 0} + - target: {fileID: 3197454023887695364, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalPosition.y + value: -19.486038 + objectReference: {fileID: 0} + - target: {fileID: 3197454023887695364, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9989917 + objectReference: {fileID: 0} + - target: {fileID: 3197454023887695364, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0021761537 + objectReference: {fileID: 0} + - target: {fileID: 3197454023887695364, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalRotation.y + value: 0.04484268 + objectReference: {fileID: 0} + - target: {fileID: 3197454023887695364, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000097683034 + objectReference: {fileID: 0} - target: {fileID: 3401975006071930001, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_Targets.Array.data[0].target value: @@ -17274,6 +17310,30 @@ PrefabInstance: propertyPath: m_Name value: CameraRig objectReference: {fileID: 0} + - target: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalPosition.x + value: -12.662641 + objectReference: {fileID: 0} + - target: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalPosition.y + value: -19.486038 + objectReference: {fileID: 0} + - target: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9989917 + objectReference: {fileID: 0} + - target: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0021761537 + objectReference: {fileID: 0} + - target: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalRotation.y + value: 0.04484268 + objectReference: {fileID: 0} + - target: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000097683034 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index d9c4b75..5bc7a2d 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffff3fffffffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffff3fffffff3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1