snxxz_scripts.git

parent: 1f4394e1 | 补丁 | 提交 | ignore whitespace

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

client_Hale

2018-09-20 947cfc55b2d28cf7cf1f303ac522c74ce3818441

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

4个文件已修改

	System/FriendSystem/MailAllModel.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/TipPanel.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/StoreModel.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Strengthening/WashTips.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/FriendSystem/MailAllModel.cs

@@ -89,6 +89,8 @@
    private Dictionary<string, MailInfo> mailModelDict = new Dictionary<string,MailInfo>();

    private List<MailInfo> timeOrderMailInfo = new List<MailInfo>();

    private Regex smatch = new Regex(@"<MailTemplate>([^>.\n]*)</MailTemplate>([^>.\n]*)", RegexOptions.Singleline);

    private Regex smatchSystem = new Regex(@"[\\]*\/[\\]*", RegexOptions.Singleline);



    public string mailTitleStr = "";

    public string mailContentstr = "";

    public string mailSendPersonStr = "";

@@ -345,6 +347,7 @@
    public void GetReciveMailContent(MailInfo info)

    {

        Debug.Log(info.Text);

        info.Text = smatchSystem.Replace(info.Text, "/");

        if (smatch.IsMatch(info.Text))

        {

            Match match = smatch.Match(info.Text);

@@ -422,7 +425,7 @@
           

                if(mailContentArray.Length > 2)

                {

                    string mailDes = Regex.Replace(mailContentArray[2], @"<[\\]+/r>", "</r>");

                    string mailDes = mailContentArray[2];

                    mailContentstr = mailDes;

                }

            }


 System/MainInterfacePanel/TipPanel.cs

@@ -91,7 +91,8 @@
            {

                firstTimeRechargeModel.OpenFirstChargeTrialWin();

            }

            else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()) //灵宠坐骑推送

            else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()

                && !WindowCenter.Instance.CheckOpen<OffLineOnHookWin>()) //灵宠坐骑推送

            {

                storeModel.SetPushPetAndMountWinState();

            }


 System/Store/StoreModel.cs

@@ -69,6 +69,7 @@
        NewBieCenter.Instance.guideBeginEvent -= GuidBegin;

        shopItemlimitDict.Clear();

        petAndMountPushlist.Clear();

        ClearPushData();

        tagTowerModel = null;

        storeFuncType = StoreFunc.WeekStore;

        tcbRefreshDict.Clear();

@@ -1118,7 +1119,11 @@


    private void GuidBegin()

    {

        SetPushPetAndMountWinState(true,true);

        PetAndMountPushWin pushWin = WindowCenter.Instance.Get<PetAndMountPushWin>();

        if(pushWin != null)

        {

            SetPushPetAndMountWinState(true, true);

        }

    }



    private void OnMoveTopPart(bool isMove)


 System/Strengthening/WashTips.cs

@@ -490,7 +490,14 @@
                {

                    if (equipWashModel.IsWashFull(_itemModel, _washProModel, _tagWashModel))

                    {

                        _washFullLvText.text = Language.Get("EquipWash113", _itemModel.chinItemModel.LV, equipWashModel.GetWashFullLv(_itemModel.chinItemModel.LV));

                        if(_washProModel.XLAttrLV  >= equipWashModel.GetMaxWashLv())

                        {

                            _washFullLvText.text = Language.Get("WashLevelFulled");

                        }

                        else

                        {

                            _washFullLvText.text = Language.Get("EquipWash113", _itemModel.chinItemModel.LV, equipWashModel.GetWashFullLv(_itemModel.chinItemModel.LV));

                        }

                        ObjHideOrShow(false, false, false, false, true);

                    }

                    else

			@@ -89,6 +89,8 @@
			private Dictionary<string, MailInfo> mailModelDict = new Dictionary<string,MailInfo>();
			private List<MailInfo> timeOrderMailInfo = new List<MailInfo>();
			private Regex smatch = new Regex(@"<MailTemplate>([^>.\n])</MailTemplate>([^>.\n])", RegexOptions.Singleline);
			private Regex smatchSystem = new Regex(@"[\\]\/[\\]", RegexOptions.Singleline);

			public string mailTitleStr = "";
			public string mailContentstr = "";
			public string mailSendPersonStr = "";
			@@ -345,6 +347,7 @@
			public void GetReciveMailContent(MailInfo info)
			{
			Debug.Log(info.Text);
			info.Text = smatchSystem.Replace(info.Text, "/");
			if (smatch.IsMatch(info.Text))
			{
			Match match = smatch.Match(info.Text);
			@@ -422,7 +425,7 @@

			if(mailContentArray.Length > 2)
			{
			string mailDes = Regex.Replace(mailContentArray[2], @"<[\\]+/r>", "</r>");
			string mailDes = mailContentArray[2];
			mailContentstr = mailDes;
			}
			}

			@@ -91,7 +91,8 @@
			{
			firstTimeRechargeModel.OpenFirstChargeTrialWin();
			}
			else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()) //灵宠坐骑推送
			else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()
			&& !WindowCenter.Instance.CheckOpen<OffLineOnHookWin>()) //灵宠坐骑推送
			{
			storeModel.SetPushPetAndMountWinState();
			}

			@@ -69,6 +69,7 @@
			NewBieCenter.Instance.guideBeginEvent -= GuidBegin;
			shopItemlimitDict.Clear();
			petAndMountPushlist.Clear();
			ClearPushData();
			tagTowerModel = null;
			storeFuncType = StoreFunc.WeekStore;
			tcbRefreshDict.Clear();
			@@ -1118,7 +1119,11 @@

			private void GuidBegin()
			{
			SetPushPetAndMountWinState(true,true);
			PetAndMountPushWin pushWin = WindowCenter.Instance.Get<PetAndMountPushWin>();
			if(pushWin != null)
			{
			SetPushPetAndMountWinState(true, true);
			}
			}

			private void OnMoveTopPart(bool isMove)

			@@ -490,7 +490,14 @@
			{
			if (equipWashModel.IsWashFull(_itemModel, _washProModel, _tagWashModel))
			{
			_washFullLvText.text = Language.Get("EquipWash113", _itemModel.chinItemModel.LV, equipWashModel.GetWashFullLv(_itemModel.chinItemModel.LV));
			if(_washProModel.XLAttrLV >= equipWashModel.GetMaxWashLv())
			{
			_washFullLvText.text = Language.Get("WashLevelFulled");
			}
			else
			{
			_washFullLvText.text = Language.Get("EquipWash113", _itemModel.chinItemModel.LV, equipWashModel.GetWashFullLv(_itemModel.chinItemModel.LV));
			}
			ObjHideOrShow(false, false, false, false, true);
			}
			else