snxxz_scripts.git

parent: c52f85c2 | 补丁 | 提交 | show whitespace

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

client_Zxw

2018-08-25 f23916b72b3320b77ae4005d6092681b89c6f166

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

4个文件已修改

	Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GAStaticDefine.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Message/RichTableEvent.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/ExceptionCatcher.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs

@@ -260,7 +260,9 @@
                    {

                        // 是否飘字

                        if (_sTarget.HurtHP != 0

                         || _sTarget.AttackType == (byte)HurtAttackType.Miss)

                         || _sTarget.AttackType == (byte)HurtAttackType.Miss

                         || _sTarget.AttackType == (byte)HurtAttackType.Immune

                         || _sTarget.AttackType == (byte)HurtAttackType.Suppress)

                        {

                            GAStaticDefine.PopHp(_attacker, _cTarget, _sTarget.AttackType, (int)_sTarget.HurtHP);

                        }

@@ -620,7 +622,9 @@
            {

                // 是否飘字

                if (_sTarget.HurtHP != 0

                 || _sTarget.AttackType == (byte)HurtAttackType.Miss)

                 || _sTarget.AttackType == (byte)HurtAttackType.Miss

                 || _sTarget.AttackType == (byte)HurtAttackType.Immune

                 || _sTarget.AttackType == (byte)HurtAttackType.Suppress)

                {

                    GAStaticDefine.PopHp(_attacker, _cTarget, _sTarget.AttackType, (int)_sTarget.HurtHP);

                }


 Fight/GameActor/GAStaticDefine.cs

@@ -284,7 +284,6 @@
        //{



        //}



        // ---- 判断是否显示

        if ((caster != null// 来源不能为空

          && (caster.ServerInstID == PlayerDatas.Instance.PlayerId // 自己攻击

@@ -395,6 +394,10 @@
                _targetRealm = 0;

                _pattern = (PopUpNum.Pattern)(((int)HurtAttackType.Normal - 1) * 3);

            }

            else if (attackType == (int)HurtAttackType.Immune)

            {

                _base = (int)PopUpNum.Pattern.PlayerAttack;

            }



            var popupInfo = new PopUpNum.PopupInfo()

            {


 System/Message/RichTableEvent.cs

@@ -285,7 +285,7 @@
                                        var _cfg = Config.Instance.Get<HorseConfig>(_id);

                                        if (_cfg != null)

                                        {

                                            return _cfg.Name;

                                            return GetTextColorByItemColor(_cfg.Name, _cfg.Quality, _dict);

                                        }

                                    }

                                }


 Utility/ExceptionCatcher.cs

@@ -5,16 +5,19 @@

public class ExceptionCatcher

{



    public static void Init()

    {

        if (VersionConfig.Get().versionAuthority == VersionAuthority.Release)

        {

#if UNITY_ANDROID

#if !UNITY_EDITOR

            BuglyAgent.ConfigDebugMode(false);

            BuglyAgent.ConfigAutoReportLogLevel(VersionConfig.Get().versionAuthority == VersionAuthority.Release ? LogSeverity.LogException : LogSeverity.LogError);

            BuglyAgent.ConfigDefault(VersionConfig.Get().appId, VersionConfig.Get().version, SystemInfo.deviceName, 0);

#if UNITY_ANDROID

            BuglyAgent.InitWithAppId("bff7374864");

#elif UNITY_IPHONE || UNITY_IOS

            BuglyAgent.InitWithAppId("553c67c376");

#endif

#endif

        }



@@ -24,7 +27,7 @@
    {

        if (VersionConfig.Get().versionAuthority == VersionAuthority.Release)

        {

#if UNITY_ANDROID

#if !UNITY_EDITOR

            BuglyAgent.EnableExceptionHandler();

#endif

        }

			@@ -260,7 +260,9 @@
			{
			// 是否飘字
			if (_sTarget.HurtHP != 0
			\|\| _sTarget.AttackType == (byte)HurtAttackType.Miss)
			\|\| _sTarget.AttackType == (byte)HurtAttackType.Miss
			\|\| _sTarget.AttackType == (byte)HurtAttackType.Immune
			\|\| _sTarget.AttackType == (byte)HurtAttackType.Suppress)
			{
			GAStaticDefine.PopHp(_attacker, _cTarget, _sTarget.AttackType, (int)_sTarget.HurtHP);
			}
			@@ -620,7 +622,9 @@
			{
			// 是否飘字
			if (_sTarget.HurtHP != 0
			\|\| _sTarget.AttackType == (byte)HurtAttackType.Miss)
			\|\| _sTarget.AttackType == (byte)HurtAttackType.Miss
			\|\| _sTarget.AttackType == (byte)HurtAttackType.Immune
			\|\| _sTarget.AttackType == (byte)HurtAttackType.Suppress)
			{
			GAStaticDefine.PopHp(_attacker, _cTarget, _sTarget.AttackType, (int)_sTarget.HurtHP);
			}

			@@ -284,7 +284,6 @@
			//{

			//}

			// ---- 判断是否显示
			if ((caster != null// 来源不能为空
			&& (caster.ServerInstID == PlayerDatas.Instance.PlayerId // 自己攻击
			@@ -395,6 +394,10 @@
			_targetRealm = 0;
			_pattern = (PopUpNum.Pattern)(((int)HurtAttackType.Normal - 1) * 3);
			}
			else if (attackType == (int)HurtAttackType.Immune)
			{
			_base = (int)PopUpNum.Pattern.PlayerAttack;
			}

			var popupInfo = new PopUpNum.PopupInfo()
			{

			@@ -285,7 +285,7 @@
			var _cfg = Config.Instance.Get<HorseConfig>(_id);
			if (_cfg != null)
			{
			return _cfg.Name;
			return GetTextColorByItemColor(_cfg.Name, _cfg.Quality, _dict);
			}
			}
			}

			@@ -5,16 +5,19 @@

			public class ExceptionCatcher
			{

			public static void Init()
			{
			if (VersionConfig.Get().versionAuthority == VersionAuthority.Release)
			{
			#if UNITY_ANDROID
			#if !UNITY_EDITOR
			BuglyAgent.ConfigDebugMode(false);
			BuglyAgent.ConfigAutoReportLogLevel(VersionConfig.Get().versionAuthority == VersionAuthority.Release ? LogSeverity.LogException : LogSeverity.LogError);
			BuglyAgent.ConfigDefault(VersionConfig.Get().appId, VersionConfig.Get().version, SystemInfo.deviceName, 0);
			#if UNITY_ANDROID
			BuglyAgent.InitWithAppId("bff7374864");
			#elif UNITY_IPHONE \|\| UNITY_IOS
			BuglyAgent.InitWithAppId("553c67c376");
			#endif
			#endif
			}

			@@ -24,7 +27,7 @@
			{
			if (VersionConfig.Get().versionAuthority == VersionAuthority.Release)
			{
			#if UNITY_ANDROID
			#if !UNITY_EDITOR
			BuglyAgent.EnableExceptionHandler();
			#endif
			}