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

client_linchunjie

2019-05-21 9d479a35640979e4bfce0eaf239bb0504f2061c5

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

 System/NewBieGuidance/FunctionalGuideBehaviour.cs

@@ -20,6 +20,7 @@
        [SerializeField] RectTransform m_ContainerRight;

        [SerializeField] Text m_DialogueLeft;

        [SerializeField] Text m_DialogueRight;

        [SerializeField] UIEffect m_Effect;



        [SerializeField] RectTransform m_ContainerArrow;

        [SerializeField] Image m_Arrow;

@@ -135,6 +136,7 @@
            clickTargetName = string.Empty;

            m_ClickTarget = null;

            m_ClickHintRoot.gameObject.SetActive(false);

            StopEffect();

            FindClickTarget();

            protectTimer = 0f;

        }

@@ -229,16 +231,19 @@
                        if (screenPoint.x < 1f && screenPoint.x > 0f && screenPoint.y < 1f && screenPoint.y > 0f)

                        {

                            m_ClickHintRoot.gameObject.SetActive(true);

                            PlayEffect();

                            m_ClickHintRoot.position = m_ClickTarget.position;

                        }

                        else

                        {

                            StopEffect();

                            m_ClickHintRoot.gameObject.SetActive(false);

                        }

                    }

                }

                else

                {

                    StopEffect();

                    m_ClickHintRoot.gameObject.SetActive(false);

                }



@@ -291,6 +296,43 @@
            }

        }



        private void PlayEffect()

        {

            var guideConfig = GuideConfig.Get(guide);

            var effectId = 0;

            if (guideConfig != null)

            {

                var stepConfig = ScriptableObjectLoader.LoadSoFunctionalGuideStep(guideConfig.Steps[0]);

                if (stepConfig != null)

                {

                    effectId = stepConfig.effect2;

                }

            }



            if (effectId != 0)

            {

                if (!m_Effect.IsPlaying)

                {

                    m_Effect.Play();

                }

            }

            else

            {

                if (m_Effect.IsPlaying)

                {

                    m_Effect.Stop();

                }

            }

        }



        private void StopEffect()

        {

            if (m_Effect.IsPlaying)

            {

                m_Effect.Stop();

            }

        }



    }



    public class FunctionalGuideBehaviourPool


 UI/HUD/PopUpNum.cs

@@ -339,6 +339,14 @@
            PetThumpHit = 47,                        //宠物重击                      

            EnemyThumpHit = 48,                   //敌人重击



            PlayerYinji = 49,                    //玩家印记

            PetYinj = 50,                        //宠物印记                      
            EnemyYinjt = 51,                   //敌人印记



            PlayerBurning = 52,                    //玩家灼烧

            PetBurning = 53,                        //宠物灼烧                      
            EnemyBurning = 54,                   //敌人灼烧



            BuffAddDefense = 101,//+防御buff

            BuffAddAttack = 102,//+攻击buff

            BuffAddAttackSpeed = 103,//+攻速buff


 Utility/EnumHelper.cs

@@ -1246,34 +1246,36 @@
    /** 普通伤害 */

    Normal = 1,

    /** 恢复 */

    Recovery,

    Recovery=2,

    /** 反弹伤害 */

    BounceHurt,

    BounceHurt=3,

    /** 留血 */

    Bleed,

    Bleed=4,

    /** 抵御 */

    Parry,

    Parry=5,

    /** 连击 */

    DoubleHit,

    DoubleHit=6,

    /** 暴击 */

    SuperHit,

    SuperHit=7,

    /** 会心一击 */

    LuckyHit,

    LuckyHit=8,

    /** 闪避 */

    Miss,

    Miss=9,

    /** 免疫 */

    Immune,

    Immune=10,

    /** 压制 */

    Suppress,

    Suppress=11,

    /**斩杀**/

    ZhanSha,

    ZhanSha=12,

    /** 诛仙一击 */

    ZhuXianAtk,

    ZhuXianAtk=13,

    /** 终极斩杀 */

    FinalKill,

    FinalKill=14,

    /*致命一击*/

    DeadlyHit,

    ThumpHit,// 重击

    DeadlyHit=15,

    ThumpHit=16,// 重击

    Yinji = 16,// 印记

    Burning = 17,// 灼烧

}



[XLua.LuaCallCSharp]