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

client_linchunjie

2019-01-04 665666a0bdbb0fdec0a24db40375293ad79fa7ff

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

 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

@@ -222,6 +222,12 @@


        private void ClickBuyTimes()

        {

            if(!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)

            {

                SysNotifyMgr.Instance.ShowTip("CrossMatching21");

                return;

            }



            int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();

            if (remainNum >= crossServerModel.freeMaxMatchNum)

            {


 System/Vip/VipInvest/WheelOfFortuneWin.cs

@@ -129,15 +129,16 @@
        }

        protected override void LateUpdate()

        {

            base.LateUpdate();

        }

        protected override void OnAfterClose()
        {

            timeType += Time.deltaTime;
            if (timeType >= Second && !IsSend)

            {

                timeType = 0;

                IsSend = true;

            }
            }

        }

        protected override void OnAfterClose()
        {

           
        }

        private void OnClickButton()


 UI/HUD/PopUpNum.cs

@@ -315,6 +315,10 @@
            PetImmune = 29,                        //宠物免疫                      

            EnemyImmune = 30,                   //敌人免疫



            PlayerZhanSha = 34,                    //玩家斩杀

            PetZhanSha = 35,                        //宠物斩杀                      
            EnemyZhanSha = 36,                   //敌人斩杀



            BuffAddDefense = 101,//+防御buff

            BuffAddAttack = 102,//+攻击buff

            BuffAddAttackSpeed = 103,//+攻速buff


 Utility/EnumHelper.cs

@@ -1352,7 +1352,9 @@
    /** 免疫 */

    Immune,

    /** 压制 */

    Suppress

    Suppress,

    /**斩杀**/

    ZhanSha,

}



public enum E_PlayerState