Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-02-25 ab80f74522d9b0cc0f37e4ae0f7be8e080f306d3

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/WeekPartyPointConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------

//    [Author]:           Fish

//    [  Date ]:           Thursday, February 14, 2019

//    [  Date ]:           Monday, February 25, 2019
//--------------------------------------------------------



using System.Collections.Generic;

@@ -17,6 +17,7 @@
    public readonly string ImageType1;

    public readonly string ImageType2;

    public readonly string name;

    public readonly float Zoom;


    public WeekPartyPointConfig()

    {

@@ -35,6 +36,8 @@
            ImageType2 = tables[2];



            name = tables[3];



            float.TryParse(tables[4],out Zoom); 
        }

        catch (Exception ex)

        {


 Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: f723363b44064444fb15fc4cafbaa0d5
timeCreated: 1550121884
timeCreated: 1551060842
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 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);