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

client_linchunjie

2018-11-27 f8d4d6a10af36ab68451cd303026e6fe80c8e45f

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

 Core/NetworkPackage/ServerPack/HB2_ActionMap/HB208_tagMCAddXianyuanCoinMsg.cs

@@ -10,6 +10,7 @@
    public uint CallPlayerID;    // 助战的玩家ID，有值时代表真实助战，没有值时为自己打的


    public byte NameLen;


    public string CallPlayerName;    // 助战的玩家名，size = NameLen


    public byte Reason;    //仙缘币为0时的原因：1-助战次数上限；2-每日获得上限




    public HB208_tagMCAddXianyuanCoinMsg () {


        _cmd = (ushort)0xB208;


@@ -22,6 +23,7 @@
        TransBytes (out CallPlayerID, vBytes, NetDataType.DWORD);


        TransBytes (out NameLen, vBytes, NetDataType.BYTE);


        TransBytes (out CallPlayerName, vBytes, NetDataType.Chars, NameLen);


        TransBytes (out Reason, vBytes, NetDataType.BYTE);

    }





}



 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);

                    }

                }

            }

@@ -565,6 +565,7 @@
                assistResult.relatedToPlayer = (RelatedToPlayer)recordInfo.Relation;

                assistResult.vipLv = recordInfo.VIPLV;

                assistResult.createTime = recordInfo.HelpTime;

                assistResult.noGetReason = 0;

                assistResult.SetNotifyResult();

                assistResults.Add(assistResult);

            }

@@ -582,6 +583,7 @@
            assistResult.relatedToPlayer = (RelatedToPlayer)0;

            assistResult.vipLv = PlayerDatas.Instance.baseData.LV;

            assistResult.createTime = ToDisplay();

            assistResult.noGetReason = msg.Reason;

            assistResult.SetNotifyResult();

            assistResults.Add(assistResult);

        }

@@ -664,6 +666,7 @@
            public string createTime;

            public ResultType resultType;

            public string info;

            public int noGetReason;//仙缘币为0时的原因：1-助战次数上限；2-每日获得上限

            private int addRatioVipLv;

            private string addRatioStr;



@@ -697,74 +700,64 @@
                {

                    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:

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

                        break;

                    case ResultType.SelfNoGetScore:

                    case ResultType.SelfNoGetScoreReason2:

                        info = Language.Get("DungeonAssist102",fbName);

                        break;

                    case ResultType.SelfNoGetScoreReason1:

                        info = Language.Get("DungeonAssist113", fbName);

                        break;

                    case ResultType.SelfGetVipScore:

                        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;

                }



@@ -810,7 +803,15 @@
                        }

                        else

                        {

                            return ResultType.SelfNoGetScore;

                            switch(noGetReason)

                            {

                                case 0:

                                case 2:

                                    return ResultType.SelfNoGetScoreReason2;

                                case 1:

                                    return ResultType.SelfNoGetScoreReason1;

                            }

                         
                        }

                    }

                }

@@ -861,7 +862,8 @@
            {

                None,

                SelfGetScore,

                SelfNoGetScore,

                SelfNoGetScoreReason1,

                SelfNoGetScoreReason2,

                SelfGetVipScore,

                AssistGetScore,

                AssistNoGetScore,


 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