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

client_Wu Xijin

2019-01-25 905147e857d07655fb493b7548a32009aebd9c8a

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

 Fight/Actor/HeroBehaviour.cs

@@ -418,7 +418,8 @@
        {

            if (m_Hero.aiHandler.IsAuto())

            {

                if (m_Hero.LockTarget != null)

                GActorFight _fight = m_Hero.LockTarget as GActorFight;

                if (_fight != null && _fight.CanAtked())

                {

                    _realDir = m_Hero.Forward = MathUtility.ForwardXZ(m_Hero.LockTarget.Pos, m_Hero.Pos);

                }

@@ -446,7 +447,8 @@
            if (skill.skillInfo.config.Skillactmark != GAStaticDefine.Act_Roll

                && skill.skillInfo.config.AtkType != (int)E_AtkType.FlashMove)

            {

                if (m_Hero.LockTarget != null)

                GActorFight _fight = m_Hero.LockTarget as GActorFight;

                if (m_Hero.LockTarget != null && _fight.CanAtked())

                {

                    skill.targetPosition = m_Hero.LockTarget.Pos;

                }

@@ -460,7 +462,8 @@
        {

            Vector3 _dir;

            float _radius = 0.5f;

            if (m_Hero.LockTarget != null)

            GActorFight _fight = m_Hero.LockTarget as GActorFight;

            if (m_Hero.LockTarget != null && _fight.CanAtked())

            {

                GActorNpcFight _npcFight = m_Hero.LockTarget as GActorNpcFight;

                if (_npcFight != null)


 System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs

@@ -183,15 +183,16 @@
                int equipPlace = equipPlaces[0];

                List<int> activeEquips = null;

                bool isActive = equipModel.TryGetIsActiveSuit(equipPlace,suitAttrData.suitLv,out activeEquips);

                activeObj.SetActive(!isActive);

                if(!isActive)

                bool isShowActiveObj = !isActive || type == PackType.rptJadeDynastyItem;

                activeObj.SetActive(isShowActiveObj);

                if(isShowActiveObj)

                {

                    string equipsName = string.Empty;

                    for(int i = 0; i < equipPlaces.Count; i++)

                    {

                        var place = equipPlaces[i];

                        string equipName = Language.Get(((RoleEquipType)place).ToString());

                        if (activeEquips.Contains(place))

                        if (activeEquips.Contains(place) && type == PackType.rptJadeDynastyEquip)

                        {

                            equipName = UIHelper.AppendStringColor(TextColType.Green,equipName);

                        }

@@ -218,15 +219,7 @@
                        var attrText = attrTextlist[i];

                        var attrConfig = Config.Instance.Get<PlayerPropertyConfig>(attrId);

                        string attrSB = string.Empty;

                        string attrValueSB = string.Empty;

                        if (isActive)

                        {

                          attrValueSB = UIHelper.AppendStringColor(TextColType.Green, tipsModel.GetProValueTypeStr(attrConfig, attrValue));

                        }

                        else

                        {

                            attrValueSB = UIHelper.AppendStringColor(TextColType.Gray, tipsModel.GetProValueTypeStr(attrConfig, attrValue));

                        }

                        string attrValueSB = tipsModel.GetProValueTypeStr(attrConfig, attrValue); ;

                        if (attrConfig.Name.Contains("%s"))

                        {

                            attrSB = attrConfig.Name.Replace("%s", attrValueSB);