Merge remote-tracking branch 'origin/dev_m1' into dev_mobile_ble

# Conflicts:
#	Assets/Scripts/App.cs

Assets/Scripts/UI/Prefab/BigMap/Item.cs

@@ -62,7 +62,11 @@ public class Item : PFUIPanel, IPointerEnterHandler, IPointerExitHandler, IPoint
             material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));
         }
         var rect = ((RectTransform)transform).rect;
+#if UNITY_ANDROID || UNITY_IOS
+        material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, 10, 0));
+#else
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.5f, 0));
+#endif
         this.GetComponent<Image>().material = material;
 
         hot = this.transform.Find("Hot");