Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-25 08e6fa059769ad8bcd3fc3202040afa6992d221e

 System/OpenServerActivity/OpenServiceItem.cs

@@ -37,6 +37,8 @@
                    m_ImageShow.SetSprite(weekPartPointConfig.ImageType2);

                }

                m_ImageShow.SetNativeSize();

                var RectTrans = m_ImageShow.transform.GetComponent<RectTransform>();

                RectTrans.localScale = new Vector3(weekPartPointConfig.Zoom, weekPartPointConfig.Zoom, 1);

            }

            int Point = model.GetPoint(day);           

            m_TextPoint.text = Language.Get("OSA_3", item.NeedPoint);