Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 Fight/GameActor/GAStaticDefine.cs

@@ -33,6 +33,7 @@
    public static readonly int State_HurtDown2Hash = Animator.StringToHash("HurtDown_801");

    public static readonly int State_RollHash = Animator.StringToHash("Skill_99");

    public static readonly int State_Dance = Animator.StringToHash("Dance");

    public static readonly int State_Transmit = Animator.StringToHash("Transmit");//传功



    public static readonly int State_Attack1Hash = Animator.StringToHash("Attack_10");

    public static readonly int State_Attack2Hash = Animator.StringToHash("Attack_11");