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

Hale Cai

2018-08-10 fed1e0a36f4df986df21bc85a2b9f05e781ce1c2

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

 System/FairylandCeremony/CeremonyOutOfPrintWin.cs

@@ -12,7 +12,7 @@
        [SerializeField] Text secondNameText;

        [SerializeField] Text thirdNameText;

        [SerializeField] Text remainTimeText;



        [SerializeField] List<UIEffect> rankEffectlist = new List<UIEffect>();

        [SerializeField] List<CommonItemBaisc> firstItemlist = new List<CommonItemBaisc>();

        [SerializeField] List<CommonItemBaisc> secondItemlist = new List<CommonItemBaisc>();

        [SerializeField] List<CommonItemBaisc> thirdItemlist = new List<CommonItemBaisc>();

@@ -83,19 +83,42 @@
                if (list.Count > 0)

                {

                    firstNameText.text = list[0].Name1;

                    SetRankEffect(0,(int)list[0].ID);

                }



                if (list.Count > 1)

                {

                    secondNameText.text = list[1].Name1;

                    SetRankEffect(1, (int)list[1].ID);

                }



                if (list.Count > 2)

                {

                    thirdNameText.text = list[2].Name1;

                    SetRankEffect(2, (int)list[2].ID);

                }

            }

        }



        private void SetRankEffect(int rank,int playerId)

        {

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

            {

                if(rank == i && playerId == PlayerDatas.Instance.baseData.PlayerID)

                {

                    if(!rankEffectlist[i].IsPlaying)

                    {

                        rankEffectlist[i].Play();

                    }

                }

                else

                {

                    if (rankEffectlist[i].IsPlaying)

                    {

                        rankEffectlist[i].Stop();

                    }

                }

            }

        }



        private void RefreshSecond()


 System/FairylandCeremony/FairylandCeremonyModel.cs

@@ -10,7 +10,7 @@
        public ReceiveState receiveState { get; private set; }

        Dictionary<CeremonyType, Dictionary<int, List<int>>> typeLvDict = new Dictionary<CeremonyType, Dictionary<int, List<int>>>();

        Dictionary<int, List<AwardItem>> rechargeAwardDict = new Dictionary<int, List<AwardItem>>();

        Dictionary<int, int> fireDict = new Dictionary<int, int>();

        public Dictionary<int, int> fireDict = new Dictionary<int, int>();

        List<AllPeoplePartyConfig> allPeoples = new List<AllPeoplePartyConfig>();

        List<AllPeoplePartyAwardConfig> allPeopleAwards = new List<AllPeoplePartyAwardConfig>();

        Dictionary<int, Dictionary<int, List<AwardItem>>> jobToHiAwardDict = new Dictionary<int, Dictionary<int, List<AwardItem>>>();


 System/KnapSack/Logic/BoxGetItemWin.cs

@@ -4,6 +4,7 @@
using UnityEngine;

using UnityEngine.UI;

using DG.Tweening;

using TableConfig;



namespace Snxxz.UI

{

@@ -16,6 +17,7 @@
        [SerializeField] Button useBtn;

        [SerializeField] Text useBtnText;

        [SerializeField] Text getCoinsText;

        [SerializeField] UIEffect fireEffect;



        PlayerPackModel _playerPack;

        PlayerPackModel playerPack

@@ -40,6 +42,7 @@
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());

            }

        }

        FairylandCeremonyModel ceremonyModel { get { return ModelCenter.Instance.GetModel<FairylandCeremonyModel>(); } }



        [SerializeField] float scaleTime = 0.3f;



@@ -122,6 +125,27 @@
            {

                getCoinsText.gameObject.SetActive(false);

            }



            foreach(var key in ceremonyModel.fireDict.Keys)

            {

                StoreConfig storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(ceremonyModel.fireDict[key]);

                if(storeConfig != null)

                {

                    if(storeConfig.ItemID == BoxModel.itemId)

                    {

                        if (!fireEffect.IsPlaying)

                        {

                            fireEffect.Play();

                            return;

                        }

                    }

                }

            }



            if (fireEffect.IsPlaying)

            {

                fireEffect.Stop();

            }

        }



        private void RefreshUI(PackType type, int index, int id)


 System/Realm/RealmProgressBehaviour.cs

@@ -102,7 +102,7 @@
                        break;

                    }

                }

                m_SpecialProperty.DisplayUpper(config.specialProperty, config.AddAttrNum[index]);

                m_SpecialProperty.DisplayColon(config.specialProperty, config.AddAttrNum[index]);

                m_HurtRemind.text = UIHelper.ReplaceNewLine(Language.Get("RealmSuppressHurt", UIHelper.GetTextColorByItemColor(config.Quality, config.Name), (float)model.realmSuppressHurt / 1000));

            }

        }


 System/Role/PropertyBehaviour.cs

@@ -32,6 +32,17 @@
                    config.ISPercentage == 1 ? "%" : string.Empty);

            }

        }



        public void DisplayColon(int _property, int _value)

        {

            var config = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_property);

            if (config != null)

            {

                m_PropertyName.text = StringUtility.Contact(config.Name, "：");

                m_PropertyValue.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum(UIHelper.ReplacePercentage(_value, config.ISPercentage)),

                    config.ISPercentage == 1 ? "%" : string.Empty);

            }

        }

    }

}