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

client_Wu Xijin

2019-01-16 c864cb1970156f23a5ea24a3113f05f5c31800f4

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

 System/Dungeon/TrialDungeonSelectWin.cs

@@ -69,14 +69,10 @@


        protected override void OnPreOpen()

        {

            ParseTrials();

            model.dungeonRecordChangeEvent += UpdateDungeonTimes;



            var mapID = model.GetTrialMaps()[0];

            DungeonOpenTimeConfig dungeonOpenTimeModel = Config.Instance.Get<DungeonOpenTimeConfig>(mapID);

            var completedTimes = dailyQuestModel.GetDailyQuestCompletedTimes((int)DailyQuestType.Trial);

            var totalTimes = dailyQuestModel.GetDailyQuestTotalTimes((int)DailyQuestType.Trial);

            trialChallengeCntTxt.text = Language.Get("TrialChallengeCnt", UIHelper.AppendStringColor(completedTimes >= totalTimes ?

                TextColType.Red : TextColType.NavyBrown, completedTimes.ToString(), true), totalTimes);

            ParseTrials();

            DisplayTrialChallengeCount();

        }



        protected override void OnActived()

@@ -91,7 +87,7 @@


        protected override void OnPreClose()

        {

            
            model.dungeonRecordChangeEvent -= UpdateDungeonTimes;

        }



        protected override void OnAfterClose()

@@ -120,6 +116,26 @@
            currentSelectDungeon = dungeons.Count > 0 ? dungeons[0] : default(Dungeon);

        }



        private void UpdateDungeonTimes(int mapID)

        {

            int trialMapID = model.GetTrialMaps()[0];

            if (trialMapID != mapID)

            {

                return;

            }

            DisplayTrialChallengeCount();

        }



        private void DisplayTrialChallengeCount()

        {

            var mapID = model.GetTrialMaps()[0];

            DungeonOpenTimeConfig dungeonOpenTimeModel = Config.Instance.Get<DungeonOpenTimeConfig>(mapID);

            var completedTimes = dailyQuestModel.GetDailyQuestCompletedTimes((int)DailyQuestType.Trial);

            var totalTimes = dailyQuestModel.GetDailyQuestTotalTimes((int)DailyQuestType.Trial);

            trialChallengeCntTxt.text = Language.Get("TrialChallengeCnt", UIHelper.AppendStringColor(completedTimes >= totalTimes ?

                TextColType.Red : TextColType.NavyBrown, completedTimes.ToString(), true), totalTimes);

        }



        private void Exchange()

        {

            if (!trialDungeonModel.CompleteTrialFloor(0))


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -2279,19 +2279,16 @@
            {

                foreach (var id in idlist)

                {

                    if (itemId != id)

                    ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(id);

                    TextColType colType = itemConfig.ItemColor < 2 ? TextColType.White : (TextColType)itemConfig.ItemColor;

                    string des = UIHelper.AppendStringColor(colType, itemConfig.ItemName);

                    if (shareNumDes.Length > 0)

                    {

                        ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(id);

                        TextColType colType = itemConfig.ItemColor < 2 ? TextColType.White : (TextColType)itemConfig.ItemColor;

                        string des = UIHelper.AppendStringColor(colType, itemConfig.ItemName);

                        if (shareNumDes.Length > 0)

                        {

                            shareNumDes = StringUtility.Contact(shareNumDes, "</r>", des);

                        }

                        else

                        {

                            shareNumDes = des;

                        }

                        shareNumDes = StringUtility.Contact(shareNumDes, "</r>", des);

                    }

                    else

                    {

                        shareNumDes = des;

                    }

                }

            }


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -248,6 +248,7 @@
            fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;

            ChatTip.OnChatUpEvent += RefreshAdaptiveChat;

            IsCrossServerOneVsOne();

            SetAtkType();

        }



        private void CompletionOfTaskEvent(int obj)

@@ -386,7 +387,6 @@
            m_HighSettingTip.AfterOpen();

            m_ChatTip.OnAfterOpen();

            HandleAchievement();

            //StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//功能预告

        }



        protected override void OnPreClose()

@@ -601,6 +601,16 @@
            }



        }



        private void SetAtkType()//逍遥城非boss区域特殊处理

        {

            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域

            if (PlayerDatas.Instance.baseData.MapID == 10040 && !IsBossBool && Buffmodel.PkType!=0)

            {

                DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);

                Buffmodel.PkType = 0;

            }

        }

        private void OnMaininterCDTime()

        {

            MarkRayButton();


 System/MainInterfacePanel/PlayerMainDate.cs

@@ -24,6 +24,8 @@
    {

        get { return m_PlayerPackModel ?? (m_PlayerPackModel = ModelCenter.Instance.GetModel<PlayerPackModel>()); }

    }

    PlayerBuffDatas m_BuffModel;

    PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }

    DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }

    //用于记录XP技能的信息

    public delegate void OnXpSkill();

@@ -257,6 +259,7 @@
        StrengtheningSripts.IsFightUp -= IsFightUp;//停止自动强化

        DeadModel.playerDieEvent -= playerDieEvent;

        playerPack.UseItemSuccessAct -= UseItemSuccessAct;

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;



        MapTransferUtility.s_OnHeroStartMoveToNPC += OnStartPathFind;

        PlayerDatas.Instance.hero.OnPathFindStop += OnFinishedPathFind;

@@ -265,9 +268,26 @@
        StrengtheningSripts.IsFightUp += IsFightUp;//停止自动强化

        DeadModel.playerDieEvent += playerDieEvent;//获取玩家死亡状态

        playerPack.UseItemSuccessAct += UseItemSuccessAct;

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;

    }





    private void Updatefighting(PlayerDataRefresh _tCDBPlayerRefresh)

    {

        if (_tCDBPlayerRefresh == PlayerDataRefresh.ExAttr5)//判断是否再跨服

        {

            bool Isbool = CrossServerUtility.IsCrossServerBoss();

            if (!Isbool)

            {

                int mapID = PlayerDatas.Instance.baseData.MapID;

                var config = Config.Instance.Get<MapConfig>(mapID);

                if (Buffmodel.PkType != config.Camp)

                {

                    Buffmodel.PkType = config.Camp;

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);

                }

            }

        }

    }



    private void playerDieEvent()

    {