少年修仙传客户端代码仓库
client_Hale
2019-01-16 76eb108c295da185486d01fb523be3c7e43d6eb2
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
230 ■■■■ 已修改文件
System/DogzDungeon/DogzDungeonModel.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/FeatureNoticeModel.cs 186 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/FairyJadeInvestmentModel.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DogzDungeon/DogzDungeonModel.cs
@@ -53,7 +53,8 @@
            set {
                if (m_BigBoxCollectCount != value)
                {
                    m_BigBoxCollectCount = value;
                    m_BigBoxCollectCount = value;
                    UpdateRedpoint();
                    if (bigBoxCollectCountChangeEvent != null)
                    {
                        bigBoxCollectCountChangeEvent();
System/MainInterfacePanel/FeatureNoticeModel.cs
@@ -25,6 +25,7 @@
    private bool RedPointChange = false;
    private bool IsRedPoint = false;
    public int FunctionForecastIndex = 0;
    private bool  Isbool=true;
    public override void Init()
    {
        AddList();
@@ -34,10 +35,7 @@
    public void OnBeforePlayerDataInitialize()
    {
        //PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnPlayersUpLV;
        //FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
        //treasureModel.treasureStateChangeEvent -= treasureStateChangeEvent;
        //treasureModel.treasureStageUpEvent -= treasureStageUpEvent;
        Isbool = true;
        FunctionForecastIndex = 0;
        DicOpenFuncState.Clear();
        StageManager.Instance.onStageLoadFinish -= OnStageLoadFinish;
@@ -46,21 +44,28 @@
    public void OnPlayerLoginOk()
    {
        //FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
        //PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnPlayersUpLV;
        //treasureModel.treasureStateChangeEvent += treasureStateChangeEvent;
        //treasureModel.treasureStageUpEvent += treasureStageUpEvent;
        Isbool = true;
        StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;
        PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;
        GlobalTimeEvent.Instance.secondEvent -= secondEvent;
        GlobalTimeEvent.Instance.secondEvent += secondEvent;
        RedPoint_State();
        // RedDotStatus();
    }
    private void secondEvent()
    {
        if (Isbool)
        {
            RedPoint_State();
            Isbool = false;
        }
    }
    private void Updatefighting(PlayerDataRefresh _tCDBPlayerRefresh)
    {
        if (_tCDBPlayerRefresh == PlayerDataRefresh.LV &&PlayerDatas.Instance.baseData.LV>=100)
        {
            RedPoint_State();
            Isbool = true;
        }
    }
@@ -77,28 +82,6 @@
            IsRedPoint = false;
        }
    }
    //private void treasureStageUpEvent(int obj)
    //{
    //    RedDotStatus();
    //}
    //private void treasureStateChangeEvent(int obj)
    //{
    //    RedDotStatus();
    //}
    //private void OnFuncStateChangeEvent(int obj)
    //{
    //    RedDotStatus();
    //}
    //private void OnPlayersUpLV(PlayerDataRefresh obj)
    //{
    //    if (obj == PlayerDataRefresh.LV)
    //    {
    //        RedDotStatus();
    //    }
    //}
    private void AddList()//添加列表信息
    {
        if (FunctionList.Count <= 0)
@@ -147,7 +130,6 @@
                    DicAwardItem.Add(functionForecastConfig.FuncId, _award);
                }
            }
            //  DebugEx.LogError(DicAwardItem);
        }
    }
@@ -190,144 +172,7 @@
            }
        }
    }
    //private void RedDotStatus()//红点1
    //{
    //    for (int i = 0; i < FunctionList.Count; i++)
    //    {
    //        if (!FuncOpen.Instance.IsFuncOpen(FunctionList[i].FuncId))
    //        {
    //            redPointStre1.state = RedPointState.None;
    //            if (OpenFuncId != FunctionList[i].FuncId)
    //            {
    //                RedPointChange = false;
    //            }
    //            if (OpenFuncId != FunctionList[i].FuncId || !RedPointChange)
    //            {
    //                OpenFuncId = FunctionList[i].FuncId;
    //                IsRedPoint = false;
    //                TrailerClassification(FunctionList[i].FuncId);
    //            }
    //            return;
    //        }
    //    }
    //}
    //private void TrailerClassification(int funcID)//红点1
    //{
    //    FuncOpenLVConfig funcoPenConfig = Config.Instance.Get<FuncOpenLVConfig>(funcID);
    //    var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcID);
    //    if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID != 0)
    //    {
    //        if (funcoPenConfig.LimitMagicWeapon != 0)//法宝
    //        {
    //            int faBaoID = funcoPenConfig.LimitMagicWeapon / 100;
    //            MagicWeapon(faBaoID, funcID);
    //            return;
    //        }
    //        else if (funcoPenConfig.LimitMissionID != 0)//任务
    //        {
    //            if (functionForecastConfig.RedPointLV <= 0)
    //            {
    //                return;
    //            }
    //            if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.RedPointLV)
    //            {
    //                RedPointChange = true;
    //                IsRedPoint = true;
    //            }
    //            if (IsRedPoint)
    //            {
    //                redPointStre1.state = RedPointState.Simple;
    //            }
    //            else
    //            {
    //                redPointStre1.state = RedPointState.None;
    //            }
    //            return;
    //        }
    //    }
    //    else//等级
    //    {
    //        if (functionForecastConfig.RedPointLV <= 0)
    //        {
    //            return;
    //        }
    //        if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.RedPointLV)
    //        {
    //            RedPointChange = true;
    //            IsRedPoint = true;
    //        }
    //        if (IsRedPoint)
    //        {
    //            redPointStre1.state = RedPointState.Simple;
    //        }
    //        else
    //        {
    //            redPointStre1.state = RedPointState.None;
    //        }
    //        return;
    //    }
    //}
    TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
    //private void MagicWeapon(int fabaoID, int funcID)//红点1
    //{
    //    var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcID);
    //    if (functionForecastConfig.RedPointLV > 0)//根据填的等级来
    //    {
    //        if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.RedPointLV)
    //        {
    //            RedPointChange = true;
    //            IsRedPoint = true;
    //        }
    //        if (IsRedPoint)
    //        {
    //            redPointStre1.state = RedPointState.Simple;
    //        }
    //        else
    //        {
    //            redPointStre1.state = RedPointState.None;
    //        }
    //        return;
    //    }
    //    Treasure treasure;//根据解锁法宝的百分比
    //    if (treasureModel.TryGetTreasure(fabaoID, out treasure)
    //          && treasure.state == TreasureState.Collected)
    //    {
    //        var list = treasure.treasureStages;
    //        var funcStage = 0;
    //        for (int i = 0; i < list.Count; i++)
    //        {
    //            if (list[i].unlockType == TreasureStageUnlock.Func &&
    //                list[i].func == funcID)
    //            {
    //                funcStage = i;
    //                break;
    //            }
    //        }
    //        if (treasure.stage == funcStage - 1 || funcStage == 0)
    //        {
    //            float exp = ((float)treasure.exp / treasure.treasureStages[funcStage].exp) * 100;
    //            if (functionForecastConfig.RedPointPercentage > -1)
    //            {
    //                if (exp >= functionForecastConfig.RedPointPercentage)
    //                {
    //                    RedPointChange = true;
    //                    IsRedPoint = true;
    //                }
    //                if (IsRedPoint)
    //                {
    //                    redPointStre1.state = RedPointState.Simple;
    //                }
    //            }
    //            else
    //            {
    //                redPointStre1.state = RedPointState.None;
    //            }
    //        }
    //    }
    //}
    public IEnumerator WhetherToPlayTheBox()
    {
        yield return new WaitForSeconds(0.7f);
@@ -404,7 +249,6 @@
        {
            functionForecastValue= Config.Instance.GetAllValues<FunctionForecastConfig>();
        }
       // var functionForecastValue = Config.Instance.GetAllValues<FunctionForecastConfig>();
        foreach (var value in functionForecastValue)
        {
            if (value.OpenNumber == Inedx)
System/MainInterfacePanel/MainInterfaceWin.cs
@@ -148,6 +148,7 @@
        IceCrystalVeinModel m_IceCrystalVeinModel;
        IceCrystalVeinModel iceCrystalVeinModel { get { return m_IceCrystalVeinModel ?? (m_IceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>()); } }
        #region Built-in
        private bool IsUpdateBool=true;
        protected override void BindController()
        {
            m_MapSwitchingBehaviour.InitAwake();
@@ -195,6 +196,7 @@
            {
                IsOpenMaininterface();
            }
            IsUpdateBool = true;
            SliderOpen = true;
            horseRidBool = false;
            friendsModel.askAddFriendEvent = FriendQuestBtn;
@@ -247,6 +249,7 @@
            purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag;
            fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;
            ChatTip.OnChatUpEvent += RefreshAdaptiveChat;
            GlobalTimeEvent.Instance.secondEvent += secondEvent;
            IsCrossServerOneVsOne();
            SetAtkType();
        }
@@ -426,6 +429,7 @@
            NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;
            fairyGrabBossModel.gotoBossStateUpdate -= ShowFairyGrabBoss;
            ChatTip.OnChatUpEvent -= RefreshAdaptiveChat;
            GlobalTimeEvent.Instance.secondEvent -= secondEvent;
            if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
            {
                WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();
@@ -435,6 +439,15 @@
            fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent;
            wishModel.UpdateWishAwardEvent -= UpdateWishAwardImag;
            m_CollectBehaviour.gameObject.SetActive(false);
        }
        private void secondEvent()
        {
            if (IsUpdateBool)
            {
                StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//功能预告
                IsUpdateBool = false;
            }
        }
        private void GuideBeginEvent()
@@ -1034,7 +1047,7 @@
            ArticleExperience();//关于经验条
            if (_tCDBPlayerRefresh == PlayerDataRefresh.LV)
            {
                StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//功能预告
                IsUpdateBool = true;
            }
            if (_tCDBPlayerRefresh == PlayerDataRefresh.ExAttr5)//判断是否再跨服
            {
System/Vip/FairyJadeInvestmentModel.cs
@@ -110,6 +110,7 @@
    private int DisplayLevel = 0;//显示等级
    private int DisplayDays = 0;//显示天数
    private bool IsUpdateBool = true;
    public override void Init()
    {
        OpenServerActivityCenter.Instance.Register(10, this);
@@ -128,6 +129,7 @@
    public void OnBeforePlayerDataInitialize()
    {
        IsUpdateBool = true;
        IsOk = false;
        IsRedpoint = false;
        SelectNumber = 0;
@@ -142,6 +144,7 @@
    public void OnPlayerLoginOk()
    {
        IsUpdateBool = true;
        IsOk = true;
        InvestmentAmount();
        BinningType = GetType();
@@ -151,6 +154,22 @@
        PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;
        FairyJadeInvestmentWin.FairyJadeInvestmentRedPointEvent -= FairyJadeInvestmentRedPoint;
        FairyJadeInvestmentWin.FairyJadeInvestmentRedPointEvent += FairyJadeInvestmentRedPoint;
        GlobalTimeEvent.Instance.secondEvent -= secondEvent;
        GlobalTimeEvent.Instance.secondEvent += secondEvent;
    }
    private void secondEvent()
    {
        if (IsUpdateBool)
        {
            int InvestGold = GetInvestGold();
            if (InvestGold > 0)
            {
                InvestmentRedPoint();
            }
            IsShowRedPointSimple();
            IsUpdateBool = false;
        }
    }
    private void FairyJadeInvestmentRedPoint()
@@ -160,14 +179,9 @@
    private void Updatefighting(PlayerDataRefresh _tCDBPlayerRefresh)
    {
        int InvestGold = GetInvestGold();
        if (_tCDBPlayerRefresh == PlayerDataRefresh.LV && InvestGold > 0)
        {
            InvestmentRedPoint();
        }
        if (_tCDBPlayerRefresh == PlayerDataRefresh.LV)
        {
            IsShowRedPointSimple();
            IsUpdateBool = true;
        }
    }