snxxz_scripts.git

parent: 7eca5fd3 | 补丁 | 提交 | ignore whitespace

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

client_Zxw

2018-10-10 474d9bdc08652f9751250787c8053e98518f46ce

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

6个文件已修改

	System/KnapSack/Logic/EquipTip.cs	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/PlayerPackModels.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Login/CreateRoleWin.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Login/LoginModel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Role/RoleRenameWin.cs	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/UIHelper.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/KnapSack/Logic/EquipTip.cs

@@ -134,6 +134,8 @@
            get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); }

        }



        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }



        ItemAttrData itemAttrData;





@@ -944,22 +946,25 @@
                foreach (ItemWinBtnType key in itemAttrData.tipsFuncBtnDic.Keys)

                {

                    Button btn = OnGUIButton(btnGroup.gameObject, operateBtn, key.ToString(), Language.Get(StringUtility.Contact("ItemHandle_", key.ToString())));

                    switch (key)

                    if(itemAttrData.guid == playerPack.lookItemGUID && playerPack.lookLineIndex != -1)

                    {

                        case ItemWinBtnType.putOn:

                            SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);

                            if(successConfig != null 
                                && (successConfig.Type == 39 
                                || successConfig.Type == 82

                                || successConfig.Type == 83))

                            {

                                AchievementGuideEffect guidEffect = AchievementGuideEffectPool.Require(1);

                                guidEffect.transform.SetParentEx(btn.transform, Vector3.zero, Quaternion.identity, Vector3.one);

                                guidEffect.effect.renderQueue = 4500;

                            }

                            break;

                        switch (key)

                        {

                            case ItemWinBtnType.putOn:

                                SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);

                                if (successConfig != null

                                    && (successConfig.Type == 39

                                    || successConfig.Type == 82

                                    || successConfig.Type == 83))

                                {

                                    AchievementGuideEffect guidEffect = AchievementGuideEffectPool.Require(1);

                                    guidEffect.transform.SetParentEx(btn.transform, Vector3.zero, Quaternion.identity, Vector3.one);

                                    guidEffect.effect.renderQueue = 4500;

                                }

                                break;

                        }

                    }



                   
                    btn.RemoveAllListeners();

                    btn.onClick.AddListener(() => {

                        OnClickCloseBtn();


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -905,6 +905,7 @@
            if (string.IsNullOrEmpty(guid) || guid == "")

            {

                lookLineIndex = -1;

                lookItemGUID = "";

            }

            else

            {


 System/Login/CreateRoleWin.cs

@@ -187,7 +187,7 @@
                return;

            }

            int error = 0;

            if (!SatisfyNameLength(userNameInput.text, out error))

            if (!UIHelper.SatisfyNameLength(userNameInput.text, out error))

            {

                switch (error)

                {

@@ -270,35 +270,6 @@
        private void RemoveRoleModel()

        {

            m_CreateRoleShow.Dispose();

        }



        public bool SatisfyNameLength(string name, out int error)

        {

            error = 0;

            bool pureChinese = Regex.IsMatch(name, "^[\u4e00-\u9fa5]+$");

            if (pureChinese)

            {

                if (name.Length > 5)

                {

                    error = 1;

                }

                else if (name.Length < 2)

                {

                    error = 2;

                }

            }

            else

            {

                if (name.Length > 6)

                {

                    error = 1;

                }

                else if (name.Length < 3)

                {

                    error = 2;

                }

            }

            return error == 0;

        }

    }




 System/Login/LoginModel.cs

@@ -278,7 +278,7 @@
                    send.Extra = "";

                    break;

                case VersionAuthority.Release:

                    send.Extra = string.Format("{0}|{1}",VersionConfig.Get().appId,VersionConfig.Get().SpID);

                    send.Extra = VersionConfig.Get().SpID;

                    send.ExtraLen = (byte)send.Extra.Length;

                    if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Free)

                    {


 System/Role/RoleRenameWin.cs

@@ -101,7 +101,7 @@
            }



            int error = 0;

            if (!SatisfyNameLength(renameInput.text, out error))

            if (!UIHelper.SatisfyNameLength(renameInput.text, out error))

            {

                switch (error)

                {

@@ -145,36 +145,5 @@
              });

              

        }



        public bool SatisfyNameLength(string name, out int error)

        {

            error = 0;

            bool pureChinese = Regex.IsMatch(name, "^[\u4e00-\u9fa5]+$");

            if (pureChinese)

            {

                if (name.Length > 5)

                {

                    error = 1;

                }

                else if (name.Length < 2)

                {

                    error = 2;

                }

            }

            else

            {

                if (name.Length > 6)

                {

                    error = 1;

                }

                else if (name.Length < 3)

                {

                    error = 2;

                }

            }

            return error == 0;

        }





    }

}


 Utility/UIHelper.cs

@@ -775,4 +775,35 @@
        content = content.Replace(" ", string.Empty);

        return content;

    }



    public static bool SatisfyNameLength(string name, out int error)

    {

        error = 0;

        bool pureChinese = Regex.IsMatch(name, "^[\u4e00-\u9fa5]+$");

        var chsCount = GetChsCount(name);

        var maxlength = pureChinese ? 5 : chsCount > 0 ? 6 : 8;

        var minlength = pureChinese ? 2 : 3;

        if (name.Length > maxlength)

        {

            error = 1;

        }

        else if (name.Length < minlength)

        {

            error = 2;

        }

        return error == 0;

    }



    public static int GetChsCount(string name)

    {

        var count = 0;

        for (int i = 0; i < name.Length; i++)

        {

            if (Regex.IsMatch(name[i].ToString(), "[\u4e00-\u9fa5]"))

            {

                count++;

            }

        }

        return count;

    }

}

			@@ -134,6 +134,8 @@
			get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); }
			}

			PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

			ItemAttrData itemAttrData;


			@@ -944,22 +946,25 @@
			foreach (ItemWinBtnType key in itemAttrData.tipsFuncBtnDic.Keys)
			{
			Button btn = OnGUIButton(btnGroup.gameObject, operateBtn, key.ToString(), Language.Get(StringUtility.Contact("ItemHandle_", key.ToString())));
			switch (key)
			if(itemAttrData.guid == playerPack.lookItemGUID && playerPack.lookLineIndex != -1)
			{
			case ItemWinBtnType.putOn:
			SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
			if(successConfig != null
			&& (successConfig.Type == 39
			\|\| successConfig.Type == 82
			\|\| successConfig.Type == 83))
			{
			AchievementGuideEffect guidEffect = AchievementGuideEffectPool.Require(1);
			guidEffect.transform.SetParentEx(btn.transform, Vector3.zero, Quaternion.identity, Vector3.one);
			guidEffect.effect.renderQueue = 4500;
			}
			break;
			switch (key)
			{
			case ItemWinBtnType.putOn:
			SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
			if (successConfig != null
			&& (successConfig.Type == 39
			\|\| successConfig.Type == 82
			\|\| successConfig.Type == 83))
			{
			AchievementGuideEffect guidEffect = AchievementGuideEffectPool.Require(1);
			guidEffect.transform.SetParentEx(btn.transform, Vector3.zero, Quaternion.identity, Vector3.one);
			guidEffect.effect.renderQueue = 4500;
			}
			break;
			}
			}


			btn.RemoveAllListeners();
			btn.onClick.AddListener(() => {
			OnClickCloseBtn();

			@@ -905,6 +905,7 @@
			if (string.IsNullOrEmpty(guid) \|\| guid == "")
			{
			lookLineIndex = -1;
			lookItemGUID = "";
			}
			else
			{

			@@ -187,7 +187,7 @@
			return;
			}
			int error = 0;
			if (!SatisfyNameLength(userNameInput.text, out error))
			if (!UIHelper.SatisfyNameLength(userNameInput.text, out error))
			{
			switch (error)
			{
			@@ -270,35 +270,6 @@
			private void RemoveRoleModel()
			{
			m_CreateRoleShow.Dispose();
			}

			public bool SatisfyNameLength(string name, out int error)
			{
			error = 0;
			bool pureChinese = Regex.IsMatch(name, "^[\u4e00-\u9fa5]+$");
			if (pureChinese)
			{
			if (name.Length > 5)
			{
			error = 1;
			}
			else if (name.Length < 2)
			{
			error = 2;
			}
			}
			else
			{
			if (name.Length > 6)
			{
			error = 1;
			}
			else if (name.Length < 3)
			{
			error = 2;
			}
			}
			return error == 0;
			}
			}

			@@ -278,7 +278,7 @@
			send.Extra = "";
			break;
			case VersionAuthority.Release:
			send.Extra = string.Format("{0}\|{1}",VersionConfig.Get().appId,VersionConfig.Get().SpID);
			send.Extra = VersionConfig.Get().SpID;
			send.ExtraLen = (byte)send.Extra.Length;
			if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Free)
			{

			@@ -101,7 +101,7 @@
			}

			int error = 0;
			if (!SatisfyNameLength(renameInput.text, out error))
			if (!UIHelper.SatisfyNameLength(renameInput.text, out error))
			{
			switch (error)
			{
			@@ -145,36 +145,5 @@
			});

			}

			public bool SatisfyNameLength(string name, out int error)
			{
			error = 0;
			bool pureChinese = Regex.IsMatch(name, "^[\u4e00-\u9fa5]+$");
			if (pureChinese)
			{
			if (name.Length > 5)
			{
			error = 1;
			}
			else if (name.Length < 2)
			{
			error = 2;
			}
			}
			else
			{
			if (name.Length > 6)
			{
			error = 1;
			}
			else if (name.Length < 3)
			{
			error = 2;
			}
			}
			return error == 0;
			}


			}
			}

			@@ -775,4 +775,35 @@
			content = content.Replace(" ", string.Empty);
			return content;
			}

			public static bool SatisfyNameLength(string name, out int error)
			{
			error = 0;
			bool pureChinese = Regex.IsMatch(name, "^[\u4e00-\u9fa5]+$");
			var chsCount = GetChsCount(name);
			var maxlength = pureChinese ? 5 : chsCount > 0 ? 6 : 8;
			var minlength = pureChinese ? 2 : 3;
			if (name.Length > maxlength)
			{
			error = 1;
			}
			else if (name.Length < minlength)
			{
			error = 2;
			}
			return error == 0;
			}

			public static int GetChsCount(string name)
			{
			var count = 0;
			for (int i = 0; i < name.Length; i++)
			{
			if (Regex.IsMatch(name[i].ToString(), "[\u4e00-\u9fa5]"))
			{
			count++;
			}
			}
			return count;
			}
			}