diff --git a/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab b/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab index 1c3c5667..61c60edc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab @@ -47,6 +47,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 722195db1b0214a7ab110e4cf4c2a7ce, type: 3} m_Name: m_EditorClassIdentifier: + lerpTime: 0.1 --- !u!212 &1453251556377932372 SpriteRenderer: m_ObjectHideFlags: 0 @@ -114,7 +115,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 8.74, y: 7.4} + oldSize: {x: 9.2, y: 7.82} newSize: {x: 7.6, y: 6.5} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -271,7 +272,7 @@ EdgeCollider2D: m_GameObject: {fileID: 1453251557352552635} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 440db2e8ae6ea41b792d56600b0532f3, type: 2} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D new file mode 100644 index 00000000..ceef943f --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PanEdge + friction: 1 + bounciness: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D.meta b/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D.meta new file mode 100644 index 00000000..141f3ce8 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/PanEdge.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 440db2e8ae6ea41b792d56600b0532f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D index 1e0db417..fed6e227 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D +++ b/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D @@ -7,5 +7,5 @@ PhysicsMaterial2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: corn - friction: 0.5 - bounciness: 0.6 + friction: 0.6 + bounciness: 0.2