少年修仙传客户端代码仓库
client_Hale
2018-08-23 ddba48b78f2e433ea0365235d13f9c20fc9183a4
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
65 ■■■■ 已修改文件
System/FindPrecious/BossHomeModel.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/SideMission.cs 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FindPrecious/BossHomeModel.cs
@@ -92,30 +92,34 @@
            var vipNeedFloor1 = GetFloorVipRequirement(1);
            var myLevel = PlayerDatas.Instance.baseData.LV;
            var maxFloor = 1;
            for (int i = 0; i < sortedBosses.Count; i++)
            {
                var bossId = sortedBosses[i];
                var config = Config.Instance.Get<NPCConfig>(bossId);
                var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);
                if (vipLevel < vipNeedFloor1)
                {
                    if (config.NPCLV > myLevel)
                    {
                        var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);
                        return bossHomeConfig.FloorNum;
                    }
                }
                else
                {
                    var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);
                    if (vipLevel >= GetFloorVipRequirement(bossHomeConfig.FloorNum) && myLevel < config.NPCLV)
                    {
                        return bossHomeConfig.FloorNum;
                    }
                }
                if (bossHomeConfig.FloorNum > maxFloor)
                {
                    maxFloor = bossHomeConfig.FloorNum;
                }
            }
            return 1;
            return maxFloor;
        }
        public int GetFloorVipRequirement(int _floor)
System/MainInterfacePanel/SideMission.cs
@@ -47,6 +47,7 @@
            _TaskRamusList.OnRefreshCell += OnRefreshGridCell;
            playerPack.RefreshItemCountAct += RefreshItemCountAct;
            playerPack.ItemCntReduceAct += ItemCntReduceAct;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)
            OnCreateGridLineCell(_TaskRamusList);
        }
@@ -55,8 +56,31 @@
            _TaskRamusList.OnRefreshCell -= OnRefreshGridCell;
            playerPack.RefreshItemCountAct -= RefreshItemCountAct;
            playerPack.ItemCntReduceAct -= ItemCntReduceAct;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)
        }
        private void Updatefighting(PlayerDataRefresh obj)
        {
            if (obj == PlayerDataRefresh.LV)
            {
                OpenShowButton();
            }
        }
        private void OpenShowButton()
        {
            if (mainModel.TaskId_Skill1.Contains(TaskIdNow))
            {
                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
                {
                    _Btn_Forward.gameObject.SetActive(true);
                }
                else
                {
                    _Btn_Forward.gameObject.SetActive(false);
                }
            }
        }
        private void ItemCntReduceAct(PackType arg1, int arg2, int arg3)
        {
            if (arg1 == PackType.rptItem && arg3 == mainModel.ItemID)
@@ -107,11 +131,11 @@
                    }
                    else
                    {
                        strNull = string.Format(Language.Get("PassiveSkillTask4"), needNumber, GoldPaper, needNumber- GoldPaper);
                        strNull = string.Format(Language.Get("PassiveSkillTask4"), needNumber, GoldPaper, needNumber - GoldPaper);
                    }
                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strNull, (bool isOk) =>
                    {
                        if (isOk)
                        {
                            if (Gold + GoldPaper >= needNumber)
@@ -128,7 +152,7 @@
                                }
                                WindowCenter.Instance.Open<RechargeTipWin>();
                            }
                        }
                        }
                    });
                }
@@ -196,6 +220,7 @@
                    if (TaskId != TaskIdNow)
                    {
                        TaskIdNow = TaskId;
                        OpenShowButton();
                        _TaskRamusList.m_Scorller.RefreshActiveCellViews();//刷新当前可见
                    }
                });
@@ -214,26 +239,34 @@
            string str = string.Empty;
            if (mainModel.TaskId_Skill1.Contains(taskID))
            {
                int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品
                if (itemNumber >= mainModel.ItemNumber)
                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
                {
                    string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, mainModel.ItemNumber);
                    str = Str_A;
                    int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品
                    if (itemNumber >= mainModel.ItemNumber)
                    {
                        string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, mainModel.ItemNumber);
                        str = Str_A;
                    }
                    else
                    {
                        string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
                        str = Str_A;
                    }
                }
                else
                {
                    string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
                    str = Str_A;
                    string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);
                    str = Str_C;
                }
            }
            else
            {
                str = Config.Instance.Get<TASKINFOConfig>(strINfor).show_writing;
            }
            }
            str = WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);
            str = WordAnalysis.Color_End_Regex.Replace(str, string.Empty);
            _Text_TaskTarget.text = str;//任务目标
            if ((int)taskmodel.GetTaskStatus(TaskIdNow) == 3 || mainModel.TaskId_Skill1.Contains(taskID))//能够进行立即完成的支线任务
            {
                _Text_Forward.text = string.Format(Language.Get("FinishAtOnce_Z"));