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

client_Zxw

2018-09-04 aed79e199629d082c0d6d7d04ba4688f16bec847

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

 System/DailyQuest/DailyQuestBehaviour.cs

@@ -181,7 +181,7 @@
            var completedTimes = model.GetDailyQuestCompletedTimes(data.id);

            var totalTimes = model.GetDailyQuestTotalTimes(data.id);



            if (totalTimes == 999)

            if (totalTimes == 60000)

            {

                m_ContainerTimes.gameObject.SetActive(false);

            }


 System/Role/MagicianWin.cs

@@ -57,6 +57,28 @@
            {

                UpdateUseItem(model.selectType);

                UpdateItems(model.selectItemIndex);

                try

                {

                    bool allNone = true;

                    int[] items = model.GetLvUpItemByType(model.selectType);

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

                    {

                        var _count = playerPack.GetItemCountByID(PackType.rptItem, items[i]);

                        if (_count > 0)

                        {

                            allNone = false;

                        }

                    }

                    var count = playerPack.GetItemCountByID(PackType.rptItem, items[model.selectItemIndex]);

                    if (count == 0 && !allNone)

                    {

                        UpdateItems(GetItemIndex(model.selectType, model.selectItemIndex));

                    }

                }

                catch (Exception e)

                {

                    DebugEx.Log(e.Message);

                }

            }

        }

        void OnRefresh()