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

client_Wu Xijin

2019-05-22 a8ca0f1a2fd8c0e09ea079f8acbc50e248e1bd4c

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

 Fight/Actor/Skill/AttackHandler.cs

@@ -211,7 +211,7 @@


                    if (attacker is GA_NpcClientFightNorm)

                    {

                        if ((target.ActorInfo.RealHp - (ulong)hurtValue) <= (target.ActorInfo.RealMaxHp * .5f))

                        if ((target.ActorInfo.RealHp - (ulong)realHurtValue) <= (target.ActorInfo.RealMaxHp * .5f))

                        {

                            hurtValue = 0;

                            realHurtValue = 0;

@@ -242,7 +242,14 @@


                    if (_doReduceHp)

                    {

                        target.ActorInfo.ReduceHp((uint)realHurtValue);

                        if (attacker is GA_NpcClientFightNorm || target is GA_NpcClientFightNorm)

                        {

                            target.ActorInfo.ReduceHp((uint)hurtValue);

                        }

                        else

                        {

                            target.ActorInfo.ReduceHp((uint)realHurtValue);

                        }

                    }



                    if (target.ServerInstID == PlayerDatas.Instance.baseData.PlayerID)


 System/Alchemy/AlchemyUseDrugCell.cs

@@ -31,6 +31,9 @@
                ItemTipUtility.Show(itemId);

            });



            m_Item.countText.gameObject.SetActive(count > 0);

            m_Item.countText.text = count.ToString();



            var eatTimes = 0;



            AlchemyDrugUseLimit drugUseLimit;