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

client_Wu Xijin

2019-06-10 dd26b7a6b66de7352d029b57c8cd78f4756af961

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

 Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Friday, May 31, 2019
//    [  Date ]:           Monday, June 10, 2019
//--------------------------------------------------------

using System.Collections.Generic;
@@ -15,6 +15,7 @@

    public readonly int id;

    public readonly string name;

    public readonly string category;

    public readonly int jump;

    public readonly int guide;

    public readonly int type;

@@ -36,22 +37,24 @@


            name = tables[1];



            int.TryParse(tables[2],out jump); 
            category = tables[2];



            int.TryParse(tables[3],out guide); 
            int.TryParse(tables[3],out jump); 


            int.TryParse(tables[4],out type); 
            int.TryParse(tables[4],out guide); 


            int.TryParse(tables[5],out condition); 
            int.TryParse(tables[5],out type); 


            string[] itemConditionStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            int.TryParse(tables[6],out condition); 


            string[] itemConditionStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            itemCondition = new Int2[itemConditionStringArray.Length];
            for (int i=0;i<itemConditionStringArray.Length;i++)
            {
                 Int2.TryParse(itemConditionStringArray[i],out itemCondition[i]);
            }



            string[] excludeFuncsStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] excludeFuncsStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            excludeFuncs = new int[excludeFuncsStringArray.Length];
            for (int i=0;i<excludeFuncsStringArray.Length;i++)
            {

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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b2d416872ed7b3048a5b2d4696c3541f
timeCreated: 1559286620
timeCreated: 1560146342
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/TelPartialConfig/PartialVipPrivilegeInfoConfig.cs

@@ -20,7 +20,7 @@
            }

            if (config.datas != null && config.datas.Length > 0)

            {

                var index = level - 1;

                var index = level;

                var min = Mathf.Min(index, config.datas.Length - 1);

                return config.datas[min];

            }

@@ -35,7 +35,7 @@
        {

            if (config.label != null && config.label.Length > 0)

            {

                var index = level - 1;

                var index = level;

                var min = Mathf.Min(index, config.label.Length - 1);

                return config.label[min];

            }


 System/FairyAu/GiveRedBagTipsWin.cs

@@ -36,6 +36,8 @@
        private int _NumberNumerical = 0;//数量数值

        private string _content = null;



        private int minRedpackCount = 10;



       // private int _Number = 0;//用来获取仙盟的人数

        private int _RedLines = 0;//红包额度

        RedPacketModel m_RedPacket;

@@ -80,10 +82,10 @@
        {

            if (int.Parse(NumKeyboardNumber.Value) <= (int)PlayerDatas.Instance.fairyData.fairy.MemberCount)

            {

                if (!RedBagTipsWin._RedBagTipsWin._RedBool && int.Parse(NumKeyboardNumber.Value) <= 10)

                if (!RedBagTipsWin._RedBagTipsWin._RedBool && int.Parse(NumKeyboardNumber.Value) <= minRedpackCount)

                {

                    NumKeyboardNumber.Value = 10.ToString();

                    _NumberNumerical = 10;//仙盟红包至少10包

                    NumKeyboardNumber.Value = minRedpackCount.ToString();

                    _NumberNumerical = minRedpackCount;//仙盟红包至少10包

                }

                else

                {

@@ -100,9 +102,9 @@
            {

                if (!RedBagTipsWin._RedBagTipsWin._RedBool)

                {

                    if (PlayerDatas.Instance.fairyData.fairy.MemberCount <= 10)

                    if (PlayerDatas.Instance.fairyData.fairy.MemberCount <= minRedpackCount)

                    {

                        NumKeyboardNumber.Value = 10.ToString();

                        NumKeyboardNumber.Value = minRedpackCount.ToString();

                    }

                    else

                    {

@@ -212,17 +214,27 @@
            }

            else

            {

                var getWay = redPacket._DicRedBag[redPacket.RedBagId].GetWay;

                var configs = RedPackConfig.GetValues();

                foreach (var config in configs)

                {

                    if (config.RedEnvelopeType == getWay)

                    {

                        minRedpackCount = config.PacketCnt;

                    }

                }



                _BonusAmount = redPacket._DicRedBag[redPacket.RedBagId].MoneyNum;

                _DotText1.text = _BonusAmount.ToString();

                _CountText.text = _BonusAmount.ToString();

                if ((int)PlayerDatas.Instance.fairyData.fairy.MemberCount <= 10)

                if ((int)PlayerDatas.Instance.fairyData.fairy.MemberCount <= minRedpackCount)

                {

                    _NumberNumerical = 10;//仙盟红包至少10包

                    _NumberNumerical = minRedpackCount;//仙盟红包至少10包

                    _DotText2.text = _NumberNumerical.ToString();

                }

                else

                {

                    _NumberNumerical = 10;

                    _NumberNumerical = minRedpackCount;

                    _DotText2.text = _NumberNumerical.ToString();

                }

            }

@@ -359,7 +371,7 @@
            }

            else

            {

                if (_NumberNumerical <= 10)

                if (_NumberNumerical <= minRedpackCount)

                    return;

                _NumberNumerical -= 1;

                _DotText2.text = _NumberNumerical.ToString();


 System/MainInterfacePanel/TaskFeedbackFuncWin.cs

@@ -15,6 +15,7 @@
    public class TaskFeedbackFuncWin : Window

    {

        [SerializeField] RectTransform m_Container;

        [SerializeField] Text m_Category;

        [SerializeField] TaskFeedbackFunc[] m_Funcs;



        public static event Action<int> onSelectTask;

@@ -75,6 +76,11 @@
                    if (config != null)

                    {

                        m_Funcs[i].label.text = config.name;



                        if (i == 0)

                        {

                            m_Category.text = config.category;

                        }

                    }

                }

            }


 System/Vip/VipPrivilegeBehaviour.cs

@@ -17,10 +17,10 @@
            m_Bottom.gameObject.SetActive(bottom);

            for (int i = 0; i < m_VipPrivileges.Count; i++)

            {

                m_VipPrivileges[i].gameObject.SetActive(i < model.vipMaxLv);

                if (i < model.vipMaxLv)

                m_VipPrivileges[i].gameObject.SetActive(i <= model.vipMaxLv);

                if (i <= model.vipMaxLv)

                {

                    m_VipPrivileges[i].Display(id, i + 1);

                    m_VipPrivileges[i].Display(id, i);

                }

            }

        }


 System/Vip/VipPrivilegeInfoWin.cs

@@ -44,7 +44,7 @@
        protected override void OnActived()

        {

            base.OnActived();

            CreateVipElements((int)model.vipMaxLv);

            CreateVipElements((int)model.vipMaxLv + 1);



            var configs = VipPrivilegeConfig.GetValues();

            CreatePrivilegeElements(configs.Count);

@@ -89,10 +89,10 @@


            for (int i = 0; i < m_VipLevels.Count; i++)

            {

                m_VipLevels[i].gameObject.SetActive(i < model.vipMaxLv);

                if (i < model.vipMaxLv)

                m_VipLevels[i].gameObject.SetActive(i <= model.vipMaxLv);

                if (i <= model.vipMaxLv)

                {

                    m_VipLevels[i].text = "VIP" + (i + 1);

                    m_VipLevels[i].text = "VIP" + i;

                }

            }

        }

@@ -110,6 +110,7 @@
                {

                    var go = GameObject.Instantiate(m_VipLevels[0]);

                    go.transform.SetParent(m_ContainerVip);

                    go.transform.localScale = Vector3.one;

                    var instance = go.GetComponent<Text>();

                    m_VipLevels.Add(instance);

                }