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

client_Wu Xijin

2018-09-21 5f87614689ea8febf25d5f3c5967ecfc7eeb00fe

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

 System/Dogz/DogzActiveWin.cs

@@ -27,6 +27,9 @@
        [SerializeField] Button m_CallBackBtn;

        [SerializeField] RedpointBehaviour assistBtnRedBehav;

        [SerializeField] Text m_CallBackBtnTxt;

        [SerializeField] UIEffect alreadyAssistEffect;

        [SerializeField] UIEffect assistEffect;

        [SerializeField] UIEffect assistTextEffect;

        DogzModel m_Model;

        DogzModel model

        {

@@ -67,8 +70,6 @@
            model.UpdateSelectDogzEvent += UpdateSelectDogzEvent;

            model.UpdateAssistDogzEvent += UpdateDogzAssistCnt;

            model.RefreshDogzEquipAct += RefreshDogzEquipEvent;





        }



        protected override void OnAfterOpen()

@@ -159,6 +160,24 @@
            var _dogzCfg = Config.Instance.Get<DogzConfig>(model.presentSelectDogz);

            m_DogzHeadIcon.SetSprite(_dogzCfg.HeadIcon);

            m_DogzHeadIcon.SetNativeSize();

            var _dogzEquips = model.GetDogzEquips(model.presentSelectDogz);

            alreadyAssistEffect.Stop();

            if (_dogzEquips != null && _dogzEquips.Count == 5)

            {

                m_DogzHeadIcon.material = MaterialUtility.GetUIDefaultGraphicMaterial();

                if(model.TryGetAssistDogzState(model.presentSelectDogz))

                {

                    if(!alreadyAssistEffect.IsPlaying)

                    {

                        alreadyAssistEffect.Play();

                    }

                }

            }

            else

            {

                m_DogzHeadIcon.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

            }



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

            {

                ItemModel _data;

@@ -234,13 +253,16 @@
                }

            }

        }



        private void UpdateDogzAssistCnt()

        {

            m_Controller.m_Scorller.RefreshActiveCellViews();

            m_DogzAssistCnt.text = Language.Get("TreasurePrivilege_Dogz_1", StringUtility.Contact(model.GetAssistDogzCount(), "/", model.DogzAssistDefaultCnt));

            UpdateDogzBtn();

            UpdateDogzProperty();

            UpdateDogzEquip();

        }



        private void UpdateDogzBtn()

        {

            var _dogzEquips = model.GetDogzEquips(model.presentSelectDogz);

@@ -275,6 +297,8 @@
                {

                    if(model.GetAssistDogzCount() < model.DogzAssistDefaultCnt)

                    {

                        assistEffect.Play();

                        assistTextEffect.Play();

                        model.SendChangeDogzAssist(1);

                    }

                    else


 System/Dungeon/DungeonNuwaVictoryWin.cs

@@ -147,11 +147,18 @@
                m_NumberOfPliesText.text = Language.Get("DungeonVictoryWin_NumberOfPliesText", str);

            }

        }



        List<ServerItem> Serveritem = new List<ServerItem>();

        protected override void DrawItemRewards()

        {

            var merged = false;

            Serveritem.Clear();

               var merged = false;

            var serveritems = dungeonModel.dungeonResult.itemInfo;



            for (int i = 0; i < serveritems.Length; i++)

            {

                Serveritem.Add(serveritems[i]);

            }

            Serveritem.Sort(Compare);

            var hasReward = (serveritems != null && serveritems.Length > 0) || dungeonModel.specialItemCollectRecord.count > 0;



            m_RewardIndexs.Clear();

@@ -164,12 +171,12 @@
            }

            m_ContainerReward.gameObject.SetActive(hasReward);



            if (serveritems != null)

            if (Serveritem != null)

            {

                var items = new List<ItemModel>();

                for (int i = 0; i < serveritems.Length; i++)

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

                {

                    var serverItem = serveritems[i];

                    var serverItem = Serveritem[i];

                    var itemModel = new ItemModel(PackType.rptItem);

                    var itemInfo = new ItemInfo();

                    itemInfo.ItemID = serverItem.ItemID;

@@ -190,7 +197,8 @@
                    itemModel.SetItemModel(itemInfo);

                    items.Add(itemModel);

                }

                items.Sort(Compare);

             //   items.Sort(Compare);



                for (int i = 0; i < passRewardBehaviours.Length; i++)

                {

                    var behaviour = passRewardBehaviours[i];

@@ -198,7 +206,7 @@
                    {

                        behaviour.transform.parent.gameObject.SetActive(true);

                        behaviour.gameObject.SetActive(false);

                        behaviour.serverItem = serveritems[i];

                        behaviour.serverItem = Serveritem[i];

                        behaviour.Init(items[i]);

                        m_RewardIndexs.Add(m_SpecialItemCollect == null ? i : i + 1);

                    }

@@ -231,10 +239,10 @@
            }

        }



        int Compare(ItemModel x, ItemModel y)//数组排列

        int Compare(ServerItem x, ServerItem y)//数组排列

        {

            ItemConfig itemConfigx = Config.Instance.Get<ItemConfig>(x.itemId);

            ItemConfig itemConfigy = Config.Instance.Get<ItemConfig>(y.itemId);

            ItemConfig itemConfigx = Config.Instance.Get<ItemConfig>(x.ItemID);

            ItemConfig itemConfigy = Config.Instance.Get<ItemConfig>(y.ItemID);

            if (itemConfigx.ItemColor.CompareTo(itemConfigy.ItemColor) != 0)

                return -itemConfigx.ItemColor.CompareTo(itemConfigy.ItemColor);

            return 1;