Merge remote-tracking branch 'origin/master'

Assets/ObjectResources/LevelStructure/Grass_Tiles/Grass.prefab

@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7837097020989566239}
   - component: {fileID: 7724424028307775222}
-  m_Layer: 31
+  m_Layer: 8
   m_Name: Grass
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -55,7 +55,7 @@ GameObject:
   - component: {fileID: 5329113890094483071}
   - component: {fileID: 8318251097761974828}
   - component: {fileID: 4973774707675209247}
-  m_Layer: 31
+  m_Layer: 8
   m_Name: Layer1
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Prefabs/Test/TestStone.prefab

@@ -11,8 +11,8 @@ GameObject:
   - component: {fileID: 1088708388262890221}
   - component: {fileID: 8320450346667173300}
   - component: {fileID: 7341239521485774464}
-  - component: {fileID: -8695742575480594994}
-  m_Layer: 10
+  - component: {fileID: -3588197436131663497}
+  m_Layer: 8
   m_Name: TestStone
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 2410282298153064044}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -5.5005, y: 2.4984, z: 0}
-  m_LocalScale: {x: 0.4990654, y: 0.49742827, z: 1}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -93,17 +93,17 @@ Rigidbody2D:
   m_Simulated: 1
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 0
-  m_Mass: 1
+  m_Mass: 0.5
   m_LinearDrag: 0
   m_AngularDrag: 0
-  m_GravityScale: 0
+  m_GravityScale: 1
   m_Material: {fileID: 6200000, guid: 7672215e50d2a5440a10e6568ffb5bc4, type: 2}
   m_Interpolate: 0
   m_SleepingMode: 1
-  m_CollisionDetection: 1
+  m_CollisionDetection: 0
   m_Constraints: 0
---- !u!61 &-8695742575480594994
-BoxCollider2D:
+--- !u!60 &-3588197436131663497
+PolygonCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -112,7 +112,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 1
+  m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
@@ -125,6 +125,49 @@ BoxCollider2D:
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 2, y: 2}
-  m_EdgeRadius: 0
+  m_Points:
+    m_Paths:
+    - - {x: 0.97319263, y: -0.9583725}
+      - {x: 0.9841164, y: -0.92634016}
+      - {x: 0.99432737, y: -0.89788306}
+      - {x: 1.0022691, y: -0.89302146}
+      - {x: 1, y: -0.28}
+      - {x: 0.98999995, y: 0.07}
+      - {x: 1, y: 0.16}
+      - {x: 1.0016032, y: 0.36633182}
+      - {x: 1.0028826, y: 0.4307745}
+      - {x: 0.984512, y: 0.915415}
+      - {x: 0.9459868, y: 0.94341004}
+      - {x: 0.8993613, y: 0.9581539}
+      - {x: 0.8597069, y: 0.95736015}
+      - {x: 0.25193575, y: 0.9697751}
+      - {x: 0.06306706, y: 0.9683295}
+      - {x: 0.05992551, y: 0.9835579}
+      - {x: -0.010274064, y: 0.9801644}
+      - {x: -0.05176015, y: 1.0067292}
+      - {x: -0.41315916, y: 1.0040447}
+      - {x: -0.58694494, y: 0.9664803}
+      - {x: -0.7165961, y: 0.94908404}
+      - {x: -0.7587157, y: 0.94652265}
+      - {x: -0.9280796, y: 0.9264605}
+      - {x: -0.9385199, y: 0.84317064}
+      - {x: -0.9758383, y: 0.62021357}
+      - {x: -0.9810465, y: 0.55481416}
+      - {x: -0.98224175, y: 0.3405377}
+      - {x: -0.998304, y: 0.31938607}
+      - {x: -1.0027374, y: -0.2488409}
+      - {x: -0.98034805, y: -0.75924575}
+      - {x: -0.9290341, y: -0.92905974}
+      - {x: -0.921786, y: -0.96415234}
+      - {x: -0.918225, y: -0.9903707}
+      - {x: -0.69703597, y: -0.99117976}
+      - {x: -0.6970015, y: -0.99936956}
+      - {x: -0.6392211, y: -1.0039618}
+      - {x: -0.6193408, y: -0.9930452}
+      - {x: -0.3005429, y: -0.97762984}
+      - {x: -0.27567226, y: -0.96357435}
+      - {x: -0.2300261, y: -0.9674787}
+      - {x: -0.058706343, y: -0.9674782}
+      - {x: 0.052021943, y: -0.9583485}
+      - {x: 0.61, y: -0.94}
+      - {x: 0.65361506, y: -0.9469895}

Assets/Scripts/Test.meta

+fileFormatVersion: 2
+guid: 93e431ad3e83c684aad9460d9143b53b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/Physics2DSettings.asset

@@ -53,4 +53,4 @@ Physics2DSettings:
   m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
   m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
   m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
-  m_LayerCollisionMatrix: ffcbffffffc8ffffffc8ffffffffffffffc8ffffffc8ffffffffffffffffffffc9eeffffc9edffffc8cbffffffffffffc8c8ffffc8cbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3fffffffbf
+  m_LayerCollisionMatrix: ffcbffffffc8ffffffc8ffffffffffffffc8ffffffc8ffffffffffffffffffffc9efffffc9edffffc8cbffffffffffffc8c8ffffc8cbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3fffffffbf