5487 【前端】【1.3.100】助战大境界渡劫的助战记录显示优化

Client_PangDeRong

2018-12-17 c1a46b29dc43397725bd49d8f2dc4664326f20bb

5487 【前端】【1.3.100】助战大境界渡劫的助战记录显示优化

2644 【BUG】【1.3.100】大境界渡劫境界显示错误修复

 System/Dungeon/DungeonAssistModel.cs

@@ -712,6 +712,7 @@
            }

            public bool IsGetAllAssistCoins { get { return addXianyuanCoins >= addXianyuanCoinsTheory && addXianyuanCoins > 0; } }

            public bool IsVipAddRatio { get { return addRatioVipLv > 0; } }

            public bool IsRealmDungeon { get { return mapId == 31110; } }



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

            DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

@@ -724,26 +725,19 @@
                DungeonConfig dungeonConfig = dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);

                if (dungeonConfig == null) return;



                string fbName = string.Empty;

                if(mapId == 31110)

                string fbName = dungeonConfig.FBName;

                string realmName = string.Empty;

                fbName = dungeonConfig.FBName;

                if (mapId == 31110)

                {

                    int realmLv = PlayerDatas.Instance.baseData.realmLevel;

                    int realmLv = funcLineId + 1;

                    RealmConfig realmConfig = Config.Instance.Get<RealmConfig>(realmLv);

                    string realmName = realmConfig != null ? realmConfig.Name : string.Empty;

                    realmName = realmConfig != null ? realmConfig.Name : string.Empty;

                    if(!string.IsNullOrEmpty(realmName))

                    {

                        realmName = StringUtility.Contact("【", realmName, "】");

                        fbName = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Blue,realmName,true), dungeonConfig.FBName);

                        realmName = UIHelper.GetRealmColorByLv(realmLv, realmName, true);

                    }

                    else

                    {

                        fbName = dungeonConfig.FBName;

                    }

                  
                }

                else

                {

                    fbName = dungeonConfig.FBName;

                }

                GetCurVipAddRatio();

                SetAddXianyuanCoinsTheory();

@@ -872,6 +866,51 @@
                        }

                        info = Language.Get("DungeonAssist150", fbName, addXianyuanCoins, sweepGetExtra);

                        break;

                    case ResultType.SelfRealmGetScore:

                        isSelf = true;

                        info = Language.Get("DungeonAssist153",fbName,realmName, addXianyuanCoins);

                        break;

                    case ResultType.SelfRealmGetPartScore:

                        isSelf = true;

                        info = Language.Get("DungeonAssist156", fbName,realmName, addXianyuanCoins);

                        break;

                    case ResultType.SelfRealmNoGetScoreReason2:

                        isSelf = true;

                        info = Language.Get("DungeonAssist154", fbName,realmName);

                        break;

                    case ResultType.SelfRealmNoGetScoreReason1:

                        isSelf = true;

                        info = Language.Get("DungeonAssist161", fbName,realmName);

                        break;

                    case ResultType.SelfRealmGetExtraScore:

                        isSelf = true;

                        string selfRealmGetExtra = string.Empty;

                        if (addCoins > 0)

                        {

                            selfRealmGetExtra = Language.Get("DungeonAssist115", addCoins);

                            if (!string.IsNullOrEmpty(sumAddStr))

                            {

                                selfRealmGetExtra = StringUtility.Contact(selfRealmGetExtra, ",", sumAddStr);

                            }

                        }

                        else

                        {

                            selfRealmGetExtra = sumAddStr;

                        }

                        info = Language.Get("DungeonAssist155", fbName,realmName,addXianyuanCoins, selfRealmGetExtra);

                        break;

                    case ResultType.AssistRealmGetScore:

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

                        break;

                    case ResultType.AssistRealmGetPartScore:

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

                        break;

                    case ResultType.AssistRealmNoGetScoreReason2:

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

                        break;

                    case ResultType.AssistRealmGetExtraScore:

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

                        break;

                }



                assistModel.SetHelpInfoLocalSave(createTime,info,isNew,isSelf);

@@ -886,6 +925,7 @@
            {

                var dungeonOpenTime = Config.Instance.Get<DungeonOpenTimeConfig>(mapId);

                int socialAdd = 0;



                switch (assistType)

                {

                    case 1:

@@ -994,18 +1034,18 @@
                            {

                                if (IsVipAddRatio || addCoins > 0)

                                {

                                    return ResultType.SelfGetExtraScore;

                                    return IsRealmDungeon ? ResultType.SelfRealmGetExtraScore : ResultType.SelfGetExtraScore;

                                }

                                else

                                {

                                    return ResultType.SelfGetScore;

                                    return IsRealmDungeon ? ResultType.SelfRealmGetScore : ResultType.SelfGetScore;

                                }

                            }

                            else

                            {

                                if (addXianyuanCoins > 0)

                                {

                                    return ResultType.SelfGetPartScore;

                                    return IsRealmDungeon ? ResultType.SelfRealmGetPartScore : ResultType.SelfGetPartScore;

                                }

                                else

                                {

@@ -1013,9 +1053,9 @@
                                    {

                                        case 0:

                                        case 2:

                                            return ResultType.SelfNoGetScoreReason2;

                                            return IsRealmDungeon ? ResultType.SelfRealmNoGetScoreReason2 : ResultType.SelfNoGetScoreReason2;

                                        case 1:

                                            return ResultType.SelfNoGetScoreReason1;

                                            return IsRealmDungeon ? ResultType.SelfRealmNoGetScoreReason1 : ResultType.SelfNoGetScoreReason1;

                                    }

                                }

                            }

@@ -1028,21 +1068,28 @@
                            switch (relatedToPlayer)

                            {

                                case RelatedToPlayer.None:

                                    return IsVipAddRatio ? ResultType.AssistGetExtraScore : ResultType.AssistGetScore;

                                    if(IsVipAddRatio)

                                    {

                                        return IsRealmDungeon ? ResultType.AssistRealmGetExtraScore : ResultType.AssistGetExtraScore;

                                    }

                                    else

                                    {

                                        return IsRealmDungeon ? ResultType.AssistRealmGetScore : ResultType.AssistGetScore;

                                    }

                                case RelatedToPlayer.Friend:

                                case RelatedToPlayer.Ally:

                                    return ResultType.AssistGetExtraScore;

                                    return IsRealmDungeon ? ResultType.AssistRealmGetExtraScore : ResultType.AssistGetExtraScore;

                            }

                        }

                        else

                        {

                            if (addXianyuanCoins > 0)

                            {

                                return ResultType.AssistGetPartScore;

                                return IsRealmDungeon ? ResultType.AssistRealmGetPartScore : ResultType.AssistGetPartScore;

                            }

                            else

                            {

                                return ResultType.AssistNoGetScoreReason2;

                                return IsRealmDungeon ? ResultType.AssistRealmNoGetScoreReason2 : ResultType.AssistNoGetScoreReason2;

                            }

                        }

                    }

@@ -1094,6 +1141,15 @@
                SweepingNoGetScoreReason1,

                SweepingNoGetScoreReason2,

                SweepingGetExtraScore,

                SelfRealmGetScore,

                SelfRealmGetPartScore,

                SelfRealmNoGetScoreReason1,

                SelfRealmNoGetScoreReason2,

                SelfRealmGetExtraScore,

                AssistRealmGetScore,

                AssistRealmGetPartScore,

                AssistRealmNoGetScoreReason2,

                AssistRealmGetExtraScore,

            }

        }




 Utility/UIHelper.cs

@@ -558,6 +558,38 @@
        }

    }



    public static string GetRealmColorByLv(int realmLv,string msg, bool bright = false)

    {

        var config = Config.Instance.Get<RealmConfig>(realmLv);

        if (config == null)

        {

            return string.Empty;

        }

        switch (config.Quality)

        {

            case 1:

                return StringUtility.Contact("<color=#", bright ? "686868" : "f7f7f7", ">",msg, "</color>");

            case 2:

                return StringUtility.Contact("<color=#", bright ? "08d00a" : "08d00a", ">", msg, "</color>");

            case 3:

                return StringUtility.Contact("<color=#", bright ? "006be3" : "31cefb", ">", msg, "</color>");

            case 4:

                return StringUtility.Contact("<color=#", bright ? "da48d5" : "ec4bf6", ">", msg, "</color>");

            case 5:

                return StringUtility.Contact("<color=#", bright ? "ff6701" : "f8983b", ">", msg, "</color>");

            case 6:

                return StringUtility.Contact("<color=#", bright ? "ff0303" : "ff0101", ">", msg, "</color>");

            case 7:

                return StringUtility.Contact("<color=#", bright ? "f6408d" : "ff7c7c", ">", msg, "</color>");

            case 8:

                return StringUtility.Contact("<color=#", bright ? "bb8800" : "ffde00", ">", msg, "</color>");

            case 9:

                return StringUtility.Contact("<color=#", bright ? "ff0303" : "ff0101", ">", msg, "</color>");

            default:

                return msg;

        }

    }



    public static string AppendStringColor(int itemColor, string msg, bool bright = false)

    {

        switch (itemColor)