snxxz_scripts.git

parent: 4a6fce01 | 补丁 | 提交 | ignore whitespace

client_Hale

2019-01-15 bc5845b137acb57cd50aac38701cb573b50e81f5

382 神兵特效切换套装消失问题

3个文件已修改

	Fight/GameActor/GA_Hero.cs	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GA_NpcFightZZPlayer.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GA_Player.cs	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Fight/GameActor/GA_Hero.cs

@@ -491,6 +491,26 @@
        {

            SwitchGodWeapon(4, 0);

        }

        _level = PlayerDatas.Instance.baseData.godWeaponLV_1;

        if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 1, out _level))

        {

            SwitchGodWeapon(1, _level);

        }

        else

        {

            SwitchGodWeapon(1, 0);

        }



        _level = PlayerDatas.Instance.baseData.godWeaponLV_2;

        _level = PlayerDatas.Instance.baseData.godWeaponLV_2;

        if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 2, out _level))

        {

            SwitchGodWeapon(2, _level);

        }

        else

        {

            SwitchGodWeapon(2, 0);

        }

    }



    protected sealed override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)

@@ -506,16 +526,6 @@
            }

            GameObjectPoolManager.Instance.AddDontDestroyGoInstID(secondary.GetInstanceID());

        }



        int _level = PlayerDatas.Instance.baseData.godWeaponLV_1;

        if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 1, out _level))

        {

            SwitchGodWeapon(1, _level);

        }

        else

        {

            SwitchGodWeapon(1, 0);

        }

    }



    protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)

@@ -528,16 +538,6 @@
            MaterialUtility.SwitchXrayShader(m_WeaponMaterial, true);

        }

        GameObjectPoolManager.Instance.AddDontDestroyGoInstID(weapon.GetInstanceID());



        int _level = PlayerDatas.Instance.baseData.godWeaponLV_2;

        if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 2, out _level))

        {

            SwitchGodWeapon(2, _level);

        }

        else

        {

            SwitchGodWeapon(2, 0);

        }

    }



    protected sealed override void OnPutonWing(uint wingItemID, GameObject wing)


 Fight/GameActor/GA_NpcFightZZPlayer.cs

@@ -318,27 +318,28 @@
        {
            SwitchGodWeapon(4, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(4));
        }
    }

    protected override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)
    {
        Renderer _renderer = secondary.GetComponentInChildren<Renderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);

        
        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
        }
        
        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(2, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(2));
        }
    }

    protected override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)
    {
        Renderer _renderer = secondary.GetComponentInChildren<Renderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);
    }

    protected override void OnPutonWeapon(uint weaponItemID, GameObject weapon)
    {
        Renderer _renderer = weapon.GetComponentInChildren<Renderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);
        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
        }
    }

    protected override void OnPutonWing(uint wingItemID, GameObject wing)

 Fight/GameActor/GA_Player.cs

@@ -523,6 +523,26 @@
        {

            SwitchGodWeapon(4, 0);

        }



        _level = (int)m_H0434.ExAttr15;

        if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 1, out _level))

        {

            SwitchGodWeapon(1, (int)m_H0434.ExAttr15);

        }

        else

        {

            SwitchGodWeapon(1, 0);

        }



        _level = (int)m_H0434.ExAttr16;

        if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 2, out _level))

        {

            SwitchGodWeapon(2, (int)m_H0434.ExAttr16);

        }

        else

        {

            SwitchGodWeapon(2, 0);

        }

    }



    protected sealed override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)

@@ -533,16 +553,6 @@
            _renderer.gameObject.SetLayer(LayerUtility.Player, false);

            MaterialUtility.SwitchXrayShader(m_SecondaryMaterial, false);

        }



        int _level = (int)m_H0434.ExAttr15;

        if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 1, out _level))

        {

            SwitchGodWeapon(1, (int)m_H0434.ExAttr15);

        }

        else

        {

            SwitchGodWeapon(1, 0);

        }

    }



    protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)

@@ -552,16 +562,6 @@
        {

            _renderer.gameObject.SetLayer(LayerUtility.Player, false);

            MaterialUtility.SwitchXrayShader(m_WeaponMaterial, false);

        }



        int _level = (int)m_H0434.ExAttr16;

        if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 2, out _level))

        {

            SwitchGodWeapon(2, (int)m_H0434.ExAttr16);

        }

        else

        {

            SwitchGodWeapon(2, 0);

        }

    }

			@@ -491,6 +491,26 @@
			{
			SwitchGodWeapon(4, 0);
			}
			_level = PlayerDatas.Instance.baseData.godWeaponLV_1;
			if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 1, out _level))
			{
			SwitchGodWeapon(1, _level);
			}
			else
			{
			SwitchGodWeapon(1, 0);
			}

			_level = PlayerDatas.Instance.baseData.godWeaponLV_2;
			_level = PlayerDatas.Instance.baseData.godWeaponLV_2;
			if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 2, out _level))
			{
			SwitchGodWeapon(2, _level);
			}
			else
			{
			SwitchGodWeapon(2, 0);
			}
			}

			protected sealed override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)
			@@ -506,16 +526,6 @@
			}
			GameObjectPoolManager.Instance.AddDontDestroyGoInstID(secondary.GetInstanceID());
			}

			int _level = PlayerDatas.Instance.baseData.godWeaponLV_1;
			if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 1, out _level))
			{
			SwitchGodWeapon(1, _level);
			}
			else
			{
			SwitchGodWeapon(1, 0);
			}
			}

			protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)
			@@ -528,16 +538,6 @@
			MaterialUtility.SwitchXrayShader(m_WeaponMaterial, true);
			}
			GameObjectPoolManager.Instance.AddDontDestroyGoInstID(weapon.GetInstanceID());

			int _level = PlayerDatas.Instance.baseData.godWeaponLV_2;
			if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 2, out _level))
			{
			SwitchGodWeapon(2, _level);
			}
			else
			{
			SwitchGodWeapon(2, 0);
			}
			}

			protected sealed override void OnPutonWing(uint wingItemID, GameObject wing)

			@@ -318,27 +318,28 @@
			{
			SwitchGodWeapon(4, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(4));
			}
			}

			protected override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)
			{
			Renderer _renderer = secondary.GetComponentInChildren<Renderer>();
			_renderer.gameObject.SetLayer(LayerUtility.Player, false);


			if (m_ViewPlayerData != null)
			{
			SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
			}

			if (m_ViewPlayerData != null)
			{
			SwitchGodWeapon(2, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(2));
			}
			}

			protected override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)
			{
			Renderer _renderer = secondary.GetComponentInChildren<Renderer>();
			_renderer.gameObject.SetLayer(LayerUtility.Player, false);
			}

			protected override void OnPutonWeapon(uint weaponItemID, GameObject weapon)
			{
			Renderer _renderer = weapon.GetComponentInChildren<Renderer>();
			_renderer.gameObject.SetLayer(LayerUtility.Player, false);
			if (m_ViewPlayerData != null)
			{
			SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
			}
			}

			protected override void OnPutonWing(uint wingItemID, GameObject wing)

			@@ -523,6 +523,26 @@
			{
			SwitchGodWeapon(4, 0);
			}

			_level = (int)m_H0434.ExAttr15;
			if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 1, out _level))
			{
			SwitchGodWeapon(1, (int)m_H0434.ExAttr15);
			}
			else
			{
			SwitchGodWeapon(1, 0);
			}

			_level = (int)m_H0434.ExAttr16;
			if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 2, out _level))
			{
			SwitchGodWeapon(2, (int)m_H0434.ExAttr16);
			}
			else
			{
			SwitchGodWeapon(2, 0);
			}
			}

			protected sealed override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)
			@@ -533,16 +553,6 @@
			_renderer.gameObject.SetLayer(LayerUtility.Player, false);
			MaterialUtility.SwitchXrayShader(m_SecondaryMaterial, false);
			}

			int _level = (int)m_H0434.ExAttr15;
			if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 1, out _level))
			{
			SwitchGodWeapon(1, (int)m_H0434.ExAttr15);
			}
			else
			{
			SwitchGodWeapon(1, 0);
			}
			}

			protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)
			@@ -552,16 +562,6 @@
			{
			_renderer.gameObject.SetLayer(LayerUtility.Player, false);
			MaterialUtility.SwitchXrayShader(m_WeaponMaterial, false);
			}

			int _level = (int)m_H0434.ExAttr16;
			if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 2, out _level))
			{
			SwitchGodWeapon(2, (int)m_H0434.ExAttr16);
			}
			else
			{
			SwitchGodWeapon(2, 0);
			}
			}