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

client_Wu Xijin

2018-08-11 7676088fbd244f5d99ead15d035a9023226f3a9e

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

 System/DailyQuest/DailyQuestBehaviour.cs

@@ -40,6 +40,8 @@
        DailyQuestModel model { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



        TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }



        DailyQuestModel.DailyQuestState state = DailyQuestModel.DailyQuestState.Normal;



        public void Init(DailyQuestData _data, DailyQuestWin _dailyQuestWin)

@@ -141,6 +143,11 @@
                switch ((DailyQuestType)data.id)

                {

                    case DailyQuestType.Trial:

                        if (!trialDungeonModel.CompleteTrialFloor(0))

                        {

                            trialDungeonModel.ProcessOpenTrialExchangeError();

                            return;

                        }

                        WindowCenter.Instance.Open<TrialExchangeWin>();

                        break;

                }


 System/Dungeon/TrialDungeonModel.cs

@@ -13,6 +13,7 @@
        public List<int> trialTokens = new List<int>();

        PlayerPackModel packModel { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



        public event Action SelectEquipClassEvent;



@@ -162,6 +163,25 @@
            }

        }



        public bool CompleteTrialFloor(int _lineId)

        {

            DungeonRecord dungeonRecord;

            if (dungeonModel.TryGetDungeonRecord(60010, out dungeonRecord))

            {

                if (dungeonRecord.lineGrades != null

                    && dungeonRecord.lineGrades.ContainsKey(_lineId))

                {

                    return dungeonRecord.lineGrades[_lineId] > 0;

                }

            }

            return false;

        }



        public void ProcessOpenTrialExchangeError()

        {

            SysNotifyMgr.Instance.ShowTip("TrialExchangeLimit");

        }



        #region 红点

        void UpdateRedpoint()

        {


 System/Dungeon/TrialDungeonSelectWin.cs

@@ -53,6 +53,8 @@


        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }



        TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }



        #region Built-in

        protected override void BindController()

        {

@@ -120,6 +122,11 @@


        private void Exchange()

        {

            if (!trialDungeonModel.CompleteTrialFloor(0))

            {

                trialDungeonModel.ProcessOpenTrialExchangeError();

                return;

            }

            WindowCenter.Instance.Open<TrialExchangeWin>();

        }




 System/KnapSack/Logic/EquipDevourWin.cs

@@ -167,7 +167,8 @@
            if (type != PackType.rptItem || (type == PackType.rptItem && itemConfig.Type != 29 && itemConfig.EquipPlace <= 0)) return;



            devourModellist = playerPack.GetDevourModellist();

            playerPack.GetSelectDevourList();

            ItemModel itemModel = playerPack.GetItemModelByIndex(type,index);

            playerPack.RefreshGetNewItem(itemModel);

            gridCtrl.m_Scorller.RefreshActiveCellViews();

        }



@@ -217,7 +218,7 @@
            if (!isOpen)

            {

                lvlistObj.SetActive(false);

                playerPack.EquipDecomRedCtrl();

                playerPack.GetSelectDevourList();

                gridCtrl.m_Scorller.RefreshActiveCellViews();

            }

        }

@@ -236,7 +237,7 @@
            if (!isOpen)

            {

                colorlistObj.SetActive(false);

                playerPack.EquipDecomRedCtrl();

                playerPack.GetSelectDevourList();

                gridCtrl.m_Scorller.RefreshActiveCellViews();

            }

        }

@@ -245,7 +246,7 @@
        {

            if (!isOpen)

            {

                playerPack.EquipDecomRedCtrl();

                playerPack.GetSelectDevourList();

                gridCtrl.m_Scorller.RefreshActiveCellViews();

            }

        }

@@ -332,7 +333,7 @@
        {

            RefreshDecomposeAttr(true);

            devourModellist = playerPack.GetDevourModellist();

            playerPack.GetCanDevourModellist();

            playerPack.GetSelectDevourList();

            gridCtrl.m_Scorller.RefreshActiveCellViews();

            RefreshGeMatProgress();

            if (playerPack.getItems != null && playerPack.getItems.Length > 0)


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -1099,6 +1099,7 @@
                RefreshColorSelectAct(type);

            }

            SendEquipDevourRecordQuest();

            EquipDecomRedCtrl();

        }



        public void SetLvSelect(EquipLvType type)

@@ -1123,6 +1124,7 @@
                RefreshLvSelectAct(type);

            }

            SendEquipDevourRecordQuest();

            EquipDecomRedCtrl();

        }

       

        public void SetStarSelect(EquipStarType type)

@@ -1133,6 +1135,7 @@
                RefreshStarSelectAct(type);

            }

            SendEquipDevourRecordQuest();

            EquipDecomRedCtrl();

        }



        public List<int> devourPlacelist { get; private set; }

@@ -1279,11 +1282,20 @@
        public void GetSelectDevourList()

        {

            GetCanDevourModellist();

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

            selectDevourlist.Clear();

            selectDevourlist.AddRange(canDevourModellist);

        }



        public void RefreshGetNewItem(ItemModel model)

        {

            if (model == null) return;



            if(CheckIsReachDevourCondi(model))

            {

                if(!selectDevourlist.Contains(canDevourModellist[i]))

                selectDevourlist.Add(model);

                if (RefreshEquipDecomNumAct != null)

                {

                    selectDevourlist.Add(canDevourModellist[i]);

                    RefreshEquipDecomNumAct();

                }

            }

        }

@@ -1296,6 +1308,27 @@
                RefreshEquipDecomNumAct();

            }

        }



        public bool CheckIsReachDevourCondi(ItemModel model)

        {

            if (model.chinItemModel.Type == 29)

            {

                if (!defaultUnSelectlist.Contains(model.itemId))

                {

                    return true;

                }

                return false;

            }

            else

            {

                if (IsCanDevour(model))

                {

                    return true;

                }



            }

            return false;

        }

        

        public void RemoveSelectDevourModellist(ItemModel model)

        {


 System/NewBieGuidance/NewBieCenter.cs

@@ -353,8 +353,8 @@
                case GuideTriggerType.TeamAutoAccept:

                    return !teamModel.myTeam.inTeam;

                case GuideTriggerType.TrialExchange:

                    var trialDailyState = dailyModel.GetQuestState((int)DailyQuestType.Trial);

                    return trialDailyState == DailyQuestModel.DailyQuestState.Completed;

                    var trialCompleteTimes = dailyModel.GetDailyQuestCompletedTimes((int)DailyQuestType.Trial);

                    return trialCompleteTimes >= 3;

                default:

                    return false;

            }


 System/WindowJump/WindowJumpMgr.cs

@@ -41,6 +41,7 @@
    TreasureFindHostModel hostModel { get { return ModelCenter.Instance.GetModel<TreasureFindHostModel>(); } }

    FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

    DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

    TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }



    public bool IsJumpState { get; private set;}

    private int jumpPhase = 0;

@@ -276,6 +277,13 @@
                    return;

                }

                break;

            case JumpUIType.TrialExchange:

                if (!trialDungeonModel.CompleteTrialFloor(0))

                {

                    trialDungeonModel.ProcessOpenTrialExchangeError();

                    return;

                }

                break;

        }



        DesignDebug.Log("WindowJumpTo" + jumpType);