少年修仙传客户端代码仓库
client_linchunjie
2018-08-29 eef5bf49bc74295a222c334539cbced5c59a9d3d
2960 抢Boss活动
5个文件已修改
68 ■■■■■ 已修改文件
System/Activity/ActivityModel.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Activity/ActivityNotifyBehaviour.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/FairyGrabBossBehaviour.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/FairyGrabBossModel.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Activity/ActivityModel.cs
@@ -281,6 +281,13 @@
                    return true;
                }
            }
            switch ((DailyQuestType)type)
            {
                case DailyQuestType.FairyGrabBoss:
                    return false;
            }
            int entertimes = dailyQuestModel.GetDailyQuestCompletedTimes(type);
            if (dailyQuestModel.GetDailyQuestTotalTimes(cfg.ID) <= entertimes)
            {
System/Activity/ActivityNotifyBehaviour.cs
@@ -53,18 +53,23 @@
        private void OnConfirmClick()
        {
            if((DailyQuestType)m_NotifyType != DailyQuestType.WyTaiChi)
            switch ((DailyQuestType)m_NotifyType)
            {
                if (PlayerDatas.Instance.extersion.pkState == 1)
                {
                    SysNotifyMgr.Instance.ShowTip("PK_Leave");
                    return;
                }
                if (PlayerDatas.Instance.extersion.bossState == 1)
                {
                    SysNotifyMgr.Instance.ShowTip("Boss_Leave");
                    return;
                }
                case DailyQuestType.FairyGrabBoss:
                case DailyQuestType.WyTaiChi:
                    break;
                default:
                    if (PlayerDatas.Instance.extersion.pkState == 1)
                    {
                        SysNotifyMgr.Instance.ShowTip("PK_Leave");
                        return;
                    }
                    if (PlayerDatas.Instance.extersion.bossState == 1)
                    {
                        SysNotifyMgr.Instance.ShowTip("Boss_Leave");
                        return;
                    }
                    break;
            }
         
            var config = Config.Instance.Get<DailyQuestConfig>((int)m_NotifyType);
@@ -121,6 +126,9 @@
                    case DailyQuestType.FairyLeague:
                        WindowCenter.Instance.Open<UnionPanel>(false, 4);
                        break;
                    case DailyQuestType.FairyGrabBoss:
                        WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);
                        break;
                }
            }
            else
System/DailyQuest/DailyQuestWin.cs
@@ -285,6 +285,10 @@
                    ChatCtrl.Inst.openFromDaily = true;
                    WindowCenter.Instance.Open<ChatWin>();
                    break;
                case DailyQuestType.FairyGrabBoss:
                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();
                    WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);
                    break;
                default:
                    break;
            }
System/FairyAu/FairyGrabBossBehaviour.cs
@@ -99,6 +99,10 @@
                m_Progress.text = StringUtility.Contact((int)(progress * 100), "%");
                killed = (float)bossProgress.currentHp / bossProgress.totalHp >= 1;
            }
            else
            {
                m_Progress.text = StringUtility.Contact(0, "%");
            }
            m_ContainerKilled.gameObject.SetActive(killed && opened);
            m_ContainerKilling.gameObject.SetActive(!killed && opened);
            m_BossPortrait.material = opened ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];
System/FairyAu/FairyGrabBossModel.cs
@@ -91,7 +91,6 @@
            DailyQuestActionTimer.Instance.RefreshDailyQuestState += RefreshDailyQuestState;
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
            GA_Hero.OnEnterOrExitArea += OnEnterOrExitArea;
            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
            GAMgr.Instance.OnFightNpcRequest += OnFightNpcUpdate;
            GAMgr.Instance.OnFightNpcRelease += OnFightNpcUpdate;
        }
@@ -115,11 +114,6 @@
            GAMgr.Instance.OnFightNpcRelease -= OnFightNpcUpdate;
        }
        private void OnRefreshFairyInfo()
        {
            RecheckGrabBoss();
        }
        private void OnEnterOrExitArea(MapArea.E_Type type, bool arg1)
        {
            if (type == MapArea.E_Type.Boss)
@@ -133,7 +127,7 @@
            if (!(StageManager.Instance.CurrentStage is DungeonStage))
            {
                grabBossHintOpen = false;
                fairyGrabBossDict.Clear();
                ClearGrabBossInfo();
            }
            else
            {
@@ -147,6 +141,12 @@
            {
                RecheckGrabBoss();
            }
        }
        void ClearGrabBossInfo()
        {
            fairyGrabBossDict.Clear();
            bossProgressDict.Clear();
        }
        public void RecheckGrabBoss()
@@ -165,11 +165,6 @@
            var grabBossLine = GeneralConfig.Instance.fairyGrabBossMapLines.ContainsKey(mapId) ?
                GeneralConfig.Instance.fairyGrabBossMapLines[mapId] : 1;
            if (PlayerDatas.Instance.baseData.FBID != grabBossLine - 1)
            {
                CloseGrabBossHint();
                return;
            }
            if (!PlayerDatas.Instance.fairyData.HasFairy)
            {
                CloseGrabBossHint();
                return;
@@ -219,6 +214,10 @@
        private void RefreshDailyQuestState()
        {
            if (!InActivityTime)
            {
                ClearGrabBossInfo();
            }
            RecheckGrabBoss();
            if (stateUpdate != null)
            {