4534 【1.3】【前端】组队功能和助战积分优化

Client_PangDeRong

2018-11-27 11ccc2eacee3264153b7d1eaad3697843a58f7b5

4534 【1.3】【前端】组队功能和助战积分优化

 System/Dungeon/DungeonAssistModel.cs

@@ -368,7 +368,7 @@
            {

                helpInfolist.RemoveAt(helpInfolist.Count - 1);

            }

            info = StringUtility.Contact(createDate,"|",info, "|", isNew);

            info = StringUtility.Contact(createDate,"$",info, "$", isNew);

            helpInfolist.Insert(0,info);

            LocalSave.SetStringArray(helpInfoLocalSave, helpInfolist.ToArray());

            if(UpdateResultEvent != null)

@@ -380,7 +380,7 @@


        public bool TryGetAssistResult(string _info,out string _date,out string _result,out bool _isNew)

        {

            string[] array = _info.Split('|');

            string[] array = _info.Split('$');

            _isNew = false;

            _date = string.Empty;

            _result = string.Empty;

@@ -400,14 +400,14 @@


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

            {

                string[] infos = helpInfolist[i].Split('|');

                string[] infos = helpInfolist[i].Split('$');

                if(infos != null && infos.Length >= 3)

                {

                    bool isNew = true;

                    bool.TryParse(infos[2], out isNew);

                    if(isNew)

                    {

                        helpInfolist[i] = StringUtility.Contact(infos[0], "|", infos[1], "|", false);

                        helpInfolist[i] = StringUtility.Contact(infos[0], "$", infos[1], "$", false);

                    }

                }

            }

@@ -697,46 +697,33 @@
                {

                    fbName = dungeonConfig.FBName;

                }

                 
                GetCurVipAddRatio();

                resultType = GetResultType();

                SetResultIsNew(true);

                string vipAddStr = string.Empty;

                string friendAddStr = string.Empty;

                string unionAddStr = string.Empty;

                string sumAddStr = string.Empty;

                if(IsVipAddRatio)

                {

                    vipAddStr = Language.Get("DungeonAssist110", addRatioVipLv, addRatioStr);

                }

                switch (relatedToPlayer)

                {

                    case RelatedToPlayer.Friend:

                        friendAddStr = Language.Get("DungeonAssist111", assistModel.GetAssistReward(1));

                        if(IsVipAddRatio)

                        {

                            sumAddStr = StringUtility.Contact(vipAddStr, ",", friendAddStr);

                        }

                        else

                        {

                            sumAddStr = friendAddStr;

                        }

                        sumAddStr = Language.Get("DungeonAssist111", assistModel.GetAssistReward(1));

                        break;

                    case RelatedToPlayer.Ally:

                        unionAddStr = Language.Get("DungeonAssist112", assistModel.GetAssistReward(2));

                        if (IsVipAddRatio)

                        {

                            sumAddStr = StringUtility.Contact(vipAddStr, ",", unionAddStr);

                        }

                        else

                        {

                            sumAddStr = unionAddStr;

                        }

                        break;

                    default:

                        sumAddStr = vipAddStr;

                        sumAddStr = Language.Get("DungeonAssist112", assistModel.GetAssistReward(2));

                        break;

                }



                if (IsVipAddRatio)

                {

                    if(sumAddStr.Length > 0)

                    {

                        sumAddStr = StringUtility.Contact(sumAddStr, ",", Language.Get("DungeonAssist110", addRatioVipLv, addRatioStr));

                    }

                    else

                    {

                        sumAddStr = Language.Get("DungeonAssist110", addRatioVipLv, addRatioStr);

                    }

                }



                callPlayerName = UIHelper.ServerStringTrim(callPlayerName);

                switch (resultType)

                {

                    case ResultType.SelfGetScore:

@@ -749,22 +736,22 @@
                        info = Language.Get("DungeonAssist103",fbName,addXianyuanCoins,sumAddStr);

                        break;

                    case ResultType.AssistGetScore:

                        info = Language.Get("DungeonAssist104",callPlayerName,fbName,addXianyuanCoins);

                        info = Language.Get("DungeonAssist104",callPlayerName,callPlayerId,fbName,addXianyuanCoins);

                        break;

                    case ResultType.AssistNoGetScore:

                        info = Language.Get("DungeonAssist105", callPlayerName, fbName);

                        info = Language.Get("DungeonAssist105", callPlayerName, callPlayerId,fbName);

                        break;

                    case ResultType.AssistGetExtraScore:

                        info = Language.Get("DungeonAssist106", callPlayerName,fbName,addXianyuanCoins,sumAddStr);

                        info = Language.Get("DungeonAssist106", callPlayerName, callPlayerId,fbName, addXianyuanCoins,sumAddStr);

                        break;

                    case ResultType.TeamAssistGetScore:

                        info = Language.Get("DungeonAssist107",callPlayerName,fbName,addXianyuanCoins);

                        info = Language.Get("DungeonAssist107",callPlayerName, callPlayerId,fbName, addXianyuanCoins);

                        break;

                    case ResultType.TeamAssistNoGetScore:

                        info = Language.Get("DungeonAssist108", callPlayerName, fbName);

                        info = Language.Get("DungeonAssist108", callPlayerName, callPlayerId, fbName);

                        break;

                    case ResultType.TeamAssistGetExtraScore:

                        info = Language.Get("DungeonAssist109", callPlayerName, fbName, addXianyuanCoins,sumAddStr);

                        info = Language.Get("DungeonAssist109", callPlayerName, callPlayerId, fbName, addXianyuanCoins,sumAddStr);

                        break;

                }




 System/Dungeon/DungeonAssistWin.cs

@@ -40,6 +40,7 @@


        protected override void OnPreOpen()

        {

            PlayerDetails.updateDetailTypeEvent += ClickFunc;

            assistModel.UpdateCheckInResultEvent += UpdateCheckInResult;

            assistModel.UpdateResultEvent += UpdateResult;

            SetDisplay();

@@ -52,6 +53,7 @@


        protected override void OnPreClose()

        {

            PlayerDetails.updateDetailTypeEvent -= ClickFunc;

            assistModel.UpdateResultEvent -= UpdateResult;

            assistModel.UpdateCheckInResultEvent -= UpdateCheckInResult;

            assistModel.SetHelpInfoRead();

@@ -165,6 +167,17 @@
            }

        }



        private void ClickFunc(PlayerDetails.DetailType type)

        {



            WindowJumpMgr.Instance.ClearJumpData();

            if (WindowCenter.Instance.IsOpen<DailyQuestWin>())

            {

                WindowCenter.Instance.CloseImmediately<DailyQuestWin>();

            }

            CloseClick();

        }



        private void ClickStore()

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.XianYuanCoinsStore);


 System/Tip/PlayerDetails.cs

@@ -9,7 +9,7 @@
        public static Vector2 targetPos;
        public static OpenType openType { get; private set; }
        public static event Action<DetailType> onClickFuncEvent;

        public static event Action<DetailType> updateDetailTypeEvent;
        public static void ShowPlayerDetails(int _playerId, Action<DetailType> _func, OpenType _type = OpenType.Default)
        {
            openType = _type;
@@ -45,6 +45,10 @@
            {
                onClickFuncEvent(_type);
            }
            if(updateDetailTypeEvent != null)

            {

                updateDetailTypeEvent(_type);

            }
        }

        public enum DetailType